October 2009 - Wine-commits

Alexandre Julliard : oleaut32/tests: Skip a test that may crash on Win64.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 4c184a8b880e0ee3c8ddf4f5cbe19518bdd115e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c184a8b880e0ee3c8ddf4f5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 22:45:40 2009 +0200 oleaut32/tests: Skip a test that may crash on Win64. --- dlls/oleaut32/tests/vartype.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 0321013..65a6a4b 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5249,8 +5249,11 @@ static void test_SysAllocStringByteLen(void) const CHAR szTestA[6] = { 'T','e','s','t','\0','?' }; BSTR str; - str = SysAllocStringByteLen(szTestA, 0x80000000); - ok (str == NULL, "Expected NULL, got %p\n", str); + if (sizeof(void *) == 4) /* not limited to 0x80000000 on Win64 */ + { + str = SysAllocStringByteLen(szTestA, 0x80000000); + ok (str == NULL, "Expected NULL, got %p\n", str); + } str = SysAllocStringByteLen(szTestA, 0xffffffff); ok (str == NULL, "Expected NULL, got %p\n", str);

1 0

Alexandre Julliard : oleaut32: Avoid floating point for some VarCy conversions.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 2a1114f80535801853025a1a82dd477096854fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1114f80535801853025a1a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 22:57:08 2009 +0200 oleaut32: Avoid floating point for some VarCy conversions. --- dlls/oleaut32/vartype.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 7f53259..6d604f3 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -3420,7 +3420,8 @@ static const int CY_Divisors[5] = { CY_MULTIPLIER/10000, CY_MULTIPLIER/1000, */ HRESULT WINAPI VarCyFromUI1(BYTE bIn, CY* pCyOut) { - return VarCyFromR8(bIn, pCyOut); + pCyOut->int64 = (ULONG64)bIn * CY_MULTIPLIER; + return S_OK; } /************************************************************************ @@ -3440,7 +3441,8 @@ HRESULT WINAPI VarCyFromUI1(BYTE bIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromI2(SHORT sIn, CY* pCyOut) { - return VarCyFromR8(sIn, pCyOut); + pCyOut->int64 = (LONG64)sIn * CY_MULTIPLIER; + return S_OK; } /************************************************************************ @@ -3460,7 +3462,8 @@ HRESULT WINAPI VarCyFromI2(SHORT sIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromI4(LONG lIn, CY* pCyOut) { - return VarCyFromR8(lIn, pCyOut); + pCyOut->int64 = (LONG64)lIn * CY_MULTIPLIER; + return S_OK; } /************************************************************************ @@ -3617,7 +3620,8 @@ HRESULT WINAPI VarCyFromDisp(IDispatch* pdispIn, LCID lcid, CY* pCyOut) */ HRESULT WINAPI VarCyFromBool(VARIANT_BOOL boolIn, CY* pCyOut) { - return VarCyFromR8(boolIn, pCyOut); + pCyOut->int64 = (LONG64)boolIn * CY_MULTIPLIER; + return S_OK; } /************************************************************************ @@ -3637,7 +3641,8 @@ HRESULT WINAPI VarCyFromBool(VARIANT_BOOL boolIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromI1(signed char cIn, CY* pCyOut) { - return VarCyFromR8(cIn, pCyOut); + pCyOut->int64 = (LONG64)cIn * CY_MULTIPLIER; + return S_OK; } /************************************************************************ @@ -3657,7 +3662,8 @@ HRESULT WINAPI VarCyFromI1(signed char cIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromUI2(USHORT usIn, CY* pCyOut) { - return VarCyFromR8(usIn, pCyOut); + pCyOut->int64 = (ULONG64)usIn * CY_MULTIPLIER; + return S_OK; } /************************************************************************ @@ -3677,7 +3683,8 @@ HRESULT WINAPI VarCyFromUI2(USHORT usIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY* pCyOut) { - return VarCyFromR8(ulIn, pCyOut); + pCyOut->int64 = (ULONG64)ulIn * CY_MULTIPLIER; + return S_OK; } /************************************************************************ @@ -3757,7 +3764,9 @@ HRESULT WINAPI VarCyFromI8(LONG64 llIn, CY* pCyOut) */ HRESULT WINAPI VarCyFromUI8(ULONG64 ullIn, CY* pCyOut) { - return VarCyFromR8(ullIn, pCyOut); + if (ullIn >= (I8_MAX/CY_MULTIPLIER)) return DISP_E_OVERFLOW; + pCyOut->int64 = ullIn * CY_MULTIPLIER; + return S_OK; } /************************************************************************

1 0

Andrew Nguyen : ddraw/tests: Remove a superfluous return statement.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 611fae610c794ca39852ae7ac59d2d5d668e20db URL: http://source.winehq.org/git/wine.git/?a=commit;h=611fae610c794ca39852ae7ac… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Oct 8 09:03:36 2009 -0500 ddraw/tests: Remove a superfluous return statement. --- dlls/ddraw/tests/d3d.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 11b6a66..d9b1c72 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -884,7 +884,6 @@ static void D3D7EnumTest(void) memset(&d3d7et, 0, sizeof(d3d7et)); IDirect3D7_EnumDevices(lpD3D, enumDevicesCallbackTest7, &d3d7et); - /* A couple of games (Delta Force LW and TFD) rely on this behaviour */ ok(d3d7et.tnlhal < d3d7et.total, "TnLHal device enumerated as only device.\n"); @@ -893,8 +892,6 @@ static void D3D7EnumTest(void) if(d3d7et.tnlhal) ok(d3d7et.hal, "TnLHal device enumerated, but no Hal device found.\n"); - - return; } static void CapsTest(void)

1 0

Andrew Nguyen : ddraw: Simplify and test DirectDrawEnumerateA.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 4c61c2ff639cd17d197e340a087fddfe5415dbee URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c61c2ff639cd17d197e340a0… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Oct 8 09:03:49 2009 -0500 ddraw: Simplify and test DirectDrawEnumerateA. --- dlls/ddraw/main.c | 6 ++-- dlls/ddraw/tests/ddrawmodes.c | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index b7eed02..647ea2f 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -368,7 +368,7 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, LPVOID Context) { - BOOL stop = FALSE; + TRACE("(%p, %p)\n", Callback, Context); TRACE(" Enumerating default DirectDraw HAL interface\n"); /* We only have one driver */ @@ -377,11 +377,11 @@ DirectDrawEnumerateA(LPDDENUMCALLBACKA Callback, static CHAR driver_desc[] = "DirectDraw HAL", driver_name[] = "display"; - stop = !Callback(NULL, driver_desc, driver_name, Context); + Callback(NULL, driver_desc, driver_name, Context); } __EXCEPT_PAGE_FAULT { - return E_INVALIDARG; + return DDERR_INVALIDPARAMS; } __ENDTRY diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index f5245d0..013862b 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -38,6 +38,14 @@ static int modes_cnt; static int modes_size; static LPDDSURFACEDESC modes; +static HRESULT (WINAPI *pDirectDrawEnumerateA)(LPDDENUMCALLBACKA,LPVOID); + +static void init_function_pointers(void) +{ + HMODULE hmod = GetModuleHandleA("ddraw.dll"); + pDirectDrawEnumerateA = (void*)GetProcAddress(hmod, "DirectDrawEnumerateA"); +} + static void createwindow(void) { wc.style = CS_HREDRAW | CS_VREDRAW; @@ -88,6 +96,68 @@ static void releasedirectdraw(void) } } +static BOOL WINAPI crash_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, + LPSTR lpDriverName, LPVOID lpContext) +{ + *(volatile char*)0 = 2; + return TRUE; +} + +static BOOL WINAPI test_nullcontext_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, + LPSTR lpDriverName, LPVOID lpContext) +{ + trace("test_nullcontext_callbackA: %p %s %s %p\n", + lpGUID, lpDriverDescription, lpDriverName, lpContext); + + ok(!lpContext, "Expected NULL lpContext\n"); + + return TRUE; +} + +static BOOL WINAPI test_context_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, + LPSTR lpDriverName, LPVOID lpContext) +{ + trace("test_context_callbackA: %p %s %s %p\n", + lpGUID, lpDriverDescription, lpDriverName, lpContext); + + ok(lpContext == (LPVOID)0xdeadbeef, "Expected non-NULL lpContext\n"); + + return TRUE; +} + +static void test_DirectDrawEnumerateA(void) +{ + HRESULT ret; + + if (!pDirectDrawEnumerateA) + { + win_skip("DirectDrawEnumerateA is not available\n"); + return; + } + + /* Test with NULL callback parameter. */ + ret = pDirectDrawEnumerateA(NULL, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + + /* Test with invalid callback parameter. */ + ret = pDirectDrawEnumerateA((LPDDENUMCALLBACKA)0xdeadbeef, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + + /* Test with callback that crashes. */ + ret = pDirectDrawEnumerateA(crash_callbackA, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + + /* Test with valid callback parameter and NULL context parameter. */ + trace("Calling DirectDrawEnumerateA with test_nullcontext_callbackA callback and NULL context.\n"); + ret = pDirectDrawEnumerateA(test_nullcontext_callbackA, NULL); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + + /* Test with valid callback parameter and valid context parameter. */ + trace("Calling DirectDrawEnumerateA with test_context_callbackA callback and non-NULL context.\n"); + ret = pDirectDrawEnumerateA(test_context_callbackA, (LPVOID)0xdeadbeef); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); +} + static void adddisplaymode(LPDDSURFACEDESC lpddsd) { if (!modes) @@ -409,9 +479,14 @@ static void testddraw3(void) START_TEST(ddrawmodes) { + init_function_pointers(); + createwindow(); if (!createdirectdraw()) return; + + test_DirectDrawEnumerateA(); + enumdisplaymodes(); if (winetest_interactive) testdisplaymodes();

1 0

Andrew Nguyen : ddraw: Implement and test DirectDrawEnumerateW.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: bab8f7e557c681927aeb3214d6b5402fcf09508c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab8f7e557c681927aeb3214d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Oct 8 09:04:00 2009 -0500 ddraw: Implement and test DirectDrawEnumerateW. --- dlls/ddraw/ddraw.spec | 2 +- dlls/ddraw/main.c | 17 +++++++++++++---- dlls/ddraw/tests/ddrawmodes.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec index 0cd1d0f..3b3916e 100644 --- a/dlls/ddraw/ddraw.spec +++ b/dlls/ddraw/ddraw.spec @@ -9,7 +9,7 @@ @ stdcall DirectDrawEnumerateA(ptr ptr) @ stdcall DirectDrawEnumerateExA(ptr ptr long) @ stub DirectDrawEnumerateExW -@ stub DirectDrawEnumerateW +@ stdcall DirectDrawEnumerateW(ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 647ea2f..be4208d 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -428,12 +428,21 @@ DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, /*********************************************************************** * DirectDrawEnumerateW (DDRAW.@) * - * Enumerates legacy drivers, unicode version. See - * the comments above DirectDrawEnumerateA for more details. - * - * The Flag member is not supported right now. + * Enumerates legacy drivers, unicode version. + * This function is not implemented on Windows. * ***********************************************************************/ +HRESULT WINAPI +DirectDrawEnumerateW(LPDDENUMCALLBACKW Callback, + LPVOID Context) +{ + TRACE("(%p, %p)\n", Callback, Context); + + if (!Callback) + return DDERR_INVALIDPARAMS; + else + return DDERR_UNSUPPORTED; +} /*********************************************************************** * DirectDrawEnumerateExW (DDRAW.@) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 013862b..17031b0 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -39,11 +39,13 @@ static int modes_size; static LPDDSURFACEDESC modes; static HRESULT (WINAPI *pDirectDrawEnumerateA)(LPDDENUMCALLBACKA,LPVOID); +static HRESULT (WINAPI *pDirectDrawEnumerateW)(LPDDENUMCALLBACKW,LPVOID); static void init_function_pointers(void) { HMODULE hmod = GetModuleHandleA("ddraw.dll"); pDirectDrawEnumerateA = (void*)GetProcAddress(hmod, "DirectDrawEnumerateA"); + pDirectDrawEnumerateW = (void*)GetProcAddress(hmod, "DirectDrawEnumerateW"); } static void createwindow(void) @@ -158,6 +160,40 @@ static void test_DirectDrawEnumerateA(void) ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); } +static BOOL WINAPI test_callbackW(GUID *lpGUID, LPWSTR lpDriverDescription, + LPWSTR lpDriverName, LPVOID lpContext) +{ + ok(0, "The callback should not be invoked by DirectDrawEnumerateW\n"); + return TRUE; +} + +static void test_DirectDrawEnumerateW(void) +{ + HRESULT ret; + + if (!pDirectDrawEnumerateW) + { + win_skip("DirectDrawEnumerateW is not available\n"); + return; + } + + /* DirectDrawEnumerateW is not implemented on Windows. */ + + /* Test with NULL callback parameter. */ + ret = pDirectDrawEnumerateW(NULL, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + + /* Test with invalid callback parameter. */ + ret = pDirectDrawEnumerateW((LPDDENUMCALLBACKW)0xdeadbeef, NULL); + ok(ret == DDERR_INVALIDPARAMS /* XP */ || + ret == DDERR_UNSUPPORTED /* Win7 */, + "Expected DDERR_INVALIDPARAMS or DDERR_UNSUPPORTED, got %d\n", ret); + + /* Test with valid callback parameter and NULL context parameter. */ + ret = pDirectDrawEnumerateW(test_callbackW, NULL); + ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); +} + static void adddisplaymode(LPDDSURFACEDESC lpddsd) { if (!modes) @@ -486,6 +522,7 @@ START_TEST(ddrawmodes) return; test_DirectDrawEnumerateA(); + test_DirectDrawEnumerateW(); enumdisplaymodes(); if (winetest_interactive)

1 0

Andrew Nguyen : ddraw: More fully implement and test DirectDrawEnumerateExA .
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 3496fe5f431ffda72982b852b1987a5f865f8b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3496fe5f431ffda72982b852b… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Oct 8 09:04:08 2009 -0500 ddraw: More fully implement and test DirectDrawEnumerateExA. --- dlls/ddraw/main.c | 15 ++++++-- dlls/ddraw/tests/ddrawmodes.c | 80 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index be4208d..137bb44 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -403,7 +403,16 @@ DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, LPVOID Context, DWORD Flags) { - BOOL stop = FALSE; + TRACE("(%p, %p, 0x%08x)\n", Callback, Context, Flags); + + if (Flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | + DDENUM_DETACHEDSECONDARYDEVICES | + DDENUM_NONDISPLAYDEVICES)) + return DDERR_INVALIDPARAMS; + + if (Flags) + FIXME("flags 0x%08x not handled\n", Flags); + TRACE("Enumerating default DirectDraw HAL interface\n"); /* We only have one driver by now */ @@ -413,11 +422,11 @@ DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA Callback, driver_name[] = "display"; /* QuickTime expects the description "DirectDraw HAL" */ - stop = !Callback(NULL, driver_desc, driver_name, Context, 0); + Callback(NULL, driver_desc, driver_name, Context, 0); } __EXCEPT_PAGE_FAULT { - return E_INVALIDARG; + return DDERR_INVALIDPARAMS; } __ENDTRY; diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 17031b0..a095063 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -40,12 +40,14 @@ static LPDDSURFACEDESC modes; static HRESULT (WINAPI *pDirectDrawEnumerateA)(LPDDENUMCALLBACKA,LPVOID); static HRESULT (WINAPI *pDirectDrawEnumerateW)(LPDDENUMCALLBACKW,LPVOID); +static HRESULT (WINAPI *pDirectDrawEnumerateExA)(LPDDENUMCALLBACKEXA,LPVOID,DWORD); static void init_function_pointers(void) { HMODULE hmod = GetModuleHandleA("ddraw.dll"); pDirectDrawEnumerateA = (void*)GetProcAddress(hmod, "DirectDrawEnumerateA"); pDirectDrawEnumerateW = (void*)GetProcAddress(hmod, "DirectDrawEnumerateW"); + pDirectDrawEnumerateExA = (void*)GetProcAddress(hmod, "DirectDrawEnumerateExA"); } static void createwindow(void) @@ -194,6 +196,83 @@ static void test_DirectDrawEnumerateW(void) ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); } +static BOOL WINAPI crash_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription, + LPSTR lpDriverName, LPVOID lpContext, + HMONITOR hm) +{ + *(volatile char*)0 = 2; + return TRUE; +} + +static BOOL WINAPI test_nullcontext_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription, + LPSTR lpDriverName, LPVOID lpContext, + HMONITOR hm) +{ + trace("test_nullcontext_callbackExA: %p %s %s %p %p\n", lpGUID, + lpDriverDescription, lpDriverName, lpContext, hm); + + ok(!lpContext, "Expected NULL lpContext\n"); + + return TRUE; +} + +static BOOL WINAPI test_context_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription, + LPSTR lpDriverName, LPVOID lpContext, + HMONITOR hm) +{ + trace("test_context_callbackExA: %p %s %s %p %p\n", lpGUID, + lpDriverDescription, lpDriverName, lpContext, hm); + + ok(lpContext == (LPVOID)0xdeadbeef, "Expected non-NULL lpContext\n"); + + return TRUE; +} + +static void test_DirectDrawEnumerateExA(void) +{ + HRESULT ret; + + if (!pDirectDrawEnumerateExA) + { + win_skip("DirectDrawEnumerateExA is not available\n"); + return; + } + + /* Test with NULL callback parameter. */ + ret = pDirectDrawEnumerateExA(NULL, NULL, 0); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + + /* Test with invalid callback parameter. */ + ret = pDirectDrawEnumerateExA((LPDDENUMCALLBACKEXA)0xdeadbeef, NULL, 0); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + + /* Test with callback that crashes. */ + ret = pDirectDrawEnumerateExA(crash_callbackExA, NULL, 0); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + + /* Test with valid callback parameter and invalid flags */ + ret = pDirectDrawEnumerateExA(test_nullcontext_callbackExA, NULL, ~0); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + + /* Test with valid callback parameter and NULL context parameter. */ + trace("Calling DirectDrawEnumerateExA with empty flags and NULL context.\n"); + ret = pDirectDrawEnumerateExA(test_nullcontext_callbackExA, NULL, 0); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + + /* Test with valid callback parameter and non-NULL context parameter. */ + trace("Calling DirectDrawEnumerateExA with empty flags and non-NULL context.\n"); + ret = pDirectDrawEnumerateExA(test_context_callbackExA, (LPVOID)0xdeadbeef, 0); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); + + /* Test with valid callback parameter, NULL context parameter, and all flags set. */ + trace("Calling DirectDrawEnumerateExA with all flags set and NULL context.\n"); + ret = pDirectDrawEnumerateExA(test_nullcontext_callbackExA, NULL, + DDENUM_ATTACHEDSECONDARYDEVICES | + DDENUM_DETACHEDSECONDARYDEVICES | + DDENUM_NONDISPLAYDEVICES); + ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); +} + static void adddisplaymode(LPDDSURFACEDESC lpddsd) { if (!modes) @@ -523,6 +602,7 @@ START_TEST(ddrawmodes) test_DirectDrawEnumerateA(); test_DirectDrawEnumerateW(); + test_DirectDrawEnumerateExA(); enumdisplaymodes(); if (winetest_interactive)

1 0

Andrew Nguyen : ddraw: Implement and test DirectDrawEnumerateExW.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 7211f7ce183076bceb01fa176e0630b5df5a8d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7211f7ce183076bceb01fa176… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Oct 8 09:04:18 2009 -0500 ddraw: Implement and test DirectDrawEnumerateExW. --- dlls/ddraw/ddraw.spec | 2 +- dlls/ddraw/main.c | 15 +++++++++--- dlls/ddraw/tests/ddrawmodes.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.spec b/dlls/ddraw/ddraw.spec index 3b3916e..7575091 100644 --- a/dlls/ddraw/ddraw.spec +++ b/dlls/ddraw/ddraw.spec @@ -8,7 +8,7 @@ @ stdcall DirectDrawCreateEx(ptr ptr ptr ptr) @ stdcall DirectDrawEnumerateA(ptr ptr) @ stdcall DirectDrawEnumerateExA(ptr ptr long) -@ stub DirectDrawEnumerateExW +@ stdcall DirectDrawEnumerateExW(ptr ptr long) @ stdcall DirectDrawEnumerateW(ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 137bb44..2a0d8f0 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -456,12 +456,19 @@ DirectDrawEnumerateW(LPDDENUMCALLBACKW Callback, /*********************************************************************** * DirectDrawEnumerateExW (DDRAW.@) * - * Enumerates DirectDraw7 drivers, unicode version. See - * the comments above DirectDrawEnumerateA for more details. - * - * The Flag member is not supported right now. + * Enumerates DirectDraw7 drivers, unicode version. + * This function is not implemented on Windows. * ***********************************************************************/ +HRESULT WINAPI +DirectDrawEnumerateExW(LPDDENUMCALLBACKEXW Callback, + LPVOID Context, + DWORD Flags) +{ + TRACE("(%p, %p, 0x%x)\n", Callback, Context, Flags); + + return DDERR_UNSUPPORTED; +} /*********************************************************************** * Classfactory implementation. diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index a095063..7ea4d53 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -41,6 +41,7 @@ static LPDDSURFACEDESC modes; static HRESULT (WINAPI *pDirectDrawEnumerateA)(LPDDENUMCALLBACKA,LPVOID); static HRESULT (WINAPI *pDirectDrawEnumerateW)(LPDDENUMCALLBACKW,LPVOID); static HRESULT (WINAPI *pDirectDrawEnumerateExA)(LPDDENUMCALLBACKEXA,LPVOID,DWORD); +static HRESULT (WINAPI *pDirectDrawEnumerateExW)(LPDDENUMCALLBACKEXW,LPVOID,DWORD); static void init_function_pointers(void) { @@ -48,6 +49,7 @@ static void init_function_pointers(void) pDirectDrawEnumerateA = (void*)GetProcAddress(hmod, "DirectDrawEnumerateA"); pDirectDrawEnumerateW = (void*)GetProcAddress(hmod, "DirectDrawEnumerateW"); pDirectDrawEnumerateExA = (void*)GetProcAddress(hmod, "DirectDrawEnumerateExA"); + pDirectDrawEnumerateExW = (void*)GetProcAddress(hmod, "DirectDrawEnumerateExW"); } static void createwindow(void) @@ -273,6 +275,50 @@ static void test_DirectDrawEnumerateExA(void) ok(ret == DD_OK, "Expected DD_OK, got %d\n", ret); } +static BOOL WINAPI test_callbackExW(GUID *lpGUID, LPWSTR lpDriverDescription, + LPWSTR lpDriverName, LPVOID lpContext, + HMONITOR hm) +{ + ok(0, "The callback should not be invoked by DirectDrawEnumerateExW.\n"); + return TRUE; +} + +static void test_DirectDrawEnumerateExW(void) +{ + HRESULT ret; + + if (!pDirectDrawEnumerateExW) + { + win_skip("DirectDrawEnumerateExW is not available\n"); + return; + } + + /* DirectDrawEnumerateExW is not implemented on Windows. */ + + /* Test with NULL callback parameter. */ + ret = pDirectDrawEnumerateExW(NULL, NULL, 0); + ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); + + /* Test with invalid callback parameter. */ + ret = pDirectDrawEnumerateExW((LPDDENUMCALLBACKEXW)0xdeadbeef, NULL, 0); + ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); + + /* Test with valid callback parameter and invalid flags */ + ret = pDirectDrawEnumerateExW(test_callbackExW, NULL, ~0); + ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); + + /* Test with valid callback parameter and NULL context parameter. */ + ret = pDirectDrawEnumerateExW(test_callbackExW, NULL, 0); + ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); + + /* Test with valid callback parameter, NULL context parameter, and all flags set. */ + ret = pDirectDrawEnumerateExW(test_callbackExW, NULL, + DDENUM_ATTACHEDSECONDARYDEVICES | + DDENUM_DETACHEDSECONDARYDEVICES | + DDENUM_NONDISPLAYDEVICES); + ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); +} + static void adddisplaymode(LPDDSURFACEDESC lpddsd) { if (!modes) @@ -603,6 +649,7 @@ START_TEST(ddrawmodes) test_DirectDrawEnumerateA(); test_DirectDrawEnumerateW(); test_DirectDrawEnumerateExA(); + test_DirectDrawEnumerateExW(); enumdisplaymodes(); if (winetest_interactive)

1 0

Eric Pouech : winmm: Remove direct inclusion of winemm.h in winemm16.h.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 5b8b9d6da72d228da572abc18b0e0c1c33191d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8b9d6da72d228da572abc18… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 8 20:57:11 2009 +0200 winmm: Remove direct inclusion of winemm.h in winemm16.h. --- dlls/winmm/message16.c | 1 + dlls/winmm/mmsystem.c | 1 + dlls/winmm/winemm16.h | 1 - 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/message16.c b/dlls/winmm/message16.c index 2e9b953..0bbc14a 100644 --- a/dlls/winmm/message16.c +++ b/dlls/winmm/message16.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wownt32.h" +#include "winemm.h" #include "winemm16.h" #include "digitalv.h" #include "wine/debug.h" diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index fd065d0..669d161 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -39,6 +39,7 @@ #include "winnls.h" #include "wine/winuser16.h" +#include "winemm.h" #include "winemm16.h" #include "wine/debug.h" diff --git a/dlls/winmm/winemm16.h b/dlls/winmm/winemm16.h index 2099833..a64e28c 100644 --- a/dlls/winmm/winemm16.h +++ b/dlls/winmm/winemm16.h @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "winemm.h" #include "wine/mmsystem16.h" #include "wownt32.h"

1 0

Alexandre Julliard : kernel32: Fix handling of overflows in GetPrivateProfileSectionA.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 362ecd06f6abc2d1296c4ba2aa522825d2fe7c35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=362ecd06f6abc2d1296c4ba2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 16:28:17 2009 +0200 kernel32: Fix handling of overflows in GetPrivateProfileSectionA. --- dlls/kernel32/profile.c | 14 +++++++------- dlls/kernel32/tests/profile.c | 8 ++++++++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 8a787da..aa223c7 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1386,23 +1386,23 @@ INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, return 0; } - bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + bufferW = HeapAlloc(GetProcessHeap(), 0, len * 2 * sizeof(WCHAR)); RtlCreateUnicodeStringFromAsciiz(&sectionW, section); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = GetPrivateProfileSectionW(sectionW.Buffer, bufferW, len, filenameW.Buffer); - if (len > 2) + retW = GetPrivateProfileSectionW(sectionW.Buffer, bufferW, len * 2, filenameW.Buffer); + if (retW) { + if (retW == len * 2 - 2) retW++; /* overflow */ ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 1, buffer, len, NULL, NULL); - if (ret > 2) - ret -= 1; - else + if (!ret || ret == len) /* overflow */ { - ret = 0; + ret = len - 2; buffer[len-2] = 0; buffer[len-1] = 0; } + else ret--; } else { diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index a1bf967..e3f7156 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -236,6 +236,14 @@ static void test_profile_sections(void) broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "expected ERROR_SUCCESS, got %d\n", GetLastError()); + /* Overflow*/ + ret=GetPrivateProfileSectionA("section1", buf, 24, testfile4); + for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) + p[-1] = ','; + ok( ret == 22 && !strcmp( buf, "name1=val1,name2=,name"), "wrong section returned(%d): %s\n", + ret, buf); + ok( buf[ret] == 0 && buf[ret+1] == 0, "returned buffer not terminated with double-null\n" ); + DeleteFileA( testfile4 ); }

1 0

Alexandre Julliard : kernel32: Reimplement GetPrivateProfileString16 on top of 32-bit functions and move it to file16 .c.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 86c6021c71a563af88c1a8cc23ea489e92c8ca70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c6021c71a563af88c1a8cc2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 19:11:58 2009 +0200 kernel32: Reimplement GetPrivateProfileString16 on top of 32-bit functions and move it to file16.c. --- dlls/kernel32/file16.c | 84 +++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel_main.c | 2 +- dlls/kernel32/profile.c | 96 +++++------------------------------------- 3 files changed, 97 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86c6021c71a563af88c1a…

1 0