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

Christian Costa : d3dx9_36: Fix ID3DXFileDataImpl_GetName + add some tests.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 635f76b085c46f4056684fd185217c495ee432ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=635f76b085c46f4056684fd18… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 16 01:09:01 2013 +0200 d3dx9_36: Fix ID3DXFileDataImpl_GetName + add some tests. --- dlls/d3dx9_36/tests/xfile.c | 83 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/xfile.c | 15 +++++++- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 49c96ea..4ac521b 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -55,6 +55,13 @@ static char objects[] = "1; 2; 3;\n" "}\n"; +static char object_noname[] = +"xof 0302txt 0064\n" +"Header\n" +"{\n" +"1; 2; 3;\n" +"}\n"; + static void test_templates(void) { ID3DXFile *d3dxfile; @@ -128,6 +135,81 @@ static void test_lock_unlock(void) d3dxfile->lpVtbl->Release(d3dxfile); } +static void test_getname(void) +{ + ID3DXFile *d3dxfile; + D3DXF_FILELOADMEMORY memory; + ID3DXFileEnumObject *enum_object; + ID3DXFileData *data_object; + SIZE_T length; + char name[100]; + HRESULT ret; + + ret = D3DXFileCreate(&d3dxfile); + ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); + ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); + + /* Check object with name */ + memory.lpMemory = objects; + memory.dSize = sizeof(objects) - 1; + ret = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &memory, D3DXF_FILELOAD_FROMMEMORY, &enum_object); + ok(ret == S_OK, "CreateEnumObject failed with %#x\n", ret); + ret = enum_object->lpVtbl->GetChild(enum_object, 0, &data_object); + ok(ret == S_OK, "GetChild failed with %#x\n", ret); + + ret = data_object->lpVtbl->GetName(data_object, NULL, NULL); + ok(ret == D3DXFERR_BADVALUE, "GetName returned %#x, expected %#x\n", ret, D3DXFERR_BADVALUE); + ret = data_object->lpVtbl->GetName(data_object, name, NULL); + ok(ret == D3DXFERR_BADVALUE, "GetName returned %#x, expected %#x\n", ret, D3DXFERR_BADVALUE); + ret = data_object->lpVtbl->GetName(data_object, NULL, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 7, "Returned length should be 7 instead of %ld\n", length); + length = sizeof(name); + ret = data_object->lpVtbl->GetName(data_object, name, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 7, "Returned length should be 7 instead of %ld\n", length); + ok(!strcmp(name, "Object"), "Returned string should be 'Object' intead of '%s'\n", name); + length = 3; + ret = data_object->lpVtbl->GetName(data_object, name, &length); + ok(ret== D3DXFERR_BADVALUE, "GetName returned %#x, expected %#x\n", ret, D3DXFERR_BADVALUE); + + data_object->lpVtbl->Release(data_object); + enum_object->lpVtbl->Release(enum_object); + + /* Check object without name */ + memory.lpMemory = object_noname; + memory.dSize = sizeof(object_noname) - 1; + ret = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &memory, D3DXF_FILELOAD_FROMMEMORY, &enum_object); + ok(ret == S_OK, "CreateEnumObject failed with %#x\n", ret); + ret = enum_object->lpVtbl->GetChild(enum_object, 0, &data_object); + ok(ret == S_OK, "GetChild failed with %#x\n", ret); + + /* Contrary to d3dxof, d3dx9_36 returns an empty string with a null byte when no name is available. + * If the input size is 0, it returns a length of 1 without touching the buffer */ + ret = data_object->lpVtbl->GetName(data_object, NULL, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 1, "Returned length should be 1 instead of %ld\n", length); + length = 0; + name[0] = 0x7f; + ret = data_object->lpVtbl->GetName(data_object, name, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 1, "Returned length should be 1 instead of %ld\n", length); + ok(name[0] == 0x7f, "First character is %#x instead of 0x7f\n", name[0]); + length = sizeof(name); + name[0] = 0x7f; + ret = data_object->lpVtbl->GetName(data_object, name, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 1, "Returned length should be 1 instead of %ld\n", length); + ok(name[0] == 0, "First character is %#x instead of 0x00\n", name[0]); + + data_object->lpVtbl->Release(data_object); + enum_object->lpVtbl->Release(enum_object); + d3dxfile->lpVtbl->Release(d3dxfile); + +} + static inline void debugstr_guid(char* buf, const GUID *id) { sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", @@ -278,5 +360,6 @@ START_TEST(xfile) { test_templates(); test_lock_unlock(); + test_getname(); test_dump(); } diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 81f9da3..9c57277 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -38,6 +38,8 @@ static HRESULT error_dxfile_to_d3dxfile(HRESULT error) return D3DXFERR_BADFILEFLOATSIZE; case DXFILEERR_PARSEERROR: return D3DXFERR_PARSEERROR; + case DXFILEERR_BADVALUE: + return D3DXFERR_BADVALUE; default: FIXME("Cannot map error %#x\n", error); return E_FAIL; @@ -151,8 +153,8 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name TRACE("(%p)->(%p, %p)\n", iface, name, size); - if (!name || !size) - return E_POINTER; + if (!size) + return D3DXFERR_BADVALUE; dxfile_size = *size; @@ -160,6 +162,15 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name if (ret != DXFILE_OK) return error_dxfile_to_d3dxfile(ret); + if (!dxfile_size) + { + /* Contrary to d3dxof, d3dx9_36 returns an empty string with a null byte when no name is available. + * If the input size is 0, it returns a length of 1 without touching the buffer */ + dxfile_size = 1; + if (name && *size) + name[0] = 0; + } + *size = dxfile_size; return S_OK;

1 0

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

16 May '13

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 16 May '13

16 May '13

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 : atl100: Don't bother to free memory at process exit.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: b2accc42c043171547600cbbe0fb379acac9a06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2accc42c043171547600cbbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:50:07 2013 +0200 atl100: Don't bother to free memory at process exit. --- dlls/atl100/atl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index 0e21963..fc7f460 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -778,6 +778,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; if(catreg) ICatRegister_Release(catreg); }

1 0

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

16 May '13

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

Alexandre Julliard : mlang: Don' t bother to free thread local storage at process exit.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: ed8a38d4001f9cad04194bcc31e0bfd51e8d12f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed8a38d4001f9cad04194bcc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:51:26 2013 +0200 mlang: Don't bother to free thread local storage at process exit. --- dlls/mlang/mlang.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 6ebe627..d28f811 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -888,6 +888,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (lpv) break; TlsFree(MLANG_tls_index); break; }

1 0

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

16 May '13

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 16 May '13

16 May '13

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 : dinput: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard 16 May '13

16 May '13

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 : dsound: Don' t bother to delete critical sections at process exit.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 5c8ffb795a476f4a7209c492c6e3f6bd6618944a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8ffb795a476f4a7209c492c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 12:53:33 2013 +0200 dsound: Don't bother to delete critical sections at process exit. --- dlls/dsound/dsound_main.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 3c47423..7a16366 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -796,20 +796,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { case DLL_PROCESS_ATTACH: - TRACE("DLL_PROCESS_ATTACH\n"); instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL); /* Increase refcount on dsound by 1 */ GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (LPCWSTR)hInstDLL, &hInstDLL); break; case DLL_PROCESS_DETACH: - TRACE("DLL_PROCESS_DETACH\n"); + if (lpvReserved) break; DeleteCriticalSection(&DSOUND_renderers_lock); DeleteCriticalSection(&DSOUND_capturers_lock); break; - default: - TRACE("UNKNOWN REASON\n"); - break; } return TRUE; }

1 0