March 2008 - Wine-Commits - list.winehq.org

Michael Stefaniuc : widl: Remove local variable shadowing in add_func_desc( ).
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 5c9d1223dbb38862753726f923a6bd0f57b66bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9d1223dbb38862753726f92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 11 21:08:02 2008 +0100 widl: Remove local variable shadowing in add_func_desc(). --- tools/widl/write_msft.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 4e7edf3..cba92de 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1452,7 +1452,6 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int i = 0; LIST_FOR_EACH_ENTRY( arg, func->args, var_t, entry ) { - const attr_t *attr; int paramflags = 0; int *paramdata = typedata + 6 + extra_attr + (num_defaults ? num_params : 0) + i * 3; int *defaultdata = num_defaults ? typedata + 6 + extra_attr + i : NULL;

1 0

Michael Stefaniuc : comctl32/tests: Fix a variable type in monthcal.c. Removes 19 -Wsign-compare warnings.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: 3ca73da928a91cf7762b60259d5b5eb13aa05a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca73da928a91cf7762b60259… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 00:24:35 2008 +0100 comctl32/tests: Fix a variable type in monthcal.c. Removes 19 -Wsign-compare warnings. --- dlls/comctl32/tests/monthcal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index c056ede..cd9592d 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -719,7 +719,7 @@ static void test_monthcal_unicode(HWND hwnd) static void test_monthcal_HitTest(HWND hwnd) { MCHITTESTINFO mchit; - int res; + UINT res; SYSTEMTIME st; memset(&mchit, 0, sizeof(MCHITTESTINFO)); @@ -911,7 +911,7 @@ static void test_monthcal_todaylink(HWND hwnd) MCHITTESTINFO mchit; SYSTEMTIME st_test, st_new; BOOL error = FALSE; - int res; + UINT res; memset(&mchit, 0, sizeof(MCHITTESTINFO));

1 0

Mikołaj Zalewski : mshtml: Add Polish translation.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: cf39c2a92b8ae144d0e065b907430e58af0ab703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf39c2a92b8ae144d0e065b90… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Mar 11 10:33:42 2008 +0100 mshtml: Add Polish translation. --- dlls/mshtml/Pl.rc | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 + 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Pl.rc b/dlls/mshtml/Pl.rc new file mode 100644 index 0000000..b140772 --- /dev/null +++ b/dlls/mshtml/Pl.rc @@ -0,0 +1,56 @@ +/* + * Copyright 2005-2006 Jacek Caban + * Copyright 2008 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "Wy�wietlanie HTML jest aktualnie wy��czone." + IDS_HTMLDOCUMENT "Dokument HTML" + IDS_DOWNLOADING "Pobieranie plik�w..." + IDS_INSTALLING "Instalacja..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalator Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ta aplikacja pr�buje wy�wietli� stron� HTML. Wine potrzebuje w tym celu zainstalowa� " \ + "Gecko (silnik HTML przegl�darek Mozilla). Wybierz 'Instaluj' je�eli chcesz automatycznie " \ + "pobra� z Internetu i zainstalowa� Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT + CONTROL "Progress", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Instaluj", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Anuluj", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hiper��cze" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "W�asno�ci hiper��cza", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&Typ:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index bbf7a81..97c1900 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -43,6 +43,7 @@ #include "Ko.rc" #include "Nl.rc" #include "No.rc" +#include "Pl.rc" #include "Sv.rc" #include "Tr.rc"

1 0

Alexandre Julliard : winex11: Discard ConfigureNotify events even if the intervening events are for other windows .
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: e874fded991d85c30f4d4f5d728923a5ff96a1ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e874fded991d85c30f4d4f5d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 19:50:27 2008 +0100 winex11: Discard ConfigureNotify events even if the intervening events are for other windows. --- dlls/winex11.drv/event.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index c531410..b85d0f1 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -255,23 +255,25 @@ enum event_merge_action */ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) { - if (prev->xany.window != next->xany.window) return MERGE_HANDLE; switch (prev->type) { case ConfigureNotify: - if (prev->xany.window != next->xany.window) break; switch (next->type) { case ConfigureNotify: - TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); - return MERGE_DISCARD; + if (prev->xany.window == next->xany.window) + { + TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); + return MERGE_DISCARD; + } + break; case Expose: case PropertyNotify: return MERGE_KEEP; } break; case MotionNotify: - if (next->type == MotionNotify) + if (prev->xany.window == next->xany.window && next->type == MotionNotify) { TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD;

1 0

Mikołaj Zalewski : regedit: Remove windows class names (they shouldn't be localized) and unused IDC_REGEDIT menu from resources.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: b859c13907787620a5c88d117599e4e5c63d2e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b859c13907787620a5c88d117… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 10 22:07:19 2008 +0100 regedit: Remove windows class names (they shouldn't be localized) and unused IDC_REGEDIT menu from resources. --- programs/regedit/Bg.rc | 2 -- programs/regedit/Cs.rc | 13 ------------- programs/regedit/De.rc | 13 ------------- programs/regedit/En.rc | 14 -------------- programs/regedit/Es.rc | 14 -------------- programs/regedit/Fr.rc | 14 -------------- programs/regedit/Hu.rc | 2 -- programs/regedit/It.rc | 14 -------------- programs/regedit/Ja.rc | 14 -------------- programs/regedit/Ko.rc | 14 -------------- programs/regedit/Nl.rc | 14 -------------- programs/regedit/No.rc | 14 -------------- programs/regedit/Pl.rc | 14 -------------- programs/regedit/Pt.rc | 31 ------------------------------- programs/regedit/Ru.rc | 14 -------------- programs/regedit/Si.rc | 14 -------------- programs/regedit/Tr.rc | 14 -------------- programs/regedit/main.c | 6 ++---- programs/regedit/main.h | 4 ++-- 19 files changed, 4 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b859c13907787620a5c88…

1 0

Alexandre Julliard : advapi32: Implemented RegOverridePredefKey.
by Alexandre Julliard March 12, 2008

March 12, 2008

Module: wine Branch: master Commit: df0f42fe784f24af6ffba03648130c11884cf854 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0f42fe784f24af6ffba0364… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 19:48:57 2008 +0100 advapi32: Implemented RegOverridePredefKey. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/registry.c | 26 ++++++++++++++++++++++++++ include/winreg.h | 1 + 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 17dac6d..38ae793 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -499,7 +499,7 @@ @ stdcall RegOpenKeyExW(long wstr long long ptr) @ stdcall RegOpenKeyW(long wstr ptr) @ stdcall RegOpenUserClassesRoot(ptr long long ptr) -@ stub RegOverridePredefKey +@ stdcall RegOverridePredefKey(long long) @ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 40994fc..9ce3da0 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -150,6 +150,32 @@ static inline HKEY get_special_root_hkey( HKEY hkey ) /****************************************************************************** + * RegOverridePredefKey [ADVAPI32.@] + */ +LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) +{ + HKEY old_key; + int idx; + + if ((hkey < HKEY_SPECIAL_ROOT_FIRST) || (hkey > HKEY_SPECIAL_ROOT_LAST)) + return ERROR_INVALID_PARAMETER; + idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST; + + if (override) + { + NTSTATUS status = NtDuplicateObject( GetCurrentProcess(), override, + GetCurrentProcess(), (HANDLE *)&override, + 0, 0, DUPLICATE_SAME_ACCESS ); + if (status) return RtlNtStatusToDosError( status ); + } + + old_key = InterlockedExchangePointer( (void **)&special_root_keys[idx], override ); + if (old_key) NtClose( old_key ); + return ERROR_SUCCESS; +} + + +/****************************************************************************** * RegCreateKeyExW [ADVAPI32.@] * * See RegCreateKeyExA. diff --git a/include/winreg.h b/include/winreg.h index 5425259..c024369 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -143,6 +143,7 @@ WINADVAPI LSTATUS WINAPI RegOpenKeyExW(HKEY,LPCWSTR,DWORD,REGSAM,PHKEY); WINADVAPI LSTATUS WINAPI RegOpenKeyExA(HKEY,LPCSTR,DWORD,REGSAM,PHKEY); #define RegOpenKeyEx WINELIB_NAME_AW(RegOpenKeyEx) WINADVAPI LSTATUS WINAPI RegOpenUserClassesRoot(HANDLE,DWORD,REGSAM,PHKEY); +WINADVAPI LSTATUS WINAPI RegOverridePredefKey(HKEY,HKEY); WINADVAPI LSTATUS WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPFILETIME); WINADVAPI LSTATUS WINAPI RegQueryInfoKeyA(HKEY,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPDWORD,LPFILETIME); #define RegQueryInfoKey WINELIB_NAME_AW(RegQueryInfoKey)

1 0

Huw Davies : comctl32: Revert to waiting on just the thread object, since the thread no longer sends messages.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 9ab07d5b3767f34d4f9253fe93d82a572fae843b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab07d5b3767f34d4f9253fe9… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 11 14:15:47 2008 +0000 comctl32: Revert to waiting on just the thread object, since the thread no longer sends messages. --- dlls/comctl32/animate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index fb8b65d..0b406b4 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -161,7 +161,7 @@ static BOOL ANIMATE_DoStop(ANIMATE_INFO *infoPtr) if (infoPtr->threadId != GetCurrentThreadId()) { LeaveCriticalSection(&infoPtr->cs); /* leave it a chance to run */ - MsgWaitForMultipleObjects( 1, &handle, FALSE, INFINITE, QS_ALLINPUT ); + WaitForSingleObject( handle, INFINITE ); TRACE("animation thread stopped\n"); EnterCriticalSection(&infoPtr->cs); }

1 0

Huw Davies : comctl32: Animation notifications should be posted not sent.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 13d0803501f249473e8e0f0a0dbc27f444bc3ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d0803501f249473e8e0f0a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 11 12:43:12 2008 +0000 comctl32: Animation notifications should be posted not sent. --- dlls/comctl32/animate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 262bd7f..fb8b65d 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -95,7 +95,7 @@ typedef struct static void ANIMATE_Notify(const ANIMATE_INFO *infoPtr, UINT notif) { - SendMessageW(infoPtr->hwndNotify, WM_COMMAND, + PostMessageW(infoPtr->hwndNotify, WM_COMMAND, MAKEWPARAM(GetDlgCtrlID(infoPtr->hwndSelf), notif), (LPARAM)infoPtr->hwndSelf); }

1 0

Alexandre Julliard : msvcrt: Implemented __CppXcptFilter.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: a6d7b6fc60b40cd9b73f1de0d7d74d96edc8b3a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d7b6fc60b40cd9b73f1de0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 11 16:14:44 2008 +0100 msvcrt: Implemented __CppXcptFilter. --- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/cppexcept.c | 11 +++++++++++ dlls/msvcrt/cppexcept.h | 4 +++- dlls/msvcrt/msvcrt.spec | 1 + 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 28ec8a3..e39f0fb 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -75,7 +75,7 @@ @ extern _HUGE msvcrt._HUGE @ cdecl _Strftime(str long str ptr ptr) msvcrt._Strftime @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter -@ stub __CppXcptFilter +@ cdecl __CppXcptFilter(long ptr) msvcrt.__CppXcptFilter @ stub __CxxCallUnwindDtor @ stub __CxxCallUnwindVecDtor @ stub __CxxDetectRethrow diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 08d928a..6dafc9e 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -440,6 +440,17 @@ void __stdcall __CxxLongjmpUnwind( const struct MSVCRT___JUMP_BUFFER *buf ) #endif /* __i386__ */ + +/********************************************************************* + * __CppXcptFilter (MSVCRT.@) + */ +int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) +{ + /* only filter c++ exceptions */ + if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; + return _XcptFilter( ex, ptr ); +} + /********************************************************************* * _CxxThrowException (MSVCRT.@) */ diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index bf607c9..0818fa7 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -133,7 +133,9 @@ typedef struct __cxx_exception_type const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void _CxxThrowException(exception*,const cxx_exception_type*); +void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); +int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS); static inline const char *dbgstr_type_info( const type_info *info ) { diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7b821e6..8f8ccf4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -75,6 +75,7 @@ @ extern _HUGE MSVCRT__HUGE @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) +@ cdecl __CppXcptFilter(long ptr) @ cdecl __CxxDetectRethrow(ptr) @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ stdcall -i386 __CxxLongjmpUnwind(ptr)

1 0

Huw Davies : comctl32: Get the background brush in ACM_OPEN where native does.
by Alexandre Julliard March 11, 2008

March 11, 2008

Module: wine Branch: master Commit: 84a1a88c5a973b9cd7b6fad7cb0fca3e26f78a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a1a88c5a973b9cd7b6fad7c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 11 14:12:51 2008 +0000 comctl32: Get the background brush in ACM_OPEN where native does. --- dlls/comctl32/animate.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 057cc3e..262bd7f 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -379,10 +379,6 @@ static LRESULT ANIMATE_Timer(ANIMATE_INFO *infoPtr) if ((hDC = GetDC(infoPtr->hwndSelf)) != 0) { - if (infoPtr->dwStyle & ACS_TRANSPARENT) - infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, - WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)infoPtr->hwndSelf); EnterCriticalSection(&infoPtr->cs); ANIMATE_DrawFrame(infoPtr, hDC); LeaveCriticalSection(&infoPtr->cs); @@ -403,10 +399,6 @@ static DWORD CALLBACK ANIMATE_AnimationThread(LPVOID ptr_) { HDC hDC = GetDC(infoPtr->hwndSelf); - if (infoPtr->dwStyle & ACS_TRANSPARENT) - infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, - WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)infoPtr->hwndSelf); EnterCriticalSection(&infoPtr->cs); ANIMATE_DrawFrame(infoPtr, hDC); timeout = infoPtr->mah.dwMicroSecPerFrame; @@ -461,10 +453,6 @@ static LRESULT ANIMATE_Play(ANIMATE_INFO *infoPtr, UINT cRepeat, WORD wFrom, WOR if ((hDC = GetDC(infoPtr->hwndSelf)) != 0) { - if (infoPtr->dwStyle & ACS_TRANSPARENT) - infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, - WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)infoPtr->hwndSelf); ANIMATE_DrawFrame(infoPtr, hDC); ReleaseDC(infoPtr->hwndSelf, hDC); @@ -481,11 +469,6 @@ static LRESULT ANIMATE_Play(ANIMATE_INFO *infoPtr, UINT cRepeat, WORD wFrom, WOR } else { - if(infoPtr->dwStyle & ACS_TRANSPARENT) - infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, - WM_CTLCOLORSTATIC, 0, - (LPARAM)infoPtr->hwndSelf); - TRACE("Using an animation thread\n"); infoPtr->hStopEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); infoPtr->hThread = CreateThread(0, 0, ANIMATE_AnimationThread, @@ -718,6 +701,8 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr) static BOOL ANIMATE_OpenW(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPWSTR lpszName) { + HDC hdc; + ANIMATE_Free(infoPtr); if (!lpszName) @@ -767,6 +752,12 @@ static BOOL ANIMATE_OpenW(ANIMATE_INFO *infoPtr, HINSTANCE hInstance, LPWSTR lps return FALSE; } + hdc = GetDC(infoPtr->hwndSelf); + /* native looks at the top left pixel of the first frame here too. */ + infoPtr->hbrushBG = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); + ReleaseDC(infoPtr->hwndSelf, hdc); + if (!(infoPtr->dwStyle & ACS_CENTER)) SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, infoPtr->mah.dwWidth, infoPtr->mah.dwHeight, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);

1 0