April 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Merged the contents of winpos.c into window.c .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 855308fd95257ff811c40390c790b4100b5d2214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855308fd95257ff811c40390c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 15:32:58 2008 +0200 winex11: Merged the contents of winpos.c into window.c. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 449 +++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/winpos.c | 466 ------------------------------------------ dlls/winex11.drv/x11drv.h | 12 +- 5 files changed, 438 insertions(+), 492 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=855308fd95257ff811c40…

1 0

Alexandre Julliard : winex11: Make sure that the window gravity is always set.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 6ba06fa7af24922ec6b88c1ba49a46628bec5299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba06fa7af24922ec6b88c1ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 15:33:29 2008 +0200 winex11: Make sure that the window gravity is always set. --- dlls/winex11.drv/window.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 95b43a7..5dc5ffc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -222,6 +222,7 @@ static int get_window_attributes( Display *display, struct x11drv_win_data *data attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); attr->cursor = x11drv_thread_data()->cursor; attr->bit_gravity = NorthWestGravity; + attr->win_gravity = StaticGravity; attr->backing_store = NotUseful; attr->event_mask = (ExposureMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | @@ -725,15 +726,17 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR if (!(size_hints = XAllocSizeHints())) return; + size_hints->win_gravity = StaticGravity; + size_hints->flags |= PWinGravity; + /* don't update size hints if window is not in normal state */ if (!(style & (WS_MINIMIZE | WS_MAXIMIZE))) { if (data->hwnd != GetDesktopWindow()) /* don't force position of desktop */ { - size_hints->win_gravity = StaticGravity; size_hints->x = data->whole_rect.left; size_hints->y = data->whole_rect.top; - size_hints->flags |= PWinGravity | PPosition; + size_hints->flags |= PPosition; } if (!is_window_resizable( data, style ))

1 0

Alexandre Julliard : winex11: Don' t allow changing the X11 size of a maximized window.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: bbd32aacff1555df0153deee22ca40de992de007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd32aacff1555df0153deee2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 15:34:07 2008 +0200 winex11: Don't allow changing the X11 size of a maximized window. --- dlls/winex11.drv/window.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5dc5ffc..89b7150 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1157,12 +1157,17 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data { DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); XWindowChanges changes; - int mask = CWWidth | CWHeight; + unsigned int mask = 0; if (data->managed && data->iconic) return; - if ((changes.width = data->whole_rect.right - data->whole_rect.left) <= 0) changes.width = 1; - if ((changes.height = data->whole_rect.bottom - data->whole_rect.top) <= 0) changes.height = 1; + /* resizing a managed maximized window is not allowed */ + if (!(style & WS_MAXIMIZE) || !data->managed) + { + if ((changes.width = data->whole_rect.right - data->whole_rect.left) <= 0) changes.width = 1; + if ((changes.height = data->whole_rect.bottom - data->whole_rect.top) <= 0) changes.height = 1; + mask |= CWWidth | CWHeight; + } /* only the size is allowed to change for the desktop window */ if (data->whole_window != root_window)

1 0

Alexandre Julliard : winex11: Moved the X11DRV_resize_desktop function to desktop.c.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 39f2a082770d150edb38a82b289193772e4af1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f2a082770d150edb38a82b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 23 15:22:17 2008 +0200 winex11: Moved the X11DRV_resize_desktop function to desktop.c. --- dlls/winex11.drv/desktop.c | 67 ++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winpos.c | 72 +------------------------------------------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 69 insertions(+), 71 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 1699318..14fba93 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -155,3 +155,70 @@ Window X11DRV_create_desktop( UINT width, UINT height ) if (win != None) X11DRV_init_desktop( win, width, height ); return win; } + + +struct desktop_resize_data +{ + RECT old_screen_rect; + RECT old_virtual_rect; +}; + +static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) +{ + struct x11drv_win_data *data; + Display *display = thread_display(); + struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; + int mask = 0; + + if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; + + /* update the full screen state */ + update_net_wm_states( display, data ); + + if (resize_data->old_virtual_rect.left != virtual_screen_rect.left) mask |= CWX; + if (resize_data->old_virtual_rect.top != virtual_screen_rect.top) mask |= CWY; + if (mask && data->whole_window) + { + XWindowChanges changes; + + wine_tsx11_lock(); + changes.x = data->whole_rect.left - virtual_screen_rect.left; + changes.y = data->whole_rect.top - virtual_screen_rect.top; + XReconfigureWMWindow( display, data->whole_window, + DefaultScreen(display), mask, &changes ); + wine_tsx11_unlock(); + } + return TRUE; +} + + +/*********************************************************************** + * X11DRV_resize_desktop + */ +void X11DRV_resize_desktop( unsigned int width, unsigned int height ) +{ + HWND hwnd = GetDesktopWindow(); + struct desktop_resize_data resize_data; + + SetRect( &resize_data.old_screen_rect, 0, 0, screen_width, screen_height ); + resize_data.old_virtual_rect = virtual_screen_rect; + + xinerama_init( width, height ); + + if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) + { + SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, MAKELPARAM( width, height ) ); + } + else + { + TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); + SetWindowPos( hwnd, 0, virtual_screen_rect.left, virtual_screen_rect.top, + virtual_screen_rect.right - virtual_screen_rect.left, + virtual_screen_rect.bottom - virtual_screen_rect.top, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); + SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, + MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); + } + + EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); +} diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 5348ec6..2f66a21 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -51,7 +51,7 @@ static const char managed_prop[] = "__wine_x11_managed"; /*********************************************************************** * update_net_wm_states */ -static void update_net_wm_states( Display *display, struct x11drv_win_data *data ) +void update_net_wm_states( Display *display, struct x11drv_win_data *data ) { static const unsigned int state_atoms[NB_NET_WM_STATES] = { @@ -464,73 +464,3 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, XFlush( display ); /* make sure changes are done before we start painting again */ wine_tsx11_unlock(); } - - -struct desktop_resize_data -{ - RECT old_screen_rect; - RECT old_virtual_rect; -}; - -static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam ) -{ - struct x11drv_win_data *data; - Display *display = thread_display(); - struct desktop_resize_data *resize_data = (struct desktop_resize_data *)lparam; - int mask = 0; - - if (!(data = X11DRV_get_win_data( hwnd ))) return TRUE; - - if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE) - { - /* update the full screen state */ - update_net_wm_states( display, data ); - } - - if (resize_data->old_virtual_rect.left != virtual_screen_rect.left) mask |= CWX; - if (resize_data->old_virtual_rect.top != virtual_screen_rect.top) mask |= CWY; - if (mask && data->whole_window) - { - XWindowChanges changes; - - wine_tsx11_lock(); - changes.x = data->whole_rect.left - virtual_screen_rect.left; - changes.y = data->whole_rect.top - virtual_screen_rect.top; - XReconfigureWMWindow( display, data->whole_window, - DefaultScreen(display), mask, &changes ); - wine_tsx11_unlock(); - } - return TRUE; -} - - -/*********************************************************************** - * X11DRV_resize_desktop - */ -void X11DRV_resize_desktop( unsigned int width, unsigned int height ) -{ - HWND hwnd = GetDesktopWindow(); - struct desktop_resize_data resize_data; - - SetRect( &resize_data.old_screen_rect, 0, 0, screen_width, screen_height ); - resize_data.old_virtual_rect = virtual_screen_rect; - - xinerama_init( width, height ); - - if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) - { - SendMessageW( hwnd, WM_X11DRV_RESIZE_DESKTOP, 0, MAKELPARAM( width, height ) ); - } - else - { - TRACE( "desktop %p change to (%dx%d)\n", hwnd, width, height ); - SetWindowPos( hwnd, 0, virtual_screen_rect.left, virtual_screen_rect.top, - virtual_screen_rect.right - virtual_screen_rect.left, - virtual_screen_rect.bottom - virtual_screen_rect.top, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_DEFERERASE ); - SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_bpp, - MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); - } - - EnumWindows( update_windows_on_desktop_resize, (LPARAM)&resize_data ); -} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 287acbb..f40445b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -711,6 +711,7 @@ extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ); extern int get_window_wm_state( Display *display, struct x11drv_win_data *data ); extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data, BOOL set ); +extern void update_net_wm_states( Display *display, struct x11drv_win_data *data ); extern void make_window_embedded( Display *display, struct x11drv_win_data *data ); /* X context to associate a hwnd to an X window */

1 0

Dan Kegel : gdiplus: GdipLoadImageFromStream: initialize variable.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 8c8262510dbd1595bda8970bc59b389b0597cf81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c8262510dbd1595bda8970bc… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Apr 22 16:52:56 2008 -0700 gdiplus: GdipLoadImageFromStream: initialize variable. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3de6ff0..a89b6ea 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -759,6 +759,7 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) IPicture_get_Handle(pic, &hbm); IPicture_get_CurDC(pic, &hdc); + ZeroMemory(&bmi, sizeof(bmi)); bmch = (BITMAPCOREHEADER*) (&bmi.bmiHeader); bmch->bcSize = sizeof(BITMAPCOREHEADER);

1 0

Reece Dunn : shlwapi/tests: Improve the way that the UrlCanonicalize tests report failure.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: eb139e44a75fb9e8388dec749723c6aabf171c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb139e44a75fb9e8388dec749… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Tue Apr 22 13:18:07 2008 +0100 shlwapi/tests: Improve the way that the UrlCanonicalize tests report failure. --- dlls/shlwapi/tests/url.c | 115 ++++++++++++++++++++++----------------------- 1 files changed, 56 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb139e44a75fb9e8388de…

1 0

Nikolay Sivov : gdiplus: Implemented GdipCloneFont.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: f994306a028cd1bc1e99abf9254cfd6a53bad9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f994306a028cd1bc1e99abf92… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 23 01:12:59 2008 +0400 gdiplus: Implemented GdipCloneFont. --- dlls/gdiplus/font.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index be60843..d5d7e94 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -99,3 +99,16 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, return Ok; } + +GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) +{ + if(!font || !cloneFont) + return InvalidParameter; + + *cloneFont = GdipAlloc(sizeof(GpFont)); + if(!*cloneFont) return OutOfMemory; + + **cloneFont = *font; + + return Ok; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index cbea1b9..e301f57 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -50,7 +50,7 @@ @ stub GdipCloneBitmapAreaI @ stdcall GdipCloneBrush(ptr ptr) @ stdcall GdipCloneCustomLineCap(ptr ptr) -@ stub GdipCloneFont +@ stdcall GdipCloneFont(ptr ptr) @ stub GdipCloneFontFamily @ stub GdipCloneImage @ stub GdipCloneImageAttributes diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a8f6568..5765795 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -313,6 +313,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC,GDIPCONST LOGFONTA*,GpFont**) GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**); GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); +GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*);

1 0

James Hawkins : version: Fix tests that fail in win9x and win2k.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 3550d3bfbc3b903c4f6e872d65a18eec02f8d189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3550d3bfbc3b903c4f6e872d6… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Apr 21 20:30:35 2008 -0500 version: Fix tests that fail in win9x and win2k. --- dlls/version/tests/info.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index 3bfc9fb..9a6bcf4 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -31,18 +31,20 @@ ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \ (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \ (ERROR_FILE_NOT_FOUND == GetLastError()) || \ - (ERROR_BAD_PATHNAME == GetLastError()), \ + (ERROR_BAD_PATHNAME == GetLastError()) || \ + (ERROR_SUCCESS == GetLastError()), \ "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_BAD_PATHNAME (98)/" \ - "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ - "expected, got %u\n", GetLastError()); + "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3) " \ + "ERROR_SUCCESS (2k) expected, got %u\n", GetLastError()); #define EXPECT_INVALID__NOT_FOUND \ ok( (ERROR_PATH_NOT_FOUND == GetLastError()) || \ (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || \ (ERROR_FILE_NOT_FOUND == GetLastError()) || \ - (ERROR_INVALID_PARAMETER == GetLastError()), \ + (ERROR_INVALID_PARAMETER == GetLastError()) || \ + (ERROR_SUCCESS == GetLastError()), \ "Last error wrong! ERROR_RESOURCE_DATA_NOT_FOUND/ERROR_INVALID_PARAMETER (98)/" \ - "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3)" \ - "expected, got %u\n", GetLastError()); + "ERROR_PATH_NOT_FOUND (NT4)/ERROR_FILE_NOT_FOUND (2k3) " \ + "ERROR_SUCCESS (2k) expected, got %u\n", GetLastError()); static void create_file(const CHAR *name) { @@ -122,7 +124,8 @@ static void test_info_size(void) retval); ok( (ERROR_FILE_NOT_FOUND == GetLastError()) || (ERROR_RESOURCE_DATA_NOT_FOUND == GetLastError()) || - (MY_LAST_ERROR == GetLastError()), + (MY_LAST_ERROR == GetLastError()) || + (ERROR_SUCCESS == GetLastError()), /* win2k */ "Last error wrong! ERROR_FILE_NOT_FOUND/ERROR_RESOURCE_DATA_NOT_FOUND " "(XP)/0x%08x (NT4) expected, got %u\n", MY_LAST_ERROR, GetLastError()); @@ -174,7 +177,9 @@ static void test_info_size(void) retval = GetFileVersionInfoSizeA("test.txt", &hdl); ok(retval == 0, "Expected 0, got %d\n", retval); ok(hdl == 0, "Expected 0, got %d\n", hdl); - ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND, + ok(GetLastError() == ERROR_RESOURCE_DATA_NOT_FOUND || + GetLastError() == ERROR_BAD_FORMAT || /* win9x */ + GetLastError() == ERROR_SUCCESS, /* win2k */ "Expected ERROR_RESOURCE_DATA_NOT_FOUND, got %d\n", GetLastError()); DeleteFileA("test.txt"); @@ -480,7 +485,9 @@ static void test_VerQueryValue(void) GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0, "expected 0 got %x\n", len); + ok(len == 0 || + len == 0xbeef, /* win9x */ + "expected 0 got %x\n", len); p = (char *)0xdeadbeef; len = 0xdeadbeef; @@ -547,7 +554,9 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); - ok(len == 0, "expected 0 got %x\n", len); + ok(len == 0 || + len == 0xbeef, /* win9x */ + "expected 0 or 0xbeef, got %x\n", len); } HeapFree(GetProcessHeap(), 0, ver);

1 0

James Hawkins : kernel32: Fix a test that fails on win9x.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4d07047d4e0cc2ce2abab131969a08a80f7fca3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d07047d4e0cc2ce2abab1319… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Apr 21 23:42:19 2008 -0500 kernel32: Fix a test that fails on win9x. --- dlls/kernel32/tests/time.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c index 73aae4d..21a8232 100644 --- a/dlls/kernel32/tests/time.c +++ b/dlls/kernel32/tests/time.c @@ -104,9 +104,12 @@ static void test_conversions(void) memset(&ft,0,sizeof ft); + SetLastError(0xdeadbeef); SETUP_EARLY(st) ok (!SystemTimeToFileTime(&st, &ft), "Conversion succeeded EARLY\n"); - ok (GetLastError() == ERROR_INVALID_PARAMETER, "EARLY should be INVALID\n"); + ok (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == 0xdeadbeef, /* win9x */ + "EARLY should be INVALID\n"); SETUP_ZEROTIME(st) ok (SystemTimeToFileTime(&st, &ft), "Conversion failed ZERO_TIME\n");

1 0

ByeongSik Jeon : imm32: Pass the old conversion status value to the IME.
by Alexandre Julliard 23 Apr '08

23 Apr '08

Module: wine Branch: master Commit: 4c5a21c60e7f929ba5daf0bc28b0c0a1dc67ded6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5a21c60e7f929ba5daf0bc2… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 23 19:05:30 2008 +0900 imm32: Pass the old conversion status value to the IME. --- dlls/imm32/imm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c4fab3c..9a46ef5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1779,6 +1779,7 @@ BOOL WINAPI ImmSetCompositionWindow( BOOL WINAPI ImmSetConversionStatus( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence) { + DWORD oldConversion, oldSentence; InputContextData *data = (InputContextData*)hIMC; TRACE("%p %d %d\n", hIMC, fdwConversion, fdwSentence); @@ -1788,14 +1789,16 @@ BOOL WINAPI ImmSetConversionStatus( if ( fdwConversion != data->IMC.fdwConversion ) { + oldConversion = data->IMC.fdwConversion; data->IMC.fdwConversion = fdwConversion; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETCONVERSIONMODE); + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldConversion, IMC_SETCONVERSIONMODE); ImmInternalSendIMENotify(data, IMN_SETCONVERSIONMODE, 0); } if ( fdwSentence != data->IMC.fdwSentence ) { + oldSentence = data->IMC.fdwSentence; data->IMC.fdwSentence = fdwSentence; - ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, 0, IMC_SETSENTENCEMODE); + ImmNotifyIME(hIMC, NI_CONTEXTUPDATED, oldSentence, IMC_SETSENTENCEMODE); ImmInternalSendIMENotify(data, IMN_SETSENTENCEMODE, 0); }

1 0