December 2010 - Wine-commits

Austin Lund : user32/tests: Disable IME for msg tests.
by Alexandre Julliard 03 Dec '10

03 Dec '10

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 03 Dec '10

03 Dec '10

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 : comctl32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 1465b4d2116ef7456159fd623114df4327d17a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1465b4d2116ef7456159fd623… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 3 15:00:42 2010 +0100 comctl32/tests: Add a trailing '\n' to an ok() call. --- dlls/comctl32/tests/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 01579a7..1856502 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -827,7 +827,7 @@ static int resize_numtests = 0; check_rect("client", r, res->rc); \ } \ value = (int)SendMessage(hRebar, RB_GETROWCOUNT, 0, 0); \ - ok(res->iNumRows == value, "RB_GETROWCOUNT expected %d got %d", res->iNumRows, value); \ + ok(res->iNumRows == value, "RB_GETROWCOUNT expected %d got %d\n", res->iNumRows, value); \ if (res->heightNotify) { \ RECT rcClient; \ GetClientRect(hRebar, &rcClient); \

1 0

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

03 Dec '10

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

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

03 Dec '10

Module: wine Branch: master Commit: b3c307fb91737b7dd79dd10b5787203b6cb58fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c307fb91737b7dd79dd10b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:03:22 2010 +0100 dsound: Convert dll registration to the IRegistrar mechanism. --- dlls/dsound/Makefile.in | 3 +- dlls/dsound/dsound_classes.idl | 61 +++++ dlls/dsound/dsound_main.c | 19 ++ dlls/dsound/regsvr.c | 530 ---------------------------------------- 4 files changed, 82 insertions(+), 531 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3c307fb91737b7dd79dd…

1 0

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

03 Dec '10

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

Alexandre Julliard : widl: Use the class name as default description for a progid.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: b3ebd5a8c532a9ac8fd7efde7b991dcb7696f31a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3ebd5a8c532a9ac8fd7efde7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 14:07:16 2010 +0100 widl: Use the class name as default description for a progid. --- tools/widl/register.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 20554b1..dcb64db 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -142,7 +142,7 @@ static int write_progid( const type_t *class ) const char *vi_progid = get_attrp( class->attrs, ATTR_VIPROGID ); if (!uuid) return 0; - if (!descr) descr = vi_progid ? vi_progid : progid; + if (!descr) descr = class->name; if (progid) {

1 0

Maarten Lankhorst : quartz: Support IFilterMapper3 interface.
by Alexandre Julliard 03 Dec '10

03 Dec '10

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: Add support for filtermapper3 to filtergraph.
by Alexandre Julliard 03 Dec '10

03 Dec '10

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

Maarten Lankhorst : quartz: Make sure video window is actually destroyed.
by Alexandre Julliard 03 Dec '10

03 Dec '10

Module: wine Branch: master Commit: 89161a8ded8bc55be02fdf93336a74dab724d46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89161a8ded8bc55be02fdf933… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Dec 3 09:38:10 2010 +0100 quartz: Make sure video window is actually destroyed. --- dlls/quartz/videorenderer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 290864b..aa870da 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -678,7 +678,8 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface) { IPin *pConnectedTo; - DestroyWindow(This->hWnd); + if (This->hWnd) + SendMessageW(This->hWnd, WM_CLOSE, 0, 0); PostThreadMessageA(This->ThreadID, WM_QUIT, 0, 0); WaitForSingleObject(This->hThread, INFINITE); CloseHandle(This->hThread);

1 0