May 2011 - Wine-Commits - list.winehq.org

Francois Gouget : winefile: Standardize the 'Arrange Icons' menu label.
by Alexandre Julliard May 16, 2011

May 16, 2011

1 0

Francois Gouget : usp10/tests: Add a '\n' to an ok() call.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: f73b860bc2c8dd33da981cd6083c8b1026711959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73b860bc2c8dd33da981cd60… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 11:30:44 2011 +0200 usp10/tests: Add a '\n' to an ok() call. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index f741786..a58d8b8 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -202,7 +202,7 @@ static void test_ScriptItemize( void ) int nItems; usp10 = LoadLibraryA("usp10.dll"); - ok (usp10 != 0,"Unable to LoadLibrary on usp10.dll"); + ok (usp10 != 0,"Unable to LoadLibrary on usp10.dll\n"); pScriptItemizeOpenType = (void*)GetProcAddress(usp10, "ScriptItemizeOpenType"); memset(&Control, 0, sizeof(Control));

1 0

Francois Gouget : user32: Use MSGBOX_IDICON throughout instead of sometimes using stc1 and sometimes 1088 .
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: dc63061af12462c5f670c68ae6b627112349cde9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc63061af12462c5f670c68ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 11:29:38 2011 +0200 user32: Use MSGBOX_IDICON throughout instead of sometimes using stc1 and sometimes 1088. --- dlls/user32/msgbox.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index effe09b..ba18076 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dialog); WINE_DECLARE_DEBUG_CHANNEL(msgbox); -#define MSGBOX_IDICON 1088 +#define MSGBOX_IDICON stc1 #define MSGBOX_IDTEXT 100 #define IDS_ERROR 2 @@ -175,23 +175,23 @@ static HFONT MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Set the icon */ switch(lpmb->dwStyle & MB_ICONMASK) { case MB_ICONEXCLAMATION: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(0, (LPWSTR)IDI_EXCLAMATION), 0); break; case MB_ICONQUESTION: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(0, (LPWSTR)IDI_QUESTION), 0); break; case MB_ICONASTERISK: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(0, (LPWSTR)IDI_ASTERISK), 0); break; case MB_ICONHAND: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(0, (LPWSTR)IDI_HAND), 0); break; case MB_USERICON: - SendDlgItemMessageW(hwnd, stc1, STM_SETICON, + SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)LoadIconW(lpmb->hInstance, lpmb->lpszIcon), 0); break; default:

1 0

Vincent Povirk : gdiplus: Set export ordinals to match Windows 7.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 73e50ba60e852831a29b9b5062d6a8578f5bb8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e50ba60e852831a29b9b506… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 14 15:52:56 2011 -0500 gdiplus: Set export ordinals to match Windows 7. --- dlls/gdiplus/gdiplus.spec | 1260 ++++++++++++++++++++++---------------------- 1 files changed, 630 insertions(+), 630 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73e50ba60e852831a29b9…

1 0

Juan Lang : setupapi: Always initialize output parameter to avoid crash in buggy applications.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 53b287530961beaaae89bd063bc0d63ef41036ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=53b287530961beaaae89bd063… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat May 14 14:55:28 2011 -0700 setupapi: Always initialize output parameter to avoid crash in buggy applications. --- dlls/setupapi/devinst.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5b8fb3c..0a3c3bd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2821,6 +2821,8 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + /* In case application fails to check return value, clear output */ + memset(DeviceInterfaceData, 0, sizeof(*DeviceInterfaceData)); if (DeviceInfoData) { struct DeviceInfo *devInfo =

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: a006296dcafc92b18a230cdc80c3a0872304e3a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a006296dcafc92b18a230cdc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 11:27:01 2011 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddrawmodes.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index ae090a2..61f07fe 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -501,7 +501,7 @@ static void enumdisplaymodes(void) modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_PITCH; - ddsd.lPitch = 123; + U1(ddsd).lPitch = 123; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc); @@ -509,7 +509,7 @@ static void enumdisplaymodes(void) modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_REFRESHRATE; - ddsd.dwRefreshRate = 1; + U2(ddsd).dwRefreshRate = 1; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc); @@ -531,7 +531,7 @@ static void enumdisplaymodes(void) { modes16bpp_cnt = 0; ddsd.dwFlags = DDSD_PIXELFORMAT | DDSD_REFRESHRATE; - ddsd.dwRefreshRate = refresh_rate; + U2(ddsd).dwRefreshRate = refresh_rate; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit); ok(rc==DD_OK,"EnumDisplayModes returned: %x\n",rc);

1 0

Igor Paliychuk : msvcrt: _CxxThrowException is stdcall, not cdecl.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 521604ffce8f87a90aee48652b9b0a48141f8f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=521604ffce8f87a90aee48652… Author: Igor Paliychuk <mansonigor(a)gmail.com> Date: Sat May 14 11:40:16 2011 +0300 msvcrt: _CxxThrowException is stdcall, not cdecl. --- dlls/msvcp90/exception.c | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/cppexcept.c | 2 +- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index cef4980..e6b1692 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -58,7 +58,7 @@ typedef struct __cxx_exception_type const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); /* vtables */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0d65877..a6cfaa3 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -337,7 +337,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT @ cdecl _CRT_RTC_INITW(ptr ptr long long long) msvcr90._CRT_RTC_INITW @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index f728300..98f9ebd 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -108,7 +108,7 @@ @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 47a2c17..f5a60bc 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -102,7 +102,7 @@ @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e0b11bc..c9f62f0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -148,7 +148,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT @ cdecl _CRT_RTC_INITW(ptr ptr long long long) msvcr90._CRT_RTC_INITW @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b2a620c..5f09767 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -145,7 +145,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ stub _CreateFrameInfo -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ stub _FindAndUnlinkFrame @ cdecl _Getdays() msvcrt._Getdays diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index a07d544..18e5aa0 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -471,7 +471,7 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) /********************************************************************* * _CxxThrowException (MSVCRT.@) */ -void CDECL _CxxThrowException( exception *object, const cxx_exception_type *type ) +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) { ULONG_PTR args[3]; diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index a46f222..705364b 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -140,7 +140,7 @@ typedef struct __cxx_exception_type const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8957e42..3b36d77 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -137,7 +137,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ cdecl _CxxThrowException(long long) +@ stdcall _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 2907102..b98cd05 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -790,7 +790,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index f9a6956..4815e2f 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -864,7 +864,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index f598742..ff83f8e 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -116,7 +116,7 @@ @ stub _CrtSetReportFile @ cdecl _CrtSetReportHook(ptr) @ cdecl _CrtSetReportMode(long long) -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths

1 0

Andrew Eikum : mmdevapi: IMMDeviceEnumerator:: GetDevice should fail on unknown device ids.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 91b684325f85c5d3f1c7bc10459066a71caa3629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b684325f85c5d3f1c7bc104… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 13 11:33:59 2011 -0500 mmdevapi: IMMDeviceEnumerator::GetDevice should fail on unknown device ids. --- dlls/mmdevapi/devenum.c | 17 ++++++++--------- dlls/mmdevapi/tests/mmdevenum.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 1e8ffe0..d2a4620 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -932,6 +932,9 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA DWORD i=0; IMMDevice *dev = NULL; + if(!name || !device) + return E_POINTER; + TRACE("(%p)->(%s,%p)\n", This, debugstr_w(name), device); for (i = 0; i < MMDevice_count; ++i) { @@ -942,18 +945,14 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA if (str && !lstrcmpW(str, name)) { CoTaskMemFree(str); - break; + IUnknown_AddRef(dev); + *device = dev; + return S_OK; } CoTaskMemFree(str); } - if (dev) - { - IUnknown_AddRef(dev); - *device = dev; - return S_OK; - } - WARN("Could not find device %s\n", debugstr_w(name)); - return E_NOTFOUND; + TRACE("Could not find device %s\n", debugstr_w(name)); + return E_INVALIDARG; } static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEnumerator *iface, IMMNotificationClient *client) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index a0898b3..ff70177 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -98,9 +98,17 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) WCHAR *id = NULL; if (IMMDevice_GetId(dev, &id) == S_OK) { + IMMDevice *dev2; + temp[sizeof(temp)-1] = 0; WideCharToMultiByte(CP_ACP, 0, id, -1, temp, sizeof(temp)-1, NULL, NULL); trace("Device found: %s\n", temp); + + hr = IMMDeviceEnumerator_GetDevice(mme, id, &dev2); + ok(hr == S_OK, "GetDevice failed: %08x\n", hr); + + IMMDevice_Release(dev2); + CoTaskMemFree(id); } } @@ -113,11 +121,14 @@ static void test_collection(IMMDeviceEnumerator *mme, IMMDeviceCollection *col) /* Only do parameter tests here, the actual MMDevice testing should be a separate test */ START_TEST(mmdevenum) { + static const WCHAR not_a_deviceW[] = {'n','o','t','a','d','e','v','i','c','e',0}; + HRESULT hr; IUnknown *unk = NULL; IMMDeviceEnumerator *mme, *mme2; ULONG ref; IMMDeviceCollection *col; + IMMDevice *dev; CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -152,6 +163,15 @@ START_TEST(mmdevenum) ok(!unk, "Unk not reset to null after invalid QI\n"); ok(hr == E_NOINTERFACE, "Invalid hr %08x returned on IID_NULL\n", hr); + hr = IMMDeviceEnumerator_GetDevice(mme, not_a_deviceW, NULL); + ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); + + hr = IMMDeviceEnumerator_GetDevice(mme, NULL, &dev); + ok(hr == E_POINTER, "GetDevice gave wrong error: %08x\n", hr); + + hr = IMMDeviceEnumerator_GetDevice(mme, not_a_deviceW, &dev); + ok(hr == E_INVALIDARG, "GetDevice gave wrong error: %08x\n", hr); + col = (void*)(LONG_PTR)0x12345678; hr = IMMDeviceEnumerator_EnumAudioEndpoints(mme, 0xffff, DEVICE_STATEMASK_ALL, &col); ok(hr == E_INVALIDARG, "Setting invalid data flow returned 0x%08x\n", hr);

1 0

Jacek Caban : mshtml: Handle aborts synchronously in nsChannelBSC_stop_binding.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: af08c97bf98da4d729564ea08260fd9027023b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af08c97bf98da4d729564ea08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 13 18:18:12 2011 +0200 mshtml: Handle aborts synchronously in nsChannelBSC_stop_binding. --- dlls/mshtml/navigate.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index bdb95a7..9e45025 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1376,12 +1376,14 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(FAILED(result)) - handle_navigation_error(This, result); - else if(This->window) { - result = async_stop_request(This); - if(SUCCEEDED(result)) - return S_OK; + if(result != E_ABORT) { + if(FAILED(result)) + handle_navigation_error(This, result); + else if(This->window) { + result = async_stop_request(This); + if(SUCCEEDED(result)) + return S_OK; + } } on_stop_nsrequest(This, result);

1 0

Alexandre Julliard : msvcrt: Add support for function namespaces in symbol demangling.
by Alexandre Julliard May 16, 2011

May 16, 2011

Module: wine Branch: master Commit: 0c45c8b58e48fdd7b710b9c37cdfde529332525d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c45c8b58e48fdd7b710b9c37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 15 19:55:56 2011 +0200 msvcrt: Add support for function namespaces in symbol demangling. --- dlls/msvcrt/tests/cpp.c | 3 +++ dlls/msvcrt/undname.c | 29 +++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 8d0dbd4..bb6ba16 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1056,6 +1056,9 @@ static void test_demangle(void) /* 121 */ {"??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z", "class std::complex<float> __cdecl std::operator*<float>(float const &,class std::complex<float> const &)", "??$?DM(a)std@@YA?AV?$complex(a)M@0(a)ABMABV10@@Z"}, +/* 122 */ {"?_R2@?BN@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB", + "double const `double __cdecl std::_Fabs<double>(class std::complex<double> const & __ptr64,int * __ptr64)'::`29'::_R2", + "?_R2@?BN@???$_Fabs(a)N@std@@YANAEBV?$complex(a)N@1(a)PEAH@Z(a)4NB"}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 9c24f4a..7d296e1 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -106,6 +106,8 @@ struct datatype_t const char* right; }; +static BOOL symbol_demangle(struct parsed_symbol* sym); + /****************************************************************** * und_alloc * @@ -597,12 +599,31 @@ static BOOL get_class(struct parsed_symbol* sym) name = str_array_get_ref(&sym->names, *sym->current++ - '0'); break; case '?': - if (*++sym->current == '$') + switch (*++sym->current) { + case '$': sym->current++; if ((name = get_template_name(sym)) && !str_array_push(sym, name, -1, &sym->names)) return FALSE; + break; + case '?': + { + struct array stack = sym->stack; + unsigned int start = sym->names.start; + unsigned int num = sym->names.num; + + str_array_init( &sym->stack ); + if (symbol_demangle( sym )) name = str_printf( sym, "`%s'", sym->result ); + sym->names.start = start; + sym->names.num = num; + sym->stack = stack; + } + break; + default: + if (!(name = get_number( sym ))) return FALSE; + name = str_printf( sym, "`%s'", name ); + break; } break; default: @@ -1233,8 +1254,6 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) /* MS mangled names always begin with '?' */ if (*sym->current != '?') return FALSE; - str_array_init(&sym->names); - str_array_init(&sym->stack); sym->current++; /* Then function name or operator code */ @@ -1436,7 +1455,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) sym->flags &= ~UNDNAME_NO_FUNCTION_RETURNS; break; case 5: - sym->names.start = 1; + sym->names.start++; break; } @@ -1497,6 +1516,8 @@ char* CDECL __unDNameEx(char* buffer, const char* mangled, int buflen, sym.mem_alloc_ptr = memget; sym.mem_free_ptr = memfree; sym.current = mangled; + str_array_init( &sym.names ); + str_array_init( &sym.stack ); result = symbol_demangle(&sym) ? sym.result : mangled; if (buffer && buflen)

1 0