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

André Hentschel : ws2_32: Handle null pointer for linger values.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: dc16a01fdffc7f2b5c56deb15ecf5ad28c8d8c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc16a01fdffc7f2b5c56deb15… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 20 23:00:03 2011 +0200 ws2_32: Handle null pointer for linger values. --- dlls/ws2_32/socket.c | 12 ++++++++++-- dlls/ws2_32/tests/sock.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0c51985..43134af 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4026,6 +4026,11 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * setsockopt follow below that.*/ case WS_SO_DONTLINGER: + if (!optval) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } linger.l_onoff = *((const int*)optval) ? 0: 1; linger.l_linger = 0; level = SOL_SOCKET; @@ -4035,10 +4040,13 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, break; case WS_SO_LINGER: + if (!optval) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } linger.l_onoff = ((LINGER*)optval)->l_onoff; linger.l_linger = ((LINGER*)optval)->l_linger; - /* FIXME: what is documented behavior if SO_LINGER optval - is null?? */ level = SOL_SOCKET; optname = SO_LINGER; optval = (char*)&linger; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 29c97e2..24799cf 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1139,6 +1139,23 @@ static void test_set_getsockopt(void) lingval.l_onoff, lingval.l_linger, linger_testvals[i].l_onoff, linger_testvals[i].l_linger); } + + size = sizeof(lingval); + err = setsockopt(s, SOL_SOCKET, SO_LINGER, NULL, size); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + err = setsockopt(s, SOL_SOCKET, SO_LINGER, NULL, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + + size = sizeof(BOOL); + err = setsockopt(s, SOL_SOCKET, SO_DONTLINGER, NULL, size); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + err = setsockopt(s, SOL_SOCKET, SO_DONTLINGER, NULL, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size);

1 0

Jörg Höhle : winealsa: Avoid deadlock in AudioClient_Stop.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 8db18a893b3769d482f22bd2e2b545b82a31574f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db18a893b3769d482f22bd2e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jun 16 00:37:59 2011 +0200 winealsa: Avoid deadlock in AudioClient_Stop. --- dlls/winealsa.drv/mmdevdrv.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index abb2d39..236ae40 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1472,13 +1472,15 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) EnterCriticalSection(&This->lock); - if(This->dataflow == eRender && This->held_frames) - alsa_write_data(This); - else if(This->dataflow == eCapture) - alsa_read_data(This); + if(This->started){ + if(This->dataflow == eRender && This->held_frames) + alsa_write_data(This); + else if(This->dataflow == eCapture) + alsa_read_data(This); - if(This->event) - SetEvent(This->event); + if(This->event) + SetEvent(This->event); + } LeaveCriticalSection(&This->lock); } @@ -1567,6 +1569,8 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) { ACImpl *This = impl_from_IAudioClient(iface); int err; + HANDLE event; + BOOL wait; TRACE("(%p)\n", This); @@ -1582,7 +1586,11 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) return S_FALSE; } - DeleteTimerQueueTimer(g_timer_q, This->timer, INVALID_HANDLE_VALUE); + event = CreateEventW(NULL, TRUE, FALSE, NULL); + wait = !DeleteTimerQueueTimer(g_timer_q, This->timer, event); + if(wait) + WARN("DeleteTimerQueueTimer error %u\n", GetLastError()); + wait = wait && GetLastError() == ERROR_IO_PENDING; if((err = snd_pcm_drop(This->pcm_handle)) < 0){ LeaveCriticalSection(&This->lock); @@ -1600,6 +1608,10 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) LeaveCriticalSection(&This->lock); + if(event && wait) + WaitForSingleObject(event, INFINITE); + CloseHandle(event); + return S_OK; }

1 0

Alexandre Julliard : user32: Don't truncate bitmap ids in InsertMenu.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 33ba7c07fb71b8c3b29ae150d94b3ef74cfa723d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ba7c07fb71b8c3b29ae150d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 16:07:00 2011 +0200 user32: Don't truncate bitmap ids in InsertMenu. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/menu.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 24cd4e0..b0c7f78 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3816,7 +3816,7 @@ static void MENU_mnu2mnuii( UINT flags, UINT_PTR id, LPCWSTR str, pmii->dwTypeData = (LPWSTR)str; } else if( flags & MFT_BITMAP){ pmii->fMask |= MIIM_BITMAP | MIIM_STRING; - pmii->hbmpItem = ULongToHandle(LOWORD(str)); + pmii->hbmpItem = (HBITMAP)str; } if( flags & MF_OWNERDRAW){ pmii->fMask |= MIIM_DATA; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 26fe6fb..5c133f9 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -404,6 +404,7 @@ static void test_menu_ownerdraw(void) int i,j,k; BOOL ret; HMENU hmenu; + MENUITEMINFO mii; LONG leftcol; HWND hwnd = CreateWindowEx(0, MAKEINTATOM(atomMenuCheckClass), NULL, WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, @@ -463,6 +464,18 @@ static void test_menu_ownerdraw(void) "Height is incorrect. Got %d expected %d\n", MOD_rc[0].bottom - MOD_rc[0].top, MOD_SIZE); + /* test owner-drawn callback bitmap */ + ModifyMenu( hmenu, 1, MF_BYPOSITION | MFT_BITMAP, 1, (LPCSTR)HBMMENU_CALLBACK ); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_BITMAP | MIIM_FTYPE | MIIM_ID; + if (GetMenuItemInfoA( hmenu, 1, TRUE, &mii )) + { + ok( mii.fType == MFT_BITMAP, "wrong type %x\n", mii.fType ); + ok( mii.wID == 1, "wrong id %x\n", mii.wID ); + ok( mii.hbmpItem == HBMMENU_CALLBACK, "wrong data %p\n", mii.hbmpItem ); + } + TrackPopupMenu( hmenu, TPM_RETURNCMD, 100,100, 0, hwnd, NULL); + /* test width/height of an ownerdraw menu bar as well */ ret = DestroyMenu(hmenu); ok(ret, "DestroyMenu failed with error %d\n", GetLastError());

1 0

Alexandre Julliard : user32: Always pass 0 as item id for WM_MEASUREITEM in menus.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: efaa068cd1280e411cc6ff5ecc8ae30d36ad4559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaa068cd1280e411cc6ff5ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 16:12:53 2011 +0200 user32: Always pass 0 as item id for WM_MEASUREITEM in menus. --- dlls/user32/menu.c | 2 +- dlls/user32/tests/menu.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b0c7f78..3ec682f 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -822,7 +822,7 @@ static void MENU_GetBitmapItemSize( MENUITEM *lpitem, SIZE *size, measItem.itemWidth = lpitem->rect.right - lpitem->rect.left; measItem.itemHeight = lpitem->rect.bottom - lpitem->rect.top; measItem.itemData = lpitem->dwItemData; - SendMessageW( hwndOwner, WM_MEASUREITEM, lpitem->wID, (LPARAM)&measItem); + SendMessageW( hwndOwner, WM_MEASUREITEM, 0, (LPARAM)&measItem); size->cx = measItem.itemWidth; size->cy = measItem.itemHeight; return; diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 5c133f9..e29039a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -169,6 +169,8 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, if( winetest_debug) trace("WM_MEASUREITEM received data %lx size %dx%d\n", pmis->itemData, pmis->itemWidth, pmis->itemHeight); + ok( !wparam, "wrong wparam %lx\n", wparam ); + ok( pmis->CtlType == ODT_MENU, "wrong type %x\n", pmis->CtlType ); MOD_odheight = pmis->itemHeight; pmis->itemWidth = MODsizes[pmis->itemData].cx; pmis->itemHeight = MODsizes[pmis->itemData].cy; @@ -197,6 +199,8 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, pdis->rcItem.right,pdis->rcItem.bottom ); SelectObject( pdis->hDC, oldpen); } + ok( !wparam, "wrong wparam %lx\n", wparam ); + ok( pdis->CtlType == ODT_MENU, "wrong type %x\n", pdis->CtlType ); /* calculate widths of some menu texts */ if( ! MOD_txtsizes[0].size.cx) for(i = 0; MOD_txtsizes[i].text; i++) {

1 0

Alexandre Julliard : server: Allow setting a zero-size clip rectangle.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 6b0d9ff1cd6876f8181c95063b775d1cfe3a1d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0d9ff1cd6876f8181c95063… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 14:50:23 2011 +0200 server: Allow setting a zero-size clip rectangle. --- dlls/user32/cursoricon.c | 6 +++++- dlls/user32/tests/monitor.c | 8 ++++++++ dlls/winex11.drv/mouse.c | 2 +- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/queue.c | 20 +++++++++++++++----- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 014a4b9..4c7658d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1722,17 +1722,21 @@ BOOL WINAPI DECLSPEC_HOTPATCH ClipCursor( const RECT *rect ) TRACE( "Clipping to %s\n", wine_dbgstr_rect(rect) ); + if (rect && (rect->left > rect->right || rect->top > rect->bottom)) return FALSE; + SERVER_START_REQ( set_cursor ) { - req->flags = SET_CURSOR_CLIP; req->clip_msg = WM_WINE_CLIPCURSOR; if (rect) { + req->flags = SET_CURSOR_CLIP; req->clip.left = rect->left; req->clip.top = rect->top; req->clip.right = rect->right; req->clip.bottom = rect->bottom; } + else req->flags = SET_CURSOR_NOCLIP; + if ((ret = !wine_server_call( req ))) { new_rect.left = reply->new_clip.left; diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index daa3035..e31019f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -267,6 +267,14 @@ static void test_ChangeDisplaySettingsEx(void) ok(ClipCursor(&r1), "ClipCursor() failed\n"); ok(GetClipCursor(&r), "GetClipCursor() failed\n"); ok(EqualRect(&r, &r1), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); + SetRect(&r1, 10, 10, 10, 10); + ok(ClipCursor(&r1), "ClipCursor() failed\n"); + ok(GetClipCursor(&r), "GetClipCursor() failed\n"); + ok(EqualRect(&r, &r1), "Invalid clip rect: (%d %d) x (%d %d)\n", r.left, r.top, r.right, r.bottom); + SetRect(&r1, 10, 10, 10, 9); + ok(!ClipCursor(&r1), "ClipCursor() succeeded\n"); + /* Windows bug: further clipping fails once an empty rect is set, so we have to reset it */ + ClipCursor(NULL); SetRect(&r1, virt.left - 10, virt.top - 10, virt.right + 20, virt.bottom + 20); ok(ClipCursor(&r1), "ClipCursor() failed\n"); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 4a73acd..7f62658 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -417,7 +417,7 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) if (msg_hwnd) XUnmapWindow( data->display, clip_window ); XMoveResizeWindow( data->display, clip_window, clip->left - virtual_screen_rect.left, clip->top - virtual_screen_rect.top, - clip->right - clip->left, clip->bottom - clip->top ); + max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) ); XMapWindow( data->display, clip_window ); /* if the rectangle is shrinking we may get a pointer warp */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5cb2467..ee438b4 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4849,6 +4849,7 @@ struct set_cursor_reply #define SET_CURSOR_COUNT 0x02 #define SET_CURSOR_POS 0x04 #define SET_CURSOR_CLIP 0x08 +#define SET_CURSOR_NOCLIP 0x10 @@ -5634,6 +5635,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 424 +#define SERVER_PROTOCOL_VERSION 425 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 767be04..123f16a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3351,6 +3351,7 @@ enum coords_relative #define SET_CURSOR_COUNT 0x02 #define SET_CURSOR_POS 0x04 #define SET_CURSOR_CLIP 0x08 +#define SET_CURSOR_NOCLIP 0x10 /* Retrieve the suspended context of a thread */ diff --git a/server/queue.c b/server/queue.c index ce773a1..6dee8f5 100644 --- a/server/queue.c +++ b/server/queue.c @@ -359,12 +359,22 @@ static void set_cursor_pos( struct desktop *desktop, int x, int y ) /* set the cursor clip rectangle */ static void set_clip_rectangle( struct desktop *desktop, const rectangle_t *rect ) { - rectangle_t top_rect, new_rect; + rectangle_t top_rect; int x, y; get_top_window_rectangle( desktop, &top_rect ); - if (!rect || !intersect_rect( &new_rect, &top_rect, rect )) new_rect = top_rect; - desktop->cursor.clip = new_rect; + if (rect) + { + rectangle_t new_rect = *rect; + if (new_rect.left < top_rect.left) new_rect.left = top_rect.left; + if (new_rect.right > top_rect.right) new_rect.right = top_rect.right; + if (new_rect.top < top_rect.top) new_rect.top = top_rect.top; + if (new_rect.bottom > top_rect.bottom) new_rect.bottom = top_rect.bottom; + if (new_rect.left > new_rect.right || new_rect.top > new_rect.bottom) new_rect = top_rect; + desktop->cursor.clip = new_rect; + } + else desktop->cursor.clip = top_rect; + if (desktop->cursor.clip_msg) post_desktop_message( desktop, desktop->cursor.clip_msg, rect != NULL, 0 ); @@ -2861,7 +2871,7 @@ DECL_HANDLER(set_cursor) { set_cursor_pos( input->desktop, req->x, req->y ); } - if (req->flags & SET_CURSOR_CLIP) + if (req->flags & (SET_CURSOR_CLIP | SET_CURSOR_NOCLIP)) { struct desktop *desktop = input->desktop; @@ -2869,7 +2879,7 @@ DECL_HANDLER(set_cursor) if (req->clip_msg && get_top_window_owner(desktop) == current->process) desktop->cursor.clip_msg = req->clip_msg; - set_clip_rectangle( desktop, &req->clip ); + set_clip_rectangle( desktop, (req->flags & SET_CURSOR_NOCLIP) ? NULL : &req->clip ); } reply->new_x = input->desktop->cursor.x;

1 0

Alexandre Julliard : winex11: Don' t enable XInput for devices reporting absolute coordinates.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: b3946a0a59860ff3b96d78df7421a6e78e6b4ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3946a0a59860ff3b96d78df7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 13:23:19 2011 +0200 winex11: Don't enable XInput for devices reporting absolute coordinates. --- dlls/winex11.drv/mouse.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 0ff701f..4a73acd 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -258,7 +258,7 @@ static void enable_xinput2(void) XIDeviceInfo *devices; XIEventMask mask; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; - int i, count; + int i, j, count; if (!xinput2_available) return; @@ -281,6 +281,20 @@ static void enable_xinput2(void) for (i = 0; i < count; ++i) { if (devices[i].use != XIMasterPointer) continue; + for (j = 0; j < devices[i].num_classes; j++) + { + XIValuatorClassInfo *class = (XIValuatorClassInfo *)devices[i].classes[j]; + + if (devices[i].classes[j]->type != XIValuatorClass) continue; + if (class->number != 0 && class->number != 1) continue; + if (class->mode == XIModeAbsolute) + { + TRACE( "Device %u (%s) class %u num %u %f,%f res %u is absolute, not enabling XInput2\n", + devices[i].deviceid, debugstr_a(devices[i].name), + j, class->number, class->min, class->max, class->resolution ); + goto done; + } + } TRACE( "Using %u (%s) as core pointer\n", devices[i].deviceid, debugstr_a(devices[i].name) ); xinput2_core_pointer = devices[i].deviceid; @@ -304,6 +318,7 @@ static void enable_xinput2(void) } } +done: pXIFreeDeviceInfo( devices ); wine_tsx11_unlock(); #endif

1 0

Ričardas Barkauskas : ddraw: Remove ddraw_set_surface_version and set surface version when initialising it .
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 8959a1395acffb02e98da598352fb0d536ef195c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8959a1395acffb02e98da5983… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Jun 20 09:30:39 2011 +0300 ddraw: Remove ddraw_set_surface_version and set surface version when initialising it. --- dlls/ddraw/ddraw.c | 70 ++++++++++++++++++------------------------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 4 +- 3 files changed, 32 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8959a1395acffb02e98da…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 651f339d382ef3619409a201ff4da8cddce2785a URL: http://source.winehq.org/git/wine.git/?a=commit;h=651f339d382ef3619409a201f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jun 20 23:02:25 2011 +0900 po: Update Japanese translation. --- po/ja.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/ja.po b/po/ja.po index b994a2d..436a931 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-05-25 20:04+0900\n" +"PO-Revision-Date: 2011-06-20 22:04+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -6384,7 +6384,6 @@ msgid "E&xit" msgstr "終了(&X)" #: shell32.rc:115 -#, fuzzy msgid "&About Control Panel" msgstr "バージョン情報(&A)..." @@ -8393,16 +8392,15 @@ msgstr "入力行が長すぎます。\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" -msgstr "" +msgstr "DirectX 診断ツール" #: dxdiag.rc:28 msgid "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]" -msgstr "" +msgstr "使い方: dxdiag [/whql:off | /whql:on] [/t ファイル名 | /x ファイル名]" #: explorer.rc:28 -#, fuzzy msgid "Wine Explorer" -msgstr "Wine インターネットエクスプローラ" +msgstr "Wine エクスプローラ" #: hostname.rc:27 msgid "Usage: hostname\n"

1 0

Vincent Povirk : user32/tests: Test that hotkeys are really replaced when using the same id/hwnd.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: ba9231993dc452122bb66f2e0427de681ea405f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba9231993dc452122bb66f2e0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 17 11:18:47 2011 -0500 user32/tests: Test that hotkeys are really replaced when using the same id/hwnd. --- dlls/user32/tests/msg.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3d9452d..1beed35 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13094,6 +13094,29 @@ static const struct message WmHotkeyCombined[] = { { WM_KEYUP, sent|wparam|lparam, VK_LWIN, 0xc0000001 }, { 0 } }; +static const struct message WmHotkeyPrevious[] = { + { WM_KEYDOWN, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED }, + { WM_KEYDOWN, kbd_hook|lparam, 0, LLKHF_INJECTED }, + { WM_KEYUP, kbd_hook|lparam, 0, LLKHF_INJECTED|LLKHF_UP }, + { WM_KEYUP, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED|LLKHF_UP }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_LWIN, 1 }, + { HCBT_KEYSKIPPED, hook|lparam|optional, 0, 1 }, + { WM_KEYDOWN, sent|lparam, 0, 1 }, + { HCBT_KEYSKIPPED, hook|optional|lparam, 0, 0xc0000001 }, + { WM_KEYUP, sent|lparam, 0, 0xc0000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_LWIN, 0xc0000001 }, + { 0 } +}; +static const struct message WmHotkeyNew[] = { + { WM_KEYDOWN, kbd_hook|lparam, 0, LLKHF_INJECTED }, + { WM_KEYUP, kbd_hook|lparam, 0, LLKHF_INJECTED|LLKHF_UP }, + { WM_HOTKEY, sent|wparam, 5 }, + { HCBT_KEYSKIPPED, hook|optional, 0, 0x80000001 }, + { WM_KEYUP, sent, 0, 0x80000001 }, /* lparam not checked so the sequence isn't a todo */ + { 0 } +}; static int hotkey_letter; @@ -13261,6 +13284,31 @@ static void test_hotkey(void) ret = RegisterHotKey(test_window, 5, 0, hotkey_letter); ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); + /* Previous key combination does not work */ + keybd_event(VK_LWIN, 0, 0, 0); + keybd_event(hotkey_letter, 0, 0, 0); + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); + + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmHotkeyPrevious, "window hotkey previous", FALSE); + + /* New key combination works */ + keybd_event(hotkey_letter, 0, 0, 0); + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); + + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_HOTKEY) + { + ok(msg.hwnd == test_window, "unexpected hwnd %p\n", msg.hwnd); + ok(msg.lParam == MAKELPARAM(0, hotkey_letter), "unexpected WM_HOTKEY lparam %lx\n", msg.lParam); + } + DispatchMessage(&msg); + } + ok_sequence(WmHotkeyNew, "window hotkey new", FALSE); + /* Unregister hotkey properly */ ret = UnregisterHotKey(test_window, 5); ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError());

1 0

Francois Gouget : shell32: Remove the ellipsis on the 'Wine license' button .
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 809dd1a0a24fe1e0b642f69a6500c9b7cf7c719c URL: http://source.winehq.org/git/wine.git/?a=commit;h=809dd1a0a24fe1e0b642f69a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 21 11:22:41 2011 +0200 shell32: Remove the ellipsis on the 'Wine license' button. --- dlls/shell32/shell32_Da.rc | 2 +- dlls/shell32/shell32_De.rc | 2 +- dlls/shell32/shell32_Es.rc | 2 +- dlls/shell32/shell32_Fi.rc | 2 +- dlls/shell32/shell32_He.rc | 2 +- dlls/shell32/shell32_Hu.rc | 2 +- dlls/shell32/shell32_It.rc | 2 +- dlls/shell32/shell32_Ja.rc | 2 +- dlls/shell32/shell32_Nl.rc | 2 +- dlls/shell32/shell32_No.rc | 2 +- dlls/shell32/shell32_Ro.rc | 2 +- dlls/shell32/shell32_Ru.rc | 2 +- dlls/shell32/shell32_Sr.rc | 4 ++-- dlls/shell32/shell32_Sv.rc | 2 +- dlls/shell32/shell32_Uk.rc | 2 +- dlls/shell32/shell32_Zh.rc | 4 ++-- 16 files changed, 18 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=809dd1a0a24fe1e0b642f…

1 0