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

Vincent Povirk : shell32: Pass MASK_NO_CONSOLE through to context menu handlers.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 33a22421337e2aa474e07e17aeefda0a6059b05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a22421337e2aa474e07e17a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 17 17:31:53 2014 -0500 shell32: Pass MASK_NO_CONSOLE through to context menu handlers. --- dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 39d640a..41c147d 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1248,7 +1248,7 @@ static HRESULT shellex_run_context_menu_default( IShellExtInit *obj, memset( &ici, 0, sizeof ici ); ici.cbSize = sizeof ici; - ici.fMask = CMIC_MASK_UNICODE | (sei->fMask & (SEE_MASK_NOASYNC|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); + ici.fMask = CMIC_MASK_UNICODE | (sei->fMask & (SEE_MASK_NO_CONSOLE|SEE_MASK_NOASYNC|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); ici.nShow = sei->nShow; ici.lpVerb = MAKEINTRESOURCEA( def ); ici.hwnd = sei->hwnd;

1 0

Vincent Povirk : shell32: Use CREATE_NEW_CONSOLE when SEE_MASK_NOCONSOLE is omitted.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 2005be6dc92c0943ede01525cecad88f8e83c9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2005be6dc92c0943ede01525c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 16 15:50:37 2014 -0500 shell32: Use CREATE_NEW_CONSOLE when SEE_MASK_NOCONSOLE is omitted. --- dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 41c147d..a6bc5c8 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -338,7 +338,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = psei->nShow; dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; - if (psei->fMask & SEE_MASK_NO_CONSOLE) + if (!(psei->fMask & SEE_MASK_NO_CONSOLE)) dwCreationFlags |= CREATE_NEW_CONSOLE; if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, lpDirectory, &startup, &info))

1 0

Vincent Povirk : shell32/tests: Use SEE_MASK_NO_CONSOLE with ShellExecuteExA.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 3d1cf168cfc517e71515bac04fa13fb2bbd4ab49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1cf168cfc517e71515bac04… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 17 17:32:27 2014 -0500 shell32/tests: Use SEE_MASK_NO_CONSOLE with ShellExecuteExA. --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9f4b1a3..e3169c8 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -183,7 +183,7 @@ static INT_PTR shell_execute_ex(DWORD mask, LPCSTR verb, LPCSTR file, trace("%s\n", shell_call); sei.cbSize=sizeof(sei); - sei.fMask=SEE_MASK_NOCLOSEPROCESS | mask; + sei.fMask=SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE | mask; sei.hwnd=NULL; sei.lpVerb=verb; sei.lpFile=file;

1 0

Vincent Povirk : start: Don't use SEE_MASK_NO_CONSOLE.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 9e0971e374c87472af00df50a57dc8de7fe74f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0971e374c87472af00df50a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 22 12:47:29 2014 -0500 start: Don't use SEE_MASK_NO_CONSOLE. --- programs/start/start.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 7bf8ea8..9f2c3f7 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -216,8 +216,7 @@ int wmain (int argc, WCHAR *argv[]) sei.nShow = SW_SHOWNORMAL; /* Dunno what these mean, but it looks like winMe's start uses them */ sei.fMask = SEE_MASK_FLAG_DDEWAIT| - SEE_MASK_FLAG_NO_UI| - SEE_MASK_NO_CONSOLE; + SEE_MASK_FLAG_NO_UI; sei.lpDirectory = NULL; creation_flags = CREATE_NEW_CONSOLE;

1 0

Andrew Eikum : user32: Allow setting horizontal extent even without WS_HSCROLL.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: c4a28490f304167d2257d2de6315f09d577742f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4a28490f304167d2257d2de6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 23 14:58:29 2014 -0500 user32: Allow setting horizontal extent even without WS_HSCROLL. --- dlls/user32/listbox.c | 6 +++--- dlls/user32/tests/listbox.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index c282d5d..d17797b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -83,7 +83,7 @@ typedef struct INT item_height; /* Default item height */ INT page_size; /* Items per listbox page */ INT column_width; /* Column width for multi-column listboxes */ - INT horz_extent; /* Horizontal extent (0 if no hscroll) */ + INT horz_extent; /* Horizontal extent */ INT horz_pos; /* Horizontal position */ INT nb_tabs; /* Number of tabs in array */ INT *tabs; /* Array of tabs */ @@ -1239,7 +1239,7 @@ static void LISTBOX_SetHorizontalPos( LB_DESCR *descr, INT pos ) */ static LRESULT LISTBOX_SetHorizontalExtent( LB_DESCR *descr, INT extent ) { - if (!descr->horz_extent || (descr->style & LBS_MULTICOLUMN)) + if (descr->style & LBS_MULTICOLUMN) return LB_OKAY; if (extent <= 0) extent = 1; if (extent == descr->horz_extent) return LB_OKAY; @@ -2485,7 +2485,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->item_height = 1; descr->page_size = 1; descr->column_width = 150; - descr->horz_extent = (descr->style & WS_HSCROLL) ? 1 : 0; + descr->horz_extent = 0; descr->horz_pos = 0; descr->nb_tabs = 0; descr->tabs = NULL; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 8e3fbcd..ebcb5e9 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -1617,6 +1617,41 @@ static void test_missing_lbuttonup( void ) DestroyWindow(parent); } +static void test_extents(void) +{ + HWND listbox, parent; + DWORD res; + + parent = create_parent(); + + listbox = create_listbox(WS_CHILD | WS_VISIBLE, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + DestroyWindow(listbox); + + + listbox = create_listbox(WS_CHILD | WS_VISIBLE | WS_HSCROLL, parent); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 0, "Got wrong initial horizontal extent: %u\n", res); + + SendMessageA(listbox, LB_SETHORIZONTALEXTENT, 64, 0); + + res = SendMessageA(listbox, LB_GETHORIZONTALEXTENT, 0, 0); + ok(res == 64, "Got wrong horizontal extent: %u\n", res); + + DestroyWindow(listbox); + + DestroyWindow(parent); +} + START_TEST(listbox) { const struct listbox_test SS = @@ -1698,4 +1733,5 @@ START_TEST(listbox) test_set_count(); test_GetListBoxInfo(); test_missing_lbuttonup(); + test_extents(); }

1 0

Ken Thomases : winemac: For GetKeyNameText(), use the hard-coded table in preference to the Mac keyboard layout.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: b52c89fc9194bfd68186f1013383c9c10d27ff34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52c89fc9194bfd68186f1013… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 23 20:00:17 2014 -0500 winemac: For GetKeyNameText(), use the hard-coded table in preference to the Mac keyboard layout. --- dlls/winemac.drv/keyboard.c | 67 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index a46d324..9c0c3a6 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1229,6 +1229,8 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) UInt32 deadKeyState = 0; UniCharCount len; OSStatus status; + DWORD vkey; + int i; uchr = (const UCKeyboardLayout*)CFDataGetBytePtr(thread_data->keyboard_layout_uchr); status = UCKeyTranslate(uchr, keyc, kUCKeyActionDisplay, 0, thread_data->keyboard_type, @@ -1237,51 +1239,46 @@ INT CDECL macdrv_GetKeyNameText(LONG lparam, LPWSTR buffer, INT size) len = 0; if (len && isgraphW(buffer[0])) buffer[len] = 0; - else - { - DWORD vkey = thread_data->keyc2vkey[keyc]; - int i; - if (scan & 0x100) vkey |= 0x100; - - if (lparam & (1 << 25)) + vkey = thread_data->keyc2vkey[keyc]; + if (lparam & (1 << 25)) + { + /* Caller doesn't care about distinctions between left and + right keys. */ + switch (vkey) { - /* Caller doesn't care about distinctions between left and - right keys. */ - switch (vkey) - { - case VK_LSHIFT: - case VK_RSHIFT: - vkey = VK_SHIFT; break; - case VK_LCONTROL: - case VK_RCONTROL: - vkey = VK_CONTROL; break; - case VK_LMENU: - case VK_RMENU: - vkey = VK_MENU; break; - } + case VK_LSHIFT: + case VK_RSHIFT: + vkey = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + vkey = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + vkey = VK_MENU; break; } + } - len = 0; - for (i = 0; i < sizeof(vkey_names) / sizeof(vkey_names[0]); i++) - { - if (vkey_names[i].vkey == vkey) - { - len = MultiByteToWideChar(CP_UTF8, 0, vkey_names[i].name, -1, buffer, size); - if (len) len--; - break; - } - } + if (scan & 0x100) vkey |= 0x100; - if (!len) + for (i = 0; i < sizeof(vkey_names) / sizeof(vkey_names[0]); i++) + { + if (vkey_names[i].vkey == vkey) { - static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; - snprintfW(buffer, size, format, vkey); - len = strlenW(buffer); + len = MultiByteToWideChar(CP_UTF8, 0, vkey_names[i].name, -1, buffer, size); + if (len) len--; + break; } } if (!len) + { + static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; + snprintfW(buffer, size, format, vkey); + len = strlenW(buffer); + } + + if (!len) break; if (status == noErr && deadKeyState)

1 0

Ken Thomases : winemac: Send WM_SIZING messages during resizing to let app alter the proposed size.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: d1f554711fad429c84501cc765f2f00a9c3c5919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f554711fad429c84501cc76… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 23 20:00:29 2014 -0500 winemac: Send WM_SIZING messages during resizing to let app alter the proposed size. --- dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 51 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/event.c | 4 +++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 6 +++++ dlls/winemac.drv/window.c | 40 ++++++++++++++++++++++++++++++ 6 files changed, 103 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index a74f6da..68905a5 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -54,6 +54,8 @@ NSUInteger lastModifierFlags; NSTimer* liveResizeDisplayTimer; + NSRect frameAtResizeStart; + BOOL resizingFromLeft, resizingFromTop; void* imeData; BOOL commandDone; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7ead126..bb173e9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1809,7 +1809,17 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void)windowDidResize:(NSNotification *)notification { macdrv_event* event; - NSRect frame = [self contentRectForFrameRect:[self frame]]; + NSRect frame = [self frame]; + + if ([self inLiveResize]) + { + if (NSMinX(frame) != NSMinX(frameAtResizeStart)) + resizingFromLeft = TRUE; + if (NSMaxY(frame) != NSMaxY(frameAtResizeStart)) + resizingFromTop = TRUE; + } + + frame = [self contentRectForFrameRect:frame]; if (ignore_windowResize || exitingFullScreen) return; @@ -1899,6 +1909,42 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self becameIneligibleParentOrChild]; } + - (NSSize) windowWillResize:(NSWindow*)sender toSize:(NSSize)frameSize + { + if ([self inLiveResize]) + { + NSRect rect; + macdrv_query* query; + + rect = [self frame]; + if (resizingFromLeft) + rect.origin.x = NSMaxX(rect) - frameSize.width; + if (!resizingFromTop) + rect.origin.y = NSMaxY(rect) - frameSize.height; + rect.size = frameSize; + rect = [self contentRectForFrameRect:rect]; + [[WineApplicationController sharedController] flipRect:&rect]; + + query = macdrv_create_query(); + query->type = QUERY_RESIZE_SIZE; + query->window = (macdrv_window)[self retain]; + query->resize_size.rect = NSRectToCGRect(rect); + query->resize_size.from_left = resizingFromLeft; + query->resize_size.from_top = resizingFromTop; + + if ([self.queue query:query timeout:0.1]) + { + rect = NSRectFromCGRect(query->resize_size.rect); + rect = [self frameRectForContentRect:rect]; + frameSize = rect.size; + } + + macdrv_release_query(query); + } + + return frameSize; + } + - (void) windowWillStartLiveResize:(NSNotification *)notification { macdrv_query* query = macdrv_create_query(); @@ -1908,6 +1954,9 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [self.queue query:query timeout:0.3]; macdrv_release_query(query); + frameAtResizeStart = [self frame]; + resizingFromLeft = resizingFromTop = FALSE; + // There's a strange restriction in window redrawing during Cocoa- // managed window resizing. Only calls to -[NSView setNeedsDisplay...] // that happen synchronously when Cocoa tells us that our window size diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 5095c99..8e03080 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -162,6 +162,10 @@ static void macdrv_query_event(HWND hwnd, const macdrv_event *event) TRACE("QUERY_PASTEBOARD_DATA\n"); success = query_pasteboard_data(hwnd, query->pasteboard_data.type); break; + case QUERY_RESIZE_SIZE: + TRACE("QUERY_RESIZE_SIZE\n"); + success = query_resize_size(hwnd, query); + break; case QUERY_RESIZE_START: TRACE("QUERY_RESIZE_START\n"); success = query_resize_start(hwnd); diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 9ffeb40..56ca24f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -173,6 +173,7 @@ extern void macdrv_window_resize_ended(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_restore_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_drag_begin(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_drag_end(HWND hwnd) DECLSPEC_HIDDEN; +extern BOOL query_resize_size(HWND hwnd, macdrv_query *query) DECLSPEC_HIDDEN; extern BOOL query_resize_start(HWND hwnd) DECLSPEC_HIDDEN; extern BOOL query_min_max_info(HWND hwnd) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 1550280..6dbaae1 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -298,6 +298,7 @@ enum { QUERY_DRAG_OPERATION, QUERY_IME_CHAR_RECT, QUERY_PASTEBOARD_DATA, + QUERY_RESIZE_SIZE, QUERY_RESIZE_START, QUERY_MIN_MAX_INFO, NUM_QUERY_TYPES @@ -331,6 +332,11 @@ typedef struct macdrv_query { struct { CFStringRef type; } pasteboard_data; + struct { + CGRect rect; + unsigned int from_left : 1; + unsigned int from_top : 1; + } resize_size; }; } macdrv_query; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 4678afc..6ef227c 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2400,6 +2400,46 @@ fail: /*********************************************************************** + * query_resize_size + * + * Handler for QUERY_RESIZE_SIZE query. + */ +BOOL query_resize_size(HWND hwnd, macdrv_query *query) +{ + struct macdrv_win_data *data = get_win_data(hwnd); + RECT rect = rect_from_cgrect(query->resize_size.rect); + int corner; + BOOL ret = FALSE; + + if (!data) return FALSE; + + macdrv_mac_to_window_rect(data, &rect); + + if (query->resize_size.from_left) + { + if (query->resize_size.from_top) + corner = WMSZ_TOPLEFT; + else + corner = WMSZ_BOTTOMLEFT; + } + else if (query->resize_size.from_top) + corner = WMSZ_TOPRIGHT; + else + corner = WMSZ_BOTTOMRIGHT; + + if (SendMessageW(hwnd, WM_SIZING, corner, (LPARAM)&rect)) + { + macdrv_window_to_mac_rect(data, GetWindowLongW(hwnd, GWL_STYLE), &rect); + query->resize_size.rect = cgrect_from_rect(rect); + ret = TRUE; + } + + release_win_data(data); + return ret; +} + + +/*********************************************************************** * query_resize_start * * Handler for QUERY_RESIZE_START query.

1 0

Patrick Rudolph : user32: Check for valid cbSize in GetMonitorInfoW.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: 4ecda80c6c97092e30b36fd3b0694d306f37dd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecda80c6c97092e30b36fd3b… Author: Patrick Rudolph <siro(a)das-labor.org> Date: Wed Apr 23 17:36:06 2014 +0200 user32: Check for valid cbSize in GetMonitorInfoW. --- dlls/user32/misc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d9eec26..15dd75a 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -440,7 +440,12 @@ BOOL WINAPI GetMonitorInfoA(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) */ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) { - BOOL ret = USER_Driver->pGetMonitorInfo( hMonitor, lpMonitorInfo ); + BOOL ret; + + if (lpMonitorInfo->cbSize != sizeof(MONITORINFOEXW) && lpMonitorInfo->cbSize != sizeof(MONITORINFO)) + return FALSE; + + ret = USER_Driver->pGetMonitorInfo( hMonitor, lpMonitorInfo ); if (ret) TRACE("flags %04x, monitor %s, work %s\n", lpMonitorInfo->dwFlags, wine_dbgstr_rect(&lpMonitorInfo->rcMonitor),

1 0

Patrick Rudolph : user32/tests: Add tests for valid cbSize in GetMonitorInfoW.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: 66316964a9a7062ef46c244a90b84b295796ad5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66316964a9a7062ef46c244a9… Author: Patrick Rudolph <siro(a)das-labor.org> Date: Wed Apr 23 17:35:43 2014 +0200 user32/tests: Add tests for valid cbSize in GetMonitorInfoW. --- dlls/user32/tests/monitor.c | 51 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 786edf3..42ae883 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -30,6 +30,7 @@ static LONG (WINAPI *pChangeDisplaySettingsExW)(LPCWSTR, LPDEVMODEW, HWND, DWORD static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); +static BOOL (WINAPI *pGetMonitorInfoW)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static HMONITOR (WINAPI *pMonitorFromRect)(LPCRECT,DWORD); static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); @@ -48,6 +49,7 @@ static void init_function_pointers(void) GET_PROC(EnumDisplayDevicesA) GET_PROC(EnumDisplayMonitors) GET_PROC(GetMonitorInfoA) + GET_PROC(GetMonitorInfoW) GET_PROC(MonitorFromPoint) GET_PROC(MonitorFromRect) GET_PROC(MonitorFromWindow) @@ -297,7 +299,8 @@ static void test_monitors(void) POINT pt; RECT rc; MONITORINFO mi; - MONITORINFOEXA miex; + MONITORINFOEXA miexa; + MONITORINFOEXW miexw; BOOL ret; DWORD i; @@ -313,13 +316,21 @@ static void test_monitors(void) {-1, FALSE}, {0xdeadbeef, FALSE}, }, - testdatamiex[] = { + testdatamiexa[] = { {0, FALSE}, {sizeof(MONITORINFOEXA)+1, FALSE}, {sizeof(MONITORINFOEXA)-1, FALSE}, {sizeof(MONITORINFOEXA), TRUE}, {-1, FALSE}, {0xdeadbeef, FALSE}, + }, + testdatamiexw[] = { + {0, FALSE}, + {sizeof(MONITORINFOEXW)+1, FALSE}, + {sizeof(MONITORINFOEXW)-1, FALSE}, + {sizeof(MONITORINFOEXW), TRUE}, + {-1, FALSE}, + {0xdeadbeef, FALSE}, }; if (!pMonitorFromPoint || !pMonitorFromWindow || !pMonitorFromRect) @@ -397,19 +408,41 @@ static void test_monitors(void) ok( (mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); else ok( !(mi.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + + memset( &miexw, 0, sizeof(miexw) ); + miexw.cbSize = testdatamiexw[i].cbSize; + ret = pGetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); + ok( ret == testdatamiexw[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); } /* tests for cbSize in MONITORINFOEXA */ - for (i = 0; i < (sizeof(testdatamiex) / sizeof(testdatamiex[0])); i++) + for (i = 0; i < (sizeof(testdatamiexa) / sizeof(testdatamiexa[0])); i++) + { + memset( &miexa, 0, sizeof(miexa) ); + miexa.cbSize = testdatamiexa[i].cbSize; + ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miexa ); + ok( ret == testdatamiexa[i].ret, "GetMonitorInfo returned wrong value\n" ); + if (ret) + ok( (miexa.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + else + ok( !(miexa.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + } + + /* tests for cbSize in MONITORINFOEXW */ + for (i = 0; i < (sizeof(testdatamiexw) / sizeof(testdatamiexw[0])); i++) { - memset( &miex, 0, sizeof(miex) ); - miex.cbSize = testdatamiex[i].cbSize; - ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miex ); - ok( ret == testdatamiex[i].ret, "GetMonitorInfo returned wrong value\n" ); + memset( &miexw, 0, sizeof(miexw) ); + miexw.cbSize = testdatamiexw[i].cbSize; + ret = pGetMonitorInfoW( monitor, (LPMONITORINFO)&miexw ); + ok( ret == testdatamiexw[i].ret, "GetMonitorInfo returned wrong value\n" ); if (ret) - ok( (miex.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); + ok( (miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag isn't set\n" ); else - ok( !(miex.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); + ok( !(miexw.dwFlags & MONITORINFOF_PRIMARY), "MONITORINFOF_PRIMARY flag is set\n" ); } SetRect( &rc, rc.left+1, rc.top+1, rc.left+2, rc.top+2 );

1 0

Alistair Leslie-Hughes : include: Add dvoice.h.
by Alexandre Julliard 24 Apr '14

24 Apr '14

Module: wine Branch: master Commit: 2d7848b0eeda3f2ec9049c7332f12c3f8f4ea706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7848b0eeda3f2ec9049c733… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 16:04:54 2014 +1000 include: Add dvoice.h. --- include/Makefile.in | 1 + include/dvoice.h | 501 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 502 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d7848b0eeda3f2ec9049…

1 0