February 2010 - Wine-Commits

Paul Vriens : user32/tests: Don't try to detect Win9x/WinMe several times.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: c0acfe1eadea7d6f0f9a12349dc340ab02baafac URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0acfe1eadea7d6f0f9a12349… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Feb 7 13:20:53 2010 +0100 user32/tests: Don't try to detect Win9x/WinMe several times. --- dlls/user32/tests/win.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d524bcc..86e955c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -63,6 +63,8 @@ static const char* szAWRClass = "Winsize"; static HMENU hmenu; static DWORD our_pid; +static BOOL is_win9x = FALSE; + #define COUNTOF(arr) (sizeof(arr)/sizeof(arr[0])) static void dump_minmax_info( const MINMAXINFO *minmax ) @@ -646,7 +648,6 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR } case WM_WINDOWPOSCHANGING: { - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; WINDOWPOS *winpos = (WINDOWPOS *)lparam; trace("main: WM_WINDOWPOSCHANGING %p after %p, x %d, y %d, cx %d, cy %d flags %08x\n", winpos->hwnd, winpos->hwndInsertAfter, @@ -855,7 +856,6 @@ static void test_nonclient_area(HWND hwnd) DWORD style, exstyle; RECT rc_window, rc_client, rc; BOOL menu; - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; LRESULT ret; style = GetWindowLongA(hwnd, GWL_STYLE); @@ -1039,9 +1039,9 @@ static void test_shell_window(void) HWND hwnd1, hwnd2, hwnd3, hwnd4, hwnd5; HWND shellWindow, nextWnd; - if (!GetWindowLongW(GetDesktopWindow(), GWL_STYLE)) + if (is_win9x) { - trace("Skipping shell window test on Win9x\n"); + win_skip("Skipping shell window test on Win9x\n"); return; } @@ -1906,7 +1906,6 @@ static void test_SetWindowPos(HWND hwnd) { RECT orig_win_rc, rect; LONG_PTR old_proc; - BOOL is_win9x = GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == 0; SetRect(&rect, 111, 222, 333, 444); ok(!GetWindowRect(0, &rect), "GetWindowRect succeeded\n"); @@ -1969,7 +1968,6 @@ static void test_SetMenu(HWND parent) { HWND child; HMENU hMenu, ret; - BOOL is_win9x = GetWindowLongPtrW(parent, GWLP_WNDPROC) == 0; BOOL retok; DWORD style; @@ -2272,7 +2270,7 @@ static void test_vis_rgn( HWND hwnd ) ok( GetRandomRgn( hdc, hrgn, SYSRGN ) != 0, "GetRandomRgn failed\n" ); GetWindowRect( hwnd, &win_rect ); GetRgnBox( hrgn, &rgn_rect ); - if (GetVersion() & 0x80000000) + if (is_win9x) { trace("win9x, mapping to screen coords\n"); MapWindowPoints( hwnd, 0, (POINT *)&rgn_rect, 2 ); @@ -2804,7 +2802,7 @@ static void test_capture_4(void) /* set main window to have initial capture */ SetCapture(hwnd); - if (!GetWindowLongW(GetDesktopWindow(), GWL_STYLE)) + if (is_win9x) { win_skip("TrackPopupMenu test crashes on Win9x/WinMe\n"); } @@ -3220,6 +3218,7 @@ static void test_SetParent(void) BOOL ret; HWND desktop = GetDesktopWindow(); HMENU hMenu; + /* FIXME: This detection is not correct as it also covers (all?) XP+ */ BOOL is_win9x = GetWindowLongPtrW(desktop, GWLP_WNDPROC) == 0; HWND parent, child1, child2, child3, child4, sibling; @@ -3280,6 +3279,8 @@ static void test_SetParent(void) check_parents(child3, child2, child2, child2, 0, child2, parent); check_parents(child4, desktop, child2, child2, child2, child4, parent); } + else + skip("Win9x/WinMe crash\n"); hMenu = CreateMenu(); sibling = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, @@ -5918,6 +5919,10 @@ START_TEST(win) if (!RegisterWindowClasses()) assert(0); + SetLastError(0xdeafbeef); + GetWindowLongPtrW(GetDesktopWindow(), GWLP_WNDPROC); + is_win9x = (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); + hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); if (!hhook) win_skip( "Cannot set CBT hook, skipping some tests\n" );

1 0

Dan Kegel : gdiplus/tests: Initialize buffer in test_GdipCreateBitmapFromHBITMAP.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: c35c7a683e7843274ee4e1673b472a0c46075284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35c7a683e7843274ee4e1673… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Feb 6 10:44:21 2010 -0800 gdiplus/tests: Initialize buffer in test_GdipCreateBitmapFromHBITMAP. --- dlls/gdiplus/tests/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index d752f16..e7747e3 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -530,6 +530,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) GdipDisposeImage((GpImage*)gpbm); DeleteObject(hbm); + memset(buff, 0, sizeof(buff)); hbm = CreateBitmap(WIDTH2, HEIGHT2, 1, 1, &buff); stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Use linear gradient brush angles.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: 71e4af507fc51c18066273b6c91c843a85c7cdfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e4af507fc51c18066273b6c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 6 15:43:16 2010 -0600 gdiplus: Use linear gradient brush angles. --- dlls/gdiplus/brush.c | 66 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0f6d707..2eca755 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -468,20 +468,74 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, /****************************************************************************** * GdipCreateLineBrushFromRectWithAngle [GDIPLUS.@] - * - * FIXME: angle value completely ignored. Don't know how to use it since native - * always set Brush rectangle to rect (independetly of this angle). - * Maybe it's used only on drawing. */ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect, ARGB startcolor, ARGB endcolor, REAL angle, BOOL isAngleScalable, GpWrapMode wrap, GpLineGradient **line) { + GpStatus stat; + LinearGradientMode mode; + REAL width, height, exofs, eyofs; + REAL sin_angle, cos_angle, sin_cos_angle; + TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable, wrap, line); - return GdipCreateLineBrushFromRect(rect, startcolor, endcolor, LinearGradientModeForwardDiagonal, - wrap, line); + sin_angle = sinf(deg2rad(angle)); + cos_angle = cosf(deg2rad(angle)); + sin_cos_angle = sin_angle * cos_angle; + + if (isAngleScalable) + { + width = height = 1.0; + } + else + { + width = rect->Width; + height = rect->Height; + } + + if (sin_cos_angle >= 0) + mode = LinearGradientModeForwardDiagonal; + else + mode = LinearGradientModeBackwardDiagonal; + + stat = GdipCreateLineBrushFromRect(rect, startcolor, endcolor, mode, wrap, line); + + if (stat == Ok) + { + if (sin_cos_angle >= 0) + { + exofs = width * sin_cos_angle + height * cos_angle * cos_angle; + eyofs = width * sin_angle * sin_angle + height * sin_cos_angle; + } + else + { + exofs = width * sin_angle * sin_angle + height * sin_cos_angle; + eyofs = -width * sin_cos_angle + height * sin_angle * sin_angle; + } + + if (isAngleScalable) + { + exofs = exofs * rect->Width; + eyofs = eyofs * rect->Height; + } + + if (sin_angle >= 0) + { + (*line)->endpoint.X = rect->X + exofs; + (*line)->endpoint.Y = rect->Y + eyofs; + } + else + { + (*line)->endpoint.X = (*line)->startpoint.X; + (*line)->endpoint.Y = (*line)->startpoint.Y; + (*line)->startpoint.X = rect->X + exofs; + (*line)->startpoint.Y = rect->Y + eyofs; + } + } + + return stat; } GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngleI(GDIPCONST GpRect* rect,

1 0

Paul Vriens : user32/tests: Fix crash on Win9x/WinMe.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: 1cbedfb2047d1d3d9728e35ea6616bf674eb739d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbedfb2047d1d3d9728e35ea… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Feb 7 13:33:51 2010 +0100 user32/tests: Fix crash on Win9x/WinMe. --- dlls/user32/tests/win.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 86e955c..2799ec8 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -448,11 +448,16 @@ static void test_parent_owner(void) ok( ret == desktop, "SetParent return value %p expected %p\n", ret, desktop ); check_parents( test, child, child, 0, 0, hwndMain, test ); - ShowWindow( test, SW_SHOW ); - ret = SetParent( test, test ); - ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); - ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); - check_parents( test, child, child, 0, 0, hwndMain, test ); + if (!is_win9x) + { + ShowWindow( test, SW_SHOW ); + ret = SetParent( test, test ); + ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); + ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); + check_parents( test, child, child, 0, 0, hwndMain, test ); + } + else + win_skip( "Test crashes on Win9x/WinMe\n" ); DestroyWindow( test ); /* owned popup */

1 0

Paul Vriens : winspool.drv: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: edf0b4a0611a24565410cc1b1674741eb401b48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf0b4a0611a24565410cc1b1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Feb 6 15:37:24 2010 +0100 winspool.drv: Fix some test failures on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f3b2d78..79f47da 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -115,6 +115,22 @@ static DWORD access_denied_reported = 0; /* ################################ */ +static BOOL on_win9x = FALSE; + +static BOOL check_win9x(void) +{ + if (pGetPrinterW) + { + SetLastError(0xdeadbeef); + pGetPrinterW(NULL, 0, NULL, 0, NULL); + return (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); + } + else + { + return TRUE; + } +} + static void find_default_printer(VOID) { static char buffer[DEFAULT_PRINTER_SIZE]; @@ -1156,7 +1172,7 @@ static void test_EnumPrinterDrivers(void) } /* EnumPrinterDriversA returns the same number of bytes as EnumPrinterDriversW */ - if (pEnumPrinterDriversW) + if (!on_win9x && pEnumPrinterDriversW) { DWORD double_needed; DWORD double_returned; @@ -2266,7 +2282,7 @@ static void test_GetPrinter(void) ok(needed > 0,"not expected needed buffer size %d\n", needed); /* GetPrinterA returns the same number of bytes as GetPrinterW */ - if (! ret && pGetPrinterW && level != 6 && level != 7) + if (!on_win9x && !ret && pGetPrinterW && level != 6 && level != 7) { DWORD double_needed; ret = pGetPrinterW(hprn, level, NULL, 0, &double_needed); @@ -2351,7 +2367,7 @@ static void test_GetPrinterDriver(void) } /* GetPrinterDriverA returns the same number of bytes as GetPrinterDriverW */ - if (! ret && pGetPrinterDriverW) + if (!on_win9x && !ret && pGetPrinterDriverW) { DWORD double_needed; ret = pGetPrinterDriverW(hprn, NULL, level, NULL, 0, &double_needed); @@ -2668,6 +2684,10 @@ START_TEST(info) pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA"); + on_win9x = check_win9x(); + if (on_win9x) + win_skip("Several W-functions are not available on Win9x/WinMe\n"); + find_default_printer(); find_local_server(); find_tempfile();

1 0

Vincent Povirk : shell32: Use the current directory when copying to an empty destination.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: b609e25204f6fdb74b6ee67ce6f348e2dda7afee URL: http://source.winehq.org/git/wine.git/?a=commit;h=b609e25204f6fdb74b6ee67ce… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Feb 1 17:42:31 2010 -0600 shell32: Use the current directory when copying to an empty destination. --- dlls/shell32/shlfileop.c | 14 ++++++++++++++ dlls/shell32/tests/shlfileop.c | 12 ++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index a768c15..0b08f52 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1182,6 +1182,20 @@ static HRESULT copy_files(FILE_OPERATION *op, const FILE_LIST *flFrom, FILE_LIST if (flFrom->bAnyDontExist) return ERROR_SHELL_INTERNAL_FILE_NOT_FOUND; + if (flTo->dwNumFiles == 0) + { + /* If the destination is empty, SHFileOperation should use the current directory */ + WCHAR curdir[MAX_PATH+1]; + + GetCurrentDirectoryW(MAX_PATH, curdir); + curdir[lstrlenW(curdir)+1] = 0; + + destroy_file_list(flTo); + ZeroMemory(flTo, sizeof(FILE_LIST)); + parse_file_list(flTo, curdir); + fileDest = &flTo->feFiles[0]; + } + if (op->req->fFlags & FOF_MULTIDESTFILES) { if (flFrom->bAnyFromWildcard) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 3e9f9c7..49ef8cb 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1720,6 +1720,18 @@ static void test_copy(void) ok(DeleteFileA("ab.txt"), "Expected file to exist\n"); ok(RemoveDirectoryA("one"), "Expected dir to exist\n"); ok(RemoveDirectoryA("two"), "Expected dir to exist\n"); + + /* pTo is an empty string */ + CreateDirectoryA("dir", NULL); + createTestFile("dir\\abcdefgh.abc"); + shfo.pFrom = "dir\\abcdefgh.abc\0"; + shfo.pTo = "\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + retval = SHFileOperation(&shfo); + ok(retval == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", retval); + ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); + ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); + ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); } /* tests the FO_MOVE action */

1 0

Vincent Povirk : gdiplus: Don't use gdi32 to do pixel format conversion.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: 318ba28630588a0dc160097f382defa6c0507b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=318ba28630588a0dc160097f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 4 19:05:54 2010 -0600 gdiplus: Don't use gdi32 to do pixel format conversion. --- dlls/gdiplus/gdiplus_private.h | 4 + dlls/gdiplus/image.c | 521 ++++++++++++++++++++++++++++++++++------ 2 files changed, 455 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=318ba28630588a0dc1600…

1 0

Vitaly Perov : setupapi: Add stub for SetupLogFile{A,W}.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: c7d4b0c69fb8de9a2344c7d9d4bcda6e3feef094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d4b0c69fb8de9a2344c7d9d… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Fri Feb 5 19:46:02 2010 +0300 setupapi: Add stub for SetupLogFile{A,W}. --- dlls/setupapi/setupapi.spec | 4 +- dlls/setupapi/stubs.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index bcf88f4..51a5c2e 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -456,8 +456,8 @@ @ stdcall SetupIterateCabinetW(wstr long ptr ptr) @ stub SetupLogErrorA @ stdcall SetupLogErrorW(wstr long) -@ stub SetupLogFileA -@ stub SetupLogFileW +@ stdcall SetupLogFileA(ptr str str str long str str str long) +@ stdcall SetupLogFileW(ptr wstr wstr wstr long wstr wstr wstr long) @ stdcall SetupOpenAppendInfFileA(str long ptr) @ stdcall SetupOpenAppendInfFileW(wstr long ptr) @ stdcall SetupOpenFileQueue() diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 3496c6b..f8e99e0 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -348,3 +348,48 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) FIXME("%u %p 0x%08x: stub\n", index, class, flags); return CR_NO_SUCH_VALUE; } + +/*********************************************************************** + * SetupLogFileW (SETUPAPI.@) + */ +BOOL WINAPI SetupLogFileW( + HSPFILELOG FileLogHandle, + PCWSTR LogSectionName, + PCWSTR SourceFileName, + PCWSTR TargetFileName, + DWORD Checksum, + PCWSTR DiskTagfile, + PCWSTR DiskDescription, + PCWSTR OtherInfo, + DWORD Flags ) +{ + FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + debugstr_w(LogSectionName), debugstr_w(SourceFileName), + debugstr_w(TargetFileName), Checksum, debugstr_w(DiskTagfile), + debugstr_w(DiskDescription), debugstr_w(OtherInfo), Flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SetupLogFileA (SETUPAPI.@) + */ +BOOL WINAPI SetupLogFileA( + HSPFILELOG FileLogHandle, + PCSTR LogSectionName, + PCSTR SourceFileName, + PCSTR TargetFileName, + DWORD Checksum, + PCSTR DiskTagfile, + PCSTR DiskDescription, + PCSTR OtherInfo, + DWORD Flags ) +{ + FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + LogSectionName, SourceFileName, TargetFileName, Checksum, DiskTagfile, + DiskDescription, OtherInfo, Flags); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Alexandre Julliard : winetest: Report the correct source directory for program tests.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: ecb2d7bd935665b51025e1a643efc9e3b4d37d66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb2d7bd935665b51025e1a64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 6 20:36:12 2010 +0100 winetest: Report the correct source directory for program tests. --- programs/winetest/main.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a20fa06..e0b9ced 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -300,16 +300,24 @@ static const char* get_test_source_file(const char* test, const char* subtest) { 0, 0 } }; static char buffer[MAX_PATH]; - int i; + int i, len = strlen(test); + + if (len > 4 && !strcmp( test + len - 4, ".exe" )) + { + len = sprintf(buffer, "programs/%s", test) - 4; + buffer[len] = 0; + } + else len = sprintf(buffer, "dlls/%s", test); for (i = 0; special_dirs[i][0]; i++) { if (strcmp(test, special_dirs[i][0]) == 0) { - test = special_dirs[i][1]; + strcpy( buffer, special_dirs[i][1] ); + len = strlen(buffer); break; } } - snprintf(buffer, sizeof(buffer), "dlls/%s/tests/%s.c", test, subtest); + sprintf(buffer + len, "/tests/%s.c", subtest); return buffer; }

1 0

Jacek Caban : jscript: Moved property creation out of find_prop_name_prot.
by Alexandre Julliard Feb. 8, 2010

Feb. 8, 2010

Module: wine Branch: master Commit: 10c99b5735e4a868f076036b2cf08e704741a5ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c99b5735e4a868f076036b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:15:07 2010 +0100 jscript: Moved property creation out of find_prop_name_prot. --- dlls/jscript/dispex.c | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 19fdd56..f2c22a9 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -160,7 +160,7 @@ static HRESULT find_prop_name(DispatchEx *This, const WCHAR *name, dispex_prop_t return S_OK; } -static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL alloc, dispex_prop_t **ret) +static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, dispex_prop_t **ret) { dispex_prop_t *prop; HRESULT hres; @@ -174,7 +174,7 @@ static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL all } if(This->prototype) { - hres = find_prop_name_prot(This->prototype, name, FALSE, &prop); + hres = find_prop_name_prot(This->prototype, name, &prop); if(FAILED(hres)) return hres; if(prop) { @@ -186,17 +186,27 @@ static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, BOOL all } } - if(alloc) { + *ret = prop; + return S_OK; +} + +static HRESULT ensure_prop_name(DispatchEx *This, const WCHAR *name, DWORD create_flags, dispex_prop_t **ret) +{ + dispex_prop_t *prop; + HRESULT hres; + + hres = find_prop_name_prot(This, name, &prop); + if(SUCCEEDED(hres) && !prop) { TRACE("creating prop %s\n", debugstr_w(name)); - prop = alloc_prop(This, name, PROP_VARIANT, PROPF_ENUM); + prop = alloc_prop(This, name, PROP_VARIANT, create_flags); if(!prop) return E_OUTOFMEMORY; VariantInit(&prop->u.var); } *ret = prop; - return S_OK; + return hres; } static HRESULT set_this(DISPPARAMS *dp, DISPPARAMS *olddp, IDispatch *jsthis) @@ -789,7 +799,7 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; - hres = find_prop_name_prot(constr, prototypeW, FALSE, &prop); + hres = find_prop_name_prot(constr, prototypeW, &prop); if(SUCCEEDED(hres) && prop) { jsexcept_t jsexcept; VARIANT var; @@ -831,7 +841,10 @@ HRESULT jsdisp_get_id(DispatchEx *jsdisp, const WCHAR *name, DWORD flags, DISPID dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(jsdisp, name, (flags&fdexNameEnsure) != 0, &prop); + if(flags & fdexNameEnsure) + hres = ensure_prop_name(jsdisp, name, PROPF_ENUM, &prop); + else + hres = find_prop_name_prot(jsdisp, name, &prop); if(FAILED(hres)) return hres; @@ -878,7 +891,7 @@ HRESULT jsdisp_call_name(DispatchEx *disp, const WCHAR *name, WORD flags, DISPPA dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(disp, name, FALSE, &prop); + hres = find_prop_name_prot(disp, name, &prop); if(FAILED(hres)) return hres; @@ -933,7 +946,7 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, js dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(obj, name, TRUE, &prop); + hres = ensure_prop_name(obj, name, PROPF_ENUM, &prop); if(FAILED(hres)) return hres; @@ -992,7 +1005,7 @@ HRESULT jsdisp_propget_name(DispatchEx *obj, const WCHAR *name, VARIANT *var, js dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(obj, name, FALSE, &prop); + hres = find_prop_name_prot(obj, name, &prop); if(FAILED(hres)) return hres; @@ -1014,7 +1027,7 @@ HRESULT jsdisp_get_idx(DispatchEx *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, sprintfW(name, formatW, idx); - hres = find_prop_name_prot(obj, name, FALSE, &prop); + hres = find_prop_name_prot(obj, name, &prop); if(FAILED(hres)) return hres;

1 0