wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Vincent Povirk : gdiplus: Add traces to unimplemented functions in imageattributes.c.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 30574dd6be85f1384f45e5c86d5715045e779768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30574dd6be85f1384f45e5c86… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 18 16:19:34 2009 -0600 gdiplus: Add traces to unimplemented functions in imageattributes.c. --- dlls/gdiplus/imageattributes.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index f74b6db..56e5ab2 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -122,6 +122,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, { static int calls; + TRACE("(%p,%u,%08x,%i)\n", imageAttr, wrap, argb, clamp); + if(!imageAttr) return InvalidParameter; @@ -136,6 +138,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes *im { static int calls; + TRACE("(%p,%i)\n", imageAttr, enableFlag); + if(!(calls++)) FIXME("not implemented\n"); @@ -147,6 +151,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesGamma(GpImageAttributes *imageAttr, { static int calls; + TRACE("(%p,%u,%i,%0.2f)\n", imageAttr, type, enableFlag, gamma); + if(!(calls++)) FIXME("not implemented\n"); @@ -158,6 +164,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes *imageAttr, { static int calls; + TRACE("(%p,%u,%i)\n", imageAttr, type, enableFlag); + if(!(calls++)) FIXME("not implemented\n"); @@ -169,6 +177,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes *image { static int calls; + TRACE("(%p,%u,%i,%x)\n", imageAttr, type, enableFlag, channelFlags); + if(!(calls++)) FIXME("not implemented\n"); @@ -181,6 +191,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(GpImageAttri { static int calls; + TRACE("(%p,%u,%i,%s)\n", imageAttr, type, enableFlag, debugstr_w(colorProfileFilename)); + if(!(calls++)) FIXME("not implemented\n"); @@ -193,6 +205,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesRemapTable(GpImageAttributes *imageAtt { static int calls; + TRACE("(%p,%u,%i,%u,%p)\n", imageAttr, type, enableFlag, mapSize, map); + if(!(calls++)) FIXME("not implemented\n"); @@ -204,6 +218,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesThreshold(GpImageAttributes *imageAttr { static int calls; + TRACE("(%p,%u,%i,%0.2f)\n", imageAttr, type, enableFlag, threshold); + if(!(calls++)) FIXME("not implemented\n"); @@ -215,6 +231,8 @@ GpStatus WINGDIPAPI GdipSetImageAttributesToIdentity(GpImageAttributes *imageAtt { static int calls; + TRACE("(%p,%u)\n", imageAttr, type); + if(!(calls++)) FIXME("not implemented\n");

1 0

André Hentschel : kernel32: Implement IsThreadAFiber function.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: c008984a01e43401159cfd08bea32851a8130212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c008984a01e43401159cfd08b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 24 16:31:19 2010 +0100 kernel32: Implement IsThreadAFiber function. --- dlls/kernel32/fiber.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/fiber.c | 2 +- 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/fiber.c b/dlls/kernel32/fiber.c index f828cdc..c866661 100644 --- a/dlls/kernel32/fiber.c +++ b/dlls/kernel32/fiber.c @@ -304,3 +304,11 @@ BOOL WINAPI FlsSetValue( DWORD index, PVOID data ) NtCurrentTeb()->FlsSlots[index] = data; return TRUE; } + +/*********************************************************************** + * IsThreadAFiber (KERNEL32.@) + */ +BOOL WINAPI IsThreadAFiber(void) +{ + return NtCurrentTeb()->Tib.u.FiberData != NULL; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3b772ba..db9713f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -749,6 +749,7 @@ @ stdcall IsProcessorFeaturePresent(long) @ stub -i386 IsSLCallback @ stdcall IsSystemResumeAutomatic() +@ stdcall IsThreadAFiber() @ stdcall IsValidCodePage(long) @ stdcall IsValidLanguageGroup(long long) @ stdcall IsValidLocale(long long) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 7009a03..dac9d6a 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -146,7 +146,7 @@ static void test_FiberHandling(void) if (!pIsThreadAFiber) { - skip( "IsThreadAFiber not present\n" ); + win_skip( "IsThreadAFiber not present\n" ); return; }

1 0

André Hentschel : kernel32/tests: Test Fiber callback count.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: a9353a1caf8a783ff69881dbac4a3887ca58966f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9353a1caf8a783ff69881dba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 24 16:31:02 2010 +0100 kernel32/tests: Test Fiber callback count. --- dlls/kernel32/tests/fiber.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 9a26e4d..7009a03 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -35,6 +35,7 @@ static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); static LPVOID fibers[2]; static BYTE testparam = 185; +static WORD cbCount; static VOID init_funcs(void) { @@ -58,12 +59,14 @@ static VOID init_funcs(void) static VOID WINAPI FiberLocalStorageProc(PVOID lpFlsData) { + cbCount++; ok(lpFlsData == (PVOID) 1587, "FlsData expected not to be changed\n"); } static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter) { BYTE *tparam = (BYTE *)lpFiberParameter; + cbCount++; ok(*tparam == 185, "Parameterdata expected not to be changed\n"); pSwitchToFiber(fibers[0]); } @@ -108,6 +111,7 @@ static void test_ConvertFiberToThread(void) static void test_FiberHandling(void) { + cbCount = 0; fibers[0] = pCreateFiber(0,FiberMainProc,&testparam); ok(fibers[0] != 0, "CreateFiber failed with error %d\n", GetLastError()); pDeleteFiber(fibers[0]); @@ -124,6 +128,7 @@ static void test_FiberHandling(void) ok(fibers[1] != 0, "CreateFiber failed with error %d\n", GetLastError()); pSwitchToFiber(fibers[1]); + ok(cbCount == 1, "Wrong callback count: %d\n", cbCount); pDeleteFiber(fibers[1]); if (!pCreateFiberEx) @@ -136,6 +141,7 @@ static void test_FiberHandling(void) ok(fibers[1] != 0, "CreateFiberEx failed with error %d\n", GetLastError()); pSwitchToFiber(fibers[1]); + ok(cbCount == 2, "Wrong callback count: %d\n", cbCount); pDeleteFiber(fibers[1]); if (!pIsThreadAFiber) @@ -160,6 +166,7 @@ static void test_FiberLocalStorage(PFLS_CALLBACK_FUNCTION cbfunc) win_skip( "Fiber Local Storage not supported\n" ); return; } + cbCount = 0; fls = pFlsAlloc(cbfunc); ok(fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %d\n", GetLastError()); @@ -170,6 +177,8 @@ static void test_FiberLocalStorage(PFLS_CALLBACK_FUNCTION cbfunc) ret = pFlsFree(fls); ok(ret, "FlsFree failed\n"); + if (cbfunc) + todo_wine ok(cbCount == 1, "Wrong callback count: %d\n", cbCount); } START_TEST(fiber)

1 0

André Hentschel : kernel32/tests: Test Fiber Local Storage functions.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 30deb6b896231b214eb1a8e06da1e80ef2a70b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30deb6b896231b214eb1a8e06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 24 16:30:49 2010 +0100 kernel32/tests: Test Fiber Local Storage functions. --- dlls/kernel32/tests/fiber.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 20f6ccc..9a26e4d 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -28,6 +28,10 @@ static void (WINAPI *pDeleteFiber)(LPVOID); static LPVOID (WINAPI *pConvertThreadToFiberEx)(LPVOID,DWORD); static LPVOID (WINAPI *pCreateFiberEx)(SIZE_T,SIZE_T,DWORD,LPFIBER_START_ROUTINE,LPVOID); static BOOL (WINAPI *pIsThreadAFiber)(void); +static DWORD (WINAPI *pFlsAlloc)(PFLS_CALLBACK_FUNCTION); +static BOOL (WINAPI *pFlsFree)(DWORD); +static PVOID (WINAPI *pFlsGetValue)(DWORD); +static BOOL (WINAPI *pFlsSetValue)(DWORD,PVOID); static LPVOID fibers[2]; static BYTE testparam = 185; @@ -45,9 +49,18 @@ static VOID init_funcs(void) X(ConvertThreadToFiberEx); X(CreateFiberEx); X(IsThreadAFiber); + X(FlsAlloc); + X(FlsFree); + X(FlsGetValue); + X(FlsSetValue); #undef X } +static VOID WINAPI FiberLocalStorageProc(PVOID lpFlsData) +{ + ok(lpFlsData == (PVOID) 1587, "FlsData expected not to be changed\n"); +} + static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter) { BYTE *tparam = (BYTE *)lpFiberParameter; @@ -136,6 +149,29 @@ static void test_FiberHandling(void) ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); } +static void test_FiberLocalStorage(PFLS_CALLBACK_FUNCTION cbfunc) +{ + DWORD fls; + BOOL ret; + PVOID val = (PVOID) 1587; + + if (!pFlsAlloc) + { + win_skip( "Fiber Local Storage not supported\n" ); + return; + } + + fls = pFlsAlloc(cbfunc); + ok(fls != FLS_OUT_OF_INDEXES, "FlsAlloc failed with error %d\n", GetLastError()); + + ret = pFlsSetValue(fls, val); + ok(ret, "FlsSetValue failed\n"); + ok(val == pFlsGetValue(fls), "FlsGetValue failed\n"); + + ret = pFlsFree(fls); + ok(ret, "FlsFree failed\n"); +} + START_TEST(fiber) { init_funcs(); @@ -147,4 +183,6 @@ START_TEST(fiber) } test_FiberHandling(); + test_FiberLocalStorage(NULL); + test_FiberLocalStorage(FiberLocalStorageProc); }

1 0

André Hentschel : kernel32/tests: Test IsThreadAFiber function.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: e0475a3e11d92f83a52c7509dec54bb848d7d238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0475a3e11d92f83a52c7509d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 24 16:30:36 2010 +0100 kernel32/tests: Test IsThreadAFiber function. --- dlls/kernel32/tests/fiber.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 85db0b0..20f6ccc 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -27,6 +27,7 @@ static void (WINAPI *pSwitchToFiber)(LPVOID); static void (WINAPI *pDeleteFiber)(LPVOID); static LPVOID (WINAPI *pConvertThreadToFiberEx)(LPVOID,DWORD); static LPVOID (WINAPI *pCreateFiberEx)(SIZE_T,SIZE_T,DWORD,LPFIBER_START_ROUTINE,LPVOID); +static BOOL (WINAPI *pIsThreadAFiber)(void); static LPVOID fibers[2]; static BYTE testparam = 185; @@ -43,6 +44,7 @@ static VOID init_funcs(void) X(DeleteFiber); X(ConvertThreadToFiberEx); X(CreateFiberEx); + X(IsThreadAFiber); #undef X } @@ -122,6 +124,16 @@ static void test_FiberHandling(void) pSwitchToFiber(fibers[1]); pDeleteFiber(fibers[1]); + + if (!pIsThreadAFiber) + { + skip( "IsThreadAFiber not present\n" ); + return; + } + + ok(pIsThreadAFiber(), "IsThreadAFiber reported FALSE\n"); + test_ConvertFiberToThread(); + ok(!pIsThreadAFiber(), "IsThreadAFiber reported TRUE\n"); } START_TEST(fiber)

1 0

André Hentschel : kernel32/tests: Test fiber Ex functions.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: f57dbecda835bfb78bbf82014ec4015f8c8208f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57dbecda835bfb78bbf82014… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 24 16:30:16 2010 +0100 kernel32/tests: Test fiber Ex functions. --- dlls/kernel32/tests/fiber.c | 48 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 30c4a5e..85db0b0 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -25,6 +25,8 @@ static LPVOID (WINAPI *pConvertThreadToFiber)(LPVOID); static BOOL (WINAPI *pConvertFiberToThread)(void); static void (WINAPI *pSwitchToFiber)(LPVOID); static void (WINAPI *pDeleteFiber)(LPVOID); +static LPVOID (WINAPI *pConvertThreadToFiberEx)(LPVOID,DWORD); +static LPVOID (WINAPI *pCreateFiberEx)(SIZE_T,SIZE_T,DWORD,LPFIBER_START_ROUTINE,LPVOID); static LPVOID fibers[2]; static BYTE testparam = 185; @@ -39,6 +41,8 @@ static VOID init_funcs(void) X(ConvertFiberToThread); X(SwitchToFiber); X(DeleteFiber); + X(ConvertThreadToFiberEx); + X(CreateFiberEx); #undef X } @@ -62,6 +66,19 @@ static void test_ConvertThreadToFiber(void) } } +static void test_ConvertThreadToFiberEx(void) +{ + if (pConvertThreadToFiberEx) + { + fibers[0] = pConvertThreadToFiberEx(&testparam, 0); + ok(fibers[0] != 0, "ConvertThreadToFiberEx failed with error %d\n", GetLastError()); + } + else + { + win_skip( "ConvertThreadToFiberEx not present\n" ); + } +} + static void test_ConvertFiberToThread(void) { if (pConvertFiberToThread) @@ -74,13 +91,37 @@ static void test_ConvertFiberToThread(void) } } -static void test_CreateFiber(void) +static void test_FiberHandling(void) { + fibers[0] = pCreateFiber(0,FiberMainProc,&testparam); + ok(fibers[0] != 0, "CreateFiber failed with error %d\n", GetLastError()); + pDeleteFiber(fibers[0]); + + test_ConvertThreadToFiber(); + test_ConvertFiberToThread(); + if (pConvertThreadToFiberEx) + test_ConvertThreadToFiberEx(); + else + test_ConvertThreadToFiber(); + + fibers[1] = pCreateFiber(0,FiberMainProc,&testparam); ok(fibers[1] != 0, "CreateFiber failed with error %d\n", GetLastError()); pSwitchToFiber(fibers[1]); pDeleteFiber(fibers[1]); + + if (!pCreateFiberEx) + { + win_skip( "CreateFiberEx not present\n" ); + return; + } + + fibers[1] = pCreateFiberEx(0,0,0,FiberMainProc,&testparam); + ok(fibers[1] != 0, "CreateFiberEx failed with error %d\n", GetLastError()); + + pSwitchToFiber(fibers[1]); + pDeleteFiber(fibers[1]); } START_TEST(fiber) @@ -93,8 +134,5 @@ START_TEST(fiber) return; } - test_ConvertThreadToFiber(); - test_ConvertFiberToThread(); - test_ConvertThreadToFiber(); - test_CreateFiber(); + test_FiberHandling(); }

1 0

André Hentschel : kernel32/tests: Run fiber tests on more platforms.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: ffae80a39c77f190be6e11e8507180ae01c4f741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffae80a39c77f190be6e11e85… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 24 16:29:30 2010 +0100 kernel32/tests: Run fiber tests on more platforms. --- dlls/kernel32/tests/fiber.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/fiber.c b/dlls/kernel32/tests/fiber.c index 34bc0c3..30c4a5e 100644 --- a/dlls/kernel32/tests/fiber.c +++ b/dlls/kernel32/tests/fiber.c @@ -27,39 +27,51 @@ static void (WINAPI *pSwitchToFiber)(LPVOID); static void (WINAPI *pDeleteFiber)(LPVOID); static LPVOID fibers[2]; -static BYTE testparam = 187; +static BYTE testparam = 185; -static BOOL init_funcs(void) +static VOID init_funcs(void) { HMODULE hKernel32 = GetModuleHandle("kernel32"); -#define X(f) if (!(p##f = (void*)GetProcAddress(hKernel32, #f))) return FALSE; +#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f); X(CreateFiber); X(ConvertThreadToFiber); X(ConvertFiberToThread); X(SwitchToFiber); X(DeleteFiber); #undef X - - return TRUE; } static VOID WINAPI FiberMainProc(LPVOID lpFiberParameter) { BYTE *tparam = (BYTE *)lpFiberParameter; - ok(*tparam == 187, "Parameterdata expected not to be changed\n"); + ok(*tparam == 185, "Parameterdata expected not to be changed\n"); pSwitchToFiber(fibers[0]); } static void test_ConvertThreadToFiber(void) { - fibers[0] = pConvertThreadToFiber(&testparam); - ok(fibers[0] != 0, "ConvertThreadToFiber failed with error %d\n", GetLastError()); + if (pConvertThreadToFiber) + { + fibers[0] = pConvertThreadToFiber(&testparam); + ok(fibers[0] != 0, "ConvertThreadToFiber failed with error %d\n", GetLastError()); + } + else + { + win_skip( "ConvertThreadToFiber not present\n" ); + } } static void test_ConvertFiberToThread(void) { - ok(pConvertFiberToThread() , "ConvertThreadToFiber failed with error %d\n", GetLastError()); + if (pConvertFiberToThread) + { + ok(pConvertFiberToThread() , "ConvertFiberToThread failed with error %d\n", GetLastError()); + } + else + { + win_skip( "ConvertFiberToThread not present\n" ); + } } static void test_CreateFiber(void) @@ -73,9 +85,11 @@ static void test_CreateFiber(void) START_TEST(fiber) { - if (!init_funcs()) + init_funcs(); + + if (!pCreateFiber) { - win_skip("Needed functions are not available\n"); + win_skip( "Fibers not supported by win95\n" ); return; }

1 0

Justin Chevrier : user32: EnumDisplayDevicesW, populate DeviceID member.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 64f2c03457bade771664293285840d57a5466bfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=64f2c03457bade77166429328… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Sun Jan 24 02:07:09 2010 -0500 user32: EnumDisplayDevicesW, populate DeviceID member. --- dlls/user32/misc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index ca807f0..d5a23d1 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -277,6 +277,8 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', 'S','y','s','t','e','m',0}; +static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0',0}; /*********************************************************************** * EnumDisplayDevicesA (USER32.@) @@ -331,7 +333,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR lpDevice, DWORD i, LPDISPLAY_DEVICEW lp DISPLAY_DEVICE_VGA_COMPATIBLE; if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - lpDisplayDevice->DeviceID[0] = 0; + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) lpDisplayDevice->DeviceKey[0] = 0;

1 0

Jacek Caban : jscript: Skip tests on old jscript.dll.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: f623e3add8a1c7ebb182c6e2097f623f6268e6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f623e3add8a1c7ebb182c6e20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 23 23:58:23 2010 +0100 jscript: Skip tests on old jscript.dll. --- dlls/jscript/tests/run.c | 50 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 72640a6..303907e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -726,7 +726,7 @@ static IActiveScript *create_script(void) return script; } -static void parse_script(DWORD flags, BSTR script_str) +static HRESULT parse_script(DWORD flags, BSTR script_str) { IActiveScriptParse *parser; IActiveScript *engine; @@ -734,14 +734,14 @@ static void parse_script(DWORD flags, BSTR script_str) engine = create_script(); if(!engine) - return; + return S_OK; hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); if (FAILED(hres)) { IActiveScript_Release(engine); - return; + return hres; } hres = IActiveScriptParse64_InitNew(parser); @@ -763,11 +763,12 @@ static void parse_script(DWORD flags, BSTR script_str) ok(script_disp != (IDispatch*)&Global, "script_disp == Global\n"); hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); IDispatch_Release(script_disp); IActiveScript_Release(engine); IUnknown_Release(parser); + + return hres; } static HRESULT parse_htmlscript(BSTR script_str) @@ -813,9 +814,13 @@ static HRESULT parse_htmlscript(BSTR script_str) static void parse_script_af(DWORD flags, const char *src) { - BSTR tmp = a2bstr(src); - parse_script(flags, tmp); + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(src); + hres = parse_script(flags, tmp); SysFreeString(tmp); + ok(hres == S_OK, "parse_script failed: %08x\n", hres); } static void parse_script_a(const char *src) @@ -873,14 +878,17 @@ static BSTR get_script_from_file(const char *filename) static void run_from_file(const char *filename) { - BSTR script_str = get_script_from_file(filename); - - strict_dispid_check = FALSE; + BSTR script_str; + HRESULT hres; - if(script_str) - parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str); + script_str = get_script_from_file(filename); + if(!script_str) + return; + strict_dispid_check = FALSE; + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, script_str); SysFreeString(script_str); + ok(hres == S_OK, "parse_script failed: %08x\n", hres); } static void run_from_res(const char *name) @@ -889,6 +897,7 @@ static void run_from_res(const char *name) DWORD size, len; BSTR str; HRSRC src; + HRESULT hres; strict_dispid_check = FALSE; test_name = name; @@ -905,10 +914,11 @@ static void run_from_res(const char *name) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - parse_script(SCRIPTITEM_GLOBALMEMBERS, str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + ok(hres == S_OK, "parse_script failed: %08x\n", hres); SysFreeString(str); } @@ -1078,6 +1088,18 @@ static void run_tests(void) ok(hres != S_OK, "ParseScriptText have not failed\n"); } +static BOOL check_jscript(void) +{ + BSTR str; + HRESULT hres; + + str = a2bstr("if(!('localeCompare' in String.prototype)) throw 1;"); + hres = parse_script(0, str); + SysFreeString(str); + + return hres == S_OK; +} + START_TEST(run) { int argc; @@ -1087,7 +1109,9 @@ START_TEST(run) CoInitialize(NULL); - if(argc > 2) { + if(!check_jscript()) { + win_skip("Broken engine, probably too old\n"); + }else if(argc > 2) { run_from_file(argv[2]); }else { trace("invoke version 0\n");

1 0

Jacek Caban : jscript: Moved resetting lastIndex to do_regexp_match_next.
by Alexandre Julliard 25 Jan '10

25 Jan '10

Module: wine Branch: master Commit: 09651321e07dc4fdd42f60be1862b76322c9aca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09651321e07dc4fdd42f60be1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 23 23:57:55 2010 +0100 jscript: Moved resetting lastIndex to do_regexp_match_next. --- dlls/jscript/jscript.h | 4 +++- dlls/jscript/regexp.c | 33 ++++++++++++++++----------------- dlls/jscript/string.c | 8 ++++---- dlls/jscript/tests/regexp.js | 1 + 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index a839067..95f5028 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -318,7 +318,9 @@ typedef struct { DWORD len; } match_result_t; -HRESULT regexp_match_next(script_ctx_t*,DispatchEx*,BOOL,const WCHAR*,DWORD,const WCHAR**,match_result_t**, +#define REM_CHECK_GLOBAL 0x0001 +#define REM_RESET_INDEX 0x0002 +HRESULT regexp_match_next(script_ctx_t*,DispatchEx*,DWORD,const WCHAR*,DWORD,const WCHAR**,match_result_t**, DWORD*,DWORD*,match_result_t*); HRESULT regexp_match(script_ctx_t*,DispatchEx*,const WCHAR*,DWORD,BOOL,match_result_t**,DWORD*); HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*); diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 751fe41..0457545 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3308,8 +3308,9 @@ static void set_last_index(RegExpInstance *This, DWORD last_index) num_set_val(&This->last_index_var, last_index); } -static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, const WCHAR *str, DWORD len, - const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) +static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, DWORD rem_flags, + const WCHAR *str, DWORD len, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, + DWORD *parens_cnt, match_result_t *ret) { REMatchState *x, *result; REGlobalData gData; @@ -3334,8 +3335,11 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, c return E_FAIL; } - if(!result) + if(!result) { + if(rem_flags & REM_RESET_INDEX) + set_last_index(regexp, 0); return S_FALSE; + } if(parens) { DWORD i; @@ -3375,19 +3379,20 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, c return S_OK; } -HRESULT regexp_match_next(script_ctx_t *ctx, DispatchEx *dispex, BOOL gcheck, const WCHAR *str, DWORD len, - const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, match_result_t *ret) +HRESULT regexp_match_next(script_ctx_t *ctx, DispatchEx *dispex, DWORD rem_flags, const WCHAR *str, + DWORD len, const WCHAR **cp, match_result_t **parens, DWORD *parens_size, DWORD *parens_cnt, + match_result_t *ret) { RegExpInstance *regexp = (RegExpInstance*)dispex; jsheap_t *mark; HRESULT hres; - if(gcheck && !(regexp->jsregexp->flags & JSREG_GLOB)) + if((rem_flags & REM_CHECK_GLOBAL) && !(regexp->jsregexp->flags & JSREG_GLOB)) return S_FALSE; mark = jsheap_mark(&ctx->tmp_heap); - hres = do_regexp_match_next(ctx, regexp, str, len, cp, parens, parens_size, parens_cnt, ret); + hres = do_regexp_match_next(ctx, regexp, rem_flags, str, len, cp, parens, parens_size, parens_cnt, ret); jsheap_clear(mark); return hres; @@ -3406,7 +3411,7 @@ HRESULT regexp_match(script_ctx_t *ctx, DispatchEx *dispex, const WCHAR *str, DW mark = jsheap_mark(&ctx->tmp_heap); while(1) { - hres = do_regexp_match_next(ctx, This, str, len, &cp, NULL, NULL, NULL, &cres); + hres = do_regexp_match_next(ctx, This, 0, str, len, &cp, NULL, NULL, NULL, &cres); if(hres == S_FALSE) { hres = S_OK; break; @@ -3653,20 +3658,14 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, VARIANT *arg, jsexce last_index = regexp->last_index; cp = string + last_index; - hres = regexp_match_next(ctx, &regexp->dispex, FALSE, string, length, &cp, parens, parens ? &parens_size : NULL, - parens_cnt, match); + hres = regexp_match_next(ctx, &regexp->dispex, REM_RESET_INDEX, string, length, &cp, parens, + parens ? &parens_size : NULL, parens_cnt, match); if(FAILED(hres)) { SysFreeString(string); return hres; } - if(hres == S_OK) { - *ret = VARIANT_TRUE; - }else { - set_last_index(regexp, 0); - *ret = VARIANT_FALSE; - } - + *ret = hres == S_OK ? VARIANT_TRUE : VARIANT_FALSE; if(input) { *input = string; }else { diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 31e73a0..df43fee 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -820,7 +820,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI DispatchEx *rep_func = NULL, *regexp = NULL; match_result_t *parens = NULL, match, **parens_ptr = &parens; strbuf_t ret = {NULL,0,0}; - BOOL gcheck = FALSE; + DWORD re_flags = 0; VARIANT *arg_var; HRESULT hres = S_OK; @@ -897,9 +897,9 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI while(1) { if(regexp) { - hres = regexp_match_next(ctx, regexp, gcheck, str, length, &cp, parens_ptr, + hres = regexp_match_next(ctx, regexp, re_flags, str, length, &cp, parens_ptr, &parens_size, &parens_cnt, &match); - gcheck = TRUE; + re_flags = REM_CHECK_GLOBAL; if(hres == S_FALSE) { hres = S_OK; @@ -1073,7 +1073,7 @@ static HRESULT String_search(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS } cp = str; - hres = regexp_match_next(ctx, regexp, FALSE, str, length, &cp, NULL, NULL, NULL, &match); + hres = regexp_match_next(ctx, regexp, REM_RESET_INDEX, str, length, &cp, NULL, NULL, NULL, &match); SysFreeString(val_str); jsdisp_release(regexp); if(FAILED(hres)) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 52a94ad..d09d787 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -433,6 +433,7 @@ re = /d/g; re.lastIndex = 1; i = 'abc'.search(re); ok(i === -1, "'abc'.search(/d/g) = " + i); +ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex); i = 'abcdde'.search(/[df]/); ok(i === 3, "'abc'.search(/[df]/) = " + i);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
62
Older →

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 January 2010