wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Vincent Povirk : shell32: Use the current directory when copying to an empty destination.
by Alexandre Julliard 08 Feb '10

08 Feb '10

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: Use linear gradient brush angles.
by Alexandre Julliard 08 Feb '10

08 Feb '10

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

Vincent Povirk : gdiplus: Don't use gdi32 to do pixel format conversion.
by Alexandre Julliard 08 Feb '10

08 Feb '10

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

Paul Vriens : user32/tests: Fix crash on Win9x/WinMe.
by Alexandre Julliard 08 Feb '10

08 Feb '10

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 : user32/tests: Don't try to detect Win9x/WinMe several times.
by Alexandre Julliard 08 Feb '10

08 Feb '10

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 08 Feb '10

08 Feb '10

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

Paul Vriens : winspool.drv: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard 08 Feb '10

08 Feb '10

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

Jacek Caban : jscript: Added support for constructor property.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 9fd4f4a44a5704a839103bfed7e03b1206d31086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd4f4a44a5704a839103bfed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:17:35 2010 +0100 jscript: Added support for constructor property. --- dlls/jscript/dispex.c | 17 +++++++++++++++++ dlls/jscript/tests/lang.js | 5 +++++ dlls/jscript/tests/regexp.js | 1 + 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c420f54..6894eae 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -803,6 +803,7 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui dispex_prop_t *prop; HRESULT hres; + static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r'}; static const WCHAR prototypeW[] = {'p','r','o','t','o','t','y','p','e',0}; hres = find_prop_name_prot(constr, prototypeW, &prop); @@ -827,6 +828,22 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui if(prot) jsdisp_release(prot); + if(FAILED(hres)) + return hres; + + hres = ensure_prop_name(dispex, constructorW, FALSE, 0, &prop); + if(SUCCEEDED(hres)) { + jsexcept_t jsexcept; + VARIANT var; + + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(constr); + memset(&jsexcept, 0, sizeof(jsexcept)); + hres = prop_put(dispex, prop, &var, &jsexcept, NULL/*FIXME*/); + } + if(FAILED(hres)) + jsdisp_release(dispex); + return hres; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index d91b1f2..495762e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -116,6 +116,7 @@ ok(tmp === 1, "tmp = " + tmp); var obj1 = new Object(); ok(typeof(obj1) === "object", "typeof(obj1) is not object"); +ok(obj1.constructor === Object, "unexpected obj1.constructor"); obj1.test = true; obj1.func = function () { ok(this === obj1, "this is not obj1"); @@ -144,6 +145,7 @@ testConstr1.prototype.pvar = 1; var obj2 = new testConstr1(true); ok(typeof(obj2) === "object", "typeof(obj2) is not object"); +ok(obj2.constructor === testConstr1, "unexpected obj2.constructor"); ok(obj2.pvar === 1, "obj2.pvar is not 1"); testConstr1.prototype.pvar = 2; @@ -209,6 +211,7 @@ if(false) { var obj3 = { prop1: 1, prop2: typeof(false) }; ok(obj3.prop1 === 1, "obj3.prop1 is not 1"); ok(obj3.prop2 === "boolean", "obj3.prop2 is not \"boolean\""); +ok(obj3.constructor === Object, "unexpected obj3.constructor"); { var blockVar = 1; @@ -422,8 +425,10 @@ ok(+"3e3" === 3000, "+'3e3' !== 3000"); tmp = new Number(1); ok(+tmp === 1, "+(new Number(1)) = " + (+tmp)); +ok(tmp.constructor === Number, "unexpected tmp.constructor"); tmp = new String("1"); ok(+tmp === 1, "+(new String('1')) = " + (+tmp)); +ok(tmp.constructor === String, "unexpected tmp.constructor"); ok("" + 0 === "0", "\"\" + 0 !== \"0\""); ok("" + 123 === "123", "\"\" + 123 !== \"123\""); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index d09d787..fac1112 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -100,6 +100,7 @@ m = "abcabc".match(re = /ca/); ok(typeof(m) === "object", "typeof m is not object"); ok(m.length === 1, "m.length is not 1"); ok(m["0"] === "ca", "m[0] is not \"ca\""); +ok(m.constructor === Array, "unexpected m.constructor"); ok(re.lastIndex === 4, "re.lastIndex = " + re.lastIndex); m = "abcabc".match(/ab/);

1 0

Jacek Caban : jscript: Avoid unnecessary prototype lookup.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 75ab8e2027379f952ddd8ee67497942323fa6c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ab8e2027379f952ddd8ee67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:17:06 2010 +0100 jscript: Avoid unnecessary prototype lookup. --- dlls/jscript/dispex.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c67fc41..c420f54 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -190,12 +190,15 @@ static HRESULT find_prop_name_prot(DispatchEx *This, const WCHAR *name, dispex_p return S_OK; } -static HRESULT ensure_prop_name(DispatchEx *This, const WCHAR *name, DWORD create_flags, dispex_prop_t **ret) +static HRESULT ensure_prop_name(DispatchEx *This, const WCHAR *name, BOOL search_prot, DWORD create_flags, dispex_prop_t **ret) { dispex_prop_t *prop; HRESULT hres; - hres = find_prop_name_prot(This, name, &prop); + if(search_prot) + hres = find_prop_name_prot(This, name, &prop); + else + hres = find_prop_name(This, name, &prop); if(SUCCEEDED(hres) && !prop) { TRACE("creating prop %s\n", debugstr_w(name)); @@ -845,7 +848,7 @@ HRESULT jsdisp_get_id(DispatchEx *jsdisp, const WCHAR *name, DWORD flags, DISPID HRESULT hres; if(flags & fdexNameEnsure) - hres = ensure_prop_name(jsdisp, name, PROPF_ENUM, &prop); + hres = ensure_prop_name(jsdisp, name, TRUE, PROPF_ENUM, &prop); else hres = find_prop_name_prot(jsdisp, name, &prop); if(FAILED(hres)) @@ -947,7 +950,7 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, js dispex_prop_t *prop; HRESULT hres; - hres = ensure_prop_name(obj, name, PROPF_ENUM, &prop); + hres = ensure_prop_name(obj, name, FALSE, PROPF_ENUM, &prop); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Get value as VARIANT in prop_put.
by Alexandre Julliard 08 Feb '10

08 Feb '10

Module: wine Branch: master Commit: 10c9931051158c7506c73b2c0162230db6e327b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c9931051158c7506c73b2c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 5 23:15:46 2010 +0100 jscript: Get value as VARIANT in prop_put. --- dlls/jscript/dispex.c | 71 +++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f2c22a9..c67fc41 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -350,19 +350,19 @@ static HRESULT prop_get(DispatchEx *This, dispex_prop_t *prop, DISPPARAMS *dp, return hres; } -static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, DISPPARAMS *dp, +static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { - DWORD i; HRESULT hres; switch(prop->type) { case PROP_BUILTIN: if(!(prop->flags & PROPF_METHOD)) { + DISPPARAMS dp = {val, NULL, 1, 0}; vdisp_t vthis; set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, DISPATCH_PROPERTYPUT, dp, NULL, ei, caller); + hres = prop->u.p->invoke(This->ctx, &vthis, DISPATCH_PROPERTYPUT, &dp, NULL, ei, caller); vdisp_release(&vthis); return hres; } @@ -379,24 +379,14 @@ static HRESULT prop_put(DispatchEx *This, dispex_prop_t *prop, DISPPARAMS *dp, return E_FAIL; } - for(i=0; i < dp->cNamedArgs; i++) { - if(dp->rgdispidNamedArgs[i] == DISPID_PROPERTYPUT) - break; - } - - if(i == dp->cNamedArgs) { - TRACE("no value to set\n"); - return DISP_E_PARAMNOTOPTIONAL; - } - - hres = VariantCopy(&prop->u.var, dp->rgvarg+i); + hres = VariantCopy(&prop->u.var, val); if(FAILED(hres)) return hres; if(This->builtin_info->on_put) This->builtin_info->on_put(This, prop->name); - TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_variant(dp->rgvarg+i)); + TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_variant(val)); return S_OK; } @@ -589,9 +579,22 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYGET: hres = prop_get(This, prop, pdp, pvarRes, &jsexcept, pspCaller); break; - case DISPATCH_PROPERTYPUT: - hres = prop_put(This, prop, pdp, &jsexcept, pspCaller); + case DISPATCH_PROPERTYPUT: { + DWORD i; + + for(i=0; i < pdp->cNamedArgs; i++) { + if(pdp->rgdispidNamedArgs[i] == DISPID_PROPERTYPUT) + break; + } + + if(i == pdp->cNamedArgs) { + TRACE("no value to set\n"); + return DISP_E_PARAMNOTOPTIONAL; + } + + hres = prop_put(This, prop, pdp->rgvarg+i, &jsexcept, pspCaller); break; + } default: FIXME("Unimplemented flags %x\n", wFlags); return E_INVALIDARG; @@ -941,8 +944,6 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { - DISPID named_arg = DISPID_PROPERTYPUT; - DISPPARAMS dp = {val, &named_arg, 1, 1}; dispex_prop_t *prop; HRESULT hres; @@ -950,7 +951,7 @@ HRESULT jsdisp_propput_name(DispatchEx *obj, const WCHAR *name, VARIANT *val, js if(FAILED(hres)) return hres; - return prop_put(obj, prop, &dp, ei, caller); + return prop_put(obj, prop, val, ei, caller); } HRESULT jsdisp_propput_idx(DispatchEx *obj, DWORD idx, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) @@ -965,9 +966,6 @@ HRESULT jsdisp_propput_idx(DispatchEx *obj, DWORD idx, VARIANT *val, jsexcept_t HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) { - DISPID dispid = DISPID_PROPERTYPUT; - DISPPARAMS dp = {val, &dispid, 1, 1}; - IDispatchEx *dispex; DispatchEx *jsdisp; HRESULT hres; @@ -977,25 +975,28 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val prop = get_prop(jsdisp, id); if(prop) - hres = prop_put(jsdisp, prop, &dp, ei, caller); + hres = prop_put(jsdisp, prop, val, ei, caller); else hres = DISP_E_MEMBERNOTFOUND; jsdisp_release(jsdisp); - return hres; - } - - hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { - ULONG err = 0; + }else { + DISPID dispid = DISPID_PROPERTYPUT; + DISPPARAMS dp = {val, &dispid, 1, 1}; + IDispatchEx *dispex; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, caller); + IDispatchEx_Release(dispex); + }else { + ULONG err = 0; - TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, &err); + TRACE("using IDispatch\n"); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, &err); + } } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, DISPATCH_PROPERTYPUT, &dp, NULL, &ei->ei, caller); - - IDispatchEx_Release(dispex); return hres; }

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
79
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 February 2010