March 2017 - Wine-Commits - list.winehq.org

Jacek Caban : rpcrt4: Get rid of manual_listen_count and use binary state instead.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: d0ed6d10358683e76f4fc059572fcd60813e8dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ed6d10358683e76f4fc0595… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 16 14:00:17 2017 +0100 rpcrt4: Get rid of manual_listen_count and use binary state instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 75 +++++++++++++++++++++++----------------------- dlls/rpcrt4/tests/rpc.c | 4 --- dlls/rpcrt4/tests/server.c | 4 +-- 3 files changed, 38 insertions(+), 45 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 9e0426a..bca22eb 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -101,11 +101,9 @@ static CRITICAL_SECTION server_auth_info_cs = { &server_auth_info_cs_debug, -1, /* whether the server is currently listening */ static BOOL std_listen; -/* number of manual listeners (calls to RpcServerListen) */ -static LONG manual_listen_count; /* total listeners including auto listeners */ static LONG listen_count; -/* event set once all listening is finished */ +/* event set once all manual listening is finished */ static HANDLE listen_done_event; static UUID uuid_nil; @@ -735,13 +733,16 @@ static RPC_STATUS RPCRT4_start_listen(BOOL auto_listen) TRACE("\n"); EnterCriticalSection(&listen_cs); - if (auto_listen || (manual_listen_count++ == 0)) + if (auto_listen || !listen_done_event) { status = RPC_S_OK; + if(!auto_listen) + listen_done_event = CreateEventW(NULL, TRUE, FALSE, NULL); if (++listen_count == 1) std_listen = TRUE; } LeaveCriticalSection(&listen_cs); + if (status) return status; if (std_listen) { @@ -764,38 +765,38 @@ static RPC_STATUS RPCRT4_start_listen(BOOL auto_listen) static RPC_STATUS RPCRT4_stop_listen(BOOL auto_listen) { + BOOL stop_listen = FALSE; RPC_STATUS status = RPC_S_OK; EnterCriticalSection(&listen_cs); - - if (!std_listen) + if (!std_listen && (auto_listen || !listen_done_event)) { status = RPC_S_NOT_LISTENING; - goto done; } - - if (auto_listen || (--manual_listen_count == 0)) + else { - if (listen_count != 0 && --listen_count == 0) { - RpcServerProtseq *cps; - + stop_listen = listen_count != 0 && --listen_count == 0; + assert(listen_count >= 0); + if (stop_listen) std_listen = FALSE; - LeaveCriticalSection(&listen_cs); + } + LeaveCriticalSection(&listen_cs); - LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) - RPCRT4_sync_with_server_thread(cps); + if (status) return status; - EnterCriticalSection(&listen_cs); - if (listen_done_event) SetEvent( listen_done_event ); - listen_done_event = 0; - goto done; - } - assert(listen_count >= 0); + if (stop_listen) { + RpcServerProtseq *cps; + LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) + RPCRT4_sync_with_server_thread(cps); } -done: - LeaveCriticalSection(&listen_cs); - return status; + if (!auto_listen) + { + EnterCriticalSection(&listen_cs); + SetEvent( listen_done_event ); + LeaveCriticalSection(&listen_cs); + } + return RPC_S_OK; } static BOOL RPCRT4_protseq_is_endpoint_registered(RpcServerProtseq *protseq, const char *endpoint) @@ -1527,25 +1528,23 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) TRACE("()\n"); EnterCriticalSection(&listen_cs); - - if (!std_listen) { - LeaveCriticalSection(&listen_cs); - return RPC_S_NOT_LISTENING; - } - if (listen_done_event) { - LeaveCriticalSection(&listen_cs); - return RPC_S_ALREADY_LISTENING; - } - event = CreateEventW( NULL, TRUE, FALSE, NULL ); - listen_done_event = event; - + event = listen_done_event; LeaveCriticalSection(&listen_cs); + if (!event) + return RPC_S_NOT_LISTENING; + TRACE( "waiting for server calls to finish\n" ); WaitForSingleObject( event, INFINITE ); TRACE( "done waiting\n" ); - CloseHandle( event ); + EnterCriticalSection(&listen_cs); + if (listen_done_event == event) + { + listen_done_event = NULL; + CloseHandle( event ); + } + LeaveCriticalSection(&listen_cs); return RPC_S_OK; } @@ -1671,7 +1670,7 @@ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) status = RPCRT4_IsServerListening(rpc_binding->Protseq, rpc_binding->Endpoint); }else { EnterCriticalSection(&listen_cs); - if (manual_listen_count > 0) status = RPC_S_OK; + if (listen_done_event && std_listen) status = RPC_S_OK; LeaveCriticalSection(&listen_cs); } diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 36b3de9..7fdaf88 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -250,10 +250,8 @@ static void test_rpc_ncacn_ip_tcp(void) ok(status == RPC_S_OK, "RpcServerListen failed (%u)\n", status); status = RpcServerListen(1, 20, TRUE); -todo_wine { ok(status == RPC_S_ALREADY_LISTENING, "wrong RpcServerListen error (%u)\n", status); -} status = RpcStringBindingComposeA(NULL, ncacn_ip_tcp, address, endpoint, NULL, &binding); @@ -301,9 +299,7 @@ todo_wine { ok(status == RPC_S_OK, "RpcServerUnregisterIf failed (%u)\n", status); status = RpcMgmtWaitServerListen(); -todo_wine { ok(status == RPC_S_OK, "RpcMgmtWaitServerListen failed (%u)\n", status); -} status = RpcStringFreeA(&binding); ok(status == RPC_S_OK, "RpcStringFree failed (%u)\n", status); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 290e7de..9dca3c8 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1752,9 +1752,7 @@ server(void) if (ret == WAIT_OBJECT_0) { status = RpcMgmtWaitServerListen(); - todo_wine { - ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %d\n", status); - } + ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %d\n", status); } }

1 0

Piotr Caban : msvcr: Add __crtUnhandledException implementation.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: a5031391f40c6196b9baccbf69f5ccbe3b59e17c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5031391f40c6196b9baccbf6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 16 17:44:52 2017 +0100 msvcr: Add __crtUnhandledException implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/misc.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 1cb8281..fa3206d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -930,7 +930,7 @@ @ stub -arch=i386,win64 __crtSetThreadStackGuarantee @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess -@ stub -arch=i386,win64 __crtUnhandledException +@ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4b744eb..84edf51 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -920,7 +920,7 @@ @ cdecl __crtSetUnhandledExceptionFilter(ptr) MSVCR110__crtSetUnhandledExceptionFilter @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess @ stub __crtSleep -@ stub -arch=i386,win64 __crtUnhandledException +@ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException @ cdecl __daylight() MSVCRT___p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() MSVCRT___doserrno diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 23a089a..767972f 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -532,3 +532,13 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved) { WARN("(%x)\n", reserved); } + +/********************************************************************* + * __crtUnhandledException (MSVCR110.@) + */ +LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep) +{ + TRACE("(%p)\n", ep); + SetUnhandledExceptionFilter(NULL); + return UnhandledExceptionFilter(ep); +}

1 0

Alistair Leslie-Hughes : oledb32: Support DBTYPE_NUMERIC in IDataConvert GetConversionSize.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: a744cc81df75f4123fb4a9cd8d42e0287ecbc5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a744cc81df75f4123fb4a9cd8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 16 04:53:56 2017 +0000 oledb32: Support DBTYPE_NUMERIC in IDataConvert GetConversionSize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 2 ++ dlls/oledb32/tests/convert.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index eadac76..0d45ef0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -139,6 +139,8 @@ static int get_length(DBTYPE type) return sizeof(FILETIME); case DBTYPE_GUID: return sizeof(GUID); + case DBTYPE_NUMERIC: + return sizeof(DB_NUMERIC); case DBTYPE_BYTES: case DBTYPE_WSTR: case DBTYPE_STR: diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 28f15e8..b8b3c6f 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2857,6 +2857,9 @@ static void test_getconversionsize(void) ok(hr == S_OK, "got 0x%08x\n", hr); VariantClear(&var); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_NUMERIC, DBTYPE_NUMERIC, NULL, &dst_len, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == sizeof(DB_NUMERIC), "%ld\n", dst_len); } static void test_converttobytes(void)

1 0

Jactry Zeng : devenum: Implement IMoniker::GetClassID().
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: 05ed8318943fe0465ad6e46ea89bfdfead19c04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ed8318943fe0465ad6e46ea… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Mar 10 18:26:53 2017 +0800 devenum: Implement IMoniker::GetClassID(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 8 +++++--- dlls/devenum/tests/devenum.c | 9 +++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 21c9db3..6634334 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -355,12 +355,14 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetClassID(IMoniker *iface, CLSID { MediaCatMoniker *This = impl_from_IMoniker(iface); - FIXME("(%p)->(%p): stub\n", This, pClassID); + TRACE("(%p)->(%p)\n", This, pClassID); if (pClassID == NULL) - return E_POINTER; + return E_INVALIDARG; - return E_NOTIMPL; + *pClassID = CLSID_CDeviceMoniker; + + return S_OK; } static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsDirty(IMoniker *iface) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 8cc4dfd..e3c0f47 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -79,6 +79,15 @@ static void test_devenum(IBindCtx *bind_ctx) IPropertyBag* prop_bag = NULL; VARIANT var; HRESULT hr; + CLSID clsid = {0}; + + hr = IMoniker_GetClassID(moniker, NULL); + ok(hr == E_INVALIDARG, "IMoniker_GetClassID should failed %x\n", hr); + + hr = IMoniker_GetClassID(moniker, &clsid); + ok(hr == S_OK, "IMoniker_GetClassID failed with error %x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_CDeviceMoniker), + "Expected CLSID_CDeviceMoniker got %s\n", wine_dbgstr_guid(&clsid)); VariantInit(&var); hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag);

1 0

Daniel Lehman : msxml3: Don't QI for IPersistStream in internal_parse.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: 8bc68f349188aaea24e110a12e889a9e18adce54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc68f349188aaea24e110a12… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Mar 15 09:38:30 2017 -0700 msxml3: Don't QI for IPersistStream in internal_parse. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 32 ++++---------------------------- dlls/msxml3/tests/saxreader.c | 2 ++ 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 78cfe08..82241ad 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2661,7 +2661,6 @@ static HRESULT internal_parse( } case VT_UNKNOWN: case VT_DISPATCH: { - IPersistStream *persistStream; ISequentialStream *stream = NULL; IXMLDOMDocument *xmlDoc; @@ -2678,34 +2677,11 @@ static HRESULT internal_parse( break; } - if(IUnknown_QueryInterface(V_UNKNOWN(&varInput), - &IID_IPersistStream, (void**)&persistStream) == S_OK) - { - IStream *stream_copy; - - hr = CreateStreamOnHGlobal(NULL, TRUE, &stream_copy); - if(hr != S_OK) - { - IPersistStream_Release(persistStream); - return hr; - } - - hr = IPersistStream_Save(persistStream, stream_copy, TRUE); - IPersistStream_Release(persistStream); - if(hr == S_OK) - IStream_QueryInterface(stream_copy, &IID_ISequentialStream, (void**)&stream); - - IStream_Release(stream_copy); - } - /* try base interface first */ - if(!stream) - { - IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_ISequentialStream, (void**)&stream); - if (!stream) - /* this should never happen if IStream is implemented properly, but just in case */ - IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IStream, (void**)&stream); - } + IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_ISequentialStream, (void**)&stream); + if (!stream) + /* this should never happen if IStream is implemented properly, but just in case */ + IUnknown_QueryInterface(V_UNKNOWN(&varInput), &IID_IStream, (void**)&stream); if(stream) { diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5fc62b7..cabca9d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1908,6 +1908,8 @@ static HRESULT WINAPI istream_QueryInterface(IStream *iface, REFIID riid, void * { *ppvObject = NULL; + ok(!IsEqualGUID(riid, &IID_IPersistStream), "Did not expect QI for IPersistStream\n"); + if(IsEqualGUID(riid, &IID_IStream) || IsEqualGUID(riid, &IID_IUnknown)) *ppvObject = iface; else

1 0

Józef Kucia : wined3d: Fix off-by-one error in wined3d_gl_limits_get_texture_unit_range().
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: c191c2a09d810c61df2f936f890f5eab90744437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c191c2a09d810c61df2f936f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 16 11:30:19 2017 +0100 wined3d: Fix off-by-one error in wined3d_gl_limits_get_texture_unit_range(). Spotted by Matteo Bruni. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd78583..e78763f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6002,7 +6002,7 @@ void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl if (gl_limits->combined_samplers == gl_limits->graphics_samplers) *base = 0; else - *base = gl_limits->graphics_samplers - 1; + *base = gl_limits->graphics_samplers; *count = gl_limits->samplers[WINED3D_SHADER_TYPE_COMPUTE]; return; }

1 0

Jacek Caban : rpcrt4/tests: Added more server listening tests.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: 9a6781f8c9149330f23f8f497c59643c8412cbe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6781f8c9149330f23f8f497… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 16 14:32:37 2017 +0100 rpcrt4/tests: Added more server listening tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 9dca3c8..44a024d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1754,6 +1754,40 @@ server(void) status = RpcMgmtWaitServerListen(); ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %d\n", status); } + + CloseHandle(stop_event); + stop_event = NULL; +} + +static void test_server_listening(void) +{ + static unsigned char np[] = "ncacn_np"; + static unsigned char pipe[] = PIPE "listen_test"; + RPC_STATUS status; + + status = RpcServerUseProtseqEpA(np, 0, pipe, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_np) failed with status %d\n", status); + + status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); + ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); + + test_is_server_listening(NULL, RPC_S_NOT_LISTENING); + status = RpcServerListen(1, 20, TRUE); + ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status); + test_is_server_listening(NULL, RPC_S_OK); + + status = RpcServerListen(1, 20, TRUE); + ok(status == RPC_S_ALREADY_LISTENING, "RpcServerListen failed with status %d\n", status); + + status = RpcMgmtStopServerListening(NULL); + ok(status == RPC_S_OK, "RpcMgmtStopServerListening\n"); + test_is_server_listening(NULL, RPC_S_NOT_LISTENING); + + status = RpcMgmtWaitServerListen(); + ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %d\n", status); + + status = RpcMgmtWaitServerListen(); + ok(status == RPC_S_NOT_LISTENING, "RpcMgmtWaitServerListening failed with status %d\n", status); } static BOOL is_process_elevated(void) @@ -1911,6 +1945,10 @@ START_TEST(server) } RpcEndExcept } + else if (argc == 4) + { + test_server_listening(); + } else { if (firewall_enabled) @@ -1924,6 +1962,7 @@ START_TEST(server) } } server(); + run_client("test listen"); if (firewall_enabled) set_firewall(APP_REMOVE); }

1 0

Francois Gouget : advapi32/tests: Trace the display name if CreateService( ) unexpectedly succeeds.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: 2f9941e224339bfba2108aed855a77869e3f50b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9941e224339bfba2108aed8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 16 15:39:41 2017 +0100 advapi32/tests: Trace the display name if CreateService() unexpectedly succeeds. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index c7e3154..ab7ae2e 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -379,7 +379,7 @@ static void test_create_delete_svc(void) { svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - ok(!svc_handle1, "Expected failure\n"); + ok(!svc_handle1, "Expected failure for display name '%s'\n", display); ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); }

1 0

Paul Gofman : d3dx9: Set dirty flag on parameter change.
by Alexandre Julliard March 16, 2017

March 16, 2017

Module: wine Branch: master Commit: af4e4a9af5d81ac6c232e99a1be9552deb680b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4e4a9af5d81ac6c232e99a1… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 14 15:46:56 2017 +0300 d3dx9: Set dirty flag on parameter change. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 5 ++++ dlls/d3dx9_36/effect.c | 61 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 9d926c7..27b91a7 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -192,6 +192,8 @@ struct d3dx_param_eval struct d3dx_const_tab shader_inputs; }; +#define PARAMETER_FLAG_DIRTY 0x1u + struct d3dx_parameter { char *name; @@ -206,6 +208,7 @@ struct d3dx_parameter UINT member_count; DWORD flags; UINT bytes; + DWORD runtime_flags; DWORD object_id; D3DXHANDLE handle; @@ -215,6 +218,8 @@ struct d3dx_parameter struct d3dx_parameter *referenced_param; struct d3dx_param_eval *param_eval; + + DWORD *dirty_flag_ptr; }; struct d3dx9_base_effect; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 42f5aea..202a9a3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1316,6 +1316,29 @@ static D3DXHANDLE d3dx9_base_effect_get_annotation_by_name(struct d3dx9_base_eff return NULL; } +static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep_func param_func, + void *data) +{ + unsigned int i; + unsigned int member_count; + + if (param_func(data, param)) + return TRUE; + + member_count = param->element_count ? param->element_count : param->member_count; + for (i = 0; i < member_count; ++i) + { + if (walk_parameter_tree(&param->members[i], param_func, data)) + return TRUE; + } + return FALSE; +} + +static void set_dirty(struct d3dx_parameter *param) +{ + *param->dirty_flag_ptr |= PARAMETER_FLAG_DIRTY; +} + static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const void *data, UINT bytes) { @@ -1364,6 +1387,7 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, case D3DXPT_FLOAT: TRACE("Copy %u bytes\n", param->bytes); memcpy(param->data, data, param->bytes); + set_dirty(param); break; default: @@ -1450,6 +1474,7 @@ static HRESULT d3dx9_base_effect_set_bool(struct d3dx9_base_effect *base, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { set_number(param->data, param->type, &b, D3DXPT_BOOL); + set_dirty(param); return D3D_OK; } @@ -1495,6 +1520,7 @@ static HRESULT d3dx9_base_effect_set_bool_array(struct d3dx9_base_effect *base, /* don't crop the input, use D3DXPT_INT instead of D3DXPT_BOOL */ set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_INT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1544,7 +1570,12 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN { if (param->rows == 1 && param->columns == 1) { - set_number(param->data, param->type, &n, D3DXPT_INT); + DWORD value; + + set_number(&value, param->type, &n, D3DXPT_INT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; return D3D_OK; } @@ -1564,6 +1595,7 @@ static HRESULT d3dx9_base_effect_set_int(struct d3dx9_base_effect *base, D3DXHAN { ((FLOAT *)param->data)[3] = ((n & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; } + set_dirty(param); return D3D_OK; } } @@ -1631,6 +1663,7 @@ static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base, { set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1678,7 +1711,12 @@ static HRESULT d3dx9_base_effect_set_float(struct d3dx9_base_effect *base, D3DXH if (param && !param->element_count && param->rows == 1 && param->columns == 1) { - set_number((DWORD *)param->data, param->type, &f, D3DXPT_FLOAT); + DWORD value; + + set_number(&value, param->type, &f, D3DXPT_FLOAT); + if (value != *(DWORD *)param->data) + set_dirty(param); + *(DWORD *)param->data = value; return D3D_OK; } @@ -1723,6 +1761,7 @@ static HRESULT d3dx9_base_effect_set_float_array(struct d3dx9_base_effect *base, { set_number((DWORD *)param->data + i, param->type, &f[i], D3DXPT_FLOAT); } + set_dirty(param); return D3D_OK; case D3DXPC_OBJECT: @@ -1777,6 +1816,7 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, { case D3DXPC_SCALAR: case D3DXPC_VECTOR: + set_dirty(param); if (param->type == D3DXPT_INT && param->bytes == 4) { DWORD tmp; @@ -1870,6 +1910,7 @@ static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base switch (param->class) { case D3DXPC_VECTOR: + set_dirty(param); if (param->type == D3DXPT_FLOAT) { if (param->columns == 4) @@ -1956,6 +1997,7 @@ static HRESULT d3dx9_base_effect_set_matrix(struct d3dx9_base_effect *base, { case D3DXPC_MATRIX_ROWS: set_matrix(param, matrix); + set_dirty(param); return D3D_OK; case D3DXPC_SCALAR: @@ -2021,6 +2063,7 @@ static HRESULT d3dx9_base_effect_set_matrix_array(struct d3dx9_base_effect *base switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix(&param->members[i], &matrix[i]); @@ -2095,6 +2138,7 @@ static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effe switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix(&param->members[i], matrix[i]); @@ -2167,6 +2211,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose(struct d3dx9_base_effect * switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); set_matrix_transpose(param, matrix); return D3D_OK; @@ -2236,6 +2281,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_array(struct d3dx9_base_ef switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix_transpose(&param->members[i], &matrix[i]); @@ -2310,6 +2356,7 @@ static HRESULT d3dx9_base_effect_set_matrix_transpose_pointer_array(struct d3dx9 switch (param->class) { case D3DXPC_MATRIX_ROWS: + set_dirty(param); for (i = 0; i < count; ++i) { set_matrix_transpose(&param->members[i], matrix[i]); @@ -2414,6 +2461,7 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, if (oltexture) IDirect3DBaseTexture9_Release(oltexture); *(struct IDirect3DBaseTexture9 **)param->data = texture; + set_dirty(param); return D3D_OK; } @@ -5798,6 +5846,12 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * return hr; } +static BOOL param_set_dirty_flag_ptr(void *dirty_flag_ptr, struct d3dx_parameter *param) +{ + param->dirty_flag_ptr = (DWORD *)dirty_flag_ptr; + return FALSE; +} + static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *data, UINT data_size, DWORD start) { const char *ptr = data + start; @@ -5907,6 +5961,9 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da } } + for (i = 0; i < base->parameter_count; ++i) + walk_parameter_tree(&base->parameters[i], param_set_dirty_flag_ptr, + &base->parameters[i].runtime_flags); return D3D_OK; err_out:

1 0

Józef Kucia : wined3d: Recompute sampler count before allocating sampler range for compute shaders.
by Alexandre Julliard March 15, 2017

March 15, 2017

Module: wine Branch: master Commit: 8ca5577ed152602ce3a08d94efb1b17595639fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca5577ed152602ce3a08d94e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 15 12:00:08 2017 +0100 wined3d: Recompute sampler count before allocating sampler range for compute shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 23b10ba..53255de 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3716,7 +3716,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) /* A majority of OpenGL implementations allow us to statically partition * the set of texture bindings into six separate sets. */ gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; - sampler_count += gl_info->limits.samplers[WINED3D_SHADER_TYPE_COMPUTE]; + sampler_count = 0; + for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) + sampler_count += gl_info->limits.samplers[i]; if (gl_info->limits.combined_samplers >= sampler_count) gl_info->limits.graphics_samplers -= gl_info->limits.samplers[WINED3D_SHADER_TYPE_COMPUTE]; }

1 0