December 2010 - Wine-Commits

Michael Stefaniuc : shdocvw: Use an iface instead of an vtbl pointer in IClassFactoryImpl.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: be6dcb549418504bd21e350209592e5a9608530d URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6dcb549418504bd21e35020… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 3 11:16:43 2010 +0100 shdocvw: Use an iface instead of an vtbl pointer in IClassFactoryImpl. --- dlls/shdocvw/factory.c | 38 ++++++++++++++++++++------------------ 1 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index 751b5a4..cc80f85 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -34,20 +34,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); /********************************************************************** * Implement the WebBrowser class factory - * - * (Based on implementation in ddraw/main.c) */ -#define FACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) - typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpClassFactoryVtbl; + IClassFactory IClassFactory_iface; HRESULT (*cf)(LPUNKNOWN, REFIID, LPVOID *); LONG ref; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + /********************************************************************** * WBCF_QueryInterface (IUnknown) @@ -131,28 +132,28 @@ static const IClassFactoryVtbl WBCF_Vtbl = */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - static IClassFactoryImpl WB1ClassFactory = {&WBCF_Vtbl, WebBrowserV1_Create}; - static IClassFactoryImpl WB2ClassFactory = {&WBCF_Vtbl, WebBrowserV2_Create}; - static IClassFactoryImpl CUHClassFactory = {&WBCF_Vtbl, CUrlHistory_Create}; - static IClassFactoryImpl ISCClassFactory = {&WBCF_Vtbl, InternetShortcut_Create}; - static IClassFactoryImpl TBLClassFactory = {&WBCF_Vtbl, TaskbarList_Create}; + static IClassFactoryImpl WB1ClassFactory = {{&WBCF_Vtbl}, WebBrowserV1_Create}; + static IClassFactoryImpl WB2ClassFactory = {{&WBCF_Vtbl}, WebBrowserV2_Create}; + static IClassFactoryImpl CUHClassFactory = {{&WBCF_Vtbl}, CUrlHistory_Create}; + static IClassFactoryImpl ISCClassFactory = {{&WBCF_Vtbl}, InternetShortcut_Create}; + static IClassFactoryImpl TBLClassFactory = {{&WBCF_Vtbl}, TaskbarList_Create}; TRACE("\n"); if(IsEqualGUID(&CLSID_WebBrowser, rclsid)) - return IClassFactory_QueryInterface(FACTORY(&WB2ClassFactory), riid, ppv); + return IClassFactory_QueryInterface(&WB2ClassFactory.IClassFactory_iface, riid, ppv); if(IsEqualGUID(&CLSID_WebBrowser_V1, rclsid)) - return IClassFactory_QueryInterface(FACTORY(&WB1ClassFactory), riid, ppv); + return IClassFactory_QueryInterface(&WB1ClassFactory.IClassFactory_iface, riid, ppv); if(IsEqualGUID(&CLSID_CUrlHistory, rclsid)) - return IClassFactory_QueryInterface(FACTORY(&CUHClassFactory), riid, ppv); + return IClassFactory_QueryInterface(&CUHClassFactory.IClassFactory_iface, riid, ppv); if(IsEqualGUID(&CLSID_InternetShortcut, rclsid)) - return IClassFactory_QueryInterface(FACTORY(&ISCClassFactory), riid, ppv); + return IClassFactory_QueryInterface(&ISCClassFactory.IClassFactory_iface, riid, ppv); if(IsEqualGUID(&CLSID_TaskbarList, rclsid)) - return IClassFactory_QueryInterface(FACTORY(&TBLClassFactory), riid, ppv); + return IClassFactory_QueryInterface(&TBLClassFactory.IClassFactory_iface, riid, ppv); /* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */ return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv); @@ -163,11 +164,12 @@ HRESULT register_class_object(BOOL do_reg) HRESULT hres; static DWORD cookie; - static IClassFactoryImpl IEClassFactory = {&WBCF_Vtbl, InternetExplorer_Create}; + static IClassFactoryImpl IEClassFactory = {{&WBCF_Vtbl}, InternetExplorer_Create}; if(do_reg) { - hres = CoRegisterClassObject(&CLSID_InternetExplorer, (IUnknown*)FACTORY(&IEClassFactory), - CLSCTX_SERVER, REGCLS_MULTIPLEUSE|REGCLS_SUSPENDED, &cookie); + hres = CoRegisterClassObject(&CLSID_InternetExplorer, + (IUnknown*)&IEClassFactory.IClassFactory_iface, CLSCTX_SERVER, + REGCLS_MULTIPLEUSE|REGCLS_SUSPENDED, &cookie); if (FAILED(hres)) { ERR("failed to register object %08x\n", hres); return hres;

1 0

Austin Lund : user32/tests: Disable IME for msg tests.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 555e59a45463a584f9252efa61a470c9de7954dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=555e59a45463a584f9252efa6… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Dec 3 21:33:01 2010 +1000 user32/tests: Disable IME for msg tests. --- dlls/user32/tests/msg.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ab617c9..ccb4e39 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12669,6 +12669,8 @@ START_TEST(msg) char **test_argv; BOOL ret; BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ + HMODULE hModuleImm32; + BOOL (WINAPI *pImmDisableIME)(DWORD); int argc = winetest_get_mainargs( &test_argv ); if (argc >= 3) @@ -12682,6 +12684,15 @@ START_TEST(msg) init_procs(); + hModuleImm32 = LoadLibrary("imm32.dll"); + if (hModuleImm32) { + pImmDisableIME = (void *)GetProcAddress(hModuleImm32, "ImmDisableIME"); + if (pImmDisableIME) + pImmDisableIME(0); + } + pImmDisableIME = NULL; + FreeLibrary(hModuleImm32); + if (!RegisterWindowClasses()) assert(0); if (pSetWinEventHook)

1 0

Alexandre Julliard : resources: Define a generic mechanism for adding extra values to the common version block .
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 5f49129e03f15a1049899251b3a57a67f5c5843e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f49129e03f15a1049899251b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:52:02 2010 +0100 resources: Define a generic mechanism for adding extra values to the common version block. --- dlls/avifil32/rsrc.rc | 2 +- dlls/browseui/version.rc | 2 +- dlls/comcat/version.rc | 4 ++-- dlls/ddraw/version.rc | 2 +- dlls/dmusic/version.rc | 2 +- dlls/dplay/version.rc | 2 +- dlls/dplayx/version.rc | 2 +- dlls/dsound/version.rc | 2 +- dlls/dswave/version.rc | 2 +- dlls/explorerframe/version.rc | 2 +- dlls/gameux/version.rc | 2 +- dlls/mciqtz32/version.rc | 2 +- dlls/mshtml/rsrc.rc | 2 +- dlls/msxml3/version.rc | 2 +- dlls/msxml6/rsrc.rc | 2 +- dlls/npmshtml/rsrc.rc | 5 +++-- dlls/ole32/ole32res.rc | 4 ++-- dlls/oleaut32/rsrc.rc | 2 +- dlls/olepro32/version.rc | 2 +- dlls/quartz/version.rc | 2 +- dlls/shdocvw/shdocvw.rc | 2 +- dlls/shell32/version.rc | 4 ++-- dlls/shfolder/version.rc | 2 +- dlls/winegstreamer/rsrc.rc | 2 +- include/wine/wine_common_ver.rc | 11 +++++------ programs/iexplore/iexplore.rc | 2 +- 26 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f49129e03f15a1049899…

1 0

Francois Gouget : shdocvw: Fix the trailing '\n' of a TRACE().
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: a4c0b0ddf224e527f3c7d9d992c4b60acc5de4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c0b0ddf224e527f3c7d9d99… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 3 15:01:24 2010 +0100 shdocvw: Fix the trailing '\n' of a TRACE(). --- dlls/shdocvw/intshcut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 8f55a20..72bceae 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -750,7 +750,7 @@ void WINAPI OpenURL(HWND hWnd, HINSTANCE hInst, LPCSTR lpcstrUrl, int nShowCmd) ici.hwndParent = hWnd; if FAILED(UniformResourceLocatorW_InvokeCommand(&shortcut->uniformResourceLocatorW, (PURLINVOKECOMMANDINFOW) &ici)) - TRACE("failed to open URL: %s\n.",debugstr_a(lpcstrUrl)); + TRACE("failed to open URL: %s\n", debugstr_a(lpcstrUrl)); } heap_free(shortcut);

1 0

Maarten Lankhorst : quartz: Make video renderer use unicode calls.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 02986df061c6523ecc26b8a87efade03c9df874e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02986df061c6523ecc26b8a87… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 3 09:38:13 2010 +0100 quartz: Make video renderer use unicode calls. --- dlls/quartz/videorenderer.c | 45 ++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index aa870da..8f492cf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -98,7 +98,7 @@ typedef struct VideoRendererImpl IMediaSample *sample_held; } VideoRendererImpl; -static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK VideoWndProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { VideoRendererImpl* pVideoRenderer = (VideoRendererImpl*)GetWindowLongPtrW(hwnd, 0); LPRECT lprect = (LPRECT)lParam; @@ -130,7 +130,7 @@ static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA case WM_RBUTTONDBLCLK: case WM_RBUTTONDOWN: case WM_RBUTTONUP: - PostMessageA(pVideoRenderer->hWndMsgDrain, uMsg, wParam, lParam); + PostMessageW(pVideoRenderer->hWndMsgDrain, uMsg, wParam, lParam); break; default: break; @@ -159,18 +159,21 @@ static LRESULT CALLBACK VideoWndProcA(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA pVideoRenderer->DestRect.bottom - pVideoRenderer->DestRect.top); return TRUE; default: - return DefWindowProcA(hwnd, uMsg, wParam, lParam); + return DefWindowProcW(hwnd, uMsg, wParam, lParam); } return 0; } +static const WCHAR classnameW[] = { 'W','i','n','e',' ','A','c','t','i','v','e','M','o','v','i','e',' ','C','l','a','s','s',0 }; +static const WCHAR windownameW[] = { 'A','c','t','i','v','e','M','o','v','i','e',' ','W','i','n','d','o','w',0 }; + static BOOL video_register_windowclass(void) { - WNDCLASSA winclass; + WNDCLASSW winclass; if (wnd_class_registered) return 1; winclass.style = 0; - winclass.lpfnWndProc = VideoWndProcA; + winclass.lpfnWndProc = VideoWndProcW; winclass.cbClsExtra = 0; winclass.cbWndExtra = sizeof(VideoRendererImpl*); winclass.hInstance = NULL; @@ -178,8 +181,8 @@ static BOOL video_register_windowclass(void) { winclass.hCursor = NULL; winclass.hbrBackground = GetStockObject(BLACK_BRUSH); winclass.lpszMenuName = NULL; - winclass.lpszClassName = "Wine ActiveMovie Class"; - if (!RegisterClassA(&winclass)) + winclass.lpszClassName = classnameW; + if (!RegisterClassW(&winclass)) { ERR("Unable to register window class: %u\n", GetLastError()); return FALSE; @@ -191,7 +194,7 @@ static BOOL video_register_windowclass(void) { void video_unregister_windowclass(void) { if (!wnd_class_registered) return; - UnregisterClassA("Wine ActiveMovie Class", NULL); + UnregisterClassW(classnameW, NULL); } static BOOL CreateRenderingWindow(VideoRendererImpl* This) @@ -199,7 +202,7 @@ static BOOL CreateRenderingWindow(VideoRendererImpl* This) TRACE("(%p)->()\n", This); if (!video_register_windowclass()) return FALSE; - This->hWnd = CreateWindowExA(0, "Wine ActiveMovie Class", "Wine ActiveMovie Window", WS_SIZEBOX, + This->hWnd = CreateWindowExW(0, classnameW, windownameW, WS_SIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, NULL, NULL); @@ -232,10 +235,10 @@ static DWORD WINAPI MessageLoop(LPVOID lpParameter) This->ThreadResult = TRUE; SetEvent(This->hEvent); - while ((fGotMessage = GetMessageA(&msg, NULL, 0, 0)) != 0 && fGotMessage != -1) + while ((fGotMessage = GetMessageW(&msg, NULL, 0, 0)) != 0 && fGotMessage != -1) { TranslateMessage(&msg); - DispatchMessageA(&msg); + DispatchMessageW(&msg); } TRACE("End of message loop\n"); @@ -680,7 +683,7 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface) if (This->hWnd) SendMessageW(This->hWnd, WM_CLOSE, 0, 0); - PostThreadMessageA(This->ThreadID, WM_QUIT, 0, 0); + PostThreadMessageW(This->ThreadID, WM_QUIT, 0, 0); WaitForSingleObject(This->hThread, INFINITE); CloseHandle(This->hThread); CloseHandle(This->hEvent); @@ -1662,14 +1665,14 @@ static HRESULT WINAPI Videowindow_put_WindowStyle(IVideoWindow *iface, ICOM_THIS_MULTI(VideoRendererImpl, IVideoWindow_vtbl, iface); LONG old; - old = GetWindowLongA(This->hWnd, GWL_STYLE); + old = GetWindowLongW(This->hWnd, GWL_STYLE); TRACE("(%p/%p)->(%x -> %x)\n", This, iface, old, WindowStyle); if (WindowStyle & (WS_DISABLED|WS_HSCROLL|WS_ICONIC|WS_MAXIMIZE|WS_MINIMIZE|WS_VSCROLL)) return E_INVALIDARG; - SetWindowLongA(This->hWnd, GWL_STYLE, WindowStyle); + SetWindowLongW(This->hWnd, GWL_STYLE, WindowStyle); SetWindowPos(This->hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); This->WindowStyle = WindowStyle; @@ -1693,7 +1696,7 @@ static HRESULT WINAPI Videowindow_put_WindowStyleEx(IVideoWindow *iface, TRACE("(%p/%p)->(%d)\n", This, iface, WindowStyleEx); - if (!SetWindowLongA(This->hWnd, GWL_EXSTYLE, WindowStyleEx)) + if (!SetWindowLongW(This->hWnd, GWL_EXSTYLE, WindowStyleEx)) return E_FAIL; return S_OK; @@ -1705,7 +1708,7 @@ static HRESULT WINAPI Videowindow_get_WindowStyleEx(IVideoWindow *iface, TRACE("(%p/%p)->(%p)\n", This, iface, WindowStyleEx); - *WindowStyleEx = GetWindowLongA(This->hWnd, GWL_EXSTYLE); + *WindowStyleEx = GetWindowLongW(This->hWnd, GWL_EXSTYLE); return S_OK; } @@ -1904,10 +1907,10 @@ static HRESULT WINAPI Videowindow_put_Owner(IVideoWindow *iface, SetParent(This->hWnd, This->hWndOwner); if (This->WindowStyle & WS_CHILD) { - LONG old = GetWindowLongA(This->hWnd, GWL_STYLE); + LONG old = GetWindowLongW(This->hWnd, GWL_STYLE); if (old != This->WindowStyle) { - SetWindowLongA(This->hWnd, GWL_STYLE, This->WindowStyle); + SetWindowLongW(This->hWnd, GWL_STYLE, This->WindowStyle); SetWindowPos(This->hWnd,0,0,0,0,0,SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOZORDER); } } @@ -1984,14 +1987,14 @@ static HRESULT WINAPI Videowindow_put_FullScreenMode(IVideoWindow *iface, if (FullScreenMode) { ShowWindow(This->hWnd, SW_HIDE); SetParent(This->hWnd, 0); - SetWindowLongA(This->hWnd, GWL_STYLE, WS_POPUP); + SetWindowLongW(This->hWnd, GWL_STYLE, WS_POPUP); SetWindowPos(This->hWnd,HWND_TOP,0,0,GetSystemMetrics(SM_CXSCREEN),GetSystemMetrics(SM_CYSCREEN),SWP_SHOWWINDOW); GetWindowRect(This->hWnd, &This->DestRect); This->WindowPos = This->DestRect; } else { ShowWindow(This->hWnd, SW_HIDE); SetParent(This->hWnd, This->hWndOwner); - SetWindowLongA(This->hWnd, GWL_STYLE, This->WindowStyle); + SetWindowLongW(This->hWnd, GWL_STYLE, This->WindowStyle); GetClientRect(This->hWnd, &This->DestRect); SetWindowPos(This->hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW); This->WindowPos = This->DestRect; @@ -2036,7 +2039,7 @@ static HRESULT WINAPI Videowindow_NotifyOwnerMessage(IVideoWindow *iface, TRACE("(%p/%p)->(%08lx, %d, %08lx, %08lx)\n", This, iface, hwnd, uMsg, wParam, lParam); - if (!PostMessageA(This->hWnd, uMsg, wParam, lParam)) + if (!PostMessageW(This->hWnd, uMsg, wParam, lParam)) return E_FAIL; return S_OK;

1 0

Alexandre Julliard : dswave: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 7ef29c5d2e51edab315ffdf007fbeb3cb3793116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ef29c5d2e51edab315ffdf00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:06:16 2010 +0100 dswave: Convert dll registration to the IRegistrar mechanism. --- dlls/dswave/Makefile.in | 5 +- dlls/dswave/dswave.idl | 28 +++ dlls/dswave/dswave_main.c | 19 ++ dlls/dswave/regsvr.c | 467 --------------------------------------------- 4 files changed, 50 insertions(+), 469 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ef29c5d2e51edab315ff…

1 0

Maarten Lankhorst : quartz: Implement AMGetErrorTextA on top of AMGetErrorTextW.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 883ca4d9d02356b01ef11259085336321d3f2346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=883ca4d9d02356b01ef112590… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 3 09:38:11 2010 +0100 quartz: Implement AMGetErrorTextA on top of AMGetErrorTextW. --- dlls/quartz/main.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 93c93a0..c40d220 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -297,17 +297,15 @@ LONG WINAPI DBToAmpFactor(LONG db) */ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) { - unsigned int len; - static const char format[] = "Error: 0x%x"; - char error[MAX_ERROR_TEXT_LEN]; + DWORD res; + WCHAR errorW[MAX_ERROR_TEXT_LEN]; - FIXME("(%x,%p,%d) stub\n", hr, buffer, maxlen); + TRACE("(%x,%p,%d)\n", hr, buffer, maxlen); + if (!buffer) + return 0; - if (!buffer) return 0; - wsprintfA(error, format, hr); - if ((len = strlen(error)) >= maxlen) return 0; - lstrcpyA(buffer, error); - return len; + res = AMGetErrorTextW(hr, errorW, sizeof(errorW)/sizeof(*errorW)); + return WideCharToMultiByte(CP_ACP, 0, errorW, res, buffer, maxlen, 0, 0); } /***********************************************************************

1 0

Maarten Lankhorst : quartz: Support IFilterMapper3 interface.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: c7a3f12359fb59170345b374576b467dc3768770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7a3f12359fb59170345b3745… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 3 09:38:08 2010 +0100 quartz: Support IFilterMapper3 interface. --- dlls/quartz/filtermapper.c | 124 ++++++++++++++++++++++++-------------------- 1 files changed, 67 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7a3f12359fb59170345b…

1 0

Maarten Lankhorst : quartz: Use unicode calls in SystemClock.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 70b31cf0ce291ce5cd40457135632133de98e995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b31cf0ce291ce5cd4045713… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 3 09:38:12 2010 +0100 quartz: Use unicode calls in SystemClock. --- dlls/quartz/systemclock.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 6241352..e48dbe4 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -137,11 +137,11 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { outrefresh: LeaveCriticalSection(&This->safe); - while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) { + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { /** if hwnd we suppose that is a windows event ... */ if (NULL != msg.hwnd) { TranslateMessage(&msg); - DispatchMessageA(&msg); + DispatchMessageW(&msg); } else { switch (msg.message) { case WM_QUIT: @@ -178,7 +178,7 @@ static BOOL SystemClockPostMessageToAdviseThread(SystemClockImpl* This, UINT iMs SetThreadPriority(This->adviseThread, THREAD_PRIORITY_TIME_CRITICAL); This->adviseThreadActive = TRUE; while(1) { - res = PostThreadMessageA(This->adviseThreadId, iMsg, 0, 0); + res = PostThreadMessageW(This->adviseThreadId, iMsg, 0, 0); /* Let the thread creates its message queue (with MsgWaitForMultipleObjects call) by yielding and retrying */ if (!res && (GetLastError() == ERROR_INVALID_THREAD_ID)) Sleep(0); @@ -187,7 +187,7 @@ static BOOL SystemClockPostMessageToAdviseThread(SystemClockImpl* This, UINT iMs } return res; } - return PostThreadMessageA(This->adviseThreadId, iMsg, 0, 0); + return PostThreadMessageW(This->adviseThreadId, iMsg, 0, 0); } static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) {

1 0

Maarten Lankhorst : quartz: Add support for filtermapper3 to filtergraph.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 6e7aff2544b97a342725f8f531e2d9abde7ede88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7aff2544b97a342725f8f53… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 3 09:38:09 2010 +0100 quartz: Add support for filtermapper3 to filtergraph. --- dlls/quartz/filtergraph.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f431cdb..ef398cb 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -269,6 +269,9 @@ static HRESULT WINAPI FilterGraphInner_QueryInterface(IUnknown * iface, } else if (IsEqualGUID(&IID_IFilterMapper2, riid)) { *ppvObj = This->pFilterMapper2; TRACE(" returning IFilterMapper2 interface from aggregated filtermapper (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_IFilterMapper3, riid)) { + *ppvObj = This->pFilterMapper2; + TRACE(" returning IFilterMapper3 interface from aggregated filtermapper (%p)\n", *ppvObj); } else { *ppvObj = NULL; FIXME("unknown interface %s\n", debugstr_guid(riid));

1 0