September 2011 - Wine-Commits

Jacek Caban : jscript: Added more SetInterfaceSafetyOptions tests and fixes .
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: ff0cea33d04e2282dc47a32c225b5a9071c3cb44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0cea33d04e2282dc47a32c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 1 17:47:41 2011 +0200 jscript: Added more SetInterfaceSafetyOptions tests and fixes. --- dlls/jscript/jscript.c | 2 +- dlls/jscript/tests/jscript.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index fb7fd8c..be225b7 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -943,7 +943,7 @@ static HRESULT WINAPI JScriptSafety_SetInterfaceSafetyOptions(IObjectSafety *ifa if(dwOptionSetMask & ~SUPPORTED_OPTIONS) return E_FAIL; - This->safeopt = dwEnabledOptions & dwEnabledOptions; + This->safeopt = (dwEnabledOptions & dwOptionSetMask) | (This->safeopt & ~dwOptionSetMask) | INTERFACE_USES_DISPEX; return S_OK; } diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 67067b9..eda867d 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -329,6 +329,38 @@ static void test_safety(IUnknown *unk) ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), "enabled=%x\n", enabled); + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, INTERFACESAFE_FOR_UNTRUSTED_DATA, 0); + ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == (INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), "enabled=%x\n", enabled); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER, 0); + ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACE_USES_DISPEX, 0); + ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + IObjectSafety_Release(safety); }

1 0

Andrew Talbot : msvcp90: Avoid a forward declaration.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: c8cb13f949d42dd49dc4d5cf9f389592e966f190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8cb13f949d42dd49dc4d5cf9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Aug 31 22:04:17 2011 +0100 msvcp90: Avoid a forward declaration. --- dlls/msvcp90/locale.c | 64 +++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c838744..6ebfb51 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -84,7 +84,37 @@ int locale_id__Id_cnt = 0; /* ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA */ locale__Locimp *locale__Locimp__Clocptr = NULL; -static const vtable_ptr MSVCP_locale_facet_vtable[]; +/* ??1facet(a)locale@std@@UAE(a)XZ */ +/* ??1facet(a)locale@std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(locale_facet_dtor, 4) +void __thiscall locale_facet_dtor(locale_facet *this) +{ + TRACE("(%p)\n", this); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_locale_facet_vector_dtor, 8) +locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) +{ + TRACE("(%p %x)\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + locale_facet_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + locale_facet_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +static const vtable_ptr MSVCP_locale_facet_vtable[] = { + (vtable_ptr)THISCALL_NAME(MSVCP_locale_facet_vector_dtor) +}; /* ??0id(a)locale@std@@QAE(a)I@Z */ /* ??0id(a)locale@std@@QEAA(a)_K@Z */ @@ -156,34 +186,6 @@ locale_facet* __thiscall locale_facet_ctor_refs(locale_facet *this, MSVCP_size_t return this; } -/* ??1facet(a)locale@std@@UAE(a)XZ */ -/* ??1facet(a)locale@std@@UEAA(a)XZ */ -DEFINE_THISCALL_WRAPPER(locale_facet_dtor, 4) -void __thiscall locale_facet_dtor(locale_facet *this) -{ - TRACE("(%p)\n", this); -} - -DEFINE_THISCALL_WRAPPER(MSVCP_locale_facet_vector_dtor, 8) -locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsigned int flags) -{ - TRACE("(%p %x)\n", this, flags); - if(flags & 2) { - /* we have an array, with the number of elements stored before the first object */ - int i, *ptr = (int *)this-1; - - for(i=*ptr-1; i>=0; i--) - locale_facet_dtor(this+i); - MSVCRT_operator_delete(ptr); - } else { - locale_facet_dtor(this); - if(flags & 1) - MSVCRT_operator_delete(this); - } - - return this; -} - /* ?_Incref(a)facet@locale(a)std@@QAEXXZ */ /* ?_Incref(a)facet@locale(a)std@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(locale_facet__Incref, 4) @@ -226,10 +228,6 @@ MSVCP_size_t __cdecl locale_facet__Getcat(const locale_facet **facet, const loca return -1; } -static const vtable_ptr MSVCP_locale_facet_vtable[] = { - (vtable_ptr)THISCALL_NAME(MSVCP_locale_facet_vector_dtor) -}; - /* ??_F_Locimp(a)locale@std@@QAEXXZ */ /* ??_F_Locimp(a)locale@std@@QEAAXXZ */ DEFINE_THISCALL_WRAPPER(locale__Locimp_ctor, 4)

1 0

Octavian Voicu : shell32: Fix an incorrect pointer/ integer cast on 64-bit and fix check for resource id.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: 776e27834d97eb6886e855fd5c90585eafdcf83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=776e27834d97eb6886e855fd5… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Sep 1 18:10:05 2011 +0300 shell32: Fix an incorrect pointer/integer cast on 64-bit and fix check for resource id. --- dlls/shell32/recyclebin.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 39b662a..eec9e00 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -238,9 +238,9 @@ static HRESULT WINAPI RecycleBinMenu_InvokeCommand(IContextMenu2 *iface, { RecycleBinMenu *This = impl_from_IContextMenu2(iface); LPCSTR verb = pici->lpVerb; - if(!HIWORD(verb)) + if(IS_INTRESOURCE(verb)) { - switch((UINT)verb) + switch(LOWORD(verb)) { case IDM_RECYCLEBIN_ERASE: DoErase(This);

1 0

Francois Gouget : hhctrl.ocx: Issue a fixme if asked for unsupported toolbar buttons.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: 083abe3fe98235e8a26539b9210ddc32a089c50e URL: http://source.winehq.org/git/wine.git/?a=commit;h=083abe3fe98235e8a26539b92… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 1 15:03:44 2011 +0200 hhctrl.ocx: Issue a fixme if asked for unsupported toolbar buttons. --- dlls/hhctrl.ocx/help.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index d52939d..7bde256 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -785,6 +785,7 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw int nHistBitmaps = 0, nStdBitmaps = 0, nHHBitmaps = 0; HWND hToolbar = pHHInfo->WinType.hwndToolBar; TBADDBITMAP tbAB; + DWORD unsupported; /* Common bitmaps */ tbAB.hInst = HINST_COMMCTRL; @@ -799,6 +800,14 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw *pdwNumButtons = 0; + unsupported = dwButtonFlags & (HHWIN_BUTTON_BROWSE_FWD | + HHWIN_BUTTON_BROWSE_BCK | HHWIN_BUTTON_NOTES | HHWIN_BUTTON_CONTENTS | + HHWIN_BUTTON_INDEX | HHWIN_BUTTON_SEARCH | HHWIN_BUTTON_HISTORY | + HHWIN_BUTTON_FAVORITES | HHWIN_BUTTON_JUMP1 | HHWIN_BUTTON_JUMP2 | + HHWIN_BUTTON_ZOOM | HHWIN_BUTTON_TOC_NEXT | HHWIN_BUTTON_TOC_PREV); + if (unsupported) + FIXME("got asked for unsupported buttons: %06x\n", unsupported); + if (dwButtonFlags & HHWIN_BUTTON_EXPAND) { TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND, nHistBitmaps + HIST_VIEWTREE);

1 0

Frédéric Delanoy : cmd: Fix echo's special '; ' handling.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: 02ef576739082235f6bbc4d07c5063339deb81ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ef576739082235f6bbc4d07… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Aug 31 22:10:57 2011 +0200 cmd: Fix echo's special ';' handling. --- programs/cmd/builtins.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7f003ed..bbf2920 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -864,10 +864,13 @@ void WCMD_echo (const WCHAR *command) { int count; const WCHAR *origcommand = command; - if (command[0]==' ' || command[0]=='\t' || command[0]=='.' || command[0]==':') + if ( command[0]==' ' || command[0]=='\t' || command[0]=='.' + || command[0]==':' || command[0]==';') command++; + count = strlenW(command); - if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':') { + if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':' + && origcommand[0]!=';') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); return;

1 0

Dmitry Timoshkov : gdi32: Add a buch of CreateScalableFontResource() tests.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: dfb4d2e96005b3a7fc582a2575ef10f145e0f614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb4d2e96005b3a7fc582a257… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 30 11:59:42 2011 +0900 gdi32: Add a buch of CreateScalableFontResource() tests. --- dlls/gdi32/tests/Makefile.in | 2 + dlls/gdi32/tests/font.c | 193 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 24 +++++ dlls/gdi32/tests/wine_test.sfd | 180 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/wine_test.ttf | Bin 0 -> 1552 bytes 5 files changed, 399 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfb4d2e96005b3a7fc582…

1 0

Andrew Eikum : winecfg: Remove driver selection from Audio tab.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

1 0

Alexandre Julliard : wininet/tests: Remove an invalid FTP test.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: 006bb26b8ce4f7dcccc0c7eca1f30f939b070062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006bb26b8ce4f7dcccc0c7eca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 15:21:01 2011 +0200 wininet/tests: Remove an invalid FTP test. --- dlls/wininet/tests/ftp.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index a483dc9..7fbbe41 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -726,8 +726,7 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, - { TRUE, ERROR_SUCCESS, "PWD" }, - { TRUE, ERROR_SUCCESS, "PWD\r\n" } + { TRUE, ERROR_SUCCESS, "PWD" } }; if (!pFtpCommandA)

1 0

Octavian Voicu : vbscript: Fix possible memory leak/ crash caused by race condition in VBScriptParse_InitNew.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: 2f053965a2dd8f167b0f0189f312b229e5372a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f053965a2dd8f167b0f0189f… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Sep 1 05:23:12 2011 +0300 vbscript: Fix possible memory leak/crash caused by race condition in VBScriptParse_InitNew. --- dlls/vbscript/vbscript.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 084337f..caee4d4 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -348,7 +348,7 @@ static ULONG WINAPI VBScriptParse_Release(IActiveScriptParse *iface) static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) { VBScript *This = impl_from_IActiveScriptParse(iface); - script_ctx_t *ctx; + script_ctx_t *ctx, *old_ctx; TRACE("(%p)\n", This); @@ -359,8 +359,8 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(!ctx) return E_OUTOFMEMORY; - ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); - if(ctx) { + old_ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); + if(old_ctx) { destroy_script(ctx); return E_UNEXPECTED; }

1 0

Octavian Voicu : opencl: Remove reference to clSetCommandQueueProperty and print fixme, saying function is deprecated.
by Alexandre Julliard Sept. 1, 2011

Sept. 1, 2011

Module: wine Branch: master Commit: f8877ea337d644e6514d2b738862ec5fed1d8751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8877ea337d644e6514d2b738… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Thu Sep 1 09:22:41 2011 +0300 opencl: Remove reference to clSetCommandQueueProperty and print fixme, saying function is deprecated. --- dlls/opencl/opencl.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 03acb48..9b466ec 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -276,10 +276,8 @@ cl_int WINAPI wine_clGetCommandQueueInfo(cl_command_queue command_queue, cl_comm cl_int WINAPI wine_clSetCommandQueueProperty(cl_command_queue command_queue, cl_command_queue_properties properties, cl_bool enable, cl_command_queue_properties * old_properties) { - cl_int ret; - TRACE("%p, 0x%lx, %d, %p\n", command_queue, (long unsigned int)properties, enable, old_properties); - ret = clSetCommandQueueProperty(command_queue, properties, enable, old_properties); - return ret; + FIXME("(%p, 0x%lx, %d, %p): deprecated\n", command_queue, (long unsigned int)properties, enable, old_properties); + return CL_INVALID_QUEUE_PROPERTIES; }

1 0