wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

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 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: 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/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

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

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 : setupapi/tests: Fix the SetupGetIntField test to load the correct key.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: f901f63bc6774d1938234a5a5711320a448fef03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f901f63bc6774d1938234a5a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 21:50:09 2009 +0200 setupapi/tests: Fix the SetupGetIntField test to load the correct key. --- dlls/setupapi/tests/parser.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index f12d02d..072ac97 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -602,14 +602,14 @@ static void test_SetupGetIntField(void) } keys[] = { /* key fields index expected int errorcode */ - { "Key=", "48", 1, 48, ERROR_SUCCESS }, - { "Key=", "48", 0, -1, ERROR_INVALID_DATA }, - { "123=", "48", 0, 123, ERROR_SUCCESS }, - { "Key=", "0x4", 1, 4, ERROR_SUCCESS }, - { "Key=", "Field1", 1, -1, ERROR_INVALID_DATA }, - { "Key=", "Field1,34", 2, 34, ERROR_SUCCESS }, - { "Key=", "Field1,,Field3", 2, 0, ERROR_SUCCESS }, - { "Key=", "Field1,", 2, 0, ERROR_SUCCESS } + { "Key", "48", 1, 48, ERROR_SUCCESS }, + { "Key", "48", 0, -1, ERROR_INVALID_DATA }, + { "123", "48", 0, 123, ERROR_SUCCESS }, + { "Key", "0x4", 1, 4, ERROR_SUCCESS }, + { "Key", "Field1", 1, -1, ERROR_INVALID_DATA }, + { "Key", "Field1,34", 2, 34, ERROR_SUCCESS }, + { "Key", "Field1,,Field3", 2, 0, ERROR_SUCCESS }, + { "Key", "Field1,", 2, 0, ERROR_SUCCESS } }; unsigned int i; @@ -624,22 +624,17 @@ static void test_SetupGetIntField(void) strcpy( buffer, STD_HEADER "[TestSection]\n" ); strcat( buffer, keys[i].key ); + strcat( buffer, "=" ); strcat( buffer, keys[i].fields ); hinf = test_file_contents( buffer, &err); ok( hinf != NULL, "Expected valid INF file\n" ); - SetupFindFirstLineA( hinf, "TestSection", "Key", &context ); + SetupFindFirstLineA( hinf, "TestSection", keys[i].key, &context ); SetLastError( 0xdeadbeef ); intfield = -1; retb = SetupGetIntField( &context, keys[i].index, &intfield ); if ( keys[i].err == ERROR_SUCCESS ) { - if ( !retb && !lstrcmpA( keys[i].key, "123=" ) ) - { - win_skip( "results differ on Win9x\n" ); - SetupCloseInfFile( hinf ); - continue; - } ok( retb, "%u: Expected success\n", i ); ok( GetLastError() == ERROR_SUCCESS || GetLastError() == 0xdeadbeef /* win9x, NT4 */,

1 0

Alexandre Julliard : kernel32: Moved the DeviceIoControl function to file.c .
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 42c5215133ac904999895e40ed422c2397c6b020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42c5215133ac904999895e40e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 19:38:38 2009 +0200 kernel32: Moved the DeviceIoControl function to file.c. --- dlls/kernel32/file.c | 77 +++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel_private.h | 3 + dlls/kernel32/vxd.c | 87 +--------------------------------------- 3 files changed, 82 insertions(+), 85 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 5432c31..e6d83bc 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2310,6 +2310,83 @@ DWORD WINAPI GetCompressedFileSizeA( LPCSTR name, LPDWORD size_high ) /*********************************************************************** + * OpenVxDHandle (KERNEL32.@) + * + * This function is supposed to return the corresponding Ring 0 + * ("kernel") handle for a Ring 3 handle in Win9x. + * Evidently, Wine will have problems with this. But we try anyway, + * maybe it helps... + */ +HANDLE WINAPI OpenVxDHandle(HANDLE hHandleRing3) +{ + FIXME( "(%p), stub! (returning Ring 3 handle instead of Ring 0)\n", hHandleRing3); + return hHandleRing3; +} + + +/**************************************************************************** + * DeviceIoControl (KERNEL32.@) + */ +BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, + LPVOID lpvInBuffer, DWORD cbInBuffer, + LPVOID lpvOutBuffer, DWORD cbOutBuffer, + LPDWORD lpcbBytesReturned, + LPOVERLAPPED lpOverlapped) +{ + NTSTATUS status; + + TRACE( "(%p,%x,%p,%d,%p,%d,%p,%p)\n", + hDevice,dwIoControlCode,lpvInBuffer,cbInBuffer, + lpvOutBuffer,cbOutBuffer,lpcbBytesReturned,lpOverlapped ); + + /* Check if this is a user defined control code for a VxD */ + + if (HIWORD( dwIoControlCode ) == 0 && (GetVersion() & 0x80000000)) + { + DeviceIoProc proc = VXD_get_proc( hDevice ); + if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer, + lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpOverlapped ); + } + + /* Not a VxD, let ntdll handle it */ + + if (lpOverlapped) + { + LPVOID cvalue = ((ULONG_PTR)lpOverlapped->hEvent & 1) ? NULL : lpOverlapped; + lpOverlapped->Internal = STATUS_PENDING; + lpOverlapped->InternalHigh = 0; + if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) + status = NtFsControlFile(hDevice, lpOverlapped->hEvent, + NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped, + dwIoControlCode, lpvInBuffer, cbInBuffer, + lpvOutBuffer, cbOutBuffer); + else + status = NtDeviceIoControlFile(hDevice, lpOverlapped->hEvent, + NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped, + dwIoControlCode, lpvInBuffer, cbInBuffer, + lpvOutBuffer, cbOutBuffer); + if (lpcbBytesReturned) *lpcbBytesReturned = lpOverlapped->InternalHigh; + } + else + { + IO_STATUS_BLOCK iosb; + + if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) + status = NtFsControlFile(hDevice, NULL, NULL, NULL, &iosb, + dwIoControlCode, lpvInBuffer, cbInBuffer, + lpvOutBuffer, cbOutBuffer); + else + status = NtDeviceIoControlFile(hDevice, NULL, NULL, NULL, &iosb, + dwIoControlCode, lpvInBuffer, cbInBuffer, + lpvOutBuffer, cbOutBuffer); + if (lpcbBytesReturned) *lpcbBytesReturned = iosb.Information; + } + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + + +/*********************************************************************** * OpenFile (KERNEL32.@) */ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 1de1163..ec8dbda 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -93,6 +93,9 @@ extern DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_en extern BOOL NLS_IsUnicodeOnlyLcid(LCID); +/* vxd.c */ +typedef BOOL (WINAPI *DeviceIoProc)(DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPOVERLAPPED); +extern DeviceIoProc VXD_get_proc( HANDLE handle ); extern HANDLE VXD_Open( LPCWSTR filename, DWORD access, LPSECURITY_ATTRIBUTES sa ); /* environ.c */ diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index deb9560..d8b8dc3 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -39,6 +39,7 @@ #include "winerror.h" #include "winternl.h" #include "winioctl.h" +#include "kernel_private.h" #include "kernel16_private.h" #include "wine/library.h" #include "wine/unicode.h" @@ -47,7 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vxd); -typedef BOOL (WINAPI *DeviceIoProc)(DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPOVERLAPPED); typedef DWORD (WINAPI *VxDCallProc)(DWORD, CONTEXT86 *); struct vxd_module @@ -134,7 +134,7 @@ static HANDLE open_vxd_handle( LPCWSTR name ) } /* retrieve the DeviceIoControl function for a Vxd given a file handle */ -static DeviceIoProc get_vxd_proc( HANDLE handle ) +DeviceIoProc VXD_get_proc( HANDLE handle ) { DeviceIoProc ret = NULL; int status, i; @@ -299,86 +299,3 @@ void WINAPI __regs_VxDCall( DWORD service, CONTEXT86 *context ) #ifdef DEFINE_REGS_ENTRYPOINT DEFINE_REGS_ENTRYPOINT( VxDCall, 1 ) #endif - - -/*********************************************************************** - * OpenVxDHandle (KERNEL32.@) - * - * This function is supposed to return the corresponding Ring 0 - * ("kernel") handle for a Ring 3 handle in Win9x. - * Evidently, Wine will have problems with this. But we try anyway, - * maybe it helps... - */ -HANDLE WINAPI OpenVxDHandle(HANDLE hHandleRing3) -{ - FIXME( "(%p), stub! (returning Ring 3 handle instead of Ring 0)\n", hHandleRing3); - return hHandleRing3; -} - - -/**************************************************************************** - * DeviceIoControl (KERNEL32.@) - * This is one of those big ugly nasty procedure which can do - * a million and one things when it comes to devices. It can also be - * used for VxD communication. - * - * A return value of FALSE indicates that something has gone wrong which - * GetLastError can decipher. - */ -BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, - LPVOID lpvInBuffer, DWORD cbInBuffer, - LPVOID lpvOutBuffer, DWORD cbOutBuffer, - LPDWORD lpcbBytesReturned, - LPOVERLAPPED lpOverlapped) -{ - NTSTATUS status; - - TRACE( "(%p,%x,%p,%d,%p,%d,%p,%p)\n", - hDevice,dwIoControlCode,lpvInBuffer,cbInBuffer, - lpvOutBuffer,cbOutBuffer,lpcbBytesReturned,lpOverlapped ); - - /* Check if this is a user defined control code for a VxD */ - - if (HIWORD( dwIoControlCode ) == 0 && (GetVersion() & 0x80000000)) - { - DeviceIoProc proc = get_vxd_proc( hDevice ); - if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer, lpcbBytesReturned, lpOverlapped ); - } - - /* Not a VxD, let ntdll handle it */ - - if (lpOverlapped) - { - LPVOID cvalue = ((ULONG_PTR)lpOverlapped->hEvent & 1) ? NULL : lpOverlapped; - lpOverlapped->Internal = STATUS_PENDING; - lpOverlapped->InternalHigh = 0; - if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) - status = NtFsControlFile(hDevice, lpOverlapped->hEvent, - NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped, - dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer); - else - status = NtDeviceIoControlFile(hDevice, lpOverlapped->hEvent, - NULL, cvalue, (PIO_STATUS_BLOCK)lpOverlapped, - dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer); - if (lpcbBytesReturned) *lpcbBytesReturned = lpOverlapped->InternalHigh; - } - else - { - IO_STATUS_BLOCK iosb; - - if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) - status = NtFsControlFile(hDevice, NULL, NULL, NULL, &iosb, - dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer); - else - status = NtDeviceIoControlFile(hDevice, NULL, NULL, NULL, &iosb, - dwIoControlCode, lpvInBuffer, cbInBuffer, - lpvOutBuffer, cbOutBuffer); - if (lpcbBytesReturned) *lpcbBytesReturned = iosb.Information; - } - if (status) SetLastError( RtlNtStatusToDosError(status) ); - return !status; -}

1 0

Alexandre Julliard : kernel32: Move some 16-bit definitions to kernel16_private.h.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: 69a1fba4c31970a818eaf58622ccfd127798f962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a1fba4c31970a818eaf5862… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 19:25:30 2009 +0200 kernel32: Move some 16-bit definitions to kernel16_private.h. --- dlls/kernel32/kernel16_private.h | 37 ++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel_private.h | 39 -------------------------------------- dlls/kernel32/selector.c | 2 +- dlls/kernel32/vxd.c | 2 +- 4 files changed, 39 insertions(+), 41 deletions(-) diff --git a/dlls/kernel32/kernel16_private.h b/dlls/kernel32/kernel16_private.h index 6ad2aea..7a0e2f5 100644 --- a/dlls/kernel32/kernel16_private.h +++ b/dlls/kernel32/kernel16_private.h @@ -188,6 +188,13 @@ static inline void stack16_pop( int size ) NtCurrentTeb()->WOW32Reserved = (char *)NtCurrentTeb()->WOW32Reserved + size; } +/* dosmem.c */ +extern BOOL DOSMEM_Init(void); +extern LPVOID DOSMEM_MapRealToLinear(DWORD); /* real-mode to linear */ +extern LPVOID DOSMEM_MapDosToLinear(UINT); /* linear DOS to Wine */ +extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ +extern BOOL load_winedos(void); + /* global16.c */ extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ); @@ -195,6 +202,10 @@ extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ); extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ); +/* instr.c */ +extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ); +extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ); + /* ne_module.c */ extern NE_MODULE *NE_GetPtr( HMODULE16 hModule ); extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name ); @@ -239,9 +250,35 @@ extern void TASK_InstallTHHook( THHOOK *pNewThook ); extern BOOL WOWTHUNK_Init(void); +extern struct winedos_exports +{ + /* for global16.c */ + void* (*AllocDosBlock)(UINT size, UINT16* pseg); + BOOL (*FreeDosBlock)(void* ptr); + UINT (*ResizeDosBlock)(void *ptr, UINT size, BOOL exact); + /* for instr.c */ + BOOL (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum ); + void (WINAPI *CallBuiltinHandler)( CONTEXT86 *context, BYTE intnum ); + DWORD (WINAPI *inport)( int port, int size ); + void (WINAPI *outport)( int port, int size, DWORD val ); +} winedos; + +extern WORD DOSMEM_0000H; +extern WORD DOSMEM_BiosDataSeg; +extern WORD DOSMEM_BiosSysSeg; extern DWORD CallTo16_DataSelector; extern DWORD CallTo16_TebSelector; extern SEGPTR CALL32_CBClient_RetAddr; extern SEGPTR CALL32_CBClientEx_RetAddr; +#ifdef __i386__ +#define DEFINE_REGS_ENTRYPOINT( name, args ) \ + __ASM_GLOBAL_FUNC( name, \ + ".byte 0x68\n\t" /* pushl $__regs_func */ \ + ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ + ".byte 0x6a," #args "\n\t" /* pushl $args */ \ + "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ + "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */ +#endif + #endif /* __WINE_KERNEL16_PRIVATE_H */ diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 236f9f8..1de1163 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -75,9 +75,6 @@ extern void FILE_SetDosError(void); extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ); extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ); -extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT86 *context ); -extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ); - /* return values for MODULE_GetBinaryType */ #define BINARY_UNKNOWN 0x00 #define BINARY_PE 0x01 @@ -98,17 +95,6 @@ extern BOOL NLS_IsUnicodeOnlyLcid(LCID); extern HANDLE VXD_Open( LPCWSTR filename, DWORD access, LPSECURITY_ATTRIBUTES sa ); -extern WORD DOSMEM_0000H; -extern WORD DOSMEM_BiosDataSeg; -extern WORD DOSMEM_BiosSysSeg; - -/* dosmem.c */ -extern BOOL DOSMEM_Init(void); -extern LPVOID DOSMEM_MapRealToLinear(DWORD); /* real-mode to linear */ -extern LPVOID DOSMEM_MapDosToLinear(UINT); /* linear DOS to Wine */ -extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ -extern BOOL load_winedos(void); - /* environ.c */ extern void ENV_CopyStartupInformation(void); @@ -122,32 +108,7 @@ extern void LOCALE_InitRegistry(void); /* oldconfig.c */ extern void convert_old_config(void); -extern struct winedos_exports -{ - /* for global16.c */ - void* (*AllocDosBlock)(UINT size, UINT16* pseg); - BOOL (*FreeDosBlock)(void* ptr); - UINT (*ResizeDosBlock)(void *ptr, UINT size, BOOL exact); - /* for instr.c */ - BOOL (WINAPI *EmulateInterruptPM)( CONTEXT86 *context, BYTE intnum ); - void (WINAPI *CallBuiltinHandler)( CONTEXT86 *context, BYTE intnum ); - DWORD (WINAPI *inport)( int port, int size ); - void (WINAPI *outport)( int port, int size, DWORD val ); -} winedos; - /* returns directory handle for named objects */ extern HANDLE get_BaseNamedObjects_handle(void); -/* Register functions */ - -#ifdef __i386__ -#define DEFINE_REGS_ENTRYPOINT( name, args ) \ - __ASM_GLOBAL_FUNC( name, \ - ".byte 0x68\n\t" /* pushl $__regs_func */ \ - ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ - ".byte 0x6a," #args "\n\t" /* pushl $args */ \ - "call " __ASM_NAME("__wine_call_from_32_regs") "\n\t" \ - "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */ -#endif - #endif diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c index 33e6b90..2142720 100644 --- a/dlls/kernel32/selector.c +++ b/dlls/kernel32/selector.c @@ -26,7 +26,7 @@ #include "wine/winbase16.h" #include "wine/server.h" #include "wine/debug.h" -#include "kernel_private.h" +#include "kernel16_private.h" WINE_DEFAULT_DEBUG_CHANNEL(selector); diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index 92ad242..deb9560 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -39,7 +39,7 @@ #include "winerror.h" #include "winternl.h" #include "winioctl.h" -#include "kernel_private.h" +#include "kernel16_private.h" #include "wine/library.h" #include "wine/unicode.h" #include "wine/server.h"

1 0

Alexandre Julliard : kernel32: Move the DOS file handle functions to file16 .c.
by Alexandre Julliard 09 Oct '09

09 Oct '09

Module: wine Branch: master Commit: e5288bf42f8d8a356996516428b99549297faaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5288bf42f8d8a35699651642… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 8 19:22:17 2009 +0200 kernel32: Move the DOS file handle functions to file16.c. --- dlls/kernel32/file.c | 104 ---------------------------------------- dlls/kernel32/file16.c | 104 +++++++++++++++++++++++++++++++++++++++- dlls/kernel32/kernel_private.h | 4 -- 3 files changed, 103 insertions(+), 109 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index d9fbddb..5432c31 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -49,8 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); -HANDLE dos_handles[DOS_TABLE_SIZE]; - /* info structure for FindFirstFile handle */ typedef struct { @@ -316,32 +314,6 @@ BOOL WINAPI AreFileApisANSI(void) * Operations on file handles * **************************************************************************/ -/*********************************************************************** - * FILE_InitProcessDosHandles - * - * Allocates the default DOS handles for a process. Called either by - * Win32HandleToDosFileHandle below or by the DOSVM stuff. - */ -static void FILE_InitProcessDosHandles( void ) -{ - static BOOL init_done /* = FALSE */; - HANDLE cp = GetCurrentProcess(); - - if (init_done) return; - init_done = TRUE; - DuplicateHandle(cp, GetStdHandle(STD_INPUT_HANDLE), cp, &dos_handles[0], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_OUTPUT_HANDLE), cp, &dos_handles[1], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[2], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[3], - 0, TRUE, DUPLICATE_SAME_ACCESS); - DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[4], - 0, TRUE, DUPLICATE_SAME_ACCESS); -} - - /****************************************************************** * FILE_ReadWriteApc (internal) */ @@ -1205,59 +1177,6 @@ BOOL WINAPI UnlockFileEx( HANDLE hFile, DWORD reserved, DWORD count_low, DWORD c } -/*********************************************************************** - * Win32HandleToDosFileHandle (KERNEL32.21) - * - * Allocate a DOS handle for a Win32 handle. The Win32 handle is no - * longer valid after this function (even on failure). - * - * Note: this is not exactly right, since on Win95 the Win32 handles - * are on top of DOS handles and we do it the other way - * around. Should be good enough though. - */ -HFILE WINAPI Win32HandleToDosFileHandle( HANDLE handle ) -{ - int i; - - if (!handle || (handle == INVALID_HANDLE_VALUE)) - return HFILE_ERROR; - - FILE_InitProcessDosHandles(); - for (i = 0; i < DOS_TABLE_SIZE; i++) - if (!dos_handles[i]) - { - dos_handles[i] = handle; - TRACE("Got %d for h32 %p\n", i, handle ); - return (HFILE)i; - } - CloseHandle( handle ); - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - return HFILE_ERROR; -} - - -/*********************************************************************** - * DosFileHandleToWin32Handle (KERNEL32.20) - * - * Return the Win32 handle for a DOS handle. - * - * Note: this is not exactly right, since on Win95 the Win32 handles - * are on top of DOS handles and we do it the other way - * around. Should be good enough though. - */ -HANDLE WINAPI DosFileHandleToWin32Handle( HFILE handle ) -{ - HFILE16 hfile = (HFILE16)handle; - if (hfile < 5) FILE_InitProcessDosHandles(); - if ((hfile >= DOS_TABLE_SIZE) || !dos_handles[hfile]) - { - SetLastError( ERROR_INVALID_HANDLE ); - return INVALID_HANDLE_VALUE; - } - return dos_handles[hfile]; -} - - /************************************************************************* * SetHandleCount (KERNEL32.@) */ @@ -1267,29 +1186,6 @@ UINT WINAPI SetHandleCount( UINT count ) } -/*********************************************************************** - * DisposeLZ32Handle (KERNEL32.22) - * - * Note: this is not entirely correct, we should only close the - * 32-bit handle and not the 16-bit one, but we cannot do - * this because of the way our DOS handles are implemented. - * It shouldn't break anything though. - */ -void WINAPI DisposeLZ32Handle( HANDLE handle ) -{ - int i; - - if (!handle || (handle == INVALID_HANDLE_VALUE)) return; - - for (i = 5; i < DOS_TABLE_SIZE; i++) - if (dos_handles[i] == handle) - { - dos_handles[i] = 0; - CloseHandle( handle ); - break; - } -} - /************************************************************************** * Operations on file names * **************************************************************************/ diff --git a/dlls/kernel32/file16.c b/dlls/kernel32/file16.c index 3ca3039..30c7bdd 100644 --- a/dlls/kernel32/file16.c +++ b/dlls/kernel32/file16.c @@ -37,12 +37,114 @@ #include "winbase.h" #include "winternl.h" #include "wine/winbase16.h" -#include "kernel_private.h" +#include "kernel16_private.h" #include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(file); +#define DOS_TABLE_SIZE 256 + +static HANDLE dos_handles[DOS_TABLE_SIZE]; + +/*********************************************************************** + * FILE_InitProcessDosHandles + * + * Allocates the default DOS handles for a process. Called either by + * Win32HandleToDosFileHandle below or by the DOSVM stuff. + */ +static void FILE_InitProcessDosHandles( void ) +{ + static BOOL init_done /* = FALSE */; + HANDLE cp = GetCurrentProcess(); + + if (init_done) return; + init_done = TRUE; + DuplicateHandle(cp, GetStdHandle(STD_INPUT_HANDLE), cp, &dos_handles[0], + 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, GetStdHandle(STD_OUTPUT_HANDLE), cp, &dos_handles[1], + 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[2], + 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[3], + 0, TRUE, DUPLICATE_SAME_ACCESS); + DuplicateHandle(cp, GetStdHandle(STD_ERROR_HANDLE), cp, &dos_handles[4], + 0, TRUE, DUPLICATE_SAME_ACCESS); +} + +/*********************************************************************** + * DosFileHandleToWin32Handle (KERNEL32.20) + * + * Return the Win32 handle for a DOS handle. + * + * Note: this is not exactly right, since on Win95 the Win32 handles + * are on top of DOS handles and we do it the other way + * around. Should be good enough though. + */ +HANDLE WINAPI DosFileHandleToWin32Handle( HFILE handle ) +{ + HFILE16 hfile = (HFILE16)handle; + if (hfile < 5) FILE_InitProcessDosHandles(); + if ((hfile >= DOS_TABLE_SIZE) || !dos_handles[hfile]) + { + SetLastError( ERROR_INVALID_HANDLE ); + return INVALID_HANDLE_VALUE; + } + return dos_handles[hfile]; +} + +/*********************************************************************** + * Win32HandleToDosFileHandle (KERNEL32.21) + * + * Allocate a DOS handle for a Win32 handle. The Win32 handle is no + * longer valid after this function (even on failure). + * + * Note: this is not exactly right, since on Win95 the Win32 handles + * are on top of DOS handles and we do it the other way + * around. Should be good enough though. + */ +HFILE WINAPI Win32HandleToDosFileHandle( HANDLE handle ) +{ + int i; + + if (!handle || (handle == INVALID_HANDLE_VALUE)) + return HFILE_ERROR; + + FILE_InitProcessDosHandles(); + for (i = 0; i < DOS_TABLE_SIZE; i++) + if (!dos_handles[i]) + { + dos_handles[i] = handle; + TRACE("Got %d for h32 %p\n", i, handle ); + return (HFILE)i; + } + CloseHandle( handle ); + SetLastError( ERROR_TOO_MANY_OPEN_FILES ); + return HFILE_ERROR; +} + +/*********************************************************************** + * DisposeLZ32Handle (KERNEL32.22) + * + * Note: this is not entirely correct, we should only close the + * 32-bit handle and not the 16-bit one, but we cannot do + * this because of the way our DOS handles are implemented. + * It shouldn't break anything though. + */ +void WINAPI DisposeLZ32Handle( HANDLE handle ) +{ + int i; + + if (!handle || (handle == INVALID_HANDLE_VALUE)) return; + + for (i = 5; i < DOS_TABLE_SIZE; i++) + if (dos_handles[i] == handle) + { + dos_handles[i] = 0; + CloseHandle( handle ); + break; + } +} /*********************************************************************** * GetProfileInt (KERNEL.57) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index a65d93f..236f9f8 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -65,10 +65,6 @@ static inline obj_handle_t console_handle_unmap(HANDLE h) extern HMODULE kernel32_handle; -/* Size of per-process table of DOS handles */ -#define DOS_TABLE_SIZE 256 -extern HANDLE dos_handles[DOS_TABLE_SIZE]; - extern const WCHAR *DIR_Windows; extern const WCHAR *DIR_System; extern const WCHAR *DIR_SysWow64;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009