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

Ken Thomases : winemac: Send WM_SIZING messages during resizing to let app alter the proposed size.
by Alexandre Julliard April 24, 2014

April 24, 2014

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

Alexandre Julliard : ntdll: Don' t wait for writes to complete in NtFlushVirtualMemory.
by Alexandre Julliard April 24, 2014

April 24, 2014

Module: wine Branch: master Commit: 693d6e48d775ba29a803ee04c344c4ba1e7cb274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=693d6e48d775ba29a803ee04c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 14:33:26 2014 +0200 ntdll: Don't wait for writes to complete in NtFlushVirtualMemory. --- dlls/ntdll/virtual.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e93ce2e..8d3539a 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -58,10 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(virtual); WINE_DECLARE_DEBUG_CHANNEL(module); -#ifndef MS_SYNC -#define MS_SYNC 0 -#endif - #ifndef MAP_NORESERVE #define MAP_NORESERVE 0 #endif @@ -2734,7 +2730,9 @@ NTSTATUS WINAPI NtFlushVirtualMemory( HANDLE process, LPCVOID *addr_ptr, { if (!*size_ptr) *size_ptr = view->size; *addr_ptr = addr; - if (msync( addr, *size_ptr, MS_SYNC )) status = STATUS_NOT_MAPPED_DATA; +#ifdef MS_ASYNC + if (msync( addr, *size_ptr, MS_ASYNC )) status = STATUS_NOT_MAPPED_DATA; +#endif } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status;

1 0

Andrew Eikum : user32: Allow setting horizontal extent even without WS_HSCROLL.
by Alexandre Julliard April 24, 2014

April 24, 2014

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 April 24, 2014

April 24, 2014

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

Patrick Rudolph : user32: Check for valid cbSize in GetMonitorInfoW.
by Alexandre Julliard April 24, 2014

April 24, 2014

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

Alexandre Julliard : dxguid: Remove some symbols that aren' t exported in native.
by Alexandre Julliard April 24, 2014

April 24, 2014

Module: wine Branch: master Commit: 7d3559bfe938d7fea0fd74e3fc2ffb33a5ebaa66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3559bfe938d7fea0fd74e3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 12:18:01 2014 +0200 dxguid: Remove some symbols that aren't exported in native. --- dlls/d3drm/d3drm_main.c | 3 ++- dlls/d3drm/tests/d3drm.c | 3 ++- dlls/dmband/dmutils.c | 1 + dlls/dmcompos/dmcompos_main.c | 14 ++++++++++++++ dlls/dmime/dmime_main.c | 16 +++++++++++++++- dlls/dmloader/dmloader_main.c | 16 +++++++++++++++- dlls/dmscript/dmscript_main.c | 16 +++++++++++++++- dlls/dmstyle/dmstyle_main.c | 16 +++++++++++++++- dlls/dmusic/dmusic_main.c | 15 ++++++++++++++- dlls/dswave/dswave_main.c | 15 ++++++++++++++- dlls/dxguid/dxguid.c | 2 -- 11 files changed, 107 insertions(+), 10 deletions(-) diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index e87dcb8..3d5255f 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -21,8 +21,9 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "d3d.h" +#include "initguid.h" #include "d3drm.h" -#include "d3drm_private.h" /*********************************************************************** diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 83fdffa..9990d2c 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -18,8 +18,9 @@ */ #define COBJMACROS -#include <d3drm.h> +#include <d3d.h> #include <initguid.h> +#include <d3drm.h> #include <d3drmwin.h> #include "wine/test.h" diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 9ca2809..760afe8 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -37,6 +37,7 @@ #include "wine/unicode.h" #include "objbase.h" +#include "initguid.h" #include "dmusici.h" #include "dmusicf.h" #include "dmusics.h" diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 240cc9d..c15c97d 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -20,6 +20,20 @@ #include "config.h" #include "wine/port.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" +#include "initguid.h" +#include "dmusici.h" + #include "dmcompos_private.h" #include "rpcproxy.h" diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index d069a01..37302ff 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -18,8 +18,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmime_private.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmime_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index 38faa8e..f02e523 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -17,8 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmloader_private.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmloader_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmloader); diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 6caf158..6a3c686 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -20,8 +20,22 @@ #include "config.h" #include "wine/port.h" -#include "dmscript_private.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmscript_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmscript); diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index b76fa73..11e3f62 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -17,8 +17,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "dmstyle_private.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmstyle_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 8708787..ad172ab 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -21,9 +21,22 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> -#include "dmusic_private.h" +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dmusic_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dmusic); diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a9be90c..b02f372 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -21,9 +21,22 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> -#include "dswave_private.h" +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" +#include "dmusici.h" + +#include "dswave_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dswave); diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c index 4f34a4f..f923d9c 100644 --- a/dlls/dxguid/dxguid.c +++ b/dlls/dxguid/dxguid.c @@ -36,7 +36,6 @@ #include "mmsystem.h" #include "dsound.h" #include "dsconf.h" -#include "dmusici.h" #include "dmusics.h" #include "dplay.h" #include "dplay8.h" @@ -45,5 +44,4 @@ #include "ddrawi.h" #include "dxdiag.h" #include "dxfile.h" -#include "d3drm.h" #include "rmxfguid.h"

1 0

André Hentschel : Wine 1.7.17 freigegeben
by Jeremy Newman April 24, 2014

April 24, 2014

Module: website Branch: master Commit: 9b523c5e9673412c84b96e3fbcfb744e25058daf URL: http://source.winehq.org/git/website.git/?a=commit;h=9b523c5e9673412c84b96e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 23 22:34:11 2014 +0200 Wine 1.7.17 freigegeben --- news/de/2014041801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014041801.xml b/news/de/2014041801.xml new file mode 100644 index 0000000..fd5f99d --- /dev/null +++ b/news/de/2014041801.xml @@ -0,0 +1,15 @@ +<news> +<date>18. April 2014</date> +<title>Wine 1.7.17 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Task Scheduler Unterstützung.</li> + <li>Kompatiblere C Runtime durch gemeinsam genutzten Quellcode.</li> + <li>Fehlerbehebungen in der Mac OS X Joystick Unterstützung.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.17.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

André Hentschel : Update download page to Ubuntu 14.04 LTS in German
by Jeremy Newman April 24, 2014

April 24, 2014

Module: website Branch: master Commit: a47be3f70d0629409a24755b2f44ba83893e533e URL: http://source.winehq.org/git/website.git/?a=commit;h=a47be3f70d0629409a2475… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 23 22:34:04 2014 +0200 Update download page to Ubuntu 14.04 LTS in German --- templates/de/download.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/de/download.template b/templates/de/download.template index b2d0040..fbf449e 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -62,7 +62,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Ubuntu</a> - binär und Quellcode .debs für Ubuntu Precise (12.04), Quantal (12.10), Raring (13.04) und Saucy (13.10) + binär und Quellcode .debs für Ubuntu Trusty (14.04 LTS) <td><a href="mailto:scottritchie(a)ubuntu.com">Scott Ritchie</a></td> </tr>

1 0

Henri Verbeet : ddraw: Validate the pitch for user memory surfaces against the unaligned minimum pitch.
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: ac70dd2c9765b7493b95e4325eb63cfe8d3248c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac70dd2c9765b7493b95e4325… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 23 14:35:20 2014 +0200 ddraw: Validate the pitch for user memory surfaces against the unaligned minimum pitch. User memory surfaces have a different minimum alignment from regular surfaces. This fixes a regression introduced by commit 9c138d772c692d44103a6641c32f3b74dc83303e. --- dlls/ddraw/surface.c | 3 ++- dlls/ddraw/tests/ddraw1.c | 10 +++++----- dlls/ddraw/tests/ddraw2.c | 10 +++++----- dlls/ddraw/tests/ddraw4.c | 20 +++++++++++--------- dlls/ddraw/tests/ddraw7.c | 20 +++++++++++--------- dlls/wined3d/directx.c | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 8 files changed, 52 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac70dd2c9765b7493b95e…

1 0

Jacek Caban : vbscript: Return proper error on invalid argument in Chr.
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: 5d31c1e82451a7ab558337929f1c970935b2819c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d31c1e82451a7ab558337929… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 23 17:49:23 2014 +0200 vbscript: Return proper error on invalid argument in Chr. --- dlls/vbscript/global.c | 4 ++-- dlls/vbscript/tests/api.vbs | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9983509..b89b888 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1141,8 +1141,8 @@ static HRESULT Global_Chr(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA return hres; if(c < 0 || c >= 0x100) { - FIXME("invalid arg\n"); - return E_FAIL; + WARN("invalid arg %d\n", c); + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); } if(res) { diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3c496b1..ee9ebd3 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -137,6 +137,20 @@ Call ok(Chr(0) <> "", "Chr(0) = """"") Call ok(Chr(120.5) = "x", "Chr(120.5) = " & Chr(120.5)) Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) +sub testChrError + on error resume next + + call Err.clear() + call Chr(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + + call Err.clear() + call Chr(256) + call ok(Err.number = 5, "Err.number = " & Err.number) +end sub + +call testChrError + Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass Call ok(isObject(x), "isObject(x) is not true?")

1 0