June 2014 - Wine-Commits - list.winehq.org

Damjan Jovanovic : winex11.drv: Use the clipboard to import text/ html XDND selections.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: b6d0df6a31e2b88c66d67937a10928bdec846bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d0df6a31e2b88c66d67937a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:21 2014 +0200 winex11.drv: Use the clipboard to import text/html XDND selections. --- dlls/winex11.drv/xdnd.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 3941900..2184a42 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -74,7 +74,6 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); -static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); @@ -569,8 +568,6 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr X11DRV_XDND_DeconstructTextURIList(property, data, len); else if (property == x11drv_atom(text_plain)) X11DRV_XDND_DeconstructTextPlain(property, data, len); - else if (property == x11drv_atom(text_html)) - X11DRV_XDND_DeconstructTextHTML(property, data, len); else { /* use the clipboard import functions for other types */ @@ -698,26 +695,6 @@ static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len) /************************************************************************** - * X11DRV_XDND_DeconstructTextHTML - * - * Interpret text/html data and add records to <dndfmt> linked list - */ -static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len) -{ - char* dostext; - - X11DRV_XDND_UnixToDos(&dostext, data, len); - - X11DRV_XDND_InsertXDNDData(property, - RegisterClipboardFormatA("HTML Format"), dostext, strlen(dostext)); - - TRACE("HTML Format: %s\n", dostext); - - return 1; -} - - -/************************************************************************** * X11DRV_XDND_SendDropFiles */ static void X11DRV_XDND_SendDropFiles(HWND hwnd)

1 0

Damjan Jovanovic : winex11.drv: text/html should be imported as CF_HTML (" HTML Format"), not CFSTR_INETURL ("UniformResourceLocator").
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: d0360402f0bf9d50df862a2ebf13498f7e0a0d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0360402f0bf9d50df862a2eb… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:40 2014 +0200 winex11.drv: text/html should be imported as CF_HTML ("HTML Format"), not CFSTR_INETURL ("UniformResourceLocator"). --- dlls/winex11.drv/xdnd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index dbe87e8..5ed0787 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -697,9 +697,9 @@ static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len) X11DRV_XDND_UnixToDos(&dostext, data, len); X11DRV_XDND_InsertXDNDData(property, - RegisterClipboardFormatA("UniformResourceLocator"), dostext, strlen(dostext)); + RegisterClipboardFormatA("HTML Format"), dostext, strlen(dostext)); - TRACE("UniformResourceLocator: %s\n", dostext); + TRACE("HTML Format: %s\n", dostext); return 1; }

1 0

Henri Verbeet : ddraw: Properly support creating compressed user memory surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: b0f1feb4f068e4181f3be5621f2e0f68974e6355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f1feb4f068e4181f3be5621… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:31 2014 +0200 ddraw: Properly support creating compressed user memory surfaces. --- dlls/ddraw/ddraw_private.h | 7 +++ dlls/ddraw/surface.c | 105 ++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw4.c | 106 ++++++++++++++++++++++++++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 106 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 276 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0f1feb4f068e4181f3be…

1 0

Henri Verbeet : ddraw: Clear DDSD_PITCH on compressed surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 92ea79a198d315777a9876fb88f557192e48615a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ea79a198d315777a9876fb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:29 2014 +0200 ddraw: Clear DDSD_PITCH on compressed surfaces. --- dlls/ddraw/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a326404..21ca19f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6118,7 +6118,8 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s || wined3d_desc.format == WINED3DFMT_DXT3 || wined3d_desc.format == WINED3DFMT_DXT4 || wined3d_desc.format == WINED3DFMT_DXT5) { - surface->surface_desc.dwFlags |= DDSD_LINEARSIZE; + desc->dwFlags |= DDSD_LINEARSIZE; + desc->dwFlags &= ~DDSD_PITCH; if (wined3d_desc.format == WINED3DFMT_DXT1) surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; else

1 0

Jacek Caban : jscript: Added accessing not existing property on IDispatchEx tests.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: cbe63d977c8e90a0d384a944f54410874ad6ac67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbe63d977c8e90a0d384a944f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 12 10:44:03 2014 +0200 jscript: Added accessing not existing property on IDispatchEx tests. --- dlls/jscript/tests/run.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index dbd9b6b..f6d600a 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -101,6 +101,7 @@ DEFINE_EXPECT(testobj_withprop_i); DEFINE_EXPECT(testobj_noprop_d); DEFINE_EXPECT(testobj_onlydispid_d); DEFINE_EXPECT(testobj_onlydispid_i); +DEFINE_EXPECT(testobj_notexists_d); DEFINE_EXPECT(GetItemInfo_testVal); DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); @@ -327,6 +328,11 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_TESTOBJ_ONLYDISPID; return S_OK; } + if(!strcmp_wa(bstrName, "notExists")) { + CHECK_EXPECT(testobj_notexists_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + return DISP_E_UNKNOWNNAME; + } ok(0, "unexpected name %s\n", wine_dbgstr_w(bstrName)); return E_NOTIMPL; @@ -2055,6 +2061,10 @@ static BOOL run_tests(void) parse_script_a("var notExists; notExists = 1;"); CHECK_CALLED(global_notexists_d); + SET_EXPECT(testobj_notexists_d); + parse_script_a("testObj.notExists;"); + CHECK_CALLED(testobj_notexists_d); + parse_script_a("function f() { var testPropGet; }"); parse_script_a("(function () { var testPropGet; })();"); parse_script_a("(function () { eval('var testPropGet;'); })();");

1 0

Piotr Caban : msvcp70: Export operators working on basic_string.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 84bf97087db1f023beba8fb783d71ef7da162304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84bf97087db1f023beba8fb78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 12 10:37:08 2014 +0200 msvcp70: Export operators working on basic_string. --- dlls/msvcp70/msvcp70.spec | 102 ++++++++++++++++++++++----------------------- dlls/msvcp90/string.c | 53 +++++++++++++++++++++++ 2 files changed, 104 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84bf97087db1f023beba8…

1 0

Shuai Meng : vbscript: Implemented CDbl.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: cde73e3a5eb8ae6d35c342eebd806c31641aeb29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde73e3a5eb8ae6d35c342eeb… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:15:34 2014 +0800 vbscript: Implemented CDbl. --- dlls/vbscript/global.c | 20 ++++++++++++++++-- dlls/vbscript/tests/api.vbs | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f8c875d..68b7638 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -470,8 +470,24 @@ static HRESULT Global_CDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_CDbl(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_R8); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CSng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 46c80d4..c9ae774 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -634,4 +634,52 @@ MyObject.myval = 0 Call ok(CCur(MyObject) = 0, "CCur(MyObject) = " & CCur(MyObject)) Call ok(getVT(CCur(MyObject)) = "VT_CY", "getVT(CCur(MyObject)) = " & getVT(CCur(MyObject))) +Sub testCDblError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CDbl(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CDbl(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CDbl(Empty) = 0, "CDbl(Empty) = " & CDbl(Empty)) +Call ok(getVT(CDbl(Empty)) = "VT_R8", "getVT(CDbl(Empty)) = " & getVT(CDbl(Empty))) +Call ok(CDbl(CByte(0)) = 0, "CDbl(CByte(0)) = " & CDbl(CByte(0))) +Call ok(getVT(CDbl(CCur(0))) = "VT_R8", "getVT(CDbl(CCur(0))) = " & getVT(CDbl(CCur(0)))) +Call ok(CDbl(CCur(0)) = 0, "CDbl(CCur(0)) = " & CDbl(CCur(0))) +Call ok(getVT(CDbl(CCur(0))) = "VT_R8", "getVT(CDbl(CCur(0))) = " & getVT(CDbl(CCur(0)))) +Call ok(CDbl(0) = 0, "CDbl(0) = " & CDbl(0)) +Call ok(getVT(CDbl(0)) = "VT_R8", "getVT(CDbl(0)) = " & getVT(CDbl(0))) +Call ok(CDbl(32768) = 32768, "CDbl(32768) = " & CDbl(32768)) +Call ok(getVT(CDbl(32768)) = "VT_R8", "getVT(CDbl(32768)) = " & getVT(CDbl(32768))) +Call ok(CDbl(0.001 * 0.001) = 0.000001, "CDbl(0.001 * 0.001) = " & CDbl(0.001 * 0.001)) +Call ok(getVT(CDbl(0.001 * 0.001)) = "VT_R8", "getVT(CDbl(0.001 * 0.001)) = " & getVT(CDbl(0.001 * 0.001))) +Call ok(CDbl("-1") = -1, "CDbl(""-1"") = " & CDbl("-1")) +Call ok(getVT(CDbl("-1")) = "VT_R8", "getVT(CDbl(""-1"")) = " & getVT(CDbl("-1"))) +If isEnglishLang Then + Call ok(CDbl("-0.5") = -0.5, "CDbl(""-0.5"") = " & CDbl("-0.5")) + Call ok(getVT(CDbl("-0.5")) = "VT_R8", "getVT(CDbl(""-0.5"")) = " & getVT(CDbl("-0.5"))) +End If +Call testCDblError("", 13, 13) +Call testCDblError("TRUE", 13, 13) +Call testCDblError("FALSE", 13, 13) +Call testCDblError("#TRue#", 13, 13) +Call testCDblError("#fAlSE#", 13, 13) +Call testCDblError(1, 0, 458) +Call ok(CDbl(True) = -1, "CDbl(True) = " & CDbl(True)) +Call ok(getVT(CDbl(True)) = "VT_R8", "getVT(CDbl(True)) = " & getVT(CDbl(True))) +Call ok(CDbl(False) = 0, "CDbl(False) = " & CDbl(False)) +Call ok(getVT(CDbl(False)) = "VT_R8", "getVT(CDbl(False)) = " & getVT(CDbl(False))) +MyObject.myval = 0.1 +Call ok(CDbl(MyObject) = 0.1, "CDbl(MyObject) = " & CDbl(MyObject)) +Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) +MyObject.myval = 0 +Call ok(CDbl(MyObject) = 0, "CDbl(MyObject) = " & CDbl(MyObject)) +Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) + Call reportSuccess()

1 0

Bruno Jesus : kernel32: Limit the environment variable size to 32767 in GetEnvironmentVariable.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 515b8bebb6dfdf173f65beda6eb5f62f7e84c87d URL: http://source.winehq.org/git/wine.git/?a=commit;h=515b8bebb6dfdf173f65beda6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri May 30 21:59:08 2014 -0300 kernel32: Limit the environment variable size to 32767 in GetEnvironmentVariable. --- dlls/kernel32/environ.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index b6b3124..14283f8 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -176,6 +176,8 @@ DWORD WINAPI GetEnvironmentVariableA( LPCSTR name, LPSTR value, DWORD size ) return 0; } + /* limit the size to sane values */ + size = min(size, 32767); if (!(valueW = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)))) return 0;

1 0

Damjan Jovanovic : winex11.drv: Use the clipboard functions and formats to import selections that XDND doesn 't support.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: e339e0d476a8eae572493a7c83f6f972b41793f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e339e0d476a8eae572493a7c8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:22:07 2014 +0200 winex11.drv: Use the clipboard functions and formats to import selections that XDND doesn't support. --- dlls/winex11.drv/clipboard.c | 18 ++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xdnd.c | 26 +++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 730b6c9..350eeab 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1519,6 +1519,24 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, A return hClipData; } +/************************************************************************** + * X11DRV_CLIPBOARD_ImportSelection + * + * Import the X selection into the clipboard format registered for the given X target. + */ +HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom prop, UINT *windowsFormat) +{ + WINE_CLIPFORMAT *clipFormat; + + clipFormat = X11DRV_CLIPBOARD_LookupProperty(NULL, target); + if (clipFormat) + { + *windowsFormat = clipFormat->wFormatID; + return clipFormat->lpDrvImportFunc(d, w, prop); + } + return NULL; +} + /************************************************************************** X11DRV_CLIPBOARD_ExportClipboardData diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7a3374d..bcbfe14 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -238,6 +238,7 @@ extern void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) DECL extern void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; extern void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) DECLSPEC_HIDDEN; +extern HANDLE X11DRV_CLIPBOARD_ImportSelection(Display *d, Atom target, Window w, Atom prop, UINT *windowsFormat) DECLSPEC_HIDDEN; /************************************************************************** * X11 GDI driver diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 4db938f..3941900 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -75,7 +75,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); -static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); +static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); @@ -497,7 +497,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, XGetWindowProperty(display, xwin, x11drv_atom(XdndTarget), 0, 65535, FALSE, AnyPropertyType, &acttype, &actfmt, &icount, &bytesret, &data); - X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); + X11DRV_XDND_MapFormat(display, xwin, types[i], data, get_property_size( actfmt, icount )); XFree(data); } @@ -554,7 +554,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns * * Map XDND MIME format to windows clipboard format. */ -static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) +static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len) { void* xdata; @@ -571,6 +571,26 @@ static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, in X11DRV_XDND_DeconstructTextPlain(property, data, len); else if (property == x11drv_atom(text_html)) X11DRV_XDND_DeconstructTextHTML(property, data, len); + else + { + /* use the clipboard import functions for other types */ + HANDLE *contents; + UINT windowsFormat; + contents = X11DRV_CLIPBOARD_ImportSelection(display, property, xwin, x11drv_atom(XdndTarget), &windowsFormat); + if (contents) + { + void *data = HeapAlloc(GetProcessHeap(), 0, GlobalSize(contents)); + if (data) + { + memcpy(data, GlobalLock(contents), GlobalSize(contents)); + GlobalUnlock(contents); + X11DRV_XDND_InsertXDNDData(property, windowsFormat, data, GlobalSize(contents)); + } + else + ERR("out of memory\n"); + GlobalFree(contents); + } + } }

1 0

Bruno Jesus : ws2_32/tests: Initialize a test buffer (valgrind).
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 79d29e2347b7d1780bc1b71f2dd6c64e564f6e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d29e2347b7d1780bc1b71f2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 01:30:38 2014 -0300 ws2_32/tests: Initialize a test buffer (valgrind). --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0bbce27..fb5ee1d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6833,6 +6833,7 @@ static void test_completion_port(void) GUID acceptExGuid = WSAID_ACCEPTEX; LPFN_ACCEPTEX pAcceptEx = NULL; + memset(buf, 0, sizeof(buf)); previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError());

1 0

Henri Verbeet : ddraw/tests: 64-bit ddraw only has DWORD surface pitch alignment in some cases.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 7e33bc7a473578dfbf6c53b2f70b993ca20706e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e33bc7a473578dfbf6c53b2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:27 2014 +0200 ddraw/tests: 64-bit ddraw only has DWORD surface pitch alignment in some cases. --- dlls/ddraw/tests/ddraw1.c | 32 +++++++++++++---------- dlls/ddraw/tests/ddraw2.c | 32 +++++++++++++---------- dlls/ddraw/tests/ddraw4.c | 62 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 62 +++++++++++++++++++++++++-------------------- 4 files changed, 106 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e33bc7a473578dfbf6c5…

1 0

Damjan Jovanovic : winex11.drv: Use the global memory functions to allocate the memory for STGMEDIUM' s hGlobal.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 8e32b5f8870ce9ffa7097c985f328e011513d5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e32b5f8870ce9ffa7097c985… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:53 2014 +0200 winex11.drv: Use the global memory functions to allocate the memory for STGMEDIUM's hGlobal. --- dlls/winex11.drv/xdnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index eb98215..4db938f 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -977,10 +977,11 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, if (current->cf_win == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = HeapAlloc(GetProcessHeap(), 0, current->size); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, current->size); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(pMedium->u.hGlobal, current->data, current->size); + memcpy(GlobalLock(pMedium->u.hGlobal), current->data, current->size); + GlobalUnlock(pMedium->u.hGlobal); pMedium->pUnkForRelease = 0; return S_OK; }

1 0

Henri Verbeet : ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: e2d9cb69ba9a8b7e4e909ab5a26fb40843f71391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2d9cb69ba9a8b7e4e909ab5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:30 2014 +0200 ddraw: Use wined3d_surface_get_pitch() to calculate dwLinearSize for compressed surfaces. --- dlls/ddraw/surface.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 21ca19f..4ffad8f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6120,10 +6120,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s { desc->dwFlags |= DDSD_LINEARSIZE; desc->dwFlags &= ~DDSD_PITCH; - if (wined3d_desc.format == WINED3DFMT_DXT1) - surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight) / 2; - else - surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight); + desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); } else if (!(desc->dwFlags & DDSD_LPSURFACE)) {

1 0

Henri Verbeet : ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 64a5dc11bf20b8a4b8a581657912bea3d713598e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a5dc11bf20b8a4b8a581657… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 12 11:52:28 2014 +0200 ddraw: Clear DDSD_LINEARSIZE on uncompressed surfaces. --- dlls/ddraw/surface.c | 3 ++- dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 10 +++++++++- dlls/ddraw/tests/ddraw7.c | 10 +++++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f230a2..a326404 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6127,6 +6127,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s else if (!(desc->dwFlags & DDSD_LPSURFACE)) { desc->dwFlags |= DDSD_PITCH; + desc->dwFlags &= ~DDSD_LINEARSIZE; desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); } @@ -6147,7 +6148,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s return hr; } - desc->dwFlags &= ~DDSD_LPSURFACE; + desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); } wined3d_surface_incref(wined3d_surface); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index df74488..c5198f5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4522,12 +4522,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 2ca7047..f07a1bd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5598,12 +5598,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DDERR_INVALIDPARAMS, 0, 0, 0 }, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ec53ae6..b515acc 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6493,6 +6493,8 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, @@ -6503,8 +6505,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x0fc, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x0f8, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x100, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x3f00, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, 0x100, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c90d89b..7ed2f00 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6316,6 +6316,8 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH, 0x0f8, DD_OK, DDSD_PITCH, 0x100, 0x0fc}, + {DDSCAPS_SYSTEMMEMORY, DDSD_PITCH | DDSD_LINEARSIZE, 0, DD_OK, + DDSD_PITCH, 0x100, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE, 0, DDERR_INVALIDPARAMS, 0, 0, 0 }, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x100, DD_OK, @@ -6326,8 +6328,14 @@ static void test_create_surface_pitch(void) DDSD_PITCH, 0x0fc, 0x0fc}, {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH, 0x0f8, DDERR_INVALIDPARAMS, 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x100, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_LINEARSIZE, 0x3f00, DDERR_INVALIDPARAMS, + 0, 0, 0 }, + {DDSCAPS_SYSTEMMEMORY, DDSD_LPSURFACE | DDSD_PITCH | DDSD_LINEARSIZE, 0x100, DD_OK, + DDSD_PITCH, 0x100, 0x100}, }; - DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE; + DWORD flags_mask = DDSD_PITCH | DDSD_LPSURFACE | DDSD_LINEARSIZE; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0);

1 0

Shuai Meng : vbscript: Fixed CInt.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 89dd8401b3d11ec57c087862f710c5ca0594188f URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dd8401b3d11ec57c087862f… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:17:54 2014 +0800 vbscript: Fixed CInt. --- dlls/vbscript/global.c | 12 ++++++--- dlls/vbscript/tests/api.vbs | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1eaf377..294004b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -398,18 +398,24 @@ static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - int val; + VARIANT v; HRESULT hres; TRACE("%s\n", debugstr_variant(arg)); assert(args_cnt == 1); - hres = to_int(arg, &val); + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_I2); if(FAILED(hres)) return hres; - return return_int(res, val); + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 1ba1cb7..2aad761 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -738,4 +738,63 @@ MyObject.myval = 0 Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +Sub testCIntError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CInt(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CInt(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CInt(Empty) = 0, "CInt(Empty) = " & CInt(Empty)) +Call ok(getVT(CInt(Empty)) = "VT_I2", "getVT(CInt(Empty)) = " & getVT(CInt(Empty))) +Call ok(CInt(CByte(0)) = 0, "CInt(CByte(0)) = " & CInt(CByte(0))) +Call ok(getVT(CInt(CByte(0))) = "VT_I2", "getVT(CInt(CByte(0))) = " & getVT(CInt(CByte(0)))) +Call ok(CInt(CCur(0)) = 0, "CInt(CCur(0)) = " & CInt(CCur(0))) +Call ok(getVT(CInt(CCur(0))) = "VT_I2", "getVT(CInt(CCur(0))) = " & getVT(CInt(CCur(0)))) +Call ok(CInt(0.49) = 0, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(0.5) = 0, "CInt(0.5) = " & CInt(0.5)) +Call ok(getVT(CInt(0.5)) = "VT_I2", "getVT(CInt(0.5)) = " & getVT(CInt(0.5))) +Call ok(CInt(0.51) = 1, "CInt(0.51) = " & CInt(0.51)) +Call ok(getVT(CInt(0.51)) = "VT_I2", "getVT(CInt(0.51)) = " & getVT(CInt(0.51))) +Call ok(CInt(1.49) = 1, "CInt(0.49) = " & CInt(0.49)) +Call ok(getVT(CInt(0.49)) = "VT_I2", "getVT(CInt(0.49)) = " & getVT(CInt(0.49))) +Call ok(CInt(1.5) = 2, "CInt(1.5) = " & CInt(1.5)) +Call ok(getVT(CInt(1.5)) = "VT_I2", "getVT(CInt(1.5)) = " & getVT(CInt(1.5))) +Call ok(CInt(1.51) = 2, "CInt(1.51) = " & CInt(1.51)) +Call ok(getVT(CInt(1.51)) = "VT_I2", "getVT(CInt(1.51)) = " & getVT(CInt(1.51))) +Call ok(CInt("-1") = -1, "CInt(""-1"") = " & CInt("-1")) +Call ok(getVT(CInt("-1")) = "VT_I2", "getVT(CInt(""-1"")) = " & getVT(CInt("-1"))) +If isEnglishLang Then + Call ok(CInt("-0.5") = 0, "CInt(""-0.5"") = " & CInt("-0.5")) + Call ok(getVT(CInt("-0.5")) = "VT_I2", "getVT(CInt(""-0.5"")) = " & getVT(CInt("-0.5"))) +End If +Call testCIntError("", 13, 13) +Call testCIntError("-1", 0, 458) +Call testCIntError("TRUE", 13, 13) +Call testCIntError("FALSE", 13, 13) +Call testCIntError("#TRue#", 13, 13) +Call testCIntError("#fAlSE#", 13, 13) +Call testCIntError(1, 0, 458) +Call testCIntError(32767.49, 0, 458) +Call testCIntError(32767.5, 6, 6) +Call testCIntError(-32768.5, 0, 458) +Call testCIntError(-32768.51, 6, 6) +Call ok(CInt(True) = -1, "CInt(True) = " & CInt(True)) +Call ok(getVT(CInt(True)) = "VT_I2", "getVT(CInt(True)) = " & getVT(CInt(True))) +Call ok(CInt(False) = 0, "CInt(False) = " & CInt(False)) +Call ok(getVT(CInt(False)) = "VT_I2", "getVT(CInt(False)) = " & getVT(CInt(False))) +MyObject.myval = 2.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) +MyObject.myval = 1.5 +Call ok(CInt(MyObject) = 2, "CInt(MyObject) = " & CInt(MyObject)) +Call ok(getVT(CInt(MyObject)) = "VT_I2", "getVT(CInt(MyObject)) = " & getVT(CInt(MyObject))) + Call reportSuccess()

1 0

Shuai Meng : vbscript: Implemented CLng.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: ded01d657e96599bfbc260427a7687602ca4809d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded01d657e96599bfbc260427… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Jun 2 08:16:43 2014 +0800 vbscript: Implemented CLng. --- dlls/vbscript/global.c | 20 ++++++++++++++-- dlls/vbscript/tests/api.vbs | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 68b7638..1eaf377 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -414,8 +414,24 @@ static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + V_VT(&v) = VT_EMPTY; + hres = VariantChangeType(&v, arg, 0, VT_I4); + if(FAILED(hres)) + return hres; + + if(!res) + return DISP_E_BADVARTYPE; + else { + *res = v; + return S_OK; + } } static HRESULT Global_CBool(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index c9ae774..1ba1cb7 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -682,4 +682,60 @@ MyObject.myval = 0 Call ok(CDbl(MyObject) = 0, "CDbl(MyObject) = " & CDbl(MyObject)) Call ok(getVT(CDbl(MyObject)) = "VT_R8", "getVT(CDbl(MyObject)) = " & getVT(CDbl(MyObject))) +Sub testCLngError(strings, error_num1, error_num2) + on error resume next + Dim x + + Call Err.clear() + x = CLng(strings) + Call ok(Err.number = error_num1, "Err.number = " & Err.number) + + Call Err.clear() + Call CLng(strings) + Call ok(Err.number = error_num2, "Err.number = " & Err.number) +End Sub + +Call ok(CLng(Empty) = 0, "CLng(Empty) = " & CLng(Empty)) +Call ok(getVT(CLng(Empty)) = "VT_I4", "getVT(CLng(Empty)) = " & getVT(CLng(Empty))) +Call ok(CLng(CByte(0)) = 0, "CLng(CByte(0)) = " & CLng(CByte(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(CCur(0)) = 0, "CLng(CCur(0)) = " & CLng(CCur(0))) +Call ok(getVT(CLng(CCur(0))) = "VT_I4", "getVT(CLng(CCur(0))) = " & getVT(CLng(CCur(0)))) +Call ok(CLng(0) = 0, "CLng(0) = " & CLng(0)) +Call ok(getVT(CLng(0)) = "VT_I4", "getVT(CLng(0)) = " & getVT(CLng(0))) +Call ok(CLng(0.49) = 0, "CLng(0.49) = " & CLng(0.49)) +Call ok(getVT(CLng(0.49)) = "VT_I4", "getVT(CLng(0.49)) = " & getVT(CLng(0.49))) +Call ok(CLng(0.5) = 0, "CLng(0.5) = " & CLng(0.5)) +Call ok(getVT(CLng(0.5)) = "VT_I4", "getVT(CLng(0.5)) = " & getVT(CLng(0.5))) +Call ok(CLng(0.51) = 1, "CLng(0.51) = " & CLng(0.51)) +Call ok(getVT(CLng(0.51)) = "VT_I4", "getVT(CLng(0.51)) = " & getVT(CLng(0.51))) +Call ok(CLng(1.49) = 1, "CLng(1.49) = " & CLng(1.49)) +Call ok(getVT(CLng(1.49)) = "VT_I4", "getVT(CLng(1.49)) = " & getVT(CLng(1.49))) +Call ok(CLng(1.5) = 2, "CLng(1.5) = " & CLng(1.5)) +Call ok(getVT(CLng(1.5)) = "VT_I4", "getVT(CLng(1.5)) = " & getVT(CLng(1.5))) +Call ok(CLng(1.51) = 2, "CLng(1.51) = " & CLng(1.51)) +Call ok(getVT(CLng(1.51)) = "VT_I4", "getVT(CLng(1.51)) = " & getVT(CLng(1.51))) +Call ok(CLng("-1") = -1, "CLng(""-1"") = " & CLng("-1")) +Call ok(getVT(CLng("-1")) = "VT_I4", "getVT(CLng(""-1"")) = " & getVT(CLng("-1"))) +If isEnglishLang Then + Call ok(CLng("-0.5") = 0, "CLng(""-0.5"") = " & CLng("-0.5")) + Call ok(getVT(CLng("-0.5")) = "VT_I4", "getVT(CLng(""-0.5"")) = " & getVT(CLng("-0.5"))) +End If +Call testCLngError("", 13, 13) +Call testCLngError("TRUE", 13, 13) +Call testCLngError("FALSE", 13, 13) +Call testCLngError("#TRue#", 13, 13) +Call testCLngError("#fAlSE#", 13, 13) +Call testCLngError(1, 0, 458) +Call ok(CLng(True) = -1, "CLng(True) = " & CLng(True)) +Call ok(getVT(CLng(True)) = "VT_I4", "getVT(CLng(True)) = " & getVT(CLng(True))) +Call ok(CLng(False) = 0, "CLng(False) = " & CLng(False)) +Call ok(getVT(CLng(False)) = "VT_I4", "getVT(CLng(False)) = " & getVT(CLng(False))) +MyObject.myval = 1 +Call ok(CLng(MyObject) = 1, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) +MyObject.myval = 0 +Call ok(CLng(MyObject) = 0, "CLng(MyObject) = " & CLng(MyObject)) +Call ok(getVT(CLng(MyObject)) = "VT_I4", "getVT(CLng(MyObject)) = " & getVT(CLng(MyObject))) + Call reportSuccess()

1 0

Damjan Jovanovic : winex11.drv: Don' t bother counting how many XDND selections are converted.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: a8499c0803ccace80b1b753a7d53c5969be9743a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8499c0803ccace80b1b753a7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:21:44 2014 +0200 winex11.drv: Don't bother counting how many XDND selections are converted. --- dlls/winex11.drv/xdnd.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 5ed0787..eb98215 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -75,9 +75,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static int X11DRV_XDND_DeconstructTextHTML(int property, void* data, int len); -static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); +static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, - Atom *types, unsigned long *count); + Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); @@ -257,7 +257,7 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) /* Do a one-time data read and cache results */ X11DRV_XDND_ResolveProperty(event->display, event->window, - event->data.l[1], xdndtypes, &count); + event->data.l[1], xdndtypes, count); if (event->data.l[1] & 1) XFree(xdndtypes); @@ -454,7 +454,7 @@ void X11DRV_XDND_LeaveEvent( HWND hWnd, XClientMessageEvent *event ) * Resolve all MIME types to windows clipboard formats. All data is cached. */ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, - Atom *types, unsigned long *count) + Atom *types, unsigned long count) { unsigned int i, j; BOOL res; @@ -462,16 +462,15 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom acttype; int actfmt; unsigned long bytesret, icount; - int entries = 0; unsigned char* data = NULL; XDNDDATA *current, *next; BOOL haveHDROP = FALSE; - TRACE("count(%ld)\n", *count); + TRACE("count(%ld)\n", count); X11DRV_XDND_FreeDragDropOp(); /* Clear previously cached data */ - for (i = 0; i < *count; i++) + for (i = 0; i < count; i++) { TRACE("requesting atom %ld from xwin %ld\n", types[i], xwin); @@ -498,7 +497,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, XGetWindowProperty(display, xwin, x11drv_atom(XdndTarget), 0, 65535, FALSE, AnyPropertyType, &acttype, &actfmt, &icount, &bytesret, &data); - entries += X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); + X11DRV_XDND_MapFormat(types[i], data, get_property_size( actfmt, icount )); XFree(data); } @@ -522,12 +521,9 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, list_remove(&current->entry); HeapFree(GetProcessHeap(), 0, current->data); HeapFree(GetProcessHeap(), 0, current); - --entries; } } } - - *count = entries; } @@ -558,10 +554,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns * * Map XDND MIME format to windows clipboard format. */ -static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) +static void X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int len) { void* xdata; - int count = 0; TRACE("%d: %s\n", property, data); @@ -569,16 +564,13 @@ static int X11DRV_XDND_MapFormat(unsigned int property, unsigned char *data, int xdata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); memcpy(xdata, data, len); X11DRV_XDND_InsertXDNDData(property, property, xdata, len); - count++; if (property == x11drv_atom(text_uri_list)) - count += X11DRV_XDND_DeconstructTextURIList(property, data, len); + X11DRV_XDND_DeconstructTextURIList(property, data, len); else if (property == x11drv_atom(text_plain)) - count += X11DRV_XDND_DeconstructTextPlain(property, data, len); + X11DRV_XDND_DeconstructTextPlain(property, data, len); else if (property == x11drv_atom(text_html)) - count += X11DRV_XDND_DeconstructTextHTML(property, data, len); - - return count; + X11DRV_XDND_DeconstructTextHTML(property, data, len); }

1 0

Zhenbo Li : mshtml: Added IHTMLTableRow::insertCell method implementation.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 48e41c4dd70243ced8412ae911722fdece37e923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48e41c4dd70243ced8412ae91… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon May 26 22:12:50 2014 +0800 mshtml: Added IHTMLTableRow::insertCell method implementation. --- dlls/mshtml/htmltablerow.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 12 ++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 731b403..589a38f 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -308,8 +308,27 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, IDispatch **row) { HTMLTableRow *This = impl_from_IHTMLTableRow(iface); - FIXME("(%p)->(%d %p)\n", This, index, row); - return E_NOTIMPL; + nsIDOMHTMLElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, index, row); + nsres = nsIDOMHTMLTableRowElement_InsertCell(This->nsrow, index, &nselem); + if(NS_FAILED(nsres)) { + ERR("Insert Cell at %d failed: %08x\n", index, nsres); + return E_FAIL; + } + + hres = HTMLTableCell_Create(This->element.node.doc, nselem, &elem); + nsIDOMHTMLElement_Release(nselem); + if (FAILED(hres)) { + ERR("Create TableCell failed: %08x\n", hres); + return hres; + } + + *row = (IDispatch *)&elem->IHTMLElement_iface; + return S_OK; } static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c16e073..4eb02fc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5737,10 +5737,22 @@ static void _test_tr_possess(unsigned line, IHTMLElement *elem, static void test_tr_modify(IHTMLElement *elem, IHTMLTableRow *row) { HRESULT hres; + IDispatch *disp; + IUnknown *unk; hres = IHTMLTableRow_deleteCell(row, 0); ok(hres == S_OK, "deleteCell failed: %08x\n", hres); test_tr_possess(elem, row, 1, "td2"); + + hres = IHTMLTableRow_insertCell(row, 0, &disp); + ok(hres == S_OK, "insertCell failed: %08x\n", hres); + ok(disp != NULL, "disp == NULL\n"); + hres = IDispatch_QueryInterface(disp, &IID_IHTMLTableCell, (void **)&unk); + ok(hres == S_OK, "Could not get IID_IHTMLTableCell interface: %08x\n", hres); + if (SUCCEEDED(hres)) + IUnknown_Release(unk); + test_tr_possess(elem, row, 2, "td2"); + IDispatch_Release(disp); } static void test_tr_elem(IHTMLElement *elem)

1 0

Vincent Povirk : ole32: Support storage files larger than 4 GB.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 81079552738be5291e563186e9acbbb22e50bbcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079552738be5291e563186e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 20 16:08:09 2014 -0500 ole32: Support storage files larger than 4 GB. --- dlls/ole32/stg_stream.c | 4 +- dlls/ole32/storage32.c | 100 ++++++++++++++++++++++------------------------- dlls/ole32/storage32.h | 1 + 3 files changed, 49 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81079552738be5291e563…

1 0

Felix Janda : dnsapi: stdio.h needs to be included for sprintf().
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 12e1ff956a058dc1860126f56bd28c052c1cdadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e1ff956a058dc1860126f56… Author: Felix Janda <felix.janda(a)posteo.de> Date: Tue Jun 3 22:33:27 2014 +0200 dnsapi: stdio.h needs to be included for sprintf(). --- dlls/dnsapi/query.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index b1d80dd..578239e 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -24,6 +24,7 @@ #include <stdarg.h> #include <string.h> +#include <stdio.h> #include <sys/types.h> #ifdef HAVE_NETINET_IN_H

1 0

Felix Janda : server: Add missing includes of poll.h.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: e3faab267ca5f2ff78d42b20e5fce7e8b0681163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3faab267ca5f2ff78d42b20e… Author: Felix Janda <felix.janda(a)posteo.de> Date: Sun Jun 1 11:00:29 2014 +0200 server: Add missing includes of poll.h. --- server/change.c | 3 +++ server/queue.c | 3 +++ server/sock.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/server/change.c b/server/change.c index f6d56b0..3ac70a4 100644 --- a/server/change.c +++ b/server/change.c @@ -32,6 +32,9 @@ #include <limits.h> #include <dirent.h> #include <errno.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/queue.c b/server/queue.c index 57603e1..601629e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -25,6 +25,9 @@ #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS diff --git a/server/sock.c b/server/sock.c index 5ffb1fe..4adad0f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -30,6 +30,9 @@ #include <string.h> #include <stdlib.h> #include <errno.h> +#ifdef HAVE_POLL_H +# include <poll.h> +#endif #include <sys/time.h> #include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H

1 0

Michael Stefaniuc : dmloader: COM cleanup for IDirectMusicContainer.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 9ab1cfb5e0bf943d9533adc2bb4247e3dfe17f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab1cfb5e0bf943d9533adc2b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 4 23:34:20 2014 +0200 dmloader: COM cleanup for IDirectMusicContainer. --- dlls/dmloader/container.c | 139 ++++++++++++++++++++++---------------- dlls/dmloader/dmloader_private.h | 21 ------ 2 files changed, 80 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ab1cfb5e0bf943d9533a…

1 0

Bruno Jesus : wininet: Use a helper to receive data and take care of EINTR.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 8a15ea1190e898accf851c7a7ef2bb3d033e7925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a15ea1190e898accf851c7a7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 12 02:24:45 2014 -0300 wininet: Use a helper to receive data and take care of EINTR. --- dlls/wininet/ftp.c | 8 ++++---- dlls/wininet/internet.c | 2 +- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 23 +++++++++++++++++------ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 5576de9..855aee0 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1195,7 +1195,7 @@ static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DW return ERROR_INTERNET_DISCONNECTED; /* FIXME: FTP should use NETCON_ stuff */ - res = recv(file->nDataSocket, buffer, size, MSG_WAITALL); + res = sock_recv(file->nDataSocket, buffer, size, MSG_WAITALL); *read = res>0 ? res : 0; error = res >= 0 ? ERROR_SUCCESS : INTERNET_ERROR_BASE; /* FIXME */ @@ -1234,7 +1234,7 @@ static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif) TRACE("%p\n", file); - available = recv(file->nDataSocket, buffer, sizeof(buffer), MSG_PEEK); + available = sock_recv(file->nDataSocket, buffer, sizeof(buffer), MSG_PEEK); if(available != -1) { iar.dwResult = (DWORD_PTR)file->hdr.hInternet; @@ -1277,7 +1277,7 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, *available = 0; - retval = recv(file->nDataSocket, &byte, 1, MSG_PEEK); + retval = sock_recv(file->nDataSocket, &byte, 1, MSG_PEEK); if(retval > 0) { task_header_t *task; @@ -3368,7 +3368,7 @@ static BOOL FTP_RetrieveFileData(ftp_session_t *lpwfs, INT nDataSocket, HANDLE h while (nRC != -1) { - nRC = recv(nDataSocket, lpszBuffer, DATA_PACKET_SIZE, 0); + nRC = sock_recv(nDataSocket, lpszBuffer, DATA_PACKET_SIZE, 0); if (nRC != -1) { /* other side closed socket. */ diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 4389c98..bb46a43 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3928,7 +3928,7 @@ LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) { if (poll(&pfd,1, RESPONSE_TIMEOUT * 1000) > 0) { - if (recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) + if (sock_recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0) { INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS); goto lend; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 87369c6..b823e43 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -458,6 +458,7 @@ int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, DWORD value) DECLSPEC_HIDDEN; int sock_get_error(int) DECLSPEC_HIDDEN; int sock_send(int fd, const void *msg, size_t len, int flags) DECLSPEC_HIDDEN; +int sock_recv(int fd, void *msg, size_t len, int flags) DECLSPEC_HIDDEN; server_t *get_server(const WCHAR*,INTERNET_PORT,BOOL,BOOL); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 595dd71..483dba4 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -507,6 +507,17 @@ int sock_send(int fd, const void *msg, size_t len, int flags) return ret; } +int sock_recv(int fd, void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = recv(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static void set_socket_blocking(int socket, blocking_mode_t mode) { #if defined(__MINGW32__) || defined (_MSC_VER) @@ -596,7 +607,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode read_buf_size += 1024; } - size = recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); + size = sock_recv(connection->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); if(size < 1) { WARN("recv error\n"); res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; @@ -799,7 +810,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking tmp_mode = buf_len ? BLOCKING_DISALLOW : mode; set_socket_blocking(conn->socket, tmp_mode); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, tmp_mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); if(size < 0) { if(!buf_len) { if(errno == EAGAIN || errno == EWOULDBLOCK) { @@ -840,7 +851,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking assert(buf_len < ssl_buf_size); set_socket_blocking(conn->socket, mode); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, mode == BLOCKING_ALLOW ? 0 : WINE_MSG_DONTWAIT); if(size < 1) { if(size < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)) { TRACE("would block\n"); @@ -924,7 +935,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t } set_socket_blocking(connection->socket, mode); - *recvd = recv(connection->socket, buf, len, flags); + *recvd = sock_recv(connection->socket, buf, len, flags); return *recvd == -1 ? sock_get_error(errno) : ERROR_SUCCESS; } else @@ -1012,7 +1023,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) ssize_t len; BYTE b; - len = recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); + len = sock_recv(netconn->socket, &b, 1, MSG_PEEK|MSG_DONTWAIT); return len == 1 || (len == -1 && errno == EWOULDBLOCK); #elif defined(__MINGW32__) || defined(_MSC_VER) ULONG mode; @@ -1023,7 +1034,7 @@ BOOL NETCON_is_alive(netconn_t *netconn) if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) return FALSE; - len = recv(netconn->socket, &b, 1, MSG_PEEK); + len = sock_recv(netconn->socket, &b, 1, MSG_PEEK); mode = 0; if(!ioctlsocket(netconn->socket, FIONBIO, &mode))

1 0

Nikolay Sivov : explorerframe: Internally make calls with interface wrappers.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: ad4ccd18216e74cb18f30eed13e2a348fe5046f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4ccd18216e74cb18f30eed1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:58:40 2014 +0400 explorerframe: Internally make calls with interface wrappers. --- dlls/explorerframe/nstc.c | 34 +++++++++++++++------------------- dlls/explorerframe/tests/nstc.c | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 04f4ec8..9daee8b 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -1056,7 +1056,7 @@ static HRESULT WINAPI NSTC2_fnAppendRoot(INameSpaceTreeControl2* iface, root_count = list_count(&This->roots); - return NSTC2_fnInsertRoot(iface, root_count, psiRoot, grfEnumFlags, grfRootStyle, pif); + return INameSpaceTreeControl2_InsertRoot(iface, root_count, psiRoot, grfEnumFlags, grfRootStyle, pif); } static HRESULT WINAPI NSTC2_fnRemoveRoot(INameSpaceTreeControl2* iface, @@ -1101,19 +1101,16 @@ static HRESULT WINAPI NSTC2_fnRemoveAllRoots(INameSpaceTreeControl2* iface) { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); nstc_root *cur1, *cur2; - UINT removed = 0; + TRACE("%p\n", This); + if (list_empty(&This->roots)) + return E_INVALIDARG; + LIST_FOR_EACH_ENTRY_SAFE(cur1, cur2, &This->roots, nstc_root, entry) - { - NSTC2_fnRemoveRoot(iface, cur1->psi); - removed++; - } + INameSpaceTreeControl2_RemoveRoot(iface, cur1->psi); - if(removed) - return S_OK; - else - return E_INVALIDARG; + return S_OK; } static HRESULT WINAPI NSTC2_fnGetRootItems(INameSpaceTreeControl2* iface, @@ -1253,7 +1250,7 @@ static HRESULT WINAPI NSTC2_fnGetSelectedItems(INameSpaceTreeControl2* iface, { NSTC2Impl *This = impl_from_INameSpaceTreeControl2(iface); IShellItem *psiselected; - HRESULT hr; + TRACE("%p (%p)\n", This, psiaItems); psiselected = get_selected_shellitem(This); @@ -1263,9 +1260,8 @@ static HRESULT WINAPI NSTC2_fnGetSelectedItems(INameSpaceTreeControl2* iface, return E_FAIL; } - hr = SHCreateShellItemArrayFromShellItem(psiselected, &IID_IShellItemArray, + return SHCreateShellItemArrayFromShellItem(psiselected, &IID_IShellItemArray, (void**)psiaItems); - return hr; } static HRESULT WINAPI NSTC2_fnGetItemCustomState(INameSpaceTreeControl2* iface, @@ -1553,22 +1549,19 @@ static const INameSpaceTreeControl2Vtbl vt_INameSpaceTreeControl2 = { static HRESULT WINAPI IOW_fnQueryInterface(IOleWindow *iface, REFIID riid, void **ppvObject) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnQueryInterface(&This->INameSpaceTreeControl2_iface, riid, ppvObject); + return INameSpaceTreeControl2_QueryInterface(&This->INameSpaceTreeControl2_iface, riid, ppvObject); } static ULONG WINAPI IOW_fnAddRef(IOleWindow *iface) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnAddRef(&This->INameSpaceTreeControl2_iface); + return INameSpaceTreeControl2_AddRef(&This->INameSpaceTreeControl2_iface); } static ULONG WINAPI IOW_fnRelease(IOleWindow *iface) { NSTC2Impl *This = impl_from_IOleWindow(iface); - TRACE("%p\n", This); - return NSTC2_fnRelease(&This->INameSpaceTreeControl2_iface); + return INameSpaceTreeControl2_Release(&This->INameSpaceTreeControl2_iface); } static HRESULT WINAPI IOW_fnGetWindow(IOleWindow *iface, HWND *phwnd) @@ -1612,6 +1605,9 @@ HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void EFRAME_LockModule(); nstc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NSTC2Impl)); + if (!nstc) + return E_OUTOFMEMORY; + nstc->ref = 1; nstc->INameSpaceTreeControl2_iface.lpVtbl = &vt_INameSpaceTreeControl2; nstc->IOleWindow_iface.lpVtbl = &vt_IOleWindow; diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 1d0c14c..f8c44b6 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1170,6 +1170,11 @@ static void test_basics(void) hr = INameSpaceTreeControl_InsertRoot(pnstc, 5, psidesktop, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; + roots[3] = psitestdir; + roots[4] = psitestdir2; roots[5] = psidesktop; roots[6] = NULL; verify_root_order(pnstc, roots); @@ -1177,6 +1182,9 @@ static void test_basics(void) hr = INameSpaceTreeControl_InsertRoot(pnstc, 3, psitestdir2, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; roots[3] = psitestdir2; roots[4] = psitestdir; roots[5] = psitestdir2; @@ -1187,6 +1195,13 @@ static void test_basics(void) hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir2, 0, 0, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); + roots[0] = psitestdir2; + roots[1] = psidesktop; + roots[2] = psidesktop2; + roots[3] = psitestdir2; + roots[4] = psitestdir; + roots[5] = psitestdir2; + roots[6] = psidesktop; roots[7] = psitestdir2; roots[8] = NULL; verify_root_order(pnstc, roots);

1 0

Nikolay Sivov : explorerframe/tests: Mark some results as broken.
by Alexandre Julliard June 12, 2014

June 12, 2014

Module: wine Branch: master Commit: 3d691afd9732269e8d9e4cd5e59c59a679092c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d691afd9732269e8d9e4cd5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 11 08:28:17 2014 +0400 explorerframe/tests: Mark some results as broken. --- dlls/explorerframe/tests/nstc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 6eefa93..1d0c14c 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -690,14 +690,16 @@ static BOOL test_initialization(void) } /* Some "random" interfaces */ + + /* Next three are supported on Vista/2k8, but not on newer versions */ hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObject, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceActiveObject, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceObjectWindowless, (void**)&punk); - ok(hr == E_NOINTERFACE || hr == S_OK /* vista, w2k8 */, "Got (0x%08x)\n", hr); + ok(hr == E_NOINTERFACE || broken(hr == S_OK) /* vista, w2k8 */, "Got (0x%08x)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleInPlaceUIWindow, (void**)&punk); @@ -2223,7 +2225,7 @@ static void test_events(void) itemstate = 0xDEADBEEF; hr = INameSpaceTreeControl_GetItemState(pnstc, psidesktop, 0xffff, &itemstate); ok(hr == S_OK, "Got (0x%08x)\n", hr); - ok(itemstate == (NSTCIS_BOLD), "itemstate is 0x%08x\n", itemstate); + ok(itemstate == NSTCIS_BOLD, "itemstate is 0x%08x\n", itemstate); ok_no_events(pnstceimpl); hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); @@ -2406,9 +2408,7 @@ START_TEST(nstc) test_events(); } else - { win_skip("No NamespaceTreeControl (or instantiation failed).\n"); - } destroy_window(); OleUninitialize();

1 0