September 2010 - Wine-Commits

Vincent Povirk : ole32: Don't fail if the file ends during a big block.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 2752c3bcd07806a84894eaad5b2c2299d139b1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2752c3bcd07806a84894eaad5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 7 19:17:43 2010 -0500 ole32: Don't fail if the file ends during a big block. Apparently, it's valid for the last block in a file to be incomplete. --- dlls/ole32/storage32.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8b6a3af..5c58201 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3875,13 +3875,20 @@ static BOOL StorageImpl_ReadBigBlock( void* buffer) { ULARGE_INTEGER ulOffset; - DWORD read; + DWORD read=0; ulOffset.u.HighPart = 0; ulOffset.u.LowPart = StorageImpl_GetBigBlockOffset(This, blockIndex); StorageImpl_ReadAt(This, ulOffset, buffer, This->bigBlockSize, &read); - return (read == This->bigBlockSize); + + if (read && read < This->bigBlockSize) + { + /* File ends during this block; fill the rest with 0's. */ + memset((LPBYTE)buffer+read, 0, This->bigBlockSize-read); + } + + return (read != 0); } static BOOL StorageImpl_ReadDWordFromBigBlock(

1 0

Luca Bennati : ipconfig: Update Italian translation.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 167a940e9d8626608f574113e56d56d58d9ed941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167a940e9d8626608f574113e… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Sep 7 21:11:31 2010 +0200 ipconfig: Update Italian translation. --- programs/ipconfig/It.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/It.rc b/programs/ipconfig/It.rc index 0a7bf40..1784026 100644 --- a/programs/ipconfig/It.rc +++ b/programs/ipconfig/It.rc @@ -46,4 +46,6 @@ STRINGTABLE STRING_DESCRIPTION, "Descrizione" STRING_PHYS_ADDR, "Indirizzo fisico" STRING_DHCP_ENABLED, "DHCP abilitato" + STRING_YES, "Sì" + STRING_NO, "No" }

1 0

Alexandre Julliard : user32: Avoid direct accesses to the window structure in NC_HandleNCHitTest.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 4858c54a8e5b59cc8a3a7d41c5a4243aca597ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4858c54a8e5b59cc8a3a7d41c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 8 13:19:04 2010 +0200 user32: Avoid direct accesses to the window structure in NC_HandleNCHitTest. --- dlls/user32/nonclient.c | 95 +++++++++++++++++----------------------------- 1 files changed, 35 insertions(+), 60 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 15ed22e..051041c 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nonclient); ((exStyle) & WS_EX_DLGMODALFRAME) || \ !((style) & (WS_CHILD | WS_POPUP))) -#define HAS_MENU(w) ((((w)->dwStyle & (WS_CHILD | WS_POPUP)) != WS_CHILD) && ((w)->wIDmenu != 0)) +#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) /****************************************************************************** @@ -512,33 +512,29 @@ static void NC_GetInsideRect( HWND hwnd, enum coords_relative relative, RECT *re /*********************************************************************** - * NC_DoNCHitTest - * - * Handle a WM_NCHITTEST message. Called from NC_HandleNCHitTest(). + * NC_HandleNCHitTest * - * FIXME: Just a modified copy of the Win 3.1 version. + * Handle a WM_NCHITTEST message. Called from DefWindowProc(). */ - -static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) +LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) { RECT rect, rcClient; - POINT ptClient; + DWORD style, ex_style; - TRACE("hwnd=%p pt=%d,%d\n", wndPtr->obj.handle, pt.x, pt.y ); + TRACE("hwnd=%p pt=%d,%d\n", hwnd, pt.x, pt.y ); - GetWindowRect(wndPtr->obj.handle, &rect ); + ScreenToClient( hwnd, &pt ); + WIN_GetRectangles( hwnd, COORDS_CLIENT, &rect, &rcClient ); if (!PtInRect( &rect, pt )) return HTNOWHERE; - if (wndPtr->dwStyle & WS_MINIMIZE) return HTCAPTION; + style = GetWindowLongW( hwnd, GWL_STYLE ); + ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); + if (style & WS_MINIMIZE) return HTCAPTION; - /* Check client area */ - ptClient = pt; - ScreenToClient( wndPtr->obj.handle, &ptClient ); - GetClientRect( wndPtr->obj.handle, &rcClient ); - if (PtInRect( &rcClient, ptClient )) return HTCLIENT; + if (PtInRect( &rcClient, pt )) return HTCLIENT; /* Check borders */ - if (HAS_THICKFRAME( wndPtr->dwStyle, wndPtr->dwExStyle )) + if (HAS_THICKFRAME( style, ex_style )) { InflateRect( &rect, -GetSystemMetrics(SM_CXFRAME), -GetSystemMetrics(SM_CYFRAME) ); if (!PtInRect( &rect, pt )) @@ -575,47 +571,46 @@ static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) } else /* No thick frame */ { - if (HAS_DLGFRAME( wndPtr->dwStyle, wndPtr->dwExStyle )) + if (HAS_DLGFRAME( style, ex_style )) InflateRect(&rect, -GetSystemMetrics(SM_CXDLGFRAME), -GetSystemMetrics(SM_CYDLGFRAME)); - else if (HAS_THINFRAME( wndPtr->dwStyle )) + else if (HAS_THINFRAME( style )) InflateRect(&rect, -GetSystemMetrics(SM_CXBORDER), -GetSystemMetrics(SM_CYBORDER)); if (!PtInRect( &rect, pt )) return HTBORDER; } /* Check caption */ - if ((wndPtr->dwStyle & WS_CAPTION) == WS_CAPTION) + if ((style & WS_CAPTION) == WS_CAPTION) { - if (wndPtr->dwExStyle & WS_EX_TOOLWINDOW) + if (ex_style & WS_EX_TOOLWINDOW) rect.top += GetSystemMetrics(SM_CYSMCAPTION) - 1; else rect.top += GetSystemMetrics(SM_CYCAPTION) - 1; if (!PtInRect( &rect, pt )) { - BOOL min_or_max_box = (wndPtr->dwStyle & WS_MAXIMIZEBOX) || - (wndPtr->dwStyle & WS_MINIMIZEBOX); + BOOL min_or_max_box = (style & WS_MAXIMIZEBOX) || + (style & WS_MINIMIZEBOX); /* Check system menu */ - if ((wndPtr->dwStyle & WS_SYSMENU) && !(wndPtr->dwExStyle & WS_EX_TOOLWINDOW)) + if ((style & WS_SYSMENU) && !(ex_style & WS_EX_TOOLWINDOW)) { - if (NC_IconForWindow(wndPtr->obj.handle)) - rect.left += GetSystemMetrics(SM_CYCAPTION) - 1; + if (NC_IconForWindow(hwnd)) rect.left += GetSystemMetrics(SM_CYCAPTION) - 1; } if (pt.x < rect.left) return HTSYSMENU; /* Check close button */ - if (wndPtr->dwStyle & WS_SYSMENU) + if (style & WS_SYSMENU) rect.right -= GetSystemMetrics(SM_CYCAPTION); if (pt.x > rect.right) return HTCLOSE; /* Check maximize box */ /* In win95 there is automatically a Maximize button when there is a minimize one*/ - if (min_or_max_box && !(wndPtr->dwExStyle & WS_EX_TOOLWINDOW)) + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) rect.right -= GetSystemMetrics(SM_CXSIZE); if (pt.x > rect.right) return HTMAXBUTTON; /* Check minimize box */ /* In win95 there is automatically a Maximize button when there is a Maximize one*/ - if (min_or_max_box && !(wndPtr->dwExStyle & WS_EX_TOOLWINDOW)) + if (min_or_max_box && !(ex_style & WS_EX_TOOLWINDOW)) rect.right -= GetSystemMetrics(SM_CXSIZE); if (pt.x > rect.right) return HTMINBUTTON; @@ -625,26 +620,26 @@ static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) /* Check vertical scroll bar */ - if (wndPtr->dwStyle & WS_VSCROLL) + if (style & WS_VSCROLL) { - if((wndPtr->dwExStyle & WS_EX_LEFTSCROLLBAR) != 0) + if((ex_style & WS_EX_LEFTSCROLLBAR) != 0) rcClient.left -= GetSystemMetrics(SM_CXVSCROLL); else rcClient.right += GetSystemMetrics(SM_CXVSCROLL); - if (PtInRect( &rcClient, ptClient )) return HTVSCROLL; + if (PtInRect( &rcClient, pt )) return HTVSCROLL; } /* Check horizontal scroll bar */ - if (wndPtr->dwStyle & WS_HSCROLL) + if (style & WS_HSCROLL) { rcClient.bottom += GetSystemMetrics(SM_CYHSCROLL); - if (PtInRect( &rcClient, ptClient )) + if (PtInRect( &rcClient, pt )) { /* Check size box */ - if ((wndPtr->dwStyle & WS_VSCROLL) && - ((((wndPtr->dwExStyle & WS_EX_LEFTSCROLLBAR) != 0) && (ptClient.x <= rcClient.left + GetSystemMetrics(SM_CXVSCROLL))) || - (((wndPtr->dwExStyle & WS_EX_LEFTSCROLLBAR) == 0) && (ptClient.x >= rcClient.right - GetSystemMetrics(SM_CXVSCROLL))))) + if ((style & WS_VSCROLL) && + ((((ex_style & WS_EX_LEFTSCROLLBAR) != 0) && (pt.x <= rcClient.left + GetSystemMetrics(SM_CXVSCROLL))) || + (((ex_style & WS_EX_LEFTSCROLLBAR) == 0) && (pt.x >= rcClient.right - GetSystemMetrics(SM_CXVSCROLL))))) return HTSIZE; return HTHSCROLL; } @@ -652,9 +647,9 @@ static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) /* Check menu bar */ - if (HAS_MENU(wndPtr)) + if (HAS_MENU( hwnd, style )) { - if ((ptClient.y < 0) && (ptClient.x >= 0) && (ptClient.x < rcClient.right)) + if ((pt.y < 0) && (pt.x >= 0) && (pt.x < rcClient.right)) return HTMENU; } @@ -664,24 +659,6 @@ static LRESULT NC_DoNCHitTest (WND *wndPtr, POINT pt ) } -/*********************************************************************** - * NC_HandleNCHitTest - * - * Handle a WM_NCHITTEST message. Called from DefWindowProc(). - */ -LRESULT NC_HandleNCHitTest (HWND hwnd , POINT pt) -{ - LRESULT retvalue; - WND *wndPtr = WIN_GetPtr( hwnd ); - - if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return HTERROR; - - retvalue = NC_DoNCHitTest (wndPtr, pt); - WIN_ReleasePtr( wndPtr ); - return retvalue; -} - - /****************************************************************************** * * NC_DrawSysButton @@ -986,10 +963,8 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) WORD flags; HRGN hrgn; RECT rectClient; - int has_menu; if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return; - has_menu = HAS_MENU(wndPtr); dwStyle = wndPtr->dwStyle; dwExStyle = wndPtr->dwExStyle; flags = wndPtr->flags; @@ -1053,7 +1028,7 @@ static void NC_DoNCPaint( HWND hwnd, HRGN clip, BOOL suppress_menupaint ) NC_DrawCaption(hdc, &r, hwnd, dwStyle, dwExStyle, active); } - if (has_menu) + if (HAS_MENU( hwnd, dwStyle )) { RECT r = rect; r.bottom = rect.top + GetSystemMetrics(SM_CYMENU);

1 0

Alexandre Julliard : user32: Avoid redundant server call in WIN_GetRectangles and fix the screen coordinates mapping .
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: ca499d070f3ac707f49d46d1bf7f7588ccc7d76b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca499d070f3ac707f49d46d1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 8 13:15:29 2010 +0200 user32: Avoid redundant server call in WIN_GetRectangles and fix the screen coordinates mapping. --- dlls/user32/win.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4f85547..f5e9064 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -708,14 +708,15 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } WIN_ReleasePtr( win ); win = parent; - OffsetRect( &window_rect, -win->rectClient.left, -win->rectClient.top ); - OffsetRect( &client_rect, -win->rectClient.left, -win->rectClient.top ); + OffsetRect( &window_rect, win->rectClient.left, win->rectClient.top ); + OffsetRect( &client_rect, win->rectClient.left, win->rectClient.top ); } break; } if (rectWindow) *rectWindow = window_rect; if (rectClient) *rectClient = client_rect; WIN_ReleasePtr( win ); + return TRUE; } other_process:

1 0

André Hentschel : ipconfig: Update German translation.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 09e164cbc66fc91dea1495e5dd793e6b42dbf0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e164cbc66fc91dea1495e5d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 7 18:47:04 2010 +0200 ipconfig: Update German translation. --- programs/ipconfig/De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/De.rc b/programs/ipconfig/De.rc index 08b0441..b21493a 100644 --- a/programs/ipconfig/De.rc +++ b/programs/ipconfig/De.rc @@ -44,4 +44,6 @@ STRINGTABLE STRING_DESCRIPTION, "Beschreibung" STRING_PHYS_ADDR, "Physikalische Adresse" STRING_DHCP_ENABLED, "DHCP aktiviert" + STRING_YES, "Ja" + STRING_NO, "Nein" }

1 0

Gerald Pfeifer : gdi32/tests: Fix another test description in test_logpen.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: db9c3b0f53e4f99165161a6ea23fcc3d27251936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9c3b0f53e4f99165161a6ea… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 7 20:56:04 2010 +0200 gdi32/tests: Fix another test description in test_logpen. --- dlls/gdi32/tests/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 5a5c063..640ffc0 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -424,7 +424,7 @@ test_geometric_pens: ok(ext_pen.elp.elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen.elp.elpHatch); ok(ext_pen.elp.elpNumEntries == 2, "expected 0, got %x\n", ext_pen.elp.elpNumEntries); ok(ext_pen.elp.elpStyleEntry[0] == 0xabc, "expected 0xabc, got %x\n", ext_pen.elp.elpStyleEntry[0]); - ok(ext_pen.elp.elpStyleEntry[1] == 0xdef, "expected 0xabc, got %x\n", ext_pen.elp.elpStyleEntry[1]); + ok(ext_pen.elp.elpStyleEntry[1] == 0xdef, "expected 0xdef, got %x\n", ext_pen.elp.elpStyleEntry[1]); break; default:

1 0

Austin English : kernel32: Add a stub for GetThreadUILanguage.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 4be494c081d35a573785450f973b10de1daa655c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be494c081d35a573785450f9… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 7 11:07:38 2010 -0500 kernel32: Add a stub for GetThreadUILanguage. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/thread.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4cb4f96..8a33013 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -658,6 +658,7 @@ @ stdcall GetTimeFormatA(long long ptr str ptr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) +@ stdcall GetThreadUILanguage() @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @ stdcall GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 024e825..691ef02 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -777,3 +777,22 @@ DWORD WINAPI GetThreadErrorMode( void ) { return rtlmode_to_win32mode( RtlGetThreadErrorMode() ); } + +/*********************************************************************** + * GetThreadUILanguage (KERNEL32.@) + * + * Get the current thread's language identifier. + * + * PARAMS + * None. + * + * RETURNS + * The current thread's language identifier. + */ +LANGID WINAPI GetThreadUILanguage( void ) +{ + LANGID lang; + NtQueryDefaultUILanguage( &lang ); + FIXME(": stub, returning default language.\n"); + return lang; +}

1 0

Aric Stewart : gdi32: Correct usage of ScriptLayout for bidi code.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 8ac121c6717dc13357cbd6829f6eb5a2338f9823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac121c6717dc13357cbd6829… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 7 14:41:56 2010 -0500 gdi32: Correct usage of ScriptLayout for bidi code. --- dlls/gdi32/bidi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 7b3995b..7d748fd 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -321,7 +321,7 @@ static void BidiLines(int baselevel, LPWSTR pszOutLine, LPCWSTR pszLine, WORD * { int i; /* reorder each line in place */ - ScriptLayout(cchLine, plevelLine, run, NULL); + ScriptLayout(cchLine, plevelLine, NULL, run); for (i = 0; i < cchLine; i++) pszOutLine[done+run[i]] = pszLine[i]; } @@ -590,7 +590,7 @@ BOOL BIDI_Reorder( for (j = 0; j < nItems; j++) runOrder[j] = pItems[j].a.s.uBidiLevel; - ScriptLayout(nItems, runOrder, NULL, visOrder); + ScriptLayout(nItems, runOrder, visOrder, NULL); for (j = 0; j < nItems; j++) {

1 0

Gerald Pfeifer : setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 053ba796e7dca37c0659c0f15a4589bccf2274c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053ba796e7dca37c0659c0f15… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 7 21:03:00 2010 +0200 setupx.dll16: Simplify VCP_CopyFiles by removing a set, but never read, variable. --- dlls/setupx.dll16/virtcopy.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index ffb54f3..b80a5be 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -437,11 +437,11 @@ static RETERR16 VCP_CheckPaths(void) static RETERR16 VCP_CopyFiles(void) { char fn_src[MAX_PATH], fn_dst[MAX_PATH]; - RETERR16 res = OK, cbres; + RETERR16 res = OK; DWORD n; LPVIRTNODE lpvn; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCOPYSTART, 0, 0, VCP_MsgRef); for (n = 0; n < vn_num; n++) { lpvn = pvnlist[n]; @@ -451,7 +451,7 @@ static RETERR16 VCP_CopyFiles(void) strcpy(fn_dst, VcpExplain16(lpvn, VCPEX_DST_FULL)); /* FIXME: what is this VCPM_VSTATWRITE here for ? * I guess it's to signal successful destination file creation */ - cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); /* FIXME: need to do the file copy in small chunks for notifications */ TRACE("copying '%s' to '%s'\n", fn_src, fn_dst); @@ -464,12 +464,12 @@ static RETERR16 VCP_CopyFiles(void) } vcp_status.prgFileRead.dwSoFar++; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATREAD, 0, 0, VCP_MsgRef); vcp_status.prgFileWrite.dwSoFar++; - cbres = VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATWRITE, 0, 0, VCP_MsgRef); } - cbres = VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef); + VCP_Callback(&vcp_status, VCPM_VSTATCOPYEND, 0, 0, VCP_MsgRef); return res; }

1 0

Aric Stewart : imm32/tests: Test various Imm call cross-thread.
by Alexandre Julliard Sept. 8, 2010

Sept. 8, 2010

Module: wine Branch: master Commit: 8d12fc61d5321350ad63b173bdfb50feef1f4b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d12fc61d5321350ad63b173b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 7 12:34:44 2010 -0500 imm32/tests: Test various Imm call cross-thread. --- dlls/imm32/tests/imm32.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 06b12f3..8b8db90 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -22,6 +22,7 @@ #include "wine/test.h" #include "winuser.h" +#include "wingdi.h" #include "imm.h" #define NUMELEMS(array) (sizeof((array))/sizeof((array)[0])) @@ -135,6 +136,19 @@ static void msg_spy_cleanup(void) { static const char wndcls[] = "winetest_imm32_wndcls"; static HWND hwnd; +static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_IME_SETCONTEXT: + case WM_NCCREATE: + case WM_CREATE: + return TRUE; + } + + return DefWindowProcA(hwnd,msg,wParam,lParam); +} + static BOOL init(void) { WNDCLASSEX wc; HIMC imc; @@ -145,7 +159,7 @@ static BOOL init(void) { wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; - wc.lpfnWndProc = DefWindowProc; + wc.lpfnWndProc = wndProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = GetModuleHandle(0); @@ -356,6 +370,8 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) { HIMC h1,h2; HWND hwnd2; + COMPOSITIONFORM cf; + POINT pt; igc_threadinfo *info= (igc_threadinfo*)lpParam; info->hwnd = CreateWindowEx(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, @@ -378,6 +394,10 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) ImmReleaseContext(info->hwnd,h2); DestroyWindow(hwnd2); + /* priming for later tests */ + ImmSetCompositionWindow(h1, &cf); + ImmSetStatusWindowPos(h1, &pt); + SetEvent(info->event); Sleep(INFINITE); return 1; @@ -389,6 +409,11 @@ static void test_ImmThreads(void) igc_threadinfo threadinfo; HANDLE hThread; DWORD dwThreadId; + BOOL rc; + LOGFONT lf; + COMPOSITIONFORM cf; + DWORD status, sentence; + POINT pt; himc = ImmGetContext(hwnd); threadinfo.event = CreateEvent(NULL, TRUE, FALSE, NULL); @@ -410,6 +435,70 @@ static void test_ImmThreads(void) ImmReleaseContext(hwnd,h1); } + + /* OpenStatus */ + rc = ImmSetOpenStatus(himc, TRUE); + ok(rc != 0, "ImmSetOpenStatus failed\n"); + rc = ImmGetOpenStatus(himc); + ok(rc != 0, "ImmGetOpenStatus failed\n"); + rc = ImmSetOpenStatus(himc, FALSE); + ok(rc != 0, "ImmSetOpenStatus failed\n"); + rc = ImmGetOpenStatus(himc); + ok(rc == 0, "ImmGetOpenStatus failed\n"); + + rc = ImmSetOpenStatus(otherHimc, TRUE); + todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); + rc = ImmGetOpenStatus(otherHimc); + todo_wine ok(rc == 0, "ImmGetOpenStatus failed\n"); + rc = ImmSetOpenStatus(otherHimc, FALSE); + todo_wine ok(rc == 0, "ImmSetOpenStatus should fail\n"); + rc = ImmGetOpenStatus(otherHimc); + ok(rc == 0, "ImmGetOpenStatus failed\n"); + + /* CompositionFont */ + rc = ImmGetCompositionFont(himc, &lf); + ok(rc != 0, "ImmGetCompositionFont failed\n"); + rc = ImmSetCompositionFont(himc, &lf); + ok(rc != 0, "ImmSetCompositionFont failed\n"); + + rc = ImmGetCompositionFont(otherHimc, &lf); + ok(rc != 0 || broken(rc == 0), "ImmGetCompositionFont failed\n"); + rc = ImmSetCompositionFont(otherHimc, &lf); + todo_wine ok(rc == 0, "ImmSetCompositionFont should fail\n"); + + /* CompositionWindow */ + rc = ImmSetCompositionWindow(himc, &cf); + ok(rc != 0, "ImmSetCompositionWindow failed\n"); + rc = ImmGetCompositionWindow(himc, &cf); + ok(rc != 0, "ImmGetCompositionWindow failed\n"); + + rc = ImmSetCompositionWindow(otherHimc, &cf); + todo_wine ok(rc == 0, "ImmSetCompositionWindow should fail\n"); + rc = ImmGetCompositionWindow(otherHimc, &cf); + ok(rc != 0 || broken(rc == 0), "ImmGetCompositionWindow failed\n"); + + /* ConversionStatus */ + rc = ImmGetConversionStatus(himc, &status, &sentence); + ok(rc != 0, "ImmGetConversionStatus failed\n"); + rc = ImmSetConversionStatus(himc, status, sentence); + ok(rc != 0, "ImmSetConversionStatus failed\n"); + + rc = ImmGetConversionStatus(otherHimc, &status, &sentence); + ok(rc != 0 || broken(rc == 0), "ImmGetConversionStatus failed\n"); + rc = ImmSetConversionStatus(otherHimc, status, sentence); + todo_wine ok(rc == 0, "ImmSetConversionStatus should fail\n"); + + /* StatusWindowPos */ + rc = ImmSetStatusWindowPos(himc, &pt); + ok(rc != 0, "ImmSetStatusWindowPos failed\n"); + rc = ImmGetStatusWindowPos(himc, &pt); + ok(rc != 0, "ImmGetStatusWindowPos failed\n"); + + rc = ImmSetStatusWindowPos(otherHimc, &pt); + todo_wine ok(rc == 0, "ImmSetStatusWindowPos should fail\n"); + rc = ImmGetStatusWindowPos(otherHimc, &pt); + ok(rc != 0 || broken(rc == 0), "ImmGetStatusWindowPos failed\n"); + ImmReleaseContext(threadinfo.hwnd,otherHimc); ImmReleaseContext(hwnd,himc);

1 0