wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Marcus Meissner : wined3d: Detect nouveau as NVIDIA.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: acf0b329f84a21ed19eeff772ca1c9787ad4929e URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf0b329f84a21ed19eeff772… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 29 10:28:21 2010 +0100 wined3d: Detect nouveau as NVIDIA. (cherry picked from commit 5d657bfdba3262d0b4af147fd4f660a104bbe52e) --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 81e7561..81f09c9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1233,7 +1233,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer) { - if (strstr(gl_vendor_string, "NVIDIA")) + if (strstr(gl_vendor_string, "NVIDIA") + || strstr(gl_vendor_string, "nouveau")) return HW_VENDOR_NVIDIA; if (strstr(gl_vendor_string, "ATI")

1 0

Hans Leidekker : advapi32: Return the computer name as referenced domain name in LookupAccountName.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: a286ae91a6990fcd47735ec4ee2ea48e27b7fa07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a286ae91a6990fcd47735ec4e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 10 12:53:25 2010 +0100 advapi32: Return the computer name as referenced domain name in LookupAccountName. (cherry picked from commit eba814763a654d1c982f2142b6a70cf7d0ae1590) --- dlls/advapi32/security.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2d0ed48..e8d7927 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2629,9 +2629,8 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo HANDLE token; BOOL ret; PSID pSid; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD nameLen; - LPCWSTR domainName; if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) { @@ -2655,9 +2654,12 @@ static BOOL lookup_user_account_name(PSID Sid, PDWORD cbSid, LPWSTR ReferencedDo } *cbSid = GetLengthSid(pSid); - domainName = dm; - nameLen = strlenW(domainName); - + nameLen = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(domainName, &nameLen)) + { + domainName[0] = 0; + nameLen = 0; + } if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2683,9 +2685,8 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc { MAX_SID local; BOOL ret; - static const WCHAR dm[] = {'D','O','M','A','I','N',0}; + WCHAR domainName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD nameLen; - LPCWSTR domainName; if ((ret = ADVAPI_GetComputerSid(&local))) { @@ -2699,9 +2700,12 @@ static BOOL lookup_computer_account_name(PSID Sid, PDWORD cbSid, LPWSTR Referenc *cbSid = GetLengthSid(&local); } - domainName = dm; - nameLen = strlenW(domainName); - + nameLen = MAX_COMPUTERNAME_LENGTH + 1; + if (!GetComputerNameW(domainName, &nameLen)) + { + domainName[0] = 0; + nameLen = 0; + } if (*cchReferencedDomainName <= nameLen || !ret) { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2898,11 +2902,12 @@ BOOL WINAPI LookupAccountNameW( LPCWSTR lpSystemName, LPCWSTR lpAccountName, PSI BOOL ret, handled; LSA_UNICODE_STRING account; - FIXME("%s %s %p %p %p %p %p - stub\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), + TRACE("%s %s %p %p %p %p %p\n", debugstr_w(lpSystemName), debugstr_w(lpAccountName), Sid, cbSid, ReferencedDomainName, cchReferencedDomainName, peUse); if (!ADVAPI_IsLocalComputer( lpSystemName )) { + FIXME("remote computer not supported\n"); SetLastError( RPC_S_SERVER_UNAVAILABLE ); return FALSE; }

1 0

Francois Gouget : server: Make sock_check_pollhup() more reliable on Solaris.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 277cf731bb53c9af6a40246c4c7aa23e3ceed946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277cf731bb53c9af6a40246c4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 26 18:08:30 2010 +0100 server: Make sock_check_pollhup() more reliable on Solaris. (cherry picked from commit c4c03180b0868fe93de4a5ccf52ba76bb00ffcab) --- server/sock.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/sock.c b/server/sock.c index 9cd0fc2..196bca2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -203,7 +203,8 @@ static sock_shutdown_t sock_check_pollhup(void) pfd.events = POLLIN; pfd.revents = 0; - n = poll( &pfd, 1, 0 ); + /* Solaris' poll() sometimes returns nothing if given a 0ms timeout here */ + n = poll( &pfd, 1, 1 ); if ( n != 1 ) goto out; /* error or timeout */ if ( pfd.revents & POLLHUP ) ret = SOCK_SHUTDOWN_POLLHUP;

1 0

Hans Leidekker : ntdll: Don't call NtClose directly in delete_view.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 0a4cf6d28ba2fb8ea37f9b44eddd745f582a5365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4cf6d28ba2fb8ea37f9b44e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 2 11:33:03 2010 +0100 ntdll: Don't call NtClose directly in delete_view. (cherry picked from commit 71beac32192d661849d5fff6e5265d2f32faf61d) --- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/om.c | 28 +++++++++++++++++----------- dlls/ntdll/virtual.c | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 212edf5..1a9c40e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -39,6 +39,8 @@ struct drive_info ino_t ino; }; +extern NTSTATUS close_handle( HANDLE ); + /* exceptions */ extern void wait_suspend( CONTEXT *context ); extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *context ); diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 0e64ddd..91f055e 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -346,6 +346,22 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, return ret; } +/* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ +NTSTATUS close_handle( HANDLE handle ) +{ + NTSTATUS ret; + int fd = server_remove_fd_from_cache( handle ); + + SERVER_START_REQ( close_handle ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (fd != -1) close( fd ); + return ret; +} + /************************************************************************** * NtClose [NTDLL.@] * @@ -360,17 +376,7 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, */ NTSTATUS WINAPI NtClose( HANDLE Handle ) { - NTSTATUS ret; - int fd = server_remove_fd_from_cache( Handle ); - - SERVER_START_REQ( close_handle ) - { - req->handle = wine_server_obj_handle( Handle ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (fd != -1) close( fd ); - return ret; + return close_handle( Handle ); } /* diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 92583c9..32b60a7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -443,7 +443,7 @@ static void delete_view( struct file_view *view ) /* [in] View */ { if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); list_remove( &view->entry ); - if (view->mapping) NtClose( view->mapping ); + if (view->mapping) close_handle( view->mapping ); RtlFreeHeap( virtual_heap, 0, view ); }

1 0

Juan Lang : ws2_32: Set length on successful return from WSAStringToAddress .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: 2874b0f7f3f10b0c9f3fb117e3b4a79407f23622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2874b0f7f3f10b0c9f3fb117e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 2 15:28:23 2010 -0800 ws2_32: Set length on successful return from WSAStringToAddress. (cherry picked from commit 7f5583aee9f8ac782376f73c05049febec6f8049) --- dlls/ws2_32/socket.c | 2 ++ dlls/ws2_32/tests/sock.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 713dab4..8221e72 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5424,6 +5424,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEFAULT; break; } + *lpAddressLength = sizeof(SOCKADDR_IN); memset(lpAddress, 0, sizeof(SOCKADDR_IN)); ((LPSOCKADDR_IN)lpAddress)->sin_family = AF_INET; @@ -5461,6 +5462,7 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, break; } #ifdef HAVE_INET_PTON + *lpAddressLength = sizeof(SOCKADDR_IN6); memset(lpAddress, 0, sizeof(SOCKADDR_IN6)); ((LPSOCKADDR_IN6)lpAddress)->sin6_family = WS_AF_INET6; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 96430ff..bebf558 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1754,8 +1754,9 @@ static void test_WSAStringToAddressA(void) static void test_WSAStringToAddressW(void) { INT ret, len; - SOCKADDR_IN sockaddr; + SOCKADDR_IN sockaddr, *sin; SOCKADDR_IN6 sockaddr6; + SOCKADDR_STORAGE sockaddr_storage; int GLE; WCHAR address1[] = { '0','.','0','.','0','.','0', 0 }; @@ -1819,6 +1820,20 @@ static void test_WSAStringToAddressW(void) (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); + /* Test with a larger buffer than necessary */ + len = sizeof(sockaddr_storage); + sin = (SOCKADDR_IN *)&sockaddr_storage; + sin->sin_port = 0; + sin->sin_addr.s_addr = 0; + + ret = WSAStringToAddressW( address5, AF_INET, NULL, (SOCKADDR*)sin, &len ); + ok( (ret == 0 && sin->sin_addr.s_addr == 0xffffffff && sin->sin_port == 0xffff) || + (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), + "WSAStringToAddressW() failed unexpectedly: %d\n", GLE ); + ok( len == sizeof(SOCKADDR_IN) || + broken(len == sizeof(SOCKADDR_STORAGE)) /* NT4/2k */, + "unexpected length %d\n", len ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6;

1 0

Wolfram Sang : winex11.drv: In GetDIBits() with DIB sections, always use dibpitch from the target.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: ffe7fb3e6ff9f30e4f007f01b8a36d92e56f38ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe7fb3e6ff9f30e4f007f01b… Author: Wolfram Sang <wolfram(a)the-dreams.de> Date: Wed Dec 1 18:10:49 2010 +0100 winex11.drv: In GetDIBits() with DIB sections, always use dibpitch from the target. (cherry picked from commit 27d2b9b81490ca41c23ac3ad1fe057a8d8f44aea) --- dlls/gdi32/tests/bitmap.c | 15 +++++++++++++-- dlls/winex11.drv/dib.c | 3 +-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index e141f1d..c34444e 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1218,7 +1218,8 @@ static void test_GetDIBits_selected_DIB(UINT bpp) BITMAPINFO * info2; void * bits; void * bits2; - UINT dib_size; + UINT dib_size, dib32_size; + DWORD pixel; HDC dib_dc, dc; HBITMAP old_bmp; BOOL equalContents; @@ -1254,6 +1255,7 @@ static void test_GetDIBits_selected_DIB(UINT bpp) dib = CreateDIBSection(NULL, info, DIB_RGB_COLORS, &bits, NULL, 0); assert(dib); dib_size = bpp * (info->bmiHeader.biWidth * info->bmiHeader.biHeight) / 8; + dib32_size = 32 * (info->bmiHeader.biWidth * info->bmiHeader.biHeight) / 8; /* Set the bits of the DIB section */ for (i=0; i < dib_size; i++) @@ -1265,7 +1267,7 @@ static void test_GetDIBits_selected_DIB(UINT bpp) dib_dc = CreateCompatibleDC(NULL); old_bmp = SelectObject(dib_dc, dib); dc = CreateCompatibleDC(NULL); - bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dib_size); + bits2 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dib32_size); assert(bits2); /* Copy the DIB attributes but not the color table */ @@ -1300,6 +1302,15 @@ static void test_GetDIBits_selected_DIB(UINT bpp) } ok(equalContents, "GetDIBits with %d bpp DIB selected in DC: Invalid DIB bits\n",bpp); + /* Map into a 32bit-DIB */ + info2->bmiHeader.biBitCount = 32; + res = GetDIBits(dc, dib, 0, info->bmiHeader.biHeight, bits2, info2, DIB_RGB_COLORS); + ok(res, "GetDIBits failed\n"); + + /* Check if last pixel was set */ + pixel = ((DWORD *)bits2)[info->bmiHeader.biWidth * info->bmiHeader.biHeight - 1]; + ok(pixel != 0, "Pixel: 0x%08x\n", pixel); + HeapFree(GetProcessHeap(), 0, bits2); DeleteDC(dc); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 11157f1..05bd30c 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4210,8 +4210,7 @@ INT CDECL X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT start descr.ySrc = startscan; } descr.shm_mode = physBitmap->shm_mode; - descr.dibpitch = (obj_size == sizeof(DIBSECTION)) ? dib.dsBm.bmWidthBytes - : (((descr.infoWidth * descr.infoBpp + 31) &~31) / 8); + descr.dibpitch = (((descr.infoWidth * descr.infoBpp + 31) &~31) / 8); X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); X11DRV_DIB_GetImageBits( &descr );

1 0

Alexandre Julliard : winex11: Only map the window the first time that WS_VISIBLE is set through WM_SETREDRAW .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: stable Commit: d11436aa07bc2ff027f2201ad63cf4403f0efe1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11436aa07bc2ff027f2201ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 19:45:34 2010 +0100 winex11: Only map the window the first time that WS_VISIBLE is set through WM_SETREDRAW. (cherry picked from commit 026d41c504175b8ee3a8681a585d2a424622c3d6) --- dlls/winex11.drv/window.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5e8b88e..18a86b2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1797,17 +1797,16 @@ void CDECL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) */ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { - struct x11drv_win_data *data; + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD changed; if (hwnd == GetDesktopWindow()) return; changed = style->styleNew ^ style->styleOld; - if (offset == GWL_STYLE && (changed & WS_VISIBLE) && (style->styleNew & WS_VISIBLE)) + /* if WS_VISIBLE was set through WM_SETREDRAW, map the window if it's the first time */ + if (offset == GWL_STYLE && (changed & WS_VISIBLE) && (style->styleNew & WS_VISIBLE) && !data) { - /* we don't unmap windows, that causes trouble with the window manager */ - if (!(data = X11DRV_get_win_data( hwnd )) && - !(data = X11DRV_create_win_data( hwnd ))) return; + if (!(data = X11DRV_create_win_data( hwnd ))) return; if (data->whole_window && is_window_rect_mapped( &data->window_rect )) { @@ -1816,20 +1815,13 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) if (!data->mapped) map_window( display, data, style->styleNew ); } } + if (!data || !data->whole_window) return; if (offset == GWL_STYLE && (changed & WS_DISABLED)) - { - data = X11DRV_get_win_data( hwnd ); - if (data && data->whole_window) - set_wm_hints( thread_display(), data ); - } + set_wm_hints( thread_display(), data ); - if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) - { - /* changing WS_EX_LAYERED resets attributes */ - if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) - sync_window_opacity( thread_display(), data->whole_window, 0, 0, 0 ); - } + if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ + sync_window_opacity( thread_display(), data->whole_window, 0, 0, 0 ); }

1 0

Dmitry Timoshkov : user32: Add a test for activating a menu consisting from a single menu item using a hot key .
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 444b781ff39605223786a9aa34ae15c6b3f3151f URL: http://source.winehq.org/git/wine.git/?a=commit;h=444b781ff39605223786a9aa3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 6 20:24:57 2011 +0900 user32: Add a test for activating a menu consisting from a single menu item using a hot key. --- dlls/user32/tests/msg.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 1 + 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4be4c38..89e1edf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11965,6 +11965,33 @@ static const struct message wm_popup_menu_3[] = { 0 } }; +static const struct message wm_single_menu_item[] = +{ + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0x20000001 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_MENU, 0x20000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'Q', 0x20000001 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, 'Q', 0x20000001 }, + { WM_SYSCHAR, sent|wparam|lparam, 'q', 0x20000001 }, + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_KEYMENU, 'q' }, + { WM_ENTERMENULOOP, sent|wparam|lparam, 0, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_MENUSELECT, sent|wparam|optional, MAKEWPARAM(300,MF_HILITE) }, + { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 }, + { WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 }, + { WM_MENUCOMMAND, sent }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 'Q', 0xe0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, 'Q', 0xe0000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_MENU, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_MENU, 0xc0000001 }, + + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_ESCAPE, 1 }, + { WM_CHAR, sent|wparam|lparam, VK_ESCAPE, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { 0 } +}; + static LRESULT WINAPI parent_menu_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) { if (message == WM_ENTERIDLE || @@ -12123,6 +12150,21 @@ static void test_menu_messages(void) } ok_sequence(wm_popup_menu_2, "submenu of a popup menu command", FALSE); + trace("testing single menu item command\n"); + flush_sequence(); + keybd_event(VK_MENU, 0, 0, 0); + keybd_event('Q', 0, 0, 0); + keybd_event('Q', 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_ESCAPE, 0, 0, 0); + keybd_event(VK_ESCAPE, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + ok_sequence(wm_single_menu_item, "single menu item command", TRUE); + set_menu_style(hmenu, 0); style = get_menu_style(hmenu); ok(style == 0, "expected 0, got %u\n", style); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 22e9d16..202b12e 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -190,4 +190,5 @@ FONT 8, "MS Shell Dlg" MENUITEM "&Paste", 203 MENUITEM "&Delete", 204 } + MENUITEM "&Quit", 300 }

1 0

Austin English : msvcp100: Add stub dll.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: dfbf47b00c80932af579df771d45373638332a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfbf47b00c80932af579df771… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 5 12:47:46 2011 -0700 msvcp100: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/msvcp100/Makefile.in | 6 + dlls/msvcp100/msvcp100.c | 37 + dlls/msvcp100/msvcp100.spec | 5789 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 5834 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfbf47b00c80932af579d…

1 0

Alexandre Julliard : winex11: Simplify the event handler lookup, and support names in debug traces for extension events.
by Alexandre Julliard 06 Apr '11

06 Apr '11

Module: wine Branch: master Commit: 9c8911e342f74d82ab43a2547b64fd4813ccf443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8911e342f74d82ab43a2547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 6 13:26:42 2011 +0200 winex11: Simplify the event handler lookup, and support names in debug traces for extension events. --- dlls/winex11.drv/event.c | 164 ++++++++++++++++----------------------------- dlls/winex11.drv/wintab.c | 21 ++++-- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 73 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c8911e342f74d82ab43a…

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011