April 2011 - Wine-Commits - list.winehq.org

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: ea8b32cecf49900e7c1b42d2d0acbe80a5ff3347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8b32cecf49900e7c1b42d2d… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Apr 5 11:12:04 2011 +0900 po: Update Korean translation. --- po/ko.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index def4671..d239c05 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2006,13 +2006,12 @@ msgid "Default MidiOut Device" msgstr "기본 미디출력 장치" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "기본 설정" +msgstr "지역 설정" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" -msgstr "" +msgstr "%uMB 사용됨, %uMB 가능함" #: hhctrl.rc:67 hhctrl.rc:47 wordpad.rc:155 msgid "Options"

1 0

Hans Leidekker : wine.inf: Add shell handler for .msp files.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 4222e33989d4d59e64bc6c92f45dccdb36cd01bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4222e33989d4d59e64bc6c92f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 5 12:04:11 2011 +0200 wine.inf: Add shell handler for .msp files. --- tools/wine.inf.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cb130e6..d4a457b 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -159,6 +159,7 @@ HKCR,.inf,,2,"inffile" HKCR,.ini,,2,"inifile" HKCR,.lnk,,2,"lnkfile" HKCR,.msi,,2,"Msi.Package" +HKCR,.msp,,2,"Msi.Patch" HKCR,.rtf,,2,"rtffile" HKCR,.wri,,2,"wrifile" HKCR,chm.file,,2,"Compiled HTML Help File" @@ -197,6 +198,9 @@ HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i ""%1""" HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f ""%1""" HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x ""%1""" +HKCR,Msi.Patch,,2,"Windows Installer Patch" +HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" +HKCR,Msi.Patch\shell\Open\command,,2,"msiexec /p ""%1""" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1"

1 0

André Hentschel : uxtheme/tests: Mark XP SP1 behaviour as broken.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 85c989be49ba646242b88c47358d049cbe8c6d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c989be49ba646242b88c473… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 1 18:50:30 2011 +0200 uxtheme/tests: Mark XP SP1 behaviour as broken. --- dlls/uxtheme/tests/system.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b730246..a63b6c4 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -507,7 +507,7 @@ static void test_GetCurrentThemeName(void) SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0); if (bThemeActive) - ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); + ok( hRes == S_OK || broken(hRes == E_FAIL /* WinXP SP1 */), "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, @@ -523,7 +523,9 @@ static void test_GetCurrentThemeName(void) hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + broken(hRes == E_FAIL /* WinXP SP1 */), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef, @@ -537,7 +539,9 @@ static void test_GetCurrentThemeName(void) currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + broken(hRes == E_FAIL /* WinXP SP1 */), + "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); ok( GetLastError() == 0xdeadbeef,

1 0

André Hentschel : uxtheme/tests: Remove unneeded comment.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: b0696b8b4a9ee4c0eefaf7d8a9f453aaaed9ed44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0696b8b4a9ee4c0eefaf7d8a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 1 18:51:59 2011 +0200 uxtheme/tests: Remove unneeded comment. --- dlls/uxtheme/tests/system.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index a63b6c4..0aaadbd 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -514,11 +514,6 @@ static void test_GetCurrentThemeName(void) "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); - /* When the number of characters given is too small (not 0, see above), GetCurrentThemeName returns 0x8007007a. - * The only definition I found was in strsafe.h: - * - * #define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) // 0x7A = 122L = ERROR_INSUFFICIENT_BUFFER - */ SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive)

1 0

Michael Stefaniuc : wininet: Move "inline" right after the storage specifier.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 9bf247d44eda5cb5396610c51057c8e91e24ce82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf247d44eda5cb5396610c51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 5 16:18:38 2011 +0200 wininet: Move "inline" right after the storage specifier. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5258c2e..e775bc0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -254,7 +254,7 @@ typedef struct { DWORD chunk_size; } chunked_stream_t; -static void inline destroy_data_stream(data_stream_t *stream) +static inline void destroy_data_stream(data_stream_t *stream) { stream->vtbl->destroy(stream); }

1 0

Hans Leidekker : msi: Honor msidbFeatureAttributesFollowParent.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: d447ae63b3194fdab39c319496dd1f24a1a629e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d447ae63b3194fdab39c31949… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 5 14:05:00 2011 +0200 msi: Honor msidbFeatureAttributesFollowParent. --- dlls/msi/action.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 366d897..3244b6d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2232,18 +2232,23 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - - /* disable child features of unselected parent features */ + /* disable child features of unselected parent or follow parent */ LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { FeatureList *fl; - if (is_feature_selected( feature, level )) continue; - LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) { - fl->feature->Action = INSTALLSTATE_UNKNOWN; - fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; + if (!is_feature_selected( feature, level )) + { + fl->feature->Action = INSTALLSTATE_UNKNOWN; + fl->feature->ActionRequest = INSTALLSTATE_UNKNOWN; + } + else if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) + { + fl->feature->Action = feature->Action; + fl->feature->ActionRequest = feature->ActionRequest; + } } } } @@ -2267,6 +2272,21 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } + LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) + { + FeatureList *fl; + + if (!is_feature_selected( feature, level )) continue; + + LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) + { + if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) + { + fl->feature->Action = feature->Action; + fl->feature->ActionRequest = feature->ActionRequest; + } + } + } } /* now we want to set component state based based on feature state */

1 0

Huw Davies : gdi32: Add a dib primitive function table.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 0c5e7a6d4dcf07855742bb339a17e7f7ee0a196c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c5e7a6d4dcf07855742bb339… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 5 13:23:20 2011 +0100 gdi32: Add a dib primitive function table. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/dibdrv/dc.c | 20 +++++++++++++++++++ dlls/gdi32/dibdrv/dibdrv.h | 8 +++++++ dlls/gdi32/dibdrv/primitives.c | 42 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + 5 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 13b1a72..9753ef4 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ dc.c \ dib.c \ dibdrv/dc.c \ + dibdrv/primitives.c \ driver.c \ enhmetafile.c \ enhmfdrv/bitblt.c \ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index d105f60..a230fbf 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -36,6 +36,13 @@ static BOOL CDECL dibdrv_DeleteDC( PHYSDEV dev ) return 0; } +static void init_bit_fields(dib_info *dib, const DWORD *bit_fields) +{ + dib->red_mask = bit_fields[0]; + dib->green_mask = bit_fields[1]; + dib->blue_mask = bit_fields[2]; +} + static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit_fields, void *bits) { dib->bit_count = bi->biBitCount; @@ -55,8 +62,21 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit dib->stride = -dib->stride; } + dib->funcs = &funcs_null; + switch(dib->bit_count) { + case 32: + init_bit_fields(dib, bit_fields); + if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) + dib->funcs = &funcs_8888; + else + { + TRACE("32 bpp bitmasks not supported, will forward to graphics driver.\n"); + return FALSE; + } + break; + default: TRACE("bpp %d not supported, will forward to graphics driver.\n", dib->bit_count); return FALSE; diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 9dca50f..da41f21 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -22,3 +22,11 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { return (dibdrv_physdev *)dev; } + +typedef struct primitive_funcs +{ + DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); +} primitive_funcs; + +extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; +extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c new file mode 100644 index 0000000..8bbfc4d --- /dev/null +++ b/dlls/gdi32/dibdrv/primitives.c @@ -0,0 +1,42 @@ +/* + * DIB driver primitives. + * + * Copyright 2011 Huw Davies + * + * 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 + */ + +#include "gdi_private.h" +#include "dibdrv.h" + +static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) +{ + return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); +} + +static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) +{ + return 0; +} + +const primitive_funcs funcs_8888 = +{ + colorref_to_pixel_888 +}; + +const primitive_funcs funcs_null = +{ + colorref_to_pixel_null +}; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5849d88..8aa23bd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -86,6 +86,8 @@ typedef struct void *bits; /* points to the top-left corner of the dib. */ DWORD red_mask, green_mask, blue_mask; + + const struct primitive_funcs *funcs; } dib_info; typedef struct dibdrv_physdev

1 0

Alexandre Julliard : winex11: Always forward SetCursor to the driver, and limit the frequency of updates on the driver side.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: 886ae4c3484bcf2cda549d8be39e2f901e0394fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=886ae4c3484bcf2cda549d8be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 15:06:59 2011 +0200 winex11: Always forward SetCursor to the driver, and limit the frequency of updates on the driver side. --- dlls/user32/cursoricon.c | 4 +--- dlls/winex11.drv/mouse.c | 26 +++++++++++++++++--------- dlls/winex11.drv/window.c | 6 +++++- dlls/winex11.drv/x11drv.h | 2 +- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 476aa51..ba06e96 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1651,9 +1651,7 @@ HCURSOR WINAPI DECLSPEC_HOTPATCH SetCursor( HCURSOR hCursor /* [in] Handle of cu SERVER_END_REQ; if (!ret) return 0; - - /* Change the cursor shape only if it is visible */ - if (show_count >= 0 && hOldCursor != hCursor) USER_Driver->pSetCursor( hCursor ); + USER_Driver->pSetCursor( show_count >= 0 ? hCursor : 0 ); if (!(obj = get_icon_ptr( hOldCursor ))) return 0; release_icon_ptr( hOldCursor, obj ); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index fe9f716..63773ce 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -93,7 +93,8 @@ static const UINT button_up_flags[NB_BUTTONS] = }; static HWND cursor_window; -static DWORD last_time_modified; +static HCURSOR last_cursor; +static DWORD last_cursor_change; static XContext cursor_context; static RECT clip_rect; static Cursor create_cursor( HANDLE handle ); @@ -157,7 +158,7 @@ static Cursor get_empty_cursor(void) /*********************************************************************** * set_window_cursor */ -void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ) +void set_window_cursor( Window window, HCURSOR handle ) { Cursor cursor, prev; @@ -184,10 +185,9 @@ void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ) } } - XDefineCursor( gdi_display, data->whole_window, cursor ); + XDefineCursor( gdi_display, window, cursor ); /* make the change take effect immediately */ XFlush( gdi_display ); - data->cursor = handle; wine_tsx11_unlock(); } @@ -206,7 +206,11 @@ void sync_window_cursor( struct x11drv_win_data *data ) } SERVER_END_REQ; - if (data->cursor != cursor) set_window_cursor( data, cursor ); + if (data->cursor != cursor) + { + data->cursor = cursor; + set_window_cursor( data->whole_window, cursor ); + } } /*********************************************************************** @@ -247,12 +251,11 @@ static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y MapWindowPoints( hwnd, 0, &pt, 1 ); if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd || - GetTickCount() - last_time_modified > 100) + GetTickCount() - last_cursor_change > 100) { - cursor_window = hwnd; sync_window_cursor( data ); + last_cursor_change = GetTickCount(); } - last_time_modified = GetTickCount(); if (hwnd != GetDesktopWindow()) hwnd = GetAncestor( hwnd, GA_ROOT ); @@ -877,7 +880,12 @@ void CDECL X11DRV_DestroyCursorIcon( HCURSOR handle ) */ void CDECL X11DRV_SetCursor( HCURSOR handle ) { - if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || + GetTickCount() - last_cursor_change > 100) + { + last_cursor_change = GetTickCount(); + if (cursor_window) SendNotifyMessageW( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); + } } /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1fcadb5..21c8352 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2699,7 +2699,11 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) ); return 0; case WM_X11DRV_SET_CURSOR: - if ((data = X11DRV_get_win_data( hwnd ))) set_window_cursor( data, (HCURSOR)lp ); + if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) + { + data->cursor = (HCURSOR)lp; + set_window_cursor( data->whole_window, data->cursor ); + } return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0a1e3d9..26375fd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -820,7 +820,7 @@ extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow); extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); -extern void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle ); +extern void set_window_cursor( Window window, HCURSOR handle ); extern void sync_window_cursor( struct x11drv_win_data *data ); extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ); extern void X11DRV_InitKeyboard( Display *display );

1 0

Dmitry Timoshkov : user32: DefDlgProc on WM_QUIT should repost it and terminate the dialog message loop .
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: bb411cfb6560c9fb0e38bbfb11493c5d8e8093b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb411cfb6560c9fb0e38bbfb1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 4 20:40:58 2011 +0900 user32: DefDlgProc on WM_QUIT should repost it and terminate the dialog message loop. --- dlls/user32/dialog.c | 8 +++++++- dlls/user32/tests/msg.c | 6 +----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 052fbff..b7b3cce 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -805,7 +805,13 @@ INT DIALOG_DoDialogBox( HWND hwnd, HWND owner ) /* No message present -> send ENTERIDLE and wait */ SendMessageW( ownerMsg, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } - if (!GetMessageW( &msg, 0, 0, 0 )) break; + GetMessageW( &msg, 0, 0, 0 ); + } + + if (msg.message == WM_QUIT) + { + PostQuitMessage( msg.wParam ); + dlgInfo->flags |= DF_END; } if (!IsWindow( hwnd )) return 0; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 65e417a..4be4c38 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10124,19 +10124,15 @@ static void test_quit_message(void) flush_events(); flush_sequence(); ret = DialogBoxParam(GetModuleHandle(0), "TEST_EMPTY_DIALOG", 0, wm_quit_dlg_proc, 0); -todo_wine ok(ret == 1, "expected 1, got %d\n", ret); - ok_sequence(WmQuitDialogSeq, "WmQuitDialogSeq", TRUE); + ok_sequence(WmQuitDialogSeq, "WmQuitDialogSeq", FALSE); memset(&msg, 0xab, sizeof(msg)); ret = PeekMessage(&msg, NULL, 0, 0, PM_REMOVE); -todo_wine ok(ret, "PeekMessage failed\n"); -if (ret) { ok(msg.message == WM_QUIT, "Received message 0x%04x instead of WM_QUIT\n", msg.message); ok(msg.wParam == 0x1234, "wParam was 0x%lx instead of 0x1234\n", msg.wParam); ok(msg.lParam == 0, "lParam was 0x%lx instead of 0\n", msg.lParam); } -} static const struct message WmMouseHoverSeq[] = { { WM_MOUSEACTIVATE, sent|optional }, /* we can get those when moving the mouse in focus-follow-mouse mode under X11 */

1 0

Hans Leidekker : msi: Fix parsing of an empty property followed by a non-empty property.
by Alexandre Julliard April 5, 2011

April 5, 2011

Module: wine Branch: master Commit: ce0b3a030baae1b6d49e66718d0f71ef76789fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0b3a030baae1b6d49e66718… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 5 12:03:36 2011 +0200 msi: Fix parsing of an empty property followed by a non-empty property. --- dlls/msi/action.c | 5 ++++- dlls/msi/tests/install.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 79d12d6..366d897 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -231,6 +231,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) if (!count) goto done; in_quotes = 1; ignore = 1; + len++; break; case '"': state = state_quote; @@ -258,6 +259,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) state = state_whitespace; if (!count) goto done; in_quotes = 1; + len++; break; default: if (!count) in_quotes = 0; @@ -276,8 +278,9 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) break; case ' ': state = state_whitespace; - if (!count) goto done; + if (!count || (count > 1 && !len)) goto done; in_quotes = 1; + len++; break; default: state = state_token; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1f5ab9c..d54f923 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6346,6 +6346,10 @@ static void test_command_line_parsing(void) r = MsiInstallProductA(msifile, cmd); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + cmd = "Q=\"\" P=\"one\""; + r = MsiInstallProductA(msifile, cmd); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); + DeleteFile(msifile); RemoveDirectory("msitest"); }

1 0