wine-commits September 2016

wine-commits@winehq.org

2 participants
430 discussions

Alexandre Julliard : user32/tests: Add some tests for synthesized clipboard formats.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: e01592e82f4967da31ec5a16cfc6b1228665c8d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01592e82f4967da31ec5a16c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 2 16:20:07 2016 +0900 user32/tests: Add some tests for synthesized clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 345 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 334 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e01592e82f4967da31ec5…

1 0

Nikolay Sivov : d3dx10/tests: Basic tests for async loaders.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 53d01474f26454b54a71ac6d4b4e36a69ac1849d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d01474f26454b54a71ac6d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 19:22:36 2016 +0200 d3dx10/tests: Basic tests for async loaders. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 35 +++++++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 10 ++--- dlls/d3dx10_43/tests/d3dx10.c | 100 ++++++++++++++++++++++++++++++++++++++++++ include/d3dx10.h | 16 +++++++ include/d3dx10async.h | 6 +++ 5 files changed, 162 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index 36110d2..f49eb92 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -67,3 +67,38 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromFileW(const WCHAR *filename, const D3D1 return E_NOTIMPL; } + +HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T data_size, ID3DX10DataLoader **loader) +{ + FIXME("data %p, data_size %lu, loader %p stub!\n", data, data_size, loader); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader) +{ + FIXME("filename %s, loader %p stub!\n", debugstr_a(filename), loader); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader) +{ + FIXME("filename %s, loader %p stub!\n", debugstr_w(filename), loader); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX10DataLoader **loader) +{ + FIXME("module %p, resource %s, loader %p stub!\n", module, debugstr_a(resource), loader); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX10DataLoader **loader) +{ + FIXME("module %p, resource %s, loader %p stub!\n", module, debugstr_w(resource), loader); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 61f16fe..49a6d3a 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -9,11 +9,11 @@ @ stub D3DX10CreateAsyncCompilerProcessor(str ptr ptr str str long long ptr ptr ptr) @ stub D3DX10CreateAsyncEffectCreateProcessor(str ptr ptr str long long ptr ptr ptr ptr) @ stub D3DX10CreateAsyncEffectPoolCreateProcessor(str ptr ptr str long long ptr ptr ptr) -@ stub D3DX10CreateAsyncFileLoaderA(str ptr) -@ stub D3DX10CreateAsyncFileLoaderW(wstr ptr) -@ stub D3DX10CreateAsyncMemoryLoader(ptr long ptr) -@ stub D3DX10CreateAsyncResourceLoaderA(long str ptr) -@ stub D3DX10CreateAsyncResourceLoaderW(long wstr ptr) +@ stdcall D3DX10CreateAsyncFileLoaderA(str ptr) +@ stdcall D3DX10CreateAsyncFileLoaderW(wstr ptr) +@ stdcall D3DX10CreateAsyncMemoryLoader(ptr long ptr) +@ stdcall D3DX10CreateAsyncResourceLoaderA(long str ptr) +@ stdcall D3DX10CreateAsyncResourceLoaderW(long wstr ptr) @ stub D3DX10CreateAsyncShaderPreprocessProcessor(str ptr ptr ptr ptr ptr) @ stub D3DX10CreateAsyncShaderResourceViewProcessor(ptr ptr ptr) @ stub D3DX10CreateAsyncTextureInfoProcessor(ptr ptr) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index d91dbdc..2eccb69 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -605,7 +605,107 @@ float4 main(float4 color : COLOR) : SV_TARGET ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_D3DX10CreateAsyncMemoryLoader(void) +{ + ID3DX10DataLoader *loader; + SIZE_T size; + DWORD data; + HRESULT hr; + void *ptr; + + hr = D3DX10CreateAsyncMemoryLoader(NULL, 0, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncMemoryLoader(NULL, 0, &loader); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncMemoryLoader(&data, 0, &loader); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + if (FAILED(hr)) + return; + + size = 100; + hr = ID3DX10DataLoader_Decompress(loader, &ptr, &size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == &data, "Got data pointer %p, original %p.\n", ptr, &data); + ok(!size, "Got unexpected data size.\n"); + + /* Load() is no-op. */ + hr = ID3DX10DataLoader_Load(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Destroy(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + data = 0; + hr = D3DX10CreateAsyncMemoryLoader(&data, sizeof(data), &loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Load() is no-op. */ + hr = ID3DX10DataLoader_Load(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Decompress(loader, &ptr, &size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(ptr == &data, "Got data pointer %p, original %p.\n", ptr, &data); + ok(size == sizeof(data), "Got unexpected data size.\n"); + + hr = ID3DX10DataLoader_Destroy(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); +} + +static void test_D3DX10CreateAsyncFileLoader(void) +{ + ID3DX10DataLoader *loader; + SIZE_T size; + HRESULT hr; + void *ptr; + + hr = D3DX10CreateAsyncFileLoaderA(NULL, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncFileLoaderA(NULL, &loader); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncFileLoaderA("nonexistentfilename", &loader); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + if (FAILED(hr)) + return; + + hr = ID3DX10DataLoader_Decompress(loader, &ptr, &size); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Load(loader); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Decompress(loader, &ptr, &size); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = ID3DX10DataLoader_Destroy(loader); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); +} + +static void test_D3DX10CreateAsyncResourceLoader(void) +{ + ID3DX10DataLoader *loader; + HRESULT hr; + + hr = D3DX10CreateAsyncResourceLoaderA(NULL, NULL, NULL); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncResourceLoaderA(NULL, NULL, &loader); + todo_wine ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); + + hr = D3DX10CreateAsyncResourceLoaderA(NULL, "nonexistentresourcename", &loader); + todo_wine ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); +} + START_TEST(d3dx10) { test_D3DX10UnsetAllDeviceObjects(); + test_D3DX10CreateAsyncMemoryLoader(); + test_D3DX10CreateAsyncFileLoader(); + test_D3DX10CreateAsyncResourceLoader(); } diff --git a/include/d3dx10.h b/include/d3dx10.h index fb48723..7062d24 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -32,4 +32,20 @@ #include "d3dx10async.h" #include "d3dx10tex.h" +#define _FACDD 0x876 +#define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) + +enum _D3DX10_ERR +{ + D3DX10_ERR_CANNOT_MODIFY_INDEX_BUFFER = MAKE_DDHRESULT(2900), + D3DX10_ERR_INVALID_MESH = MAKE_DDHRESULT(2901), + D3DX10_ERR_CANNOT_ATTR_SORT = MAKE_DDHRESULT(2902), + D3DX10_ERR_SKINNING_NOT_SUPPORTED = MAKE_DDHRESULT(2903), + D3DX10_ERR_TOO_MANY_INFLUENCES = MAKE_DDHRESULT(2904), + D3DX10_ERR_INVALID_DATA = MAKE_DDHRESULT(2905), + D3DX10_ERR_LOADED_MESH_HAS_NO_DATA = MAKE_DDHRESULT(2906), + D3DX10_ERR_DUPLICATE_NAMED_FRAGMENT = MAKE_DDHRESULT(2907), + D3DX10_ERR_CANNOT_REMOVE_LAST_ITEM = MAKE_DDHRESULT(2908) +}; + #endif diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 364ad12..6663be4 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -54,4 +54,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncResourceLoaderA(HMODULE module, const char *resource, ID3DX10DataLoader **loader); +HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *resource, ID3DX10DataLoader **loader); + #endif

1 0

Sebastian Lackner : ntdll: Simplify RtlFormatCurrentUserKeyPath using GetCurrentThreadEffectiveToken.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: be74d3a5d52c713af061ea9030889345c887bcc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be74d3a5d52c713af061ea903… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 23:52:27 2016 +0200 ntdll: Simplify RtlFormatCurrentUserKeyPath using GetCurrentThreadEffectiveToken. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 0d03300..6dc5d61 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -911,42 +911,33 @@ NTSTATUS WINAPI NtUnloadKey(IN POBJECT_ATTRIBUTES attr) NTSTATUS WINAPI RtlFormatCurrentUserKeyPath( IN OUT PUNICODE_STRING KeyPath) { static const WCHAR pathW[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\'}; - HANDLE token; + char buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + DWORD len = sizeof(buffer); NTSTATUS status; - status = NtOpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token); - if (status == STATUS_NO_TOKEN) - status = NtOpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token); + status = NtQueryInformationToken(GetCurrentThreadEffectiveToken(), TokenUser, buffer, len, &len); if (status == STATUS_SUCCESS) { - char buffer[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; - DWORD len = sizeof(buffer); - - status = NtQueryInformationToken(token, TokenUser, buffer, len, &len); - if (status == STATUS_SUCCESS) + KeyPath->MaximumLength = 0; + status = RtlConvertSidToUnicodeString(KeyPath, ((TOKEN_USER *)buffer)->User.Sid, FALSE); + if (status == STATUS_BUFFER_OVERFLOW) { - KeyPath->MaximumLength = 0; - status = RtlConvertSidToUnicodeString(KeyPath, ((TOKEN_USER *)buffer)->User.Sid, FALSE); - if (status == STATUS_BUFFER_OVERFLOW) + PWCHAR buf = RtlAllocateHeap(GetProcessHeap(), 0, + sizeof(pathW) + KeyPath->Length + sizeof(WCHAR)); + if (buf) { - PWCHAR buf = RtlAllocateHeap(GetProcessHeap(), 0, - sizeof(pathW) + KeyPath->Length + sizeof(WCHAR)); - if (buf) - { - memcpy(buf, pathW, sizeof(pathW)); - KeyPath->MaximumLength = KeyPath->Length + sizeof(WCHAR); - KeyPath->Buffer = (PWCHAR)((LPBYTE)buf + sizeof(pathW)); - status = RtlConvertSidToUnicodeString(KeyPath, - ((TOKEN_USER *)buffer)->User.Sid, FALSE); - KeyPath->Buffer = buf; - KeyPath->Length += sizeof(pathW); - KeyPath->MaximumLength += sizeof(pathW); - } - else - status = STATUS_NO_MEMORY; + memcpy(buf, pathW, sizeof(pathW)); + KeyPath->MaximumLength = KeyPath->Length + sizeof(WCHAR); + KeyPath->Buffer = (PWCHAR)((LPBYTE)buf + sizeof(pathW)); + status = RtlConvertSidToUnicodeString(KeyPath, + ((TOKEN_USER *)buffer)->User.Sid, FALSE); + KeyPath->Buffer = buf; + KeyPath->Length += sizeof(pathW); + KeyPath->MaximumLength += sizeof(pathW); } + else + status = STATUS_NO_MEMORY; } - NtClose(token); } return status; }

1 0

Andrew Eikum : quartz: Implement IClassFactory::LockServer.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: b0534c12c0a8b7a526aef04f23f67a33abd3a455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0534c12c0a8b7a526aef04f2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 1 15:11:43 2016 -0500 quartz: Implement IClassFactory::LockServer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 32865f3..7c2accb 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -29,6 +29,8 @@ extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLS extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; +static LONG server_locks = 0; + /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -142,6 +144,10 @@ static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); + if(dolock) + InterlockedIncrement(&server_locks); + else + InterlockedDecrement(&server_locks); return S_OK; } @@ -204,7 +210,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return QUARTZ_DllCanUnloadNow(); + if(server_locks == 0 && QUARTZ_DllCanUnloadNow() == S_OK) + return S_OK; + return S_FALSE; }

1 0

Andrew Eikum : qcap: Use HRESULT correctly.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: d6afd45e71c134367a5fb8cbd331d17aaccc41a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6afd45e71c134367a5fb8cbd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Sep 1 15:11:31 2016 -0500 qcap: Use HRESULT correctly. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/qcap_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index b379850..bc0b903 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -185,7 +185,7 @@ HRESULT WINAPI DllCanUnloadNow(void) { TRACE("\n"); - if (STRMBASE_DllCanUnloadNow() && objects_ref == 0) + if (STRMBASE_DllCanUnloadNow() == S_OK && objects_ref == 0) return S_OK; return S_FALSE; }

1 0

Sebastian Lackner : ntoskrnl.exe: Use the same timeout for service startup like in other wine modules.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: b1c36e7583f790569234a16226da51fd81843ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c36e7583f790569234a1622… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 21:46:13 2016 +0200 ntoskrnl.exe: Use the same timeout for service startup like in other wine modules. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 507ffdd..b671e81 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2701,9 +2701,9 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) { SERVICE_STATUS_PROCESS service_status; SC_HANDLE service_handle; + ULONGLONG start_time; NTSTATUS status; DWORD bytes; - int i; TRACE( "(%s)\n", debugstr_us(service_name) ); @@ -2712,21 +2712,24 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) TRACE( "trying to start %s\n", debugstr_us(service_name) ); - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (StartServiceW( service_handle, 0, NULL )) break; if (GetLastError() == ERROR_SERVICE_ALREADY_RUNNING) break; if (GetLastError() != ERROR_SERVICE_DATABASE_LOCKED) goto error; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } - if (i == 100) goto error; - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (!QueryServiceStatusEx( service_handle, SC_STATUS_PROCESS_INFO, (BYTE *)&service_status, sizeof(service_status), &bytes )) goto error; if (service_status.dwCurrentState != SERVICE_START_PENDING) break; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } if (service_status.dwCurrentState == SERVICE_RUNNING) @@ -2756,8 +2759,8 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) { SERVICE_STATUS service_status; SC_HANDLE service_handle; + ULONGLONG start_time; NTSTATUS status; - int i; TRACE( "(%s)\n", debugstr_us(service_name) ); @@ -2767,11 +2770,13 @@ NTSTATUS WINAPI ZwUnloadDriver( const UNICODE_STRING *service_name ) if (!ControlService( service_handle, SERVICE_CONTROL_STOP, &service_status )) goto error; - for (i = 0; i < 100; i++) /* 10 sec timeout */ + start_time = GetTickCount64(); + for (;;) { if (!QueryServiceStatus( service_handle, &service_status )) goto error; if (service_status.dwCurrentState != SERVICE_STOP_PENDING) break; - Sleep(100); + if (GetTickCount64() - start_time > 30000) goto error; + Sleep( 100 ); } if (service_status.dwCurrentState == SERVICE_STOPPED)

1 0

Sebastian Lackner : schedsvc: Avoid deadlock when scheduler service starts rpcss.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: bd31e320ddbeddd7d6948839fb5db786b0659b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd31e320ddbeddd7d6948839f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 21:44:24 2016 +0200 schedsvc: Avoid deadlock when scheduler service starts rpcss. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/svc_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index b559311..45496c9 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -175,8 +175,6 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { TRACE("starting Task Scheduler Service\n"); - if (RPC_init() != RPC_S_OK) return; - schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler); if (!schedsvc_handle) { @@ -186,11 +184,15 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) done_event = CreateEventW(NULL, TRUE, FALSE, NULL); - schedsvc_update_status(SERVICE_RUNNING); + schedsvc_update_status(SERVICE_START_PENDING); - WaitForSingleObject(done_event, INFINITE); + if (RPC_init() == RPC_S_OK) + { + schedsvc_update_status(SERVICE_RUNNING); + WaitForSingleObject(done_event, INFINITE); + RPC_finish(); + } - RPC_finish(); schedsvc_update_status(SERVICE_STOPPED); TRACE("exiting Task Scheduler Service\n");

1 0

Bruno Jesus : xinput1_3/tests: Cope with XInputGetStateEx not being present by name.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: e3cda2c45d22f76d309675ffa33c525c4e13ccba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3cda2c45d22f76d309675ffa… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 1 16:26:12 2016 -0300 xinput1_3/tests: Cope with XInputGetStateEx not being present by name. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 5261425..fadacae 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -238,10 +238,10 @@ START_TEST(xinput) pXInputGetDSoundAudioDeviceGuids = (void*)GetProcAddress(hXinput, "XInputGetDSoundAudioDeviceGuids"); pXInputGetBatteryInformation = (void*)GetProcAddress(hXinput, "XInputGetBatteryInformation"); - if (pXInputGetStateEx_Ordinal) - ok (pXInputGetStateEx_Ordinal == pXInputGetStateEx, "XInputGetStateEx in the wrong ordinal\n"); - else - ok (broken(1), "XInputGetStateEx not found in this dll version\n"); + /* XInputGetStateEx may not be present by name, use ordinal in this case */ + if (!pXInputGetStateEx) + pXInputGetStateEx = pXInputGetStateEx_Ordinal; + ok (pXInputGetStateEx != NULL, "XInputGetStateEx not found in this dll version\n"); test_set_state(); test_get_state();

1 0

Henri Verbeet : wined3d: Sanitise resource map flags in wined3d_resource_map().
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 8232f371d82fb1068416e1f6c9bde792f12e137c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8232f371d82fb1068416e1f6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:48 2016 +0200 wined3d: Sanitise resource map flags in wined3d_resource_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 1 - dlls/wined3d/resource.c | 68 ++++++++++++++++++++++-------------------- dlls/wined3d/texture.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fdecb04..7dc33c7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -942,7 +942,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); - flags = wined3d_resource_sanitize_map_flags(&buffer->resource, flags); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 multitexture * fill rate test seems to depend on this. When we map a buffer with * GL_MAP_INVALIDATE_BUFFER_BIT, the driver is free to discard the diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6484174..611c61f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -311,12 +311,47 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st desc->size = resource->size; } +static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource *resource, DWORD flags) +{ + /* Not all flags make sense together, but Windows never returns an error. + * Catch the cases that could cause issues. */ + if (flags & WINED3D_MAP_READONLY) + { + if (flags & WINED3D_MAP_DISCARD) + { + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); + return 0; + } + if (flags & WINED3D_MAP_NOOVERWRITE) + { + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); + return 0; + } + } + else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); + return 0; + } + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) + && !(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return 0; + } + + return flags; +} + HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); + flags = wined3d_resource_sanitise_map_flags(resource, flags); + return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags); } @@ -360,39 +395,6 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) resource->heap_memory = NULL; } -DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) -{ - /* Not all flags make sense together, but Windows never returns an error. - * Catch the cases that could cause issues. */ - if (flags & WINED3D_MAP_READONLY) - { - if (flags & WINED3D_MAP_DISCARD) - { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); - return 0; - } - if (flags & WINED3D_MAP_NOOVERWRITE) - { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); - return 0; - } - } - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - { - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); - return 0; - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) - && !(resource->usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; - } - - return flags; -} - GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) { GLbitfield ret = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d2b1be5..cf5fc93 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1700,8 +1700,6 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return WINED3DERR_INVALIDCALL; } - flags = wined3d_resource_sanitize_map_flags(resource, flags); - if (device->d3d_initialized) { context = context_acquire(device, NULL); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f59f60..b57b971 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2605,7 +2605,6 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; -DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */

1 0

Henri Verbeet : wined3d: Send resource unmaps through the command stream.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 66e54fd682f494265b6059d2f04d766ec085f149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e54fd682f494265b6059d2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:47 2016 +0200 wined3d: Send resource unmaps through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d86213b..7af0b81 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -58,6 +58,7 @@ enum wined3d_cs_op WINED3D_CS_OP_PRELOAD_RESOURCE, WINED3D_CS_OP_UNLOAD_RESOURCE, WINED3D_CS_OP_MAP, + WINED3D_CS_OP_UNMAP, }; struct wined3d_cs_present @@ -301,6 +302,14 @@ struct wined3d_cs_map HRESULT *hr; }; +struct wined3d_cs_unmap +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; + unsigned int sub_resource_idx; + HRESULT *hr; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1342,6 +1351,30 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, return hr; } +static void wined3d_cs_exec_unmap(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_unmap *op = data; + struct wined3d_resource *resource = op->resource; + + *op->hr = resource->resource_ops->resource_sub_resource_unmap(resource, op->sub_resource_idx); +} + +HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx) +{ + struct wined3d_cs_unmap *op; + HRESULT hr; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_UNMAP; + op->resource = resource; + op->sub_resource_idx = sub_resource_idx; + op->hr = &hr; + + cs->ops->submit(cs); + + return hr; +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1376,6 +1409,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_PRELOAD_RESOURCE */ wined3d_cs_exec_preload_resource, /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, /* WINED3D_CS_OP_MAP */ wined3d_cs_exec_map, + /* WINED3D_CS_OP_UNMAP */ wined3d_cs_exec_unmap, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2285c3c..6484174 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -324,7 +324,7 @@ HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned { TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); - return resource->resource_ops->resource_sub_resource_unmap(resource, sub_resource_idx); + return wined3d_cs_unmap(resource->device->cs, resource, sub_resource_idx); } void CDECL wined3d_resource_preload(struct wined3d_resource *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48f613f..1f59f60 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3098,6 +3098,8 @@ void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_vi void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; +HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, + unsigned int sub_resource_idx) DECLSPEC_HIDDEN; static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants)

1 0

← Newer
1
...
35
36
37
38
39
40
41
42
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2016