February 2013 - Wine-Commits

Dmitry Timoshkov : gdiplus: If a device doesn't support AlphaBlend don' t convert image to PARGB.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 1896e5575ef63919fefbe3bfc587f41be086b211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1896e5575ef63919fefbe3bfc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 25 13:31:12 2013 +0800 gdiplus: If a device doesn't support AlphaBlend don't convert image to PARGB. --- dlls/gdiplus/graphics.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 01e127c..853027c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -398,8 +398,11 @@ static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, - 4 * src_width, src, src_stride); + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + memcpy(temp_bits, src, src_width * src_height * 4); + else + convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, + 4 * src_width, src, src_stride); SelectObject(hdc, hbitmap); gdi_alpha_blend(graphics, dst_x, dst_y, src_width, src_height,

1 0

André Hentschel : winedbg: There is no hardware single stepping support on ARM.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 371bbf8db4089999166d5b9ceccc148cc1b867b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371bbf8db4089999166d5b9ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Feb 23 17:34:26 2013 +0100 winedbg: There is no hardware single stepping support on ARM. --- programs/winedbg/be_arm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 00b6f5c..5d14a37 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1686,7 +1686,6 @@ static unsigned be_arm_get_register_info(int regno, enum be_cpu_addr* kind) static void be_arm_single_step(CONTEXT* ctx, unsigned enable) { - dbg_printf("be_arm_single_step: not done\n"); } static void be_arm_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs)

1 0

Ken Thomases : winemac: Implement ClipCursor().
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 9b0fdc645f1a27085a6ca94d8e2160519e79f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0fdc645f1a27085a6ca94d8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:51 2013 -0600 winemac: Implement ClipCursor(). --- dlls/winemac.drv/cocoa_app.h | 8 + dlls/winemac.drv/cocoa_app.m | 408 ++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 15 +- dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 26 +++ dlls/winemac.drv/winemac.drv.spec | 1 + 6 files changed, 442 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b0fdc645f1a27085a6ca…

1 0

Ken Thomases : winemac: Implement SetCursorPos().
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 5c933c89ad1bddf44768085c0d3b22a2a936db3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c933c89ad1bddf44768085c0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:47 2013 -0600 winemac: Implement SetCursorPos(). --- dlls/winemac.drv/cocoa_app.h | 2 + dlls/winemac.drv/cocoa_app.m | 53 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 14 ++++++++++ dlls/winemac.drv/winemac.drv.spec | 1 + 5 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 32e4180..3567595 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -58,6 +58,8 @@ int cursorFrame; NSTimer* cursorTimer; BOOL cursorHidden; + + NSTimeInterval lastSetCursorPositionTime; } @property (nonatomic) CGEventSourceKeyboardType keyboardType; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3744498..f1ad0bc 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -548,6 +548,31 @@ int macdrv_err_on; } } + - (BOOL) setCursorPosition:(CGPoint)pos + { + BOOL ret; + + ret = (CGWarpMouseCursorPosition(pos) == kCGErrorSuccess); + if (ret) + { + WineEventQueue* queue; + + lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; + + // Discard all pending mouse move events. + [eventQueuesLock lock]; + for (queue in eventQueues) + { + [queue discardEventsMatchingMask:event_mask_for_type(MOUSE_MOVED) | + event_mask_for_type(MOUSE_MOVED_ABSOLUTE) + forWindow:nil]; + } + [eventQueuesLock unlock]; + } + + return ret; + } + /* * ---------- NSApplication method overrides ---------- @@ -587,6 +612,17 @@ int macdrv_err_on; BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); forceNextMouseMoveAbsolute = FALSE; + // If we recently warped the cursor, discard mouse move events until + // we see an event which is later than that time. + if (lastSetCursorPositionTime) + { + if ([anEvent timestamp] <= lastSetCursorPositionTime) + return; + + lastSetCursorPositionTime = 0; + absolute = TRUE; + } + [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; lastTargetWindow = targetWindow; } @@ -893,3 +929,20 @@ int macdrv_get_cursor_position(CGPoint *pos) return TRUE; } + +/*********************************************************************** + * macdrv_set_cursor_position + * + * Sets the cursor position without generating events. Returns zero on + * failure, non-zero on success. + */ +int macdrv_set_cursor_position(CGPoint pos) +{ + __block int ret; + + OnMainThread(^{ + ret = [NSApp setCursorPosition:pos]; + }); + + return ret; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index c3ad6ba..16f5595 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -121,6 +121,7 @@ extern void macdrv_beep(void) DECLSPEC_HIDDEN; /* cursor */ extern void macdrv_set_cursor(CFStringRef name, CFArrayRef frames) DECLSPEC_HIDDEN; extern int macdrv_get_cursor_position(CGPoint *pos) DECLSPEC_HIDDEN; +extern int macdrv_set_cursor_position(CGPoint pos) DECLSPEC_HIDDEN; /* display */ diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index b0288f6..d38a316 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -848,6 +848,20 @@ done: /*********************************************************************** + * SetCursorPos (MACDRV.@) + */ +BOOL CDECL macdrv_SetCursorPos(INT x, INT y) +{ + BOOL ret = macdrv_set_cursor_position(CGPointMake(x, y)); + if (ret) + TRACE("warped to %d,%d\n", x, y); + else + ERR("failed to warp to %d,%d\n", x, y); + return ret; +} + + +/*********************************************************************** * macdrv_mouse_button * * Handler for MOUSE_BUTTON events. diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec index 99746b4..87cd0ee 100644 --- a/dlls/winemac.drv/winemac.drv.spec +++ b/dlls/winemac.drv/winemac.drv.spec @@ -22,6 +22,7 @@ @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) macdrv_MsgWaitForMultipleObjectsEx @ cdecl ScrollDC(long long long ptr ptr long ptr) macdrv_ScrollDC @ cdecl SetCursor(long) macdrv_SetCursor +@ cdecl SetCursorPos(long long) macdrv_SetCursorPos @ cdecl SetFocus(long) macdrv_SetFocus @ cdecl SetLayeredWindowAttributes(long long long long) macdrv_SetLayeredWindowAttributes @ cdecl SetParent(long long long) macdrv_SetParent

1 0

Ken Thomases : winemac: Reset the cursor to the normal Mac arrow when it' s outside all Wine windows.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: de079223bf6ac1b5695c125267fb8bece3cb8c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de079223bf6ac1b5695c12526… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:42 2013 -0600 winemac: Reset the cursor to the normal Mac arrow when it's outside all Wine windows. --- dlls/winemac.drv/cocoa_app.m | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 47ec05c..3744498 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -590,8 +590,12 @@ int macdrv_err_on; [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; lastTargetWindow = targetWindow; } - else + else if (lastTargetWindow) + { + [[NSCursor arrowCursor] set]; + [self unhideCursor]; lastTargetWindow = nil; + } } else if (type == NSLeftMouseDown || type == NSLeftMouseUp || type == NSRightMouseDown || type == NSRightMouseUp ||

1 0

Ken Thomases : winemac: Handle mouse moves in -[WineApplication sendEvent:] instead of WineWindow.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 0a56ef356a2932b503ce1331df4fc17898de5514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a56ef356a2932b503ce1331d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:32 2013 -0600 winemac: Handle mouse moves in -[WineApplication sendEvent:] instead of WineWindow. --- dlls/winemac.drv/cocoa_app.h | 3 ++ dlls/winemac.drv/cocoa_app.m | 44 ++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.h | 3 +- dlls/winemac.drv/cocoa_window.m | 19 ++-------------- 4 files changed, 51 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 0447d47..32e4180 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -47,6 +47,9 @@ CGFloat primaryScreenHeight; BOOL primaryScreenHeightValid; + WineWindow* lastTargetWindow; + BOOL forceNextMouseMoveAbsolute; + NSMutableArray* orderedWineWindows; NSMutableDictionary* originalDisplayModes; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index d22596e..7e22221 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -554,10 +554,40 @@ int macdrv_err_on; */ - (void) sendEvent:(NSEvent*)anEvent { - if ([anEvent type] == NSFlagsChanged) + NSEventType type = [anEvent type]; + if (type == NSFlagsChanged) self.lastFlagsChanged = anEvent; [super sendEvent:anEvent]; + + if (type == NSMouseMoved || type == NSLeftMouseDragged || + type == NSRightMouseDragged || type == NSOtherMouseDragged) + { + WineWindow* targetWindow; + + targetWindow = (WineWindow*)[anEvent window]; + + if ([targetWindow isKindOfClass:[WineWindow class]]) + { + BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); + forceNextMouseMoveAbsolute = FALSE; + + [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; + lastTargetWindow = targetWindow; + } + else + lastTargetWindow = nil; + } + else if (type == NSLeftMouseDown || type == NSLeftMouseUp || + type == NSRightMouseDown || type == NSRightMouseUp || + type == NSOtherMouseDown || type == NSOtherMouseUp || + type == NSScrollWheel) + { + // Since mouse button and scroll wheel events deliver absolute cursor + // position, the accumulating delta from move events is invalidated. + // Make sure next mouse move event starts over from an absolute baseline. + forceNextMouseMoveAbsolute = TRUE; + } } @@ -583,12 +613,22 @@ int macdrv_err_on; // activated. This will provoke a re-synchronization of Wine's notion of // the desktop rect with the actual state. [self sendDisplaysChanged:TRUE]; + + // The cursor probably moved while we were inactive. Accumulated mouse + // movement deltas are invalidated. Make sure the next mouse move event + // starts over from an absolute baseline. + forceNextMouseMoveAbsolute = TRUE; } - (void)applicationDidChangeScreenParameters:(NSNotification *)notification { primaryScreenHeightValid = FALSE; [self sendDisplaysChanged:FALSE]; + + // When the display configuration changes, the cursor position may jump. + // Accumulated mouse movement deltas are invalidated. Make sure the next + // mouse move event starts over from an absolute baseline. + forceNextMouseMoveAbsolute = TRUE; } - (void)applicationDidResignActive:(NSNotification *)notification @@ -627,6 +667,8 @@ int macdrv_err_on; NSWindow* window = [note object]; [keyWindows removeObjectIdenticalTo:window]; [orderedWineWindows removeObjectIdenticalTo:window]; + if (window == lastTargetWindow) + lastTargetWindow = nil; }]; [nc addObserver:self diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 0aecf83..ea7988d 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -48,7 +48,6 @@ NSUInteger lastModifierFlags; - BOOL forceNextMouseMoveAbsolute; double mouseMoveDeltaX, mouseMoveDeltaY; NSInteger levelWhenActive; @@ -64,4 +63,6 @@ - (void) adjustWindowLevel; + - (void) postMouseMovedEvent:(NSEvent *)theEvent absolute:(BOOL)absolute; + @end diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index af624a7..b8bc79d 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -264,7 +264,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (!window) return nil; window->normalStyleMask = [window styleMask]; - window->forceNextMouseMoveAbsolute = TRUE; /* Standardize windows to eliminate differences between titled and borderless windows and between NSWindow and NSPanel. */ @@ -285,8 +284,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [contentView setAutoresizesSubviews:NO]; trackingArea = [[[NSTrackingArea alloc] initWithRect:[contentView bounds] - options:(NSTrackingMouseEnteredAndExited | - NSTrackingMouseMoved | + options:(NSTrackingMouseMoved | NSTrackingActiveAlways | NSTrackingInVisibleRect) owner:window @@ -508,7 +506,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) { self.latentParentWindow = [self parentWindow]; [latentParentWindow removeChildWindow:self]; - forceNextMouseMoveAbsolute = TRUE; [self orderOut:nil]; [NSApp wineWindow:self ordered:NSWindowOut relativeTo:nil]; [NSApp removeWindowsItem:self]; @@ -739,11 +736,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) event:theEvent]; } - - (void) postMouseMovedEvent:(NSEvent *)theEvent + - (void) postMouseMovedEvent:(NSEvent *)theEvent absolute:(BOOL)absolute { macdrv_event event; - if (forceNextMouseMoveAbsolute) + if (absolute) { CGPoint point = CGEventGetLocation([theEvent CGEvent]); @@ -753,8 +750,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) mouseMoveDeltaX = 0; mouseMoveDeltaY = 0; - - forceNextMouseMoveAbsolute = FALSE; } else { @@ -961,14 +956,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } - - (void) mouseEntered:(NSEvent *)theEvent { forceNextMouseMoveAbsolute = TRUE; } - - (void) mouseExited:(NSEvent *)theEvent { forceNextMouseMoveAbsolute = TRUE; } - - - (void) mouseMoved:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - - (void) mouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - - (void) rightMouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - - (void) otherMouseDragged:(NSEvent *)theEvent { [self postMouseMovedEvent:theEvent]; } - - (void) scrollWheel:(NSEvent *)theEvent { CGPoint pt;

1 0

Ken Thomases : winemac: Use system cursors when possible.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: b79d955342754df7aee8143e530d2054c092bece URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79d955342754df7aee8143e5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:25 2013 -0600 winemac: Use system cursors when possible. --- dlls/winemac.drv/mouse.c | 215 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 196 insertions(+), 19 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 4d87324..8e16388 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -44,6 +44,90 @@ static CRITICAL_SECTION cursor_cache_section = { &critsect_debug, -1, 0, 0, 0, 0 static CFMutableDictionaryRef cursor_cache; +struct system_cursors +{ + WORD id; + CFStringRef name; +}; + +static const struct system_cursors user32_cursors[] = +{ + { OCR_NORMAL, CFSTR("arrowCursor") }, + { OCR_IBEAM, CFSTR("IBeamCursor") }, + { OCR_CROSS, CFSTR("crosshairCursor") }, + { OCR_SIZEWE, CFSTR("resizeLeftRightCursor") }, + { OCR_SIZENS, CFSTR("resizeUpDownCursor") }, + { OCR_NO, CFSTR("operationNotAllowedCursor") }, + { OCR_HAND, CFSTR("pointingHandCursor") }, + { 0 } +}; + +static const struct system_cursors comctl32_cursors[] = +{ + { 102, CFSTR("closedHandCursor") }, + { 104, CFSTR("dragCopyCursor") }, + { 105, CFSTR("arrowCursor") }, + { 106, CFSTR("resizeLeftRightCursor") }, + { 107, CFSTR("resizeLeftRightCursor") }, + { 108, CFSTR("pointingHandCursor") }, + { 135, CFSTR("resizeUpDownCursor") }, + { 0 } +}; + +static const struct system_cursors ole32_cursors[] = +{ + { 1, CFSTR("operationNotAllowedCursor") }, + { 2, CFSTR("closedHandCursor") }, + { 3, CFSTR("dragCopyCursor") }, + { 4, CFSTR("dragLinkCursor") }, + { 0 } +}; + +static const struct system_cursors riched20_cursors[] = +{ + { 105, CFSTR("pointingHandCursor") }, + { 109, CFSTR("dragCopyCursor") }, + { 110, CFSTR("closedHandCursor") }, + { 111, CFSTR("operationNotAllowedCursor") }, + { 0 } +}; + +static const struct +{ + const struct system_cursors *cursors; + WCHAR name[16]; +} module_cursors[] = +{ + { user32_cursors, {'u','s','e','r','3','2','.','d','l','l',0} }, + { comctl32_cursors, {'c','o','m','c','t','l','3','2','.','d','l','l',0} }, + { ole32_cursors, {'o','l','e','3','2','.','d','l','l',0} }, + { riched20_cursors, {'r','i','c','h','e','d','2','0','.','d','l','l',0} } +}; + +/* The names of NSCursor class methods which return cursor objects. */ +static const CFStringRef cocoa_cursor_names[] = +{ + CFSTR("arrowCursor"), + CFSTR("closedHandCursor"), + CFSTR("contextualMenuCursor"), + CFSTR("crosshairCursor"), + CFSTR("disappearingItemCursor"), + CFSTR("dragCopyCursor"), + CFSTR("dragLinkCursor"), + CFSTR("IBeamCursor"), + CFSTR("IBeamCursorForVerticalLayout"), + CFSTR("openHandCursor"), + CFSTR("operationNotAllowedCursor"), + CFSTR("pointingHandCursor"), + CFSTR("resizeDownCursor"), + CFSTR("resizeLeftCursor"), + CFSTR("resizeLeftRightCursor"), + CFSTR("resizeRightCursor"), + CFSTR("resizeUpCursor"), + CFSTR("resizeUpDownCursor"), +}; + + /*********************************************************************** * send_mouse_input * @@ -90,6 +174,90 @@ static void send_mouse_input(HWND hwnd, UINT flags, int x, int y, /*********************************************************************** + * copy_system_cursor_name + */ +CFStringRef copy_system_cursor_name(ICONINFOEXW *info) +{ + static const WCHAR idW[] = {'%','h','u',0}; + const struct system_cursors *cursors; + unsigned int i; + CFStringRef cursor_name = NULL; + HMODULE module; + HKEY key; + WCHAR *p, name[MAX_PATH * 2]; + + TRACE("info->szModName %s info->szResName %s info->wResID %hu\n", debugstr_w(info->szModName), + debugstr_w(info->szResName), info->wResID); + + if (!info->szModName[0]) return NULL; + + p = strrchrW(info->szModName, '\\'); + strcpyW(name, p ? p + 1 : info->szModName); + p = name + strlenW(name); + *p++ = ','; + if (info->szResName[0]) strcpyW(p, info->szResName); + else sprintfW(p, idW, info->wResID); + + /* @@ Wine registry key: HKCU\Software\Wine\Mac Driver\Cursors */ + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Mac Driver\\Cursors", &key)) + { + WCHAR value[64]; + DWORD size, ret; + + value[0] = 0; + size = sizeof(value) / sizeof(WCHAR); + ret = RegQueryValueExW(key, name, NULL, NULL, (BYTE *)value, &size); + RegCloseKey(key); + if (!ret) + { + if (!value[0]) + { + TRACE("registry forces standard cursor for %s\n", debugstr_w(name)); + return NULL; /* force standard cursor */ + } + + cursor_name = CFStringCreateWithCharacters(NULL, value, strlenW(value)); + if (!cursor_name) + { + WARN("CFStringCreateWithCharacters failed for %s\n", debugstr_w(value)); + return NULL; + } + + /* Make sure it's one of the appropriate NSCursor class methods. */ + for (i = 0; i < sizeof(cocoa_cursor_names) / sizeof(cocoa_cursor_names[0]); i++) + if (CFEqual(cursor_name, cocoa_cursor_names[i])) + goto done; + + WARN("%s mapped to invalid Cocoa cursor name %s\n", debugstr_w(name), debugstr_w(value)); + CFRelease(cursor_name); + return NULL; + } + } + + if (info->szResName[0]) goto done; /* only integer resources are supported here */ + if (!(module = GetModuleHandleW(info->szModName))) goto done; + + for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + if (GetModuleHandleW(module_cursors[i].name) == module) break; + if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) goto done; + + cursors = module_cursors[i].cursors; + for (i = 0; cursors[i].id; i++) + if (cursors[i].id == info->wResID) + { + cursor_name = CFRetain(cursors[i].name); + break; + } + +done: + if (cursor_name) + TRACE("%s -> %s\n", debugstr_w(name), debugstr_cf(cursor_name)); + else + WARN("no system cursor found for %s\n", debugstr_w(name)); + return cursor_name; +} + +/*********************************************************************** * release_provider_cfdata * * Helper for create_monochrome_cursor. A CFData is used by two @@ -580,8 +748,6 @@ void CDECL macdrv_SetCursor(HCURSOR cursor) if (cursor) { ICONINFOEXW info; - BITMAP bm; - HDC hdc; EnterCriticalSection(&cursor_cache_section); if (cursor_cache) @@ -606,28 +772,39 @@ void CDECL macdrv_SetCursor(HCURSOR cursor) return; } - GetObjectW(info.hbmMask, sizeof(bm), &bm); - if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); - - /* make sure hotspot is valid */ - if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight) + if ((cursor_name = copy_system_cursor_name(&info))) { - info.xHotspot = bm.bmWidth / 2; - info.yHotspot = bm.bmHeight / 2; - } - - hdc = CreateCompatibleDC(0); - - if (info.hbmColor) - { - cursor_frames = create_color_cursor(hdc, &info, cursor, bm.bmWidth, bm.bmHeight); DeleteObject(info.hbmColor); + DeleteObject(info.hbmMask); } else - cursor_frames = create_monochrome_cursor(hdc, &info, bm.bmWidth, bm.bmHeight); + { + BITMAP bm; + HDC hdc; + + GetObjectW(info.hbmMask, sizeof(bm), &bm); + if (!info.hbmColor) bm.bmHeight = max(1, bm.bmHeight / 2); - DeleteObject(info.hbmMask); - DeleteDC(hdc); + /* make sure hotspot is valid */ + if (info.xHotspot >= bm.bmWidth || info.yHotspot >= bm.bmHeight) + { + info.xHotspot = bm.bmWidth / 2; + info.yHotspot = bm.bmHeight / 2; + } + + hdc = CreateCompatibleDC(0); + + if (info.hbmColor) + { + cursor_frames = create_color_cursor(hdc, &info, cursor, bm.bmWidth, bm.bmHeight); + DeleteObject(info.hbmColor); + } + else + cursor_frames = create_monochrome_cursor(hdc, &info, bm.bmWidth, bm.bmHeight); + + DeleteObject(info.hbmMask); + DeleteDC(hdc); + } if (cursor_name || cursor_frames) {

1 0

Ken Thomases : winemac: Implement SetCursor() and DestroyCursorIcon().
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: a49df4b3172dda83262fdea9125dabf3a2bb3445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49df4b3172dda83262fdea91… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:21 2013 -0600 winemac: Implement SetCursor() and DestroyCursorIcon(). --- dlls/winemac.drv/cocoa_app.h | 5 + dlls/winemac.drv/cocoa_app.m | 142 +++++++++ dlls/winemac.drv/macdrv.h | 2 + dlls/winemac.drv/macdrv_cocoa.h | 4 + dlls/winemac.drv/macdrv_main.c | 34 +++ dlls/winemac.drv/mouse.c | 577 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 2 + 7 files changed, 766 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a49df4b3172dda83262fd…

1 0

Ken Thomases : winemac: Request mouse move events when our window is active even when cursor is outside it .
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 5d8e6852978a3f0cc4edfdaa0ca78e76a5a0070c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d8e6852978a3f0cc4edfdaa0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Feb 24 22:53:37 2013 -0600 winemac: Request mouse move events when our window is active even when cursor is outside it. --- dlls/winemac.drv/cocoa_app.m | 17 ++++++++++++++++- dlls/winemac.drv/cocoa_window.m | 3 +++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7e22221..47ec05c 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -565,7 +565,22 @@ int macdrv_err_on; { WineWindow* targetWindow; - targetWindow = (WineWindow*)[anEvent window]; + /* Because of the way -[NSWindow setAcceptsMouseMovedEvents:] works, the + event indicates its window is the main window, even if the cursor is + over a different window. Find the actual WineWindow that is under the + cursor and post the event as being for that window. */ + if (type == NSMouseMoved) + { + CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]); + NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)]; + NSInteger windowUnderNumber; + + windowUnderNumber = [NSWindow windowNumberAtPoint:point + belowWindowWithWindowNumber:0]; + targetWindow = (WineWindow*)[self windowWithWindowNumber:windowUnderNumber]; + } + else + targetWindow = (WineWindow*)[anEvent window]; if ([targetWindow isKindOfClass:[WineWindow class]]) { diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index b8bc79d..204a0bc 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -273,6 +273,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [window disableCursorRects]; [window setShowsResizeIndicator:NO]; [window setHasShadow:wf->shadow]; + [window setAcceptsMouseMovedEvents:YES]; [window setColorSpace:[NSColorSpace genericRGBColorSpace]]; [window setDelegate:window]; window.hwnd = hwnd; @@ -283,6 +284,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return nil; [contentView setAutoresizesSubviews:NO]; + /* We use tracking areas in addition to setAcceptsMouseMovedEvents:YES + because they give us mouse moves in the background. */ trackingArea = [[[NSTrackingArea alloc] initWithRect:[contentView bounds] options:(NSTrackingMouseMoved | NSTrackingActiveAlways |

1 0

Dmitry Timoshkov : gdiplus: Add some tests for ARGB conversions.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: ada3aea73645c9c48995b366b0920826027e9769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ada3aea73645c9c48995b366b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 25 13:29:44 2013 +0800 gdiplus: Add some tests for ARGB conversions. --- dlls/gdiplus/tests/image.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 46e250d..a075b42 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4107,6 +4107,77 @@ static void test_gif_properties(void) GdipDisposeImage(image); } +static void test_ARGB_conversion(void) +{ + BYTE argb[8] = { 0x11,0x22,0x33,0x80, 0xff,0xff,0xff,0 }; + BYTE pargb[8] = { 0x09,0x11,0x1a,0x80, 0,0,0,0 }; + BYTE rgb32_xp[8] = { 0x11,0x22,0x33,0xff, 0xff,0xff,0xff,0xff }; + BYTE rgb24[6] = { 0x11,0x22,0x33, 0xff,0xff,0xff }; + BYTE *bits; + GpBitmap *bitmap; + BitmapData data; + GpStatus status; + int match; + + status = GdipCreateBitmapFromScan0(2, 1, 8, PixelFormat32bppARGB, argb, &bitmap); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppPARGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat32bppPARGB, "expected PixelFormat32bppPARGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, pargb, sizeof(pargb)); +todo_wine + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppPARGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppRGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat32bppRGB, "expected PixelFormat32bppRGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, argb, sizeof(argb)) || + !memcmp(data.Scan0, rgb32_xp, sizeof(rgb32_xp)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat32bppRGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &data); + expect(Ok, status); + ok(data.Width == 2, "expected 2, got %d\n", data.Width); + ok(data.Height == 1, "expected 1, got %d\n", data.Height); + ok(data.Stride == 8, "expected 8, got %d\n", data.Stride); + ok(data.PixelFormat == PixelFormat24bppRGB, "expected PixelFormat24bppRGB, got %d\n", data.PixelFormat); + match = !memcmp(data.Scan0, rgb24, sizeof(rgb24)); + ok(match, "bits don't match\n"); + if (!match) + { + bits = data.Scan0; + trace("format %#x, bits %02x,%02x,%02x,%02x %02x,%02x,%02x,%02x\n", PixelFormat24bppRGB, + bits[0], bits[1], bits[2], bits[3], bits[4], bits[5], bits[6], bits[7]); + } + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + + GdipDisposeImage((GpImage *)bitmap); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4119,6 +4190,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_ARGB_conversion(); test_DrawImage_scale(); test_image_format(); test_DrawImage();

1 0

Andrew Talbot : oledlg: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 10e9e1531a3e62c4b6c7574643eb1cbd009ae451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e9e1531a3e62c4b6c757464… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 22:49:07 2013 +0000 oledlg: Avoid signed-unsigned integer comparisons. --- dlls/oledlg/pastespl.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 1dba9583..f136438 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -85,7 +85,9 @@ static void dump_ps_flags(DWORD flags) static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) { - UINT i; + INT i; + UINT j; + dump_ps_flags(ps->dwFlags); TRACE("hwnd %p caption %s hook %p custdata %lx\n", ps->hWndOwner, debugstr_w(ps->lpszCaption), ps->lpfnHook, ps->lCustData); @@ -110,8 +112,8 @@ static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) } for(i = 0; i < ps->cLinkTypes; i++) TRACE("arrLinkTypes[%d] %08x\n", i, ps->arrLinkTypes[i]); - for(i = 0; i < ps->cClsidExclude; i++) - TRACE("lpClsidExclude[%d] %s\n", i, debugstr_guid(&ps->lpClsidExclude[i])); + for(j = 0; j < ps->cClsidExclude; j++) + TRACE("lpClsidExclude[%u] %s\n", j, debugstr_guid(&ps->lpClsidExclude[j])); }

1 0

Andrew Talbot : quartz: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: d50189c162dc1ae6c03a1e158c12ec4ab2a8730f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50189c162dc1ae6c03a1e158… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 22:49:16 2013 +0000 quartz: Avoid signed-unsigned integer comparisons. --- dlls/quartz/vmr9.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 847b460..5a837dd 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1495,7 +1495,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_ChangeD3DDevice(IVMRSurfaceAllo static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfaceAllocatorNotify9 *iface, VMR9AllocationInfo *allocinfo, DWORD *numbuffers, IDirect3DSurface9 **surface) { VMR9Impl *This = impl_from_IVMRSurfaceAllocatorNotify9(iface); - INT i; + DWORD i; HRESULT hr = S_OK; FIXME("(%p/%p)->(%p, %p => %u, %p) semi-stub\n", iface, This, allocinfo, numbuffers, (numbuffers ? *numbuffers : 0), surface); @@ -1554,11 +1554,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa } else { - ERR("Allocation failed\n"); - for (--i; i >= 0; --i) - { - IDirect3DSurface9_Release(surface[i]); - } + for ( ; i > 0; --i) IDirect3DSurface9_Release(surface[i - 1]); *numbuffers = 0; } return hr; @@ -1691,7 +1687,7 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) if (!refCount) { - int i; + DWORD i; TRACE("Destroying\n"); CloseHandle(This->ack); IDirect3D9_Release(This->d3d9_ptr); @@ -2091,7 +2087,7 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPrese { struct VERTEX t_vert[4]; UINT width, height; - INT i; + unsigned int i; void *bits = NULL; D3DPRESENT_PARAMETERS d3dpp; HRESULT hr;

1 0

Nikolay Sivov : msvcrt: Move demangler flags to a header and use them.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: eab914b968e2558fc9dc61e002b124d8c614b6fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab914b968e2558fc9dc61e00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 24 15:23:29 2013 +0400 msvcrt: Move demangler flags to a header and use them. --- dlls/msvcrt/cpp.c | 2 +- dlls/msvcrt/msvcrt.h | 25 ++++++++++++++++++++++--- dlls/msvcrt/undname.c | 19 ------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index ec0fa7df..0fbdf5f 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -592,7 +592,7 @@ const char * __thiscall MSVCRT_type_info_name(type_info * _this) * Is this '.' really part of the mangled name, or has it some other meaning ? */ char* name = __unDName(0, _this->mangled + 1, 0, - MSVCRT_malloc, MSVCRT_free, 0x2800); + MSVCRT_malloc, MSVCRT_free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE); if (name) { unsigned int len = strlen(name); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ba67b65..bd69224 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -251,9 +251,6 @@ void __cdecl MSVCRT_operator_delete(void*); typedef void* (__cdecl *malloc_func_t)(MSVCRT_size_t); typedef void (__cdecl *free_func_t)(void*); -extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); -extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int); - /* Setup and teardown multi threaded locks */ extern void msvcrt_init_mt_locks(void) DECLSPEC_HIDDEN; extern void msvcrt_free_mt_locks(void) DECLSPEC_HIDDEN; @@ -1012,4 +1009,26 @@ typedef struct double x; } MSVCRT__CRT_DOUBLE; +extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); + +/* __unDName/__unDNameEx flags */ +#define UNDNAME_COMPLETE (0x0000) +#define UNDNAME_NO_LEADING_UNDERSCORES (0x0001) /* Don't show __ in calling convention */ +#define UNDNAME_NO_MS_KEYWORDS (0x0002) /* Don't show calling convention at all */ +#define UNDNAME_NO_FUNCTION_RETURNS (0x0004) /* Don't show function/method return value */ +#define UNDNAME_NO_ALLOCATION_MODEL (0x0008) +#define UNDNAME_NO_ALLOCATION_LANGUAGE (0x0010) +#define UNDNAME_NO_MS_THISTYPE (0x0020) +#define UNDNAME_NO_CV_THISTYPE (0x0040) +#define UNDNAME_NO_THISTYPE (0x0060) +#define UNDNAME_NO_ACCESS_SPECIFIERS (0x0080) /* Don't show access specifier (public/protected/private) */ +#define UNDNAME_NO_THROW_SIGNATURES (0x0100) +#define UNDNAME_NO_MEMBER_TYPE (0x0200) /* Don't show static/virtual specifier */ +#define UNDNAME_NO_RETURN_UDT_MODEL (0x0400) +#define UNDNAME_32_BIT_DECODE (0x0800) +#define UNDNAME_NAME_ONLY (0x1000) /* Only report the variable/method name */ +#define UNDNAME_NO_ARGUMENTS (0x2000) /* Don't show method arguments */ +#define UNDNAME_NO_SPECIAL_SYMS (0x4000) +#define UNDNAME_NO_COMPLEX_TYPE (0x8000) + #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 4fe5c2c..a997351 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -36,25 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); * - back-port this new code into tools/winedump/msmangle.c */ -#define UNDNAME_COMPLETE (0x0000) -#define UNDNAME_NO_LEADING_UNDERSCORES (0x0001) /* Don't show __ in calling convention */ -#define UNDNAME_NO_MS_KEYWORDS (0x0002) /* Don't show calling convention at all */ -#define UNDNAME_NO_FUNCTION_RETURNS (0x0004) /* Don't show function/method return value */ -#define UNDNAME_NO_ALLOCATION_MODEL (0x0008) -#define UNDNAME_NO_ALLOCATION_LANGUAGE (0x0010) -#define UNDNAME_NO_MS_THISTYPE (0x0020) -#define UNDNAME_NO_CV_THISTYPE (0x0040) -#define UNDNAME_NO_THISTYPE (0x0060) -#define UNDNAME_NO_ACCESS_SPECIFIERS (0x0080) /* Don't show access specifier (public/protected/private) */ -#define UNDNAME_NO_THROW_SIGNATURES (0x0100) -#define UNDNAME_NO_MEMBER_TYPE (0x0200) /* Don't show static/virtual specifier */ -#define UNDNAME_NO_RETURN_UDT_MODEL (0x0400) -#define UNDNAME_32_BIT_DECODE (0x0800) -#define UNDNAME_NAME_ONLY (0x1000) /* Only report the variable/method name */ -#define UNDNAME_NO_ARGUMENTS (0x2000) /* Don't show method arguments */ -#define UNDNAME_NO_SPECIAL_SYMS (0x4000) -#define UNDNAME_NO_COMPLEX_TYPE (0x8000) - /* How data types modifiers are stored: * M (in the following definitions) is defined for * 'A', 'B', 'C' and 'D' as follows

1 0

Andrew Talbot : oledb32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 79bda3d44d5b5a5e01f4bf5b5a6b78b92a49a30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=79bda3d44d5b5a5e01f4bf5b5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Feb 23 22:48:47 2013 +0000 oledb32: Avoid signed-unsigned integer comparisons. --- dlls/oledb32/datainit.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index d979846..62e2e50 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -275,11 +275,11 @@ static ULONG WINAPI datainit_Release(IDataInitialize *iface) static void free_dbpropset(ULONG count, DBPROPSET *propset) { - int i; + ULONG i; for (i = 0; i < count; i++) { - int p; + ULONG p; for (p = 0; p < propset[i].cProperties; p++) VariantClear(&propset[i].rgProperties[p].vValue); @@ -566,7 +566,7 @@ static void write_propvalue_str(WCHAR *str, DBPROP *prop) static WCHAR *get_propinfo_descr(DBPROP *prop, DBPROPINFOSET *propinfoset) { - int i; + ULONG i; for (i = 0; i < propinfoset->cPropertyInfos; i++) if (propinfoset->rgPropertyInfos[i].dwPropertyID == prop->dwPropertyID) @@ -577,11 +577,11 @@ static WCHAR *get_propinfo_descr(DBPROP *prop, DBPROPINFOSET *propinfoset) static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) { - int i; + ULONG i; for (i = 0; i < count; i++) { - int p; + ULONG p; for (p = 0; p < propinfoset[i].cPropertyInfos; p++) VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues); @@ -606,7 +606,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I IPersist *persist; HRESULT hr; CLSID clsid; - int i, len; + ULONG i, len; TRACE("(%p)->(%p %d %p)\n", This, datasource, include_pass, init_string);

1 0

Daniel Jelinski : comctl32/imagelist: Allow only one drag cursor.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: wine Branch: master Commit: 30d667bd25701076400481204658fb772edc2b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d667bd25701076400481204… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Feb 24 00:33:58 2013 +0100 comctl32/imagelist: Allow only one drag cursor. --- dlls/comctl32/imagelist.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3eb7724..54d864e 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -114,6 +114,7 @@ typedef struct { HWND hwnd; HIMAGELIST himl; + HIMAGELIST himlNoCursor; /* position of the drag image relative to the window */ INT x; INT y; @@ -126,7 +127,7 @@ typedef struct HBITMAP hbmBg; } INTERNALDRAG; -static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 }; +static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, 0, FALSE, 0 }; static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count); static HRESULT ImageListImpl_CreateInstance(const IUnknown *pUnkOuter, REFIID iid, void** ppv); @@ -607,7 +608,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, cx = himlTrack->cx; cy = himlTrack->cy; - InternalDrag.himl = ImageList_Create (cx, cy, himlTrack->flags, 1, 1); + InternalDrag.himlNoCursor = InternalDrag.himl = ImageList_Create (cx, cy, himlTrack->flags, 1, 1); if (InternalDrag.himl == NULL) { WARN("Error creating drag image list!\n"); return FALSE; @@ -1635,8 +1636,10 @@ ImageList_EndDrag (void) { /* cleanup the InternalDrag struct */ InternalDrag.hwnd = 0; + if (InternalDrag.himl != InternalDrag.himlNoCursor) + ImageList_Destroy (InternalDrag.himlNoCursor); ImageList_Destroy (InternalDrag.himl); - InternalDrag.himl = 0; + InternalDrag.himlNoCursor = InternalDrag.himl = 0; InternalDrag.x= 0; InternalDrag.y= 0; InternalDrag.dxHotspot = 0; @@ -2699,7 +2702,7 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag, visible = InternalDrag.bShow; - himlTemp = ImageList_Merge (InternalDrag.himl, 0, himlDrag, iDrag, + himlTemp = ImageList_Merge (InternalDrag.himlNoCursor, 0, himlDrag, iDrag, dxHotspot, dyHotspot); if (visible) { @@ -2713,7 +2716,8 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag, InternalDrag.hbmBg = 0; } - ImageList_Destroy (InternalDrag.himl); + if (InternalDrag.himl != InternalDrag.himlNoCursor) + ImageList_Destroy (InternalDrag.himl); InternalDrag.himl = himlTemp; if (visible) {

1 0

Francois Gouget : testbot/TestAgent: Retrieve the netcat error when the connection breaks.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: bb7361dccc5918ae71e1ef341c7c00eaa6fb1d48 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bb7361dccc5918ae71e1ef34… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:32:50 2013 +0100 testbot/TestAgent: Retrieve the netcat error when the connection breaks. It may provide important clues as to what went wrong, especially when trying to connect. --- testbot/lib/WineTestBot/TestAgent.pm | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 4fe1b25..cda83a8 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -88,6 +88,7 @@ sub Disconnect($) # which will avoid undue delays. $self->{ssh}->disconnect(); $self->{ssh} = undef; + $self->{nc} = undef; } if ($self->{sshfd}) { @@ -148,7 +149,29 @@ sub _SetError($$$) $self->{err} = $Msg; # And disconnect on fatal errors since the connection is unusable anyway - $self->Disconnect() if ($Level == $FATAL); + if ($Level == $FATAL) + { + if ($self->{ssh}) + { + # Try to capture the netcat exit code and error message as + # they may provide important clues as to what went wrong + my $rc = $self->{fd}->exit_status(); + if ($rc) + { + my $ncerr; + eval + { + alarm(2); + $self->{fd}->read($ncerr, 1024, 1); + alarm(0); + }; + $ncerr = $rc if (!$ncerr); + $ncerr = "the \"$self->{nc}\" command returned $ncerr"; + $self->{err} = $self->{agentversion} ? "$self->{err}\n$ncerr" : $ncerr; + } + } + $self->Disconnect(); + } } elsif (!$self->{err}) { @@ -851,7 +874,9 @@ sub _Connect($) # Use netcat to forward the connection from the SSH server to the TestAgent # server. Note that we won't know about netcat errors at this point. - if (!$self->{fd}->exec("nc -q0 '$self->{agenthost}' '$self->{agentport}'")) + $self->{nc} = "nc -q0 '$self->{agenthost}' '$self->{agentport}'"; + debug("Tunneling command: $self->{nc}\n"); + if (!$self->{fd}->exec($self->{nc})) { $self->_SetError($FATAL, "Unable to start netcat: " . $self->_ssherror()); return undef; @@ -864,7 +889,7 @@ sub _Connect($) if (!defined $self->{agentversion}) { # We have already been disconnected at this point - $self->{err} = "Unable to get the protocol version spoken by the server: $self->{err}"; + debug("could not get the protocol version spoken by the server\n"); return undef; }

1 0

Francois Gouget : testbot/testagentd: Catch SIGPIPE so the server does not die if the client disconnects during a file transfer .
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: da4926a61e72a4a91e1941a53872828a9d725ea7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da4926a61e72a4a91e1941a5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:59:57 2013 +0100 testbot/testagentd: Catch SIGPIPE so the server does not die if the client disconnects during a file transfer. --- testbot/src/testagentd/platform_unix.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index d7d8f54..cd08c58 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -228,6 +228,8 @@ void ta_freeaddrinfo(struct addrinfo *addresses) int platform_init(void) { struct sigaction sa, osa; + + /* Catch SIGCHLD so we can keep track of child processes */ sa.sa_handler = reaper; sigemptyset(&sa.sa_mask); sa.sa_flags = SA_RESTART; @@ -236,5 +238,18 @@ int platform_init(void) error("could not set up the SIGCHLD handler: %s\n", strerror(errno)); return 0; } + + /* Catch SIGPIPE so we don't die if the client disconnects at an + * inconvenient time + */ + sa.sa_handler = SIG_IGN; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART; + if (sigaction(SIGPIPE, &sa, &osa) < 0) + { + error("could not set up the SIGPIPE handler: %s\n", strerror(errno)); + return 0; + } + return 1; }

1 0

Francois Gouget : testbot/TestAgent: Fix GetFile()'s error handling.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 00c73ead8962dc69ec1e02a69633c70362c5dfef URL: http://source.winehq.org/git/tools.git/?a=commit;h=00c73ead8962dc69ec1e02a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:53:03 2013 +0100 testbot/TestAgent: Fix GetFile()'s error handling. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f06bd71..7852e41 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -287,7 +287,7 @@ sub _RecvEntryHeader($) return ($Type, $High << 32 | $Low); } -sub _ExpectEntryHeader($$$) +sub _ExpectEntryHeader($$;$) { my ($self, $Type, $Size) = @_; @@ -368,7 +368,7 @@ sub _RecvFile($$$) return undef if (!defined $self->{fd}); debug(" RecvFile($Filename)\n"); - my $Size = $self->_RecvEntryHeader('d'); + my $Size = $self->_ExpectEntryHeader('d'); return undef if (!defined $Size); my $Success; @@ -988,6 +988,7 @@ sub GetFile($$$) { my $Success = $self->_GetFileOrString($ServerPathName, $LocalPathName, $fh); close($fh); + unlink $LocalPathName if (!$Success); return $Success; } $self->_SetError($ERROR, "Unable to open '$LocalPathName' for writing: $!");

1 0

Francois Gouget : testbot/build: Rename the wine-git directory to wine to simplify setup.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: a7ab9e840be914c71c7519c6df3c3c85c798949e URL: http://source.winehq.org/git/tools.git/?a=commit;h=a7ab9e840be914c71c7519c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 15:55:53 2013 +0100 testbot/build: Rename the wine-git directory to wine to simplify setup. --- testbot/bin/build/Build.pl | 8 ++++---- testbot/bin/build/Reconfig.pl | 6 +++--- testbot/doc/INSTALL.txt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 8ecbd09..21899af 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -115,7 +115,7 @@ sub ApplyPatch } InfoMsg "Applying patch\n"; - system("( cd $DataDir/wine-git && set -x && " . + system("( cd $DataDir/wine && set -x && " . " git apply --verbose $PatchFile " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) @@ -127,7 +127,7 @@ sub ApplyPatch if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; - system("( cd $DataDir/wine-git && set -x && " . + system("( cd $DataDir/wine && set -x && " . " autoconf --output configure configure.ac " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) @@ -141,7 +141,7 @@ sub ApplyPatch if ($NeedImplib) { - if (open (FH, "<$DataDir/wine-git/$PatchType/$BaseName/Makefile.in")) + if (open (FH, "<$DataDir/wine/$PatchType/$BaseName/Makefile.in")) { $NeedImplib = !1; my $Line; @@ -179,7 +179,7 @@ sub BuildTestExecutable InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index cc8e76e..a82d879 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -60,7 +60,7 @@ sub FatalError sub GitPull { - system("cd $DataDir/wine-git && git pull >> $LogDir/Reconfig.log 2>&1"); + system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { LogMsg "Git pull failed\n"; @@ -115,7 +115,7 @@ sub BuildNative mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . - " time ../wine-git/configure --enable-win64 --without-x --without-freetype && " . + " time ../wine/configure --enable-win64 --without-x --without-freetype && " . " time make -j$ncpus depend && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -137,7 +137,7 @@ sub BuildCross mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . - " time ../wine-git/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype && " . " time make -j$ncpus depend && " . " time make -j$ncpus programs/winetest " . ") >>$LogDir/Reconfig.log 2>&1"); diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index e8101ab..c8597d2 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -139,10 +139,10 @@ Dependencies: should be available as $HOME/tools/testbot/doc/INSTALL.txt). git clone git://source.winehq.org/git/tools.git - Create the $HOME/tools/testbot/var directory and clone the Wine git - repository to wine-git: + repository to wine: mkdir $HOME/tools/testbot/var cd $HOME/tools/testbot/var - git clone git://source.winehq.org/git/wine.git wine-git + git clone git://source.winehq.org/git/wine.git wine - Run $HOME/tools/testbot/bin/build/Reconfig.pl. - Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix issues until it works.

1 0

Francois Gouget : testbot/TestAgent: Don' t try to parse $TunnelOpt as an SSH URI if it is set to 'never'.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: da1496d337c3970e5cbc26db41d6247e48a2af35 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da1496d337c3970e5cbc26db… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:03:11 2013 +0100 testbot/TestAgent: Don't try to parse $TunnelOpt as an SSH URI if it is set to 'never'. --- testbot/scripts/TestAgent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 78d9c24..d25a3d6 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -271,7 +271,7 @@ if (defined $Usage) $TunnelOpt = $Tunnel if (!defined $TunnelOpt); my $TunnelInfo; -if ($TunnelOpt) +if ($TunnelOpt and $TunnelOpt =~ /^ssh:/) { my $ParsedURI = URI->new($TunnelOpt); %$TunnelInfo = %$TunnelDefaults if ($TunnelDefaults);

1 0

Francois Gouget : testbot/TestAgent: Use the basename of the first filename if the second one is omitted for getfile or sendfile .
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 82048e24fad06f016a182544829a02a2d5138fe1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=82048e24fad06f016a182544… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 16:59:25 2013 +0100 testbot/TestAgent: Use the basename of the first filename if the second one is omitted for getfile or sendfile. --- testbot/scripts/TestAgent | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 8605002..02da611 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -128,13 +128,35 @@ while (@ARGV) { $Cmd = $arg; $LocalFilename = check_opt_val($arg, $LocalFilename); - $ServerFilename = check_opt_val($arg, $ServerFilename) if (!$Usage); + if (!$Usage) + { + if (@ARGV) + { + $ServerFilename = check_opt_val($arg, $ServerFilename); + } + else + { + $ServerFilename = $LocalFilename; + $ServerFilename =~ s%^.*/%%; + } + } } elsif ($arg eq "getfile") { $Cmd = $arg; $ServerFilename = check_opt_val($arg, $ServerFilename); - $LocalFilename = check_opt_val($arg, $LocalFilename) if (!$Usage); + if (!$Usage) + { + if (@ARGV) + { + $LocalFilename = check_opt_val($arg, $LocalFilename); + } + else + { + $LocalFilename = $ServerFilename; + $LocalFilename =~ s%^.*[/\\]%%; + } + } } elsif ($arg eq "run") {

1 0

Francois Gouget : testbot/build: Update the build VM configuration documentation.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 74bc129c0245b11c1e55c5eb91a358132fff00c9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=74bc129c0245b11c1e55c5eb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 15:55:15 2013 +0100 testbot/build: Update the build VM configuration documentation. --- testbot/doc/INSTALL.txt | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index f57ed17..e8101ab 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -132,18 +132,20 @@ Dependencies: with MinGW. For instance on Debian you should install autoconf, bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to have 64bit VMs then make sure MinGW can generate 64bit PE executables. -- Create a new system group 'winehq' and a system user 'winehq', - make sure to make user winehq a member of group winehq. +- You may also want to install ccache. +- You will also need genisoimage. +- Create a new user, 'testbot' for instance, and log in as that user. - Clone Wine's tools repository to $HOME/tools (so this document should be available as $HOME/tools/testbot/doc/INSTALL.txt). -- Create the $HOME/tools/testbot/var directory and make it writable to - group winehq. + git clone git://source.winehq.org/git/tools.git +- Create the $HOME/tools/testbot/var directory and clone the Wine git + repository to wine-git: mkdir $HOME/tools/testbot/var - chmod g+w $HOME/tools/testbot/var -- Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. -- In the winehq account, run Reconfig.pl. - Check $HOME/tools/testbot/log/Reconfig.log to make sure it - succeeded. + cd $HOME/tools/testbot/var + git clone git://source.winehq.org/git/wine.git wine-git +- Run $HOME/tools/testbot/bin/build/Reconfig.pl. +- Check $HOME/tools/testbot/var/Reconfig.log to make sure it succeeded. Fix + issues until it works. - Start the TestAgent server from the var directory: cd $HOME/tools/testbot/var && ../bin/build/testagentd PORT SRCHOST Where PORT is the $AgentPort that was configured in ConfigLocal.pl

1 0

Francois Gouget : testbot/TestAgent: 'nc -q0' seems to be the default but make it explicit just in case.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 3fff4c25a586c150969ea181519228e5855dec07 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3fff4c25a586c150969ea181… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:32:11 2013 +0100 testbot/TestAgent: 'nc -q0' seems to be the default but make it explicit just in case. --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7852e41..4fe1b25 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -851,7 +851,7 @@ sub _Connect($) # Use netcat to forward the connection from the SSH server to the TestAgent # server. Note that we won't know about netcat errors at this point. - if (!$self->{fd}->exec("nc '$self->{agenthost}' '$self->{agentport}'")) + if (!$self->{fd}->exec("nc -q0 '$self->{agenthost}' '$self->{agentport}'")) { $self->_SetError($FATAL, "Unable to start netcat: " . $self->_ssherror()); return undef;

1 0

Francois Gouget : testbot/TestAgent: Extend and fix the run RPC' s redirection options.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 3fca08b59407b3e7c215e5d9298ccd267cce3831 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3fca08b59407b3e7c215e5d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:40:42 2013 +0100 testbot/TestAgent: Extend and fix the run RPC's redirection options. Always set up the stdout and stderr redirections for append so they don't overwrite each other. Add options to prevent the truncation of the files stdout and stderr are redirected to. This makes it possible to run multiple commands in a row and to collect all their output in a single file. --- testbot/lib/WineTestBot/TestAgent.pm | 5 ++++- testbot/scripts/TestAgent | 10 ++++++++++ testbot/src/testagentd/platform.h | 2 ++ testbot/src/testagentd/platform_unix.c | 16 ++++++++++++++-- testbot/src/testagentd/platform_windows.c | 19 ++++++++++++++++++- testbot/src/testagentd/testagentd.c | 11 ++++++----- 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index c3326d6..074e4f0 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -21,7 +21,7 @@ package TestAgent; use strict; -use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT); +use vars qw (@ISA @EXPORT_OK $SENDFILE_EXE $RUN_DNT $RUN_DNTRUNC_OUT $RUN_DNTRUNC_ERR $RUN_DNTRUNC); require Exporter; @ISA = qw(Exporter); @@ -1031,6 +1031,9 @@ sub GetFileToString($$) } $RUN_DNT = 1; +$RUN_DNTRUNC_OUT = 2; +$RUN_DNTRUNC_ERR = 4; +$RUN_DNTRUNC = $RUN_DNTRUNC_OUT | $RUN_DNTRUNC_ERR; sub Run($$$;$$$) { diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 1424998..521e741 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -120,6 +120,14 @@ while (@ARGV) { $RunErr = check_opt_val($arg, $RunErr); } + elsif ($arg eq "--run-dntrunc-out") + { + $RunFlags |= $TestAgent::RUN_DNTRUNC_OUT; + } + elsif ($arg eq "--run-dntrunc-err") + { + $RunFlags |= $TestAgent::RUN_DNTRUNC_ERR; + } elsif (!defined $Hostname) { $Hostname = $arg; @@ -252,8 +260,10 @@ if (defined $Usage) print " specified server file.\n"; print " --run-out <serverpath> Redirect the stdout or the command being run to the\n"; print " specified server file.\n"; + print " --run-dntrunc-out Do not truncate the file stdout is redirected to.\n"; print " --run-err <serverpath> Redirect the stderr or the command being run to the\n"; print " specified server file.\n"; + print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the version of the server.\n"; print " ping Makes sure the server is still alive.\n"; diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index d2a3934..621ce98 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -60,6 +60,8 @@ int platform_init(void); enum run_flags_t { RUN_DNT = 1, + RUN_DNTRUNC_OUT = 2, + RUN_DNTRUNC_ERR = 4, }; /* Starts the specified command in the background and reports the status to diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index 6552e05..48eef73 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -69,13 +69,25 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) { pid_t pid; int fds[3] = {-1, -1, -1}; - int i; + int ofl, i; for (i = 0; i < 3; i++) { if (redirects[i][0] == '\0') continue; - fds[i] = open(redirects[i], (i ? O_WRONLY : O_RDONLY) | O_CREAT | O_TRUNC); + switch (i) + { + case 0: + ofl = O_RDONLY; + break; + case 1: + ofl = O_APPEND | O_CREAT | (flags & RUN_DNTRUNC_OUT ? 0 : O_TRUNC); + break; + case 2: + ofl = O_APPEND | O_CREAT | (flags & RUN_DNTRUNC_ERR ? 0 : O_TRUNC); + break; + } + fds[i] = open(redirects[i], ofl, 0666); if (fds[i] < 0) { set_status(ST_ERROR, "unable to open '%s' for %s: %s", redirects[i], i ? "writing" : "reading", strerror(errno)); diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 9e5bf78..10ea55a 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -82,13 +82,30 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) has_redirects = 0; for (i = 0; i < 3; i++) { + DWORD access, creation; if (redirects[i][0] == '\0') { fhs[i] = GetStdHandle(stdhandles[i]); continue; } has_redirects = 1; - fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + switch (i) + { + case 0: + access = GENERIC_READ; + creation = OPEN_EXISTING; + break; + case 1: + access = FILE_APPEND_DATA; + creation = (flags & RUN_DNTRUNC_OUT ? OPEN_ALWAYS : CREATE_ALWAYS); + break; + case 2: + access = FILE_APPEND_DATA; + creation = (flags & RUN_DNTRUNC_ERR ? OPEN_ALWAYS : CREATE_ALWAYS); + break; + } + fhs[i] = CreateFile(redirects[i], access, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, creation, FILE_ATTRIBUTE_NORMAL, NULL); + debug(" %d redirected -> %p\n", i, fhs[i]); if (fhs[i] == INVALID_HANDLE_VALUE) { set_status(ST_ERROR, "unable to open '%s' for %s: %lu", redirects[i], i ? "writing" : "reading", GetLastError()); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 8a8f2bb..c06af72 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -33,8 +33,9 @@ * Otherwise increase the minor version number: * 1.0: Initial release. * 1.1: Added the wait2 RPC. + * 1.2: Add more redirection options to the run RPC. */ -#define PROTOCOL_VERSION "testagentd 1.1" +#define PROTOCOL_VERSION "testagentd 1.2" #define BLOCK_SIZE 4096 @@ -730,10 +731,10 @@ static void do_run(SOCKET client) debug(" run '%s", argv[0]); for (i = 1; i < argc; i++) debug("' '%s", argv[i]); - debug("' %s%s%s%s%s%s\n", - redirects[0][0] ? " <" : "", redirects[0], - redirects[1][0] ? " >" : "", redirects[1], - redirects[2][0] ? " 2>" : "", redirects[2]); + debug("'%s%s%s%s%s%s\n", + !redirects[0][0] ? "" : " <", redirects[0], + !redirects[1][0] ? "" : (flags & RUN_DNTRUNC_OUT) ? " >>" : " >", redirects[1], + !redirects[2][0] ? "" : (flags & RUN_DNTRUNC_ERR) ? " 2>>" : " 2>", redirects[2]); pid = platform_run(argv, flags, redirects); if (!pid)

1 0

Francois Gouget : testbot/testagentd: Allow reading, writing and deleting the run command redirect files.
by Alexandre Julliard Feb. 25, 2013

Feb. 25, 2013

Module: tools Branch: master Commit: 2b6cf2889054a8fdf5117795480d515ae8915330 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2b6cf2889054a8fdf5117795… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 25 17:35:16 2013 +0100 testbot/testagentd: Allow reading, writing and deleting the run command redirect files. In particular if we send stdout or stderr to a log, it's important that we can read it even if the command gets stuck. --- testbot/src/testagentd/platform_windows.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 55ed51d..9e5bf78 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -88,7 +88,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) continue; } has_redirects = 1; - fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), 0, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + fhs[i] = CreateFile(redirects[i], (i ? GENERIC_WRITE : GENERIC_READ), FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (fhs[i] == INVALID_HANDLE_VALUE) { set_status(ST_ERROR, "unable to open '%s' for %s: %lu", redirects[i], i ? "writing" : "reading", GetLastError());

1 0