April 2008 - Wine-commits - list.winehq.org

Erik de Castro Lopo : dbghelp: Fix pointer cast.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: ab2424710f7f76443aecdb5d0c6a69118e799116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab2424710f7f76443aecdb5d0… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Fri Apr 25 10:36:03 2008 +1000 dbghelp: Fix pointer cast. --- dlls/dbghelp/dbghelp_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index c81f778..e4cae5b 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -106,7 +106,7 @@ void hash_table_iter_init(const struct hash_table* ht, void* hash_table_iter_up(struct hash_table_iter* hti); #define GET_ENTRY(__i, __t, __f) \ - ((__t*)((char*)(__i) - (unsigned int)(&((__t*)0)->__f))) + ((__t*)((char*)(__i) - FIELD_OFFSET(__t,__f))) extern unsigned dbghelp_options;

1 0

James Hawkins : winspool.drv: Disable a test for capabilities not available on all printer drivers.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 1cf567ecc901239cc9a890636ea2d444bc95156c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf567ecc901239cc9a890636… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 25 01:10:02 2008 -0500 winspool.drv: Disable a test for capabilities not available on all printer drivers. --- dlls/winspool.drv/tests/info.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index cd93f16..f0f4754 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2345,15 +2345,19 @@ static void test_DeviceCapabilities(void) ok(n_copies > 0, "DeviceCapabilities DC_COPIES failed\n"); trace("n_copies = %d\n", n_copies); - ret = DeviceCapabilities(device, port, DC_MAXEXTENT, NULL, NULL); - ok(ret != -1, "DeviceCapabilities DC_MAXEXTENT failed\n"); - ext = MAKEPOINTS(ret); - trace("max ext = %d x %d\n", ext.x, ext.y); - - ret = DeviceCapabilities(device, port, DC_MINEXTENT, NULL, NULL); - ok(ret != -1, "DeviceCapabilities DC_MINEXTENT failed\n"); - ext = MAKEPOINTS(ret); - trace("min ext = %d x %d\n", ext.x, ext.y); + /* these capabilities not available on all printer drivers */ + if (0) + { + ret = DeviceCapabilities(device, port, DC_MAXEXTENT, NULL, NULL); + ok(ret != -1, "DeviceCapabilities DC_MAXEXTENT failed\n"); + ext = MAKEPOINTS(ret); + trace("max ext = %d x %d\n", ext.x, ext.y); + + ret = DeviceCapabilities(device, port, DC_MINEXTENT, NULL, NULL); + ok(ret != -1, "DeviceCapabilities DC_MINEXTENT failed\n"); + ext = MAKEPOINTS(ret); + trace("min ext = %d x %d\n", ext.x, ext.y); + } fields = DeviceCapabilities(device, port, DC_FIELDS, NULL, NULL); ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n");

1 0

James Hawkins : winmm: Remove a failing test that is driver-specific.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 4daec079c17c6e4644620b92132dc584f892b433 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4daec079c17c6e4644620b921… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri Apr 25 03:35:38 2008 -0500 winmm: Remove a failing test that is driver-specific. --- dlls/winmm/tests/mixer.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 6cd1c7a..89ac7c9 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -382,12 +382,6 @@ static void mixer_test_deviceA(int device) ok(rc==MMSYSERR_INVALFLAG, "mixerOpen: MMSYSERR_INVALFLAG expected, got %s\n", mmsys_error(rc)); - /* Shouldn't open without a valid HWND */ - rc=mixerOpen(&mix, device, 0, 0, CALLBACK_WINDOW); - ok(rc==MMSYSERR_INVALPARAM, - "mixerOpen: MMSYSERR_INVALPARAM expected, got %s\n", mmsys_error(rc)); - - for (d=0;d<capsA.cDestinations;d++) { MIXERLINEA mixerlineA; mixerlineA.cbStruct = 0; @@ -775,11 +769,6 @@ static void mixer_test_deviceW(int device) ok(rc==MMSYSERR_INVALFLAG, "mixerOpen: MMSYSERR_INVALFLAG expected, got %s\n", mmsys_error(rc)); - /* Shouldn't open without a valid HWND */ - rc=mixerOpen(&mix, device, 0, 0, CALLBACK_WINDOW); - ok(rc==MMSYSERR_INVALPARAM, - "mixerOpen: MMSYSERR_INVALPARAM expected, got %s\n", mmsys_error(rc)); - for (d=0;d<capsW.cDestinations;d++) { MIXERLINEW mixerlineW; mixerlineW.cbStruct = 0;

1 0

Erik de Castro Lopo : user32/tests: Use SetWindowLongPtr instead of SetWindowLong.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 56797f9c65e0611cccf5f3e77865a9e465583b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56797f9c65e0611cccf5f3e77… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Fri Apr 25 17:13:39 2008 +1000 user32/tests: Use SetWindowLongPtr instead of SetWindowLong. --- dlls/user32/tests/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9f40416..0c5a678 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1930,7 +1930,7 @@ static void test_child_edit_wmkeydown(void) hwEdit = create_child_editcontrol(0, 0); hwParent = GetParent(hwEdit); - SetWindowLong(hwParent, GWL_WNDPROC, (LONG)child_edit_wmkeydown_proc); + SetWindowLongPtr(hwParent, GWLP_WNDPROC, (LONG_PTR)child_edit_wmkeydown_proc); r = SendMessage(hwEdit, WM_KEYDOWN, VK_RETURN, 0x1c0001); ok(1 == r, "expected 1, got %d\n", r); ok(0 == child_edit_wmkeydown_num_messages, "expected 0, got %d\n", child_edit_wmkeydown_num_messages);

1 0

Erik de Castro Lopo : crypt32: Use LOWORD on LPCSTR type instead of casting to int.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 0ef69ef9dd04af37fedc0fbec1b40c98b2a7f11d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef69ef9dd04af37fedc0fbec… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Fri Apr 25 11:14:35 2008 +1000 crypt32: Use LOWORD on LPCSTR type instead of casting to int. --- dlls/crypt32/chain.c | 8 ++++---- dlls/crypt32/store.c | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 362eddc..a13a896 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1780,16 +1780,16 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, { switch (LOWORD(szPolicyOID)) { - case (int)CERT_CHAIN_POLICY_BASE: + case LOWORD(CERT_CHAIN_POLICY_BASE): verifyPolicy = verify_base_policy; break; - case (int)CERT_CHAIN_POLICY_AUTHENTICODE: + case LOWORD(CERT_CHAIN_POLICY_AUTHENTICODE): verifyPolicy = verify_authenticode_policy; break; - case (int)CERT_CHAIN_POLICY_BASIC_CONSTRAINTS: + case LOWORD(CERT_CHAIN_POLICY_BASIC_CONSTRAINTS): verifyPolicy = verify_basic_constraints_policy; break; - case (int)CERT_CHAIN_POLICY_MICROSOFT_ROOT: + case LOWORD(CERT_CHAIN_POLICY_MICROSOFT_ROOT): verifyPolicy = verify_ms_root_policy; break; default: diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 84d326c..9534e5c 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -674,43 +674,43 @@ HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider, { switch (LOWORD(lpszStoreProvider)) { - case (int)CERT_STORE_PROV_MSG: + case LOWORD(CERT_STORE_PROV_MSG): openFunc = CRYPT_MsgOpenStore; break; - case (int)CERT_STORE_PROV_MEMORY: + case LOWORD(CERT_STORE_PROV_MEMORY): openFunc = CRYPT_MemOpenStore; break; - case (int)CERT_STORE_PROV_FILE: + case LOWORD(CERT_STORE_PROV_FILE): openFunc = CRYPT_FileOpenStore; break; - case (int)CERT_STORE_PROV_PKCS7: + case LOWORD(CERT_STORE_PROV_PKCS7): openFunc = CRYPT_PKCSOpenStore; break; - case (int)CERT_STORE_PROV_REG: + case LOWORD(CERT_STORE_PROV_REG): openFunc = CRYPT_RegOpenStore; break; - case (int)CERT_STORE_PROV_FILENAME_A: + case LOWORD(CERT_STORE_PROV_FILENAME_A): openFunc = CRYPT_FileNameOpenStoreA; break; - case (int)CERT_STORE_PROV_FILENAME_W: + case LOWORD(CERT_STORE_PROV_FILENAME_W): openFunc = CRYPT_FileNameOpenStoreW; break; - case (int)CERT_STORE_PROV_COLLECTION: + case LOWORD(CERT_STORE_PROV_COLLECTION): openFunc = CRYPT_CollectionOpenStore; break; - case (int)CERT_STORE_PROV_SYSTEM_A: + case LOWORD(CERT_STORE_PROV_SYSTEM_A): openFunc = CRYPT_SysOpenStoreA; break; - case (int)CERT_STORE_PROV_SYSTEM_W: + case LOWORD(CERT_STORE_PROV_SYSTEM_W): openFunc = CRYPT_SysOpenStoreW; break; - case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_A: + case LOWORD(CERT_STORE_PROV_SYSTEM_REGISTRY_A): openFunc = CRYPT_SysRegOpenStoreA; break; - case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_W: + case LOWORD(CERT_STORE_PROV_SYSTEM_REGISTRY_W): openFunc = CRYPT_SysRegOpenStoreW; break; - case (int)CERT_STORE_PROV_PHYSICAL_W: + case LOWORD(CERT_STORE_PROV_PHYSICAL_W): openFunc = CRYPT_PhysOpenStoreW; break; default:

1 0

Erik de Castro Lopo : ntdll: Win64 fix for get_pointer_obfuscator.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: eba704b8bb756a91c455483a48d2e3bc30ec15c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba704b8bb756a91c455483a4… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Fri Apr 25 11:54:30 2008 +1000 ntdll: Win64 fix for get_pointer_obfuscator. --- dlls/ntdll/rtl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 1390c64..a4d1dac 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -904,10 +904,10 @@ static DWORD_PTR get_pointer_obfuscator( void ) rand = RtlUniform( &seed ); /* handle 64bit pointers */ - rand ^= RtlUniform( &seed ) << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); + rand ^= (ULONG_PTR)RtlUniform( &seed ) << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); /* set the high bits so dereferencing obfuscated pointers will (usually) crash */ - rand |= 0xc0000000 << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); + rand |= (ULONG_PTR)0xc0000000 << ((sizeof (DWORD_PTR) - sizeof (ULONG))*8); interlocked_cmpxchg_ptr( (void**) &pointer_obfuscator, (void*) rand, NULL ); }

1 0

James Hawkins : gdi32: Remove a dependence on the amount of available memory.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: b48118b4727373309f7e64aa8b5a622d9b24cc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48118b4727373309f7e64aa8… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 24 20:47:44 2008 -0500 gdi32: Remove a dependence on the amount of available memory. --- dlls/gdi32/tests/bitmap.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index f7bfdfd..00441c0 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -974,9 +974,13 @@ static void test_bitmap(void) SetLastError(0xdeadbeef); hbmp = CreateBitmap(0x7ffffff, 9, 1, 1, NULL); - ok(!hbmp, "CreateBitmap should fail\n"); - ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, - "expected ERROR_NOT_ENOUGH_MEMORY, got %u\n", GetLastError()); + if (!hbmp) + { + ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + "expected ERROR_NOT_ENOUGH_MEMORY, got %u\n", GetLastError()); + } + else + DeleteObject(hbmp); SetLastError(0xdeadbeef); hbmp = CreateBitmap(0x7ffffff + 1, 1, 1, 1, NULL);

1 0

Robert Reif : winmm: Fix a test failure on Windows with Terminal Server.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: fa9a26921c5021c3f227f44bc12b2a5b75c79be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9a26921c5021c3f227f44bc… Author: Robert Reif <reif(a)earthlink.net> Date: Thu Apr 24 19:39:43 2008 -0400 winmm: Fix a test failure on Windows with Terminal Server. --- dlls/winmm/tests/wave.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 60f0622..2844be4 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -854,9 +854,9 @@ static void wave_out_test_device(int device) } rc=waveOutGetDevCapsA(device,&capsA,4); - ok(rc==MMSYSERR_NOERROR, - "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n", - dev_name(device),wave_out_error(rc)); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALPARAM, + "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR or MMSYSERR_INVALPARAM " + "expected, got %s\n", dev_name(device),wave_out_error(rc)); rc=waveOutGetDevCapsW(device,&capsW,4); ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, @@ -888,6 +888,13 @@ static void wave_out_test_device(int device) nameA=strdup("not supported"); } + rc=waveOutGetDevCapsA(device,&capsA,sizeof(capsA)); + ok(rc==MMSYSERR_NOERROR, + "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n", + dev_name(device),wave_out_error(rc)); + if (rc!=MMSYSERR_NOERROR) + return; + trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname, (nameA?nameA:"failed"),capsA.vDriverVersion >> 8, capsA.vDriverVersion & 0xff, capsA.wMid,capsA.wPid);

1 0

James Hawkins : advapi32: Fix a test that fails in win2k3 SP2.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 76dfff11a34a321040f6e7348dbafabdb09d9295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dfff11a34a321040f6e7348… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 24 20:19:35 2008 -0500 advapi32: Fix a test that fails in win2k3 SP2. --- dlls/advapi32/tests/registry.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index e027a97..fe3d3ff 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -806,8 +806,9 @@ static void test_get_value(void) size = 0; ret = pRegGetValueA(hkey_main, NULL, "TP2_EXP_SZ", RRF_RT_REG_SZ, NULL, NULL, &size); ok(ret == ERROR_SUCCESS, "ret=%d\n", ret); - /* At least v5.2.3790.1830 (2003 SP1) returns the unexpanded sTestpath2 length + 1 here. */ - ok((size == strlen(expanded2)+1) || (size == strlen(sTestpath2)+1), + ok((size == strlen(expanded2)+1) || /* win2k3 SP1 */ + (size == strlen(expanded2)+2) || /* win2k3 SP2 */ + (size == strlen(sTestpath2)+1), "strlen(expanded2)=%d, strlen(sTestpath2)=%d, size=%d\n", lstrlenA(expanded2), lstrlenA(sTestpath2), size); /* Query REG_EXPAND_SZ using RRF_RT_REG_SZ (ok, expands) */

1 0

James Hawkins : d3d8: Fix a few test failures in win2k3.
by Alexandre Julliard 25 Apr '08

25 Apr '08

Module: wine Branch: master Commit: 537c4babed22fec1f31fb3414528f4153b676045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537c4babed22fec1f31fb3414… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Apr 24 20:36:04 2008 -0500 d3d8: Fix a few test failures in win2k3. --- dlls/d3d8/tests/device.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 8617c0c..9ce967a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1174,7 +1174,8 @@ static void test_lights(void) hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, + "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); if(!device) { skip("Failed to create a d3d device\n"); @@ -1252,7 +1253,8 @@ static void test_render_zero_triangles(void) hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, + "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); if(!device) { skip("Failed to create a d3d device\n"); @@ -1302,7 +1304,8 @@ static void test_set_material(void) hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device ); - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL, + "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr)); if(!device) { skip("Failed to create a d3d device\n");

1 0