December 2010 - Wine-commits

Maarten Lankhorst : quartz: Implement AMGetErrorTextA on top of AMGetErrorTextW.
by Alexandre Julliard 03 Dec '10

03 Dec '10

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: Use unicode calls in SystemClock.
by Alexandre Julliard 03 Dec '10

03 Dec '10

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: Make video renderer use unicode calls.
by Alexandre Julliard 03 Dec '10

03 Dec '10

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 : dmband: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: fde44df4d05cccddccccac63e166d5d45241f78e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde44df4d05cccddccccac63e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:04:45 2010 +0100 dmband: Convert dll registration to the IRegistrar mechanism. --- dlls/dmband/Makefile.in | 5 +- dlls/dmband/dmband.idl | 35 ++++ dlls/dmband/dmband_main.c | 19 ++ dlls/dmband/regsvr.c | 476 --------------------------------------------- 4 files changed, 57 insertions(+), 478 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fde44df4d05cccddcccca…

1 0

Alexandre Julliard : dmcompos: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 8db3669d19a2078505b854fd2b36424215cb1002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db3669d19a2078505b854fd2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:20:11 2010 +0100 dmcompos: Convert dll registration to the IRegistrar mechanism. --- dlls/dmcompos/Makefile.in | 3 +- dlls/dmcompos/dmcompos.idl | 59 +++++ dlls/dmcompos/dmcompos_main.c | 18 ++ dlls/dmcompos/regsvr.c | 500 ----------------------------------------- 4 files changed, 79 insertions(+), 501 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8db3669d19a2078505b85…

1 0

Alexandre Julliard : dmime: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 5bc129aa89d4d97966bbcffcd6bab7cb4728e606 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc129aa89d4d97966bbcffcd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:32:10 2010 +0100 dmime: Convert dll registration to the IRegistrar mechanism. --- dlls/dmime/Makefile.in | 3 +- dlls/dmime/dmime.idl | 139 ++++++++++++ dlls/dmime/dmime_main.c | 19 ++ dlls/dmime/regsvr.c | 578 ----------------------------------------------- 4 files changed, 160 insertions(+), 579 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5bc129aa89d4d97966bbc…

1 0

Alexandre Julliard : dmloader: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 4e4ea3f0a16a3a9909ee3fc73fadda14e5e55cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4ea3f0a16a3a9909ee3fc73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:36:54 2010 +0100 dmloader: Convert dll registration to the IRegistrar mechanism. --- dlls/dmloader/Makefile.in | 5 +- dlls/dmloader/dmloader.idl | 35 +++ dlls/dmloader/dmloader_main.c | 19 ++ dlls/dmloader/regsvr.c | 476 ----------------------------------------- 4 files changed, 57 insertions(+), 478 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e4ea3f0a16a3a9909ee3…

1 0

Alexandre Julliard : dmscript: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: e559640482f1d65bb4c85831e391daed186a16c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e559640482f1d65bb4c85831e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 13:41:43 2010 +0100 dmscript: Convert dll registration to the IRegistrar mechanism. --- dlls/dmscript/Makefile.in | 5 +- dlls/dmscript/dmscript.idl | 108 +++++++ dlls/dmscript/dmscript.rgs | 5 + dlls/dmscript/dmscript_main.c | 19 ++ dlls/dmscript/regsvr.c | 541 --------------------------------- dlls/dmscript/{version.rc => rsrc.rc} | 3 + 6 files changed, 138 insertions(+), 543 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e559640482f1d65bb4c85…

1 0

Alexandre Julliard : dmstyle: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 0dbd79900286a4180e337e7684cfd0b6750de3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbd79900286a4180e337e768… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 13:48:42 2010 +0100 dmstyle: Convert dll registration to the IRegistrar mechanism. --- dlls/dmstyle/Makefile.in | 3 +- dlls/dmstyle/dmstyle.idl | 91 ++++++++ dlls/dmstyle/dmstyle_main.c | 19 ++ dlls/dmstyle/regsvr.c | 530 ------------------------------------------- 4 files changed, 112 insertions(+), 531 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0dbd79900286a4180e337…

1 0

Alexandre Julliard : dmsynth: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: ca110e4d71e729334e3b71360d81da61022be426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca110e4d71e729334e3b71360… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 13:52:05 2010 +0100 dmsynth: Convert dll registration to the IRegistrar mechanism. --- dlls/dmsynth/Makefile.in | 3 +- dlls/dmsynth/dmsynth.idl | 35 ++++ dlls/dmsynth/dmsynth_main.c | 19 ++ dlls/dmsynth/regsvr.c | 476 ------------------------------------------- 4 files changed, 56 insertions(+), 477 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca110e4d71e729334e3b7…

1 0