July 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : dbghelp: Remove dead code ( Clang).
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: e35cdaa138146e90cc43836d36efca945e8063a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35cdaa138146e90cc43836d3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 20:38:52 2011 +0200 dbghelp: Remove dead code (Clang). --- dlls/dbghelp/elf_module.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8d06065..625127d 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -991,7 +991,6 @@ static BOOL elf_load_debug_info_from_map(struct module* module, WARN("Couldn't correctly read stabs\n"); ret = ret || lret; } - else lret = FALSE; image_unmap_section(&stab_sect); image_unmap_section(&stabstr_sect); }

1 0

Dylan Smith : riched20/tests: Test the text services IIDs.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 819e1a899aa78a4fded93d04ee6ed659e4c09743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819e1a899aa78a4fded93d04e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 4 00:43:52 2011 -0400 riched20/tests: Test the text services IIDs. --- dlls/riched20/tests/txtsrv.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1ed9836..efeffc1 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -35,6 +35,24 @@ #include <limits.h> static HMODULE hmoduleRichEdit; +static IID *pIID_ITextServices; +static IID *pIID_ITextHost; +static IID *pIID_ITextHost2; + +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + if(!riid) + return "(null)"; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], + riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], + riid->Data4[5], riid->Data4[6], riid->Data4[7]); + + return buf; +} /* Define C Macros for ITextServices calls. */ @@ -90,7 +108,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, { ITextHostTestImpl *This = impl_from_ITextHost(iface); - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) { + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, pIID_ITextHost)) { *ppvObject = This; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; @@ -624,7 +642,7 @@ static BOOL init_texthost(void) return FALSE; } - result = IUnknown_QueryInterface(init, &IID_ITextServices, + result = IUnknown_QueryInterface(init, pIID_ITextServices, (void **)&txtserv); ok((result == S_OK) && (txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, txtserv); IUnknown_Release(init); @@ -780,6 +798,21 @@ static void test_TxDraw(void) } +DEFINE_GUID(expected_iid_itextservices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); +DEFINE_GUID(expected_iid_itexthost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); +DEFINE_GUID(expected_iid_itexthost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); + +static void test_IIDs(void) +{ + ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices), + "unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices)); + todo_wine ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), + "unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost)); + todo_wine ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), + "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); +} + + START_TEST( txtsrv ) { setup_thiscall_wrappers(); @@ -789,6 +822,11 @@ START_TEST( txtsrv ) hmoduleRichEdit = LoadLibrary("RICHED20.DLL"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); + pIID_ITextServices = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextServices"); + pIID_ITextHost = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost"); + pIID_ITextHost2 = (IID*)GetProcAddress(hmoduleRichEdit, "IID_ITextHost2"); + test_IIDs(); + if (init_texthost()) { free_texthost();

1 0

Dylan Smith : richedit: Fix incorrect GUID values for ITextHost and ITextHost2.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 82da77c0a6903a414591f77621a41e1460f02310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82da77c0a6903a414591f7762… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jul 4 00:44:00 2011 -0400 richedit: Fix incorrect GUID values for ITextHost and ITextHost2. --- dlls/msftedit/msftedit.spec | 6 +++--- dlls/riched20/richole.c | 10 +++------- dlls/riched20/tests/txtsrv.c | 4 ++-- include/textserv.h | 5 ++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/msftedit/msftedit.spec b/dlls/msftedit/msftedit.spec index 0dd878d..5f71886 100644 --- a/dlls/msftedit/msftedit.spec +++ b/dlls/msftedit/msftedit.spec @@ -1,9 +1,9 @@ 2 extern IID_IRichEditOle 3 extern IID_IRichEditOleCallback 4 stdcall CreateTextServices(ptr ptr ptr) riched20.CreateTextServices -5 extern IID_ITextServices -6 extern IID_ITextHost -7 extern IID_ITextHost2 +5 extern IID_ITextServices riched20.IID_ITextServices +6 extern IID_ITextHost riched20.IID_ITextHost +7 extern IID_ITextHost2 riched20.IID_ITextHost2 8 stdcall REExtendedRegisterClass() riched20.REExtendedRegisterClass 9 stdcall RichEdit10ANSIWndProc(ptr long long long) riched20.RichEdit10ANSIWndProc 10 stdcall RichEditANSIWndProc(ptr long long long) riched20.RichEditANSIWndProc diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index ce6d308..840678d 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -39,14 +39,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/ -/* FIXME: the next 6 lines should be in textserv.h */ #include "initguid.h" -#define TEXTSERV_GUID(name, l, w1, w2, b1, b2) \ - DEFINE_GUID(name, l, w1, w2, b1, b2, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5) - -TEXTSERV_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d); -TEXTSERV_GUID(IID_ITextHost, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e); -TEXTSERV_GUID(IID_ITextHost2, 0xc5bdd8d0, 0xd26e, 0x11ce, 0xa8, 0x9e); +DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); +DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); +DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextDocument, 0x8cc497c0, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextRange, 0x8cc497c2, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); DEFINE_GUID(IID_ITextSelection, 0x8cc497c1, 0xa1df, 0x11ce, 0x80, 0x98, 0x00, 0xaa, 0x00, 0x47, 0xbe, 0x5d); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index efeffc1..a6c53ce 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -806,9 +806,9 @@ static void test_IIDs(void) { ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices), "unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices)); - todo_wine ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), + ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), "unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost)); - todo_wine ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), + ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); } diff --git a/include/textserv.h b/include/textserv.h index 7a0cfbf..0d509a6 100644 --- a/include/textserv.h +++ b/include/textserv.h @@ -23,9 +23,8 @@ extern "C" { #endif -DEFINE_GUID(IID_ITextServices,0x8d33f740,0xcf58,0x11ce,0xa8,0x9d,0x00,0xaa,0x00,0x6c,0xad,0xc5); -DEFINE_GUID(IID_ITextHost, 0xc5bdd8d0,0xd26e,0x11ce,0xa8,0x9e,0x00,0xaa,0x00,0x6c,0xad,0xc5); -DEFINE_GUID(IID_ITextHost2, 0xc5bdd8d0,0xd26e,0x11ce,0xa8,0x9e,0x00,0xaa,0x00,0x6c,0xad,0xc5); +EXTERN_C const IID IID_ITextServices; +EXTERN_C const IID IID_ITextHost; /***************************************************************************** * ITextServices interface

1 0

Michał Ziętek : wscript: Implemented Host_get_BuildVersion.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: e244222c65306cd4750ee70675e949b327369adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e244222c65306cd4750ee7067… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Mon Jul 4 23:28:52 2011 +0200 wscript: Implemented Host_get_BuildVersion. --- programs/wscript/host.c | 8 ++++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index f6dfaa0..c0d73a5 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -29,6 +29,8 @@ #include <wine/debug.h> +#define BUILDVERSION 16535 + static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; static const WCHAR wshVersionW[] = {'5','.','8'}; @@ -169,8 +171,10 @@ static HRESULT WINAPI Host_get_Version(IHost *iface, BSTR *out_Version) static HRESULT WINAPI Host_get_BuildVersion(IHost *iface, int *out_Build) { - WINE_FIXME("(%p)\n", out_Build); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Build); + + *out_Build = BUILDVERSION; + return S_OK; } static HRESULT WINAPI Host_get_Timeout(IHost *iface, LONG *out_Timeout) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 8b43ce7..fda62f6 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -27,5 +27,6 @@ ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); winetest.reportSuccess();

1 0

Andrew Eikum : winmm/tests: Don' t test MCI output if no output devices are available.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: f78af0e04689e2faf2cc66e29899598d89b4a174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78af0e04689e2faf2cc66e29… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jun 30 15:05:08 2011 -0500 winmm/tests: Don't test MCI output if no output devices are available. --- dlls/winmm/tests/mci.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 91a3e47..1cbcc68 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1271,9 +1271,12 @@ START_TEST(mci) test_mciParser(hwnd); test_openCloseWAVE(hwnd); test_recordWAVE(hwnd); - test_playWAVE(hwnd); - test_asyncWAVE(hwnd); - test_AutoOpenWAVE(hwnd); + if(waveOutGetNumDevs()){ + test_playWAVE(hwnd); + test_asyncWAVE(hwnd); + test_AutoOpenWAVE(hwnd); + }else + skip("No output devices available, skipping all output tests\n"); /* Win9X hangs when exiting with something still open. */ err = mciSendString("close all", NULL, 0, hwnd); ok(!err,"final close all returned %s\n", dbg_mcierr(err));

1 0

Vincent Povirk : user32: Notify the user driver of hotkey changes.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 8c0d568c32c4ce5938e825a35e92356af5829060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0d568c32c4ce5938e825a35… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 23 12:34:26 2011 -0500 user32: Notify the user driver of hotkey changes. --- dlls/user32/driver.c | 25 +++++++++++++++++++++++++ dlls/user32/input.c | 25 ++++++++++++++++++++----- dlls/user32/user_private.h | 2 ++ 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index d152f86..6e21ca2 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -80,8 +80,10 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetKeyboardLayoutName); GET_USER_FUNC(LoadKeyboardLayout); GET_USER_FUNC(MapVirtualKeyEx); + GET_USER_FUNC(RegisterHotKey); GET_USER_FUNC(ToUnicodeEx); GET_USER_FUNC(UnloadKeyboardLayout); + GET_USER_FUNC(UnregisterHotKey); GET_USER_FUNC(VkKeyScanEx); GET_USER_FUNC(CreateCursorIcon); GET_USER_FUNC(DestroyCursorIcon); @@ -193,6 +195,11 @@ static UINT CDECL nulldrv_MapVirtualKeyEx( UINT code, UINT type, HKL layout ) return 0; } +static BOOL CDECL nulldrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ + return TRUE; +} + static INT CDECL nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { @@ -204,6 +211,10 @@ static BOOL CDECL nulldrv_UnloadKeyboardLayout( HKL layout ) return 0; } +static void CDECL nulldrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ +} + static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) { return -1; @@ -430,8 +441,10 @@ static USER_DRIVER null_driver = nulldrv_GetKeyboardLayoutName, nulldrv_LoadKeyboardLayout, nulldrv_MapVirtualKeyEx, + nulldrv_RegisterHotKey, nulldrv_ToUnicodeEx, nulldrv_UnloadKeyboardLayout, + nulldrv_UnregisterHotKey, nulldrv_VkKeyScanEx, /* cursor/icon functions */ nulldrv_CreateCursorIcon, @@ -528,6 +541,11 @@ static UINT CDECL loaderdrv_MapVirtualKeyEx( UINT code, UINT type, HKL layout ) return load_driver()->pMapVirtualKeyEx( code, type, layout ); } +static BOOL CDECL loaderdrv_RegisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ + return load_driver()->pRegisterHotKey( hwnd, modifiers, vk ); +} + static INT CDECL loaderdrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { @@ -539,6 +557,11 @@ static BOOL CDECL loaderdrv_UnloadKeyboardLayout( HKL layout ) return load_driver()->pUnloadKeyboardLayout( layout ); } +static void CDECL loaderdrv_UnregisterHotKey( HWND hwnd, UINT modifiers, UINT vk ) +{ + load_driver()->pUnregisterHotKey( hwnd, modifiers, vk ); +} + static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) { return load_driver()->pVkKeyScanEx( ch, layout ); @@ -765,8 +788,10 @@ static USER_DRIVER lazy_load_driver = loaderdrv_GetKeyboardLayoutName, loaderdrv_LoadKeyboardLayout, loaderdrv_MapVirtualKeyEx, + loaderdrv_RegisterHotKey, loaderdrv_ToUnicodeEx, loaderdrv_UnloadKeyboardLayout, + loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, /* cursor/icon functions */ loaderdrv_CreateCursorIcon, diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 335be1f..1ffce8d 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -984,10 +984,13 @@ UINT WINAPI GetKeyboardLayoutList(INT nBuff, HKL *layouts) BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) { BOOL ret; + int replaced=0; TRACE_(keyboard)("(%p,%d,0x%08x,%X)\n",hwnd,id,modifiers,vk); - /* FIXME: Register hotkey with user driver. */ + if ((hwnd == NULL || WIN_IsCurrentThread(hwnd)) && + !USER_Driver->pRegisterHotKey(hwnd, modifiers, vk)) + return FALSE; SERVER_START_REQ( register_hotkey ) { @@ -995,11 +998,17 @@ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) req->id = id; req->flags = modifiers; req->vkey = vk; - ret = !wine_server_call_err( req ); + if ((ret = !wine_server_call_err( req ))) + { + replaced = reply->replaced; + modifiers = reply->flags; + vk = reply->vkey; + } } SERVER_END_REQ; - /* FIXME: Unregister new or replaced hotkey with user driver if necessary. */ + if (ret && replaced) + USER_Driver->pUnregisterHotKey(hwnd, modifiers, vk); return ret; } @@ -1010,6 +1019,7 @@ BOOL WINAPI RegisterHotKey(HWND hwnd,INT id,UINT modifiers,UINT vk) BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) { BOOL ret; + UINT modifiers, vk; TRACE_(keyboard)("(%p,%d)\n",hwnd,id); @@ -1017,11 +1027,16 @@ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) { req->window = wine_server_user_handle( hwnd ); req->id = id; - ret = !wine_server_call_err( req ); + if ((ret = !wine_server_call_err( req ))) + { + modifiers = reply->flags; + vk = reply->vkey; + } } SERVER_END_REQ; - /* FIXME: Unregister hotkey with user driver if necessary. */ + if (ret) + USER_Driver->pUnregisterHotKey(hwnd, modifiers, vk); return ret; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 92b52a3..399974e 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -62,8 +62,10 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pGetKeyboardLayoutName)(LPWSTR); HKL (CDECL *pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (CDECL *pMapVirtualKeyEx)(UINT, UINT, HKL); + BOOL (CDECL *pRegisterHotKey)(HWND, UINT, UINT); INT (CDECL *pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL); BOOL (CDECL *pUnloadKeyboardLayout)(HKL); + void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); /* cursor/icon functions */ void (CDECL *pCreateCursorIcon)(HCURSOR);

1 0

André Hentschel : shdocvw: Add ITaskbarList[34] Interface.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 8b733dd31348e26a0fdf47775eca0cec68aa25f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b733dd31348e26a0fdf47775… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 3 13:35:51 2011 +0200 shdocvw: Add ITaskbarList[34] Interface. --- dlls/shdocvw/taskbarlist.c | 178 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 160 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b733dd31348e26a0fdf4…

1 0

Alistair Leslie-Hughes : msxml3: clang corrections.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 5f1262825c2dc72d7f6cf407a89d5aba0bb5449f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1262825c2dc72d7f6cf407a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 3 18:14:12 2011 +1000 msxml3: clang corrections. --- dlls/msxml3/saxreader.c | 1 - dlls/msxml3/tests/domdoc.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index f1c2b4b..4f0a5f1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1998,7 +1998,6 @@ static HRESULT internal_parse( TRACE("(%p)->(%s)\n", This, debugstr_variant(&varInput)); - hr = S_OK; switch(V_VT(&varInput)) { case VT_BSTR: diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fd62062..bced22c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5553,6 +5553,7 @@ static void test_cloneNode(void ) hr = IXMLDOMNode_get_attributes(node_clone, &mapAttr); ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt1); + ok(hr == S_OK, "ret %08x\n", hr ); ok(attr_cnt1 == 3, "Attribute count should be 3 (%d)\n", attr_cnt1); IXMLDOMNamedNodeMap_Release(mapAttr); @@ -9746,6 +9747,7 @@ static void test_get_attributes(void) str = SysAllocString( szComplete4 ); hr = IXMLDOMDocument_loadXML(doc, str, &b); + ok(hr == S_OK, "got %08x\n", hr); SysFreeString(str); hr = IXMLDOMDocument_get_attributes(doc, NULL);

1 0

Maarten Lankhorst : winegstreamer: Fix setcaps call.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 715921fea080187ec8a9513ab8b80c6e1c7ab636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715921fea080187ec8a9513ab… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 5 14:25:28 2011 +0200 winegstreamer: Fix setcaps call. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 46cd9ec..c28f9b7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -727,7 +727,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS gst_pad_set_event_function(mypad, event_sink); gst_pad_set_bufferalloc_function(mypad, request_buffer_sink); gst_pad_set_acceptcaps_function(mypad, accept_caps_sink); - gst_pad_set_acceptcaps_function(mypad, setcaps_sink); + gst_pad_set_setcaps_function(mypad, setcaps_sink); if (!strcmp(typename, "audio/x-raw-int") || !strcmp(typename, "audio/x-raw-float")) {

1 0

Jacek Caban : propkeydef.h: Fixed DEFINE_PROPERTYKEY define.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: a2e0f0f4de7331618af6d52977899009e59dca91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e0f0f4de7331618af6d5297… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 14:00:20 2011 +0200 propkeydef.h: Fixed DEFINE_PROPERTYKEY define. --- include/propkeydef.h | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index ab8a7e6..189af7f 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -33,18 +33,16 @@ #ifdef INITGUID #ifdef __cplusplus #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ - EXTERN_C const PROPERTYKEY name = \ + EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ - const PROPERTYKEY name = \ + const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY + EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN #endif #ifndef IsEqualPropertyKey

1 0