May 2013 - Wine-Commits - list.winehq.org

Christian Costa : d3dxof: Fix IDirectXFileDataImpl_GetName and IDirectXFileDataReferenceImpl_GetName + tests .
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 21525261656670fc81cc64ccf4fd6428caefdded URL: http://source.winehq.org/git/wine.git/?a=commit;h=21525261656670fc81cc64ccf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 16 01:28:46 2013 +0200 d3dxof: Fix IDirectXFileDataImpl_GetName and IDirectXFileDataReferenceImpl_GetName + tests. --- dlls/d3dxof/d3dxof.c | 6 ++++++ dlls/d3dxof/tests/d3dxof.c | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 498b192..7090141 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -587,6 +587,9 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetName(IDirectXFileData* iface, LPST if (*pdwBufLen < len) return DXFILEERR_BADVALUE; CopyMemory(pstrNameBuf, This->pobj->name, len); + /* Even if we return a size of 0, an empty string with a null byte must be returned */ + if (*pdwBufLen && !len) + pstrNameBuf[0] = 0; } *pdwBufLen = len; @@ -851,6 +854,9 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetName(IDirectXFileDataRefe if (*pdwBufLen < len) return DXFILEERR_BADVALUE; CopyMemory(pstrNameBuf, This->ptarget->name, len); + /* Even if we return a size of 0, an empty string with a null byte must be returned */ + if (*pdwBufLen && !len) + pstrNameBuf[0] = 0; } *pdwBufLen = len; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index f6874a4..87b7985 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -546,10 +546,18 @@ static void test_getname(void) hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); ok(length == 0, "Returned length should be 0 instead of %u\n", length); + length = 0; + name[0] = 0x7f; + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 0, "Returned length should be 0 instead of %u\n", length); + ok(name[0] == 0x7f, "First character is %#x instead of 0x7f\n", name[0]); length = sizeof(name); + name[0] = 0x7f; hr = IDirectXFileData_GetName(lpdxfd, name, &length); ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); ok(length == 0, "Returned length should be 0 instead of %u\n", length); + ok(name[0] == 0, "First character is %#x instead of 0x00\n", name[0]); ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(ref == 0, "Got refcount %d, expected 0\n", ref);

1 0

C John Klehm : winex11.drv: Add pen to tablet stylus detection whitelist.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: d2ab8e454e61ddc8b3dd41601a74df7e52190027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ab8e454e61ddc8b3dd41601… Author: C John Klehm <cjohn(a)klehm.net> Date: Wed May 15 19:59:36 2013 -0500 winex11.drv: Add pen to tablet stylus detection whitelist. --- dlls/winex11.drv/wintab.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index a2ffa84..23a5423 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -422,6 +422,7 @@ static BOOL is_stylus(const char *name, const char *type) "stylus", "wizardpen", "acecad", + "pen", NULL };

1 0

Alexandre Julliard : msctf: Don' t bother to free thread local storage at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 460f898959937b48fd76f144a1c283083872df4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=460f898959937b48fd76f144a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:51:53 2013 +0200 msctf: Don't bother to free thread local storage at process exit. --- dlls/msctf/msctf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 109c3ab..0d4bd84 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -526,6 +526,7 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) tlsIndex = TlsAlloc(); break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; TlsFree(tlsIndex); break; }

1 0

Alexandre Julliard : shlwapi: Don' t bother to free thread local storage at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 20ff6bc9132003a53adf28f2d9219a2d80d23e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ff6bc9132003a53adf28f2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:52:21 2013 +0200 shlwapi: Don't bother to free thread local storage at process exit. --- dlls/shlwapi/shlwapi_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c index 5dc5152..38439b7 100644 --- a/dlls/shlwapi/shlwapi_main.c +++ b/dlls/shlwapi/shlwapi_main.c @@ -64,6 +64,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) SHLWAPI_ThreadRef_index = TlsAlloc(); break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; if (SHLWAPI_ThreadRef_index != TLS_OUT_OF_INDEXES) TlsFree(SHLWAPI_ThreadRef_index); break; }

1 0

Alexandre Julliard : pdh: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 0b8c655591aa5f2f29c73ea81d2ba5509a808cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8c655591aa5f2f29c73ea81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:54:20 2013 +0200 pdh: Don't bother to delete critical sections at process exit. --- dlls/pdh/pdh_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index f1a34e7..25bd858 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -93,6 +93,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; DeleteCriticalSection(&pdh_handle_cs); break; }

1 0

Alexandre Julliard : winealsa.drv: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: d2f41e762a9b87e61ca7082b704a7efcbb648cc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f41e762a9b87e61ca7082b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:54:34 2013 +0200 winealsa.drv: Don't bother to delete critical sections at process exit. --- dlls/winealsa.drv/mmdevdrv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2948366..ce4b2c8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -238,6 +238,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) break; case DLL_PROCESS_DETACH: + if (reserved) break; DeleteCriticalSection(&g_sessions_lock); break; }

1 0

Alexandre Julliard : winecoreaudio.drv: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: d47d03d26aedd658e6572f285599837e97a3f30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d47d03d26aedd658e6572f285… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:54:41 2013 +0200 winecoreaudio.drv: Don't bother to delete critical sections at process exit. --- dlls/winecoreaudio.drv/mmdevdrv.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ee965e7..7264147 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -263,6 +263,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) break; case DLL_PROCESS_DETACH: + if (reserved) break; DeleteCriticalSection(&g_sessions_lock); break; }

1 0

Alexandre Julliard : winspool: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: 03041b93baa39c4625e3bcd1dd3c6e4cd6fbf996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03041b93baa39c4625e3bcd1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:55:05 2013 +0200 winspool: Don't bother to delete critical sections at process exit. --- dlls/winspool.drv/wspool.c | 18 +++--------------- 1 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index 1f25129..bbfb0fb 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -105,20 +105,6 @@ BOOL load_backend(void) } /****************************************************************************** - * unload_backend [internal] - * - */ -static void unload_backend(void) -{ - EnterCriticalSection(&backend_cs); - backend = NULL; - FreeLibrary(hlocalspl); - LeaveCriticalSection(&backend_cs); - DeleteCriticalSection(&backend_cs); -} - - -/****************************************************************************** * DllMain * * Winspool entry point. @@ -135,7 +121,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD reason, LPVOID lpReserved) break; } case DLL_PROCESS_DETACH: - unload_backend(); + if (lpReserved) break; + DeleteCriticalSection(&backend_cs); + FreeLibrary(hlocalspl); break; }

1 0

Alexandre Julliard : dinput: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: d15aee92f2b5c365cd221fa26415d1ef9819a654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15aee92f2b5c365cd221fa26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:53:07 2013 +0200 dinput: Don't bother to delete critical sections at process exit. --- dlls/dinput/dinput_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 87041e4..1c6bf9a 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1634,7 +1634,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) LeaveCriticalSection(&dinput_hook_crit); } -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) { switch(reason) { @@ -1643,6 +1643,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserv) DINPUT_instance = inst; break; case DLL_PROCESS_DETACH: + if (reserved) break; DeleteCriticalSection(&dinput_hook_crit); break; }

1 0

Alexandre Julliard : comdlg32: Don' t bother to free thread local storage at process exit.
by Alexandre Julliard May 16, 2013

May 16, 2013

Module: wine Branch: master Commit: a7d4b2711ca85ef278a5fc8813de45d030550ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d4b2711ca85ef278a5fc881… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:51:07 2013 +0200 comdlg32: Don't bother to free thread local storage at process exit. --- dlls/comdlg32/cdlg32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 25b5198..e794f94 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -112,6 +112,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) break; case DLL_PROCESS_DETACH: + if (Reserved) break; if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES) TlsFree(COMDLG32_TlsIndex); if(SHFOLDER_hInstance) FreeLibrary(SHFOLDER_hInstance); break;

1 0