May 2013 - Wine-Commits - list.winehq.org

Ken Thomases : winemac: Consolidate mouse move handling into -[ WineApplicationController handleMouseMove:].
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 72e893237ca9db195c9b3004576f2097c735d2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e893237ca9db195c9b30045… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:39 2013 -0500 winemac: Consolidate mouse move handling into -[WineApplicationController handleMouseMove:]. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 38 +++++++++++++++++++++++++++++++++++- dlls/winemac.drv/cocoa_window.h | 4 --- dlls/winemac.drv/cocoa_window.m | 41 --------------------------------------- 4 files changed, 38 insertions(+), 46 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 60a239c..f0cdfc3 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -60,6 +60,7 @@ enum { WineWindow* lastTargetWindow; BOOL forceNextMouseMoveAbsolute; + double mouseMoveDeltaX, mouseMoveDeltaY; NSMutableArray* orderedWineWindows; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7f2ec7c..3ef84e0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1157,6 +1157,7 @@ int macdrv_err_on; if ([targetWindow isKindOfClass:[WineWindow class]]) { + macdrv_event* event; BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); forceNextMouseMoveAbsolute = FALSE; @@ -1172,7 +1173,42 @@ int macdrv_err_on; absolute = TRUE; } - [targetWindow postMouseMovedEvent:anEvent absolute:absolute]; + if (absolute) + { + CGPoint point = CGEventGetLocation([anEvent CGEvent]); + + event = macdrv_create_event(MOUSE_MOVED_ABSOLUTE, targetWindow); + event->mouse_moved.x = point.x; + event->mouse_moved.y = point.y; + + mouseMoveDeltaX = 0; + mouseMoveDeltaY = 0; + } + else + { + /* Add event delta to accumulated delta error */ + /* deltaY is already flipped */ + mouseMoveDeltaX += [anEvent deltaX]; + mouseMoveDeltaY += [anEvent deltaY]; + + event = macdrv_create_event(MOUSE_MOVED, targetWindow); + event->mouse_moved.x = mouseMoveDeltaX; + event->mouse_moved.y = mouseMoveDeltaY; + + /* Keep the remainder after integer truncation. */ + mouseMoveDeltaX -= event->mouse_moved.x; + mouseMoveDeltaY -= event->mouse_moved.y; + } + + if (event->type == MOUSE_MOVED_ABSOLUTE || event->mouse_moved.x || event->mouse_moved.y) + { + event->mouse_moved.time_ms = [self ticksForEventTime:[anEvent timestamp]]; + + [targetWindow.queue postEvent:event]; + } + + macdrv_release_event(event); + lastTargetWindow = targetWindow; } else if (lastTargetWindow) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index ed5f1f9..2d95e1a 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -48,8 +48,6 @@ NSUInteger lastModifierFlags; - double mouseMoveDeltaX, mouseMoveDeltaY; - NSInteger levelWhenActive; NSTimer* liveResizeDisplayTimer; @@ -68,6 +66,4 @@ - (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 65d7bc5..80bf9a4 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -952,47 +952,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) event:theEvent]; } - - (void) postMouseMovedEvent:(NSEvent *)theEvent absolute:(BOOL)absolute - { - macdrv_event* event; - - if (absolute) - { - CGPoint point = CGEventGetLocation([theEvent CGEvent]); - - event = macdrv_create_event(MOUSE_MOVED_ABSOLUTE, self); - event->mouse_moved.x = point.x; - event->mouse_moved.y = point.y; - - mouseMoveDeltaX = 0; - mouseMoveDeltaY = 0; - } - else - { - /* Add event delta to accumulated delta error */ - /* deltaY is already flipped */ - mouseMoveDeltaX += [theEvent deltaX]; - mouseMoveDeltaY += [theEvent deltaY]; - - event = macdrv_create_event(MOUSE_MOVED, self); - event->mouse_moved.x = mouseMoveDeltaX; - event->mouse_moved.y = mouseMoveDeltaY; - - /* Keep the remainder after integer truncation. */ - mouseMoveDeltaX -= event->mouse_moved.x; - mouseMoveDeltaY -= event->mouse_moved.y; - } - - if (event->type == MOUSE_MOVED_ABSOLUTE || event->mouse_moved.x || event->mouse_moved.y) - { - event->mouse_moved.time_ms = [[WineApplicationController sharedController] ticksForEventTime:[theEvent timestamp]]; - - [queue postEvent:event]; - } - - macdrv_release_event(event); - } - - (void) setLevelWhenActive:(NSInteger)level { levelWhenActive = level;

1 0

Ken Thomases : winemac: Extract application-level handling of mouse move events to a separate method .
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 76691853f527fe799a05f0d8cb75a4f2abfec4a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76691853f527fe799a05f0d8c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:35 2013 -0500 winemac: Extract application-level handling of mouse move events to a separate method. --- dlls/winemac.drv/cocoa_app.m | 94 ++++++++++++++++++++++-------------------- 1 files changed, 49 insertions(+), 45 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7a304a8..7f2ec7c 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1134,6 +1134,54 @@ int macdrv_err_on; return TRUE; } + - (void) handleMouseMove:(NSEvent*)anEvent + { + WineWindow* targetWindow; + + /* 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 ([anEvent type] == NSMouseMoved) + { + CGPoint cgpoint = CGEventGetLocation([anEvent CGEvent]); + NSPoint point = [self flippedMouseLocation:NSPointFromCGPoint(cgpoint)]; + NSInteger windowUnderNumber; + + windowUnderNumber = [NSWindow windowNumberAtPoint:point + belowWindowWithWindowNumber:0]; + targetWindow = (WineWindow*)[NSApp windowWithWindowNumber:windowUnderNumber]; + } + else + targetWindow = (WineWindow*)[anEvent window]; + + if ([targetWindow isKindOfClass:[WineWindow class]]) + { + BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); + forceNextMouseMoveAbsolute = FALSE; + + // If we recently warped the cursor (other than in our cursor-clipping + // event tap), 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; + } + else if (lastTargetWindow) + { + [[NSCursor arrowCursor] set]; + [self unhideCursor]; + lastTargetWindow = nil; + } + } // Returns TRUE if the event was handled and caller should do nothing more // with it. Returns FALSE if the caller should process it as normal and @@ -1152,51 +1200,7 @@ int macdrv_err_on; if (type == NSMouseMoved || type == NSLeftMouseDragged || type == NSRightMouseDragged || type == NSOtherMouseDragged) { - WineWindow* targetWindow; - - /* 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*)[NSApp windowWithWindowNumber:windowUnderNumber]; - } - else - targetWindow = (WineWindow*)[anEvent window]; - - if ([targetWindow isKindOfClass:[WineWindow class]]) - { - BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); - forceNextMouseMoveAbsolute = FALSE; - - // If we recently warped the cursor (other than in our cursor-clipping - // event tap), 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; - } - else if (lastTargetWindow) - { - [[NSCursor arrowCursor] set]; - [self unhideCursor]; - lastTargetWindow = nil; - } + [self handleMouseMove:anEvent]; } else if (type == NSLeftMouseDown || type == NSLeftMouseUp || type == NSRightMouseDown || type == NSRightMouseUp ||

1 0

Stefan Leichter : include: Fix prototype of CryptUIWizDigitalSign.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: d0ea3642917006fac9a93f24f94eeb949dd5ec53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ea3642917006fac9a93f24f… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon May 6 22:23:35 2013 +0200 include: Fix prototype of CryptUIWizDigitalSign. --- include/cryptuiapi.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/cryptuiapi.h b/include/cryptuiapi.h index 81c58af..7201cbc 100644 --- a/include/cryptuiapi.h +++ b/include/cryptuiapi.h @@ -240,6 +240,7 @@ typedef struct _CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT DWORD cbBlob; BYTE *pbBlob; } CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT, *PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT; +typedef const CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT; /* Values for CryptUIWizDigitalSign's dwFlags */ #define CRYPTUI_WIZ_NO_UI 0x00000001 @@ -248,7 +249,7 @@ typedef struct _CRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT BOOL WINAPI CryptUIWizDigitalSign(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardTitle, PCCRYPTUI_WIZ_DIGITAL_SIGN_INFO pDigitalSignInfo, - PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext); + PCCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT *ppSignContext); BOOL WINAPI CryptUIWizFreeDigitalSignContext( PCRYPTUI_WIZ_DIGITAL_SIGN_CONTEXT pSignContext);

1 0

Max Kellermann : msvcrt: Fix character/ byte confusion in buffer overflow branch.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: cee65e94094afcadac996473ff5f98beea2f7aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee65e94094afcadac996473f… Author: Max Kellermann <max(a)duempel.org> Date: Mon May 6 22:21:03 2013 +0200 msvcrt: Fix character/byte confusion in buffer overflow branch. --- dlls/msvcrt/printf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 3ccb1c4..0fe27f7 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -48,7 +48,7 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len); + memcpy(out->buf, str, out->len*sizeof(APICHAR)); out->buf += out->len; out->len = 0; return -1;

1 0

Christian Costa : d3dx9_36: Add stub for DisassembleEffect.
by Alexandre Julliard May 6, 2013

May 6, 2013

Module: wine Branch: master Commit: bdc5c3211cd3f5330ca90da09a1158885ce3be8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc5c3211cd3f5330ca90da09… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 5 20:44:14 2013 +0200 d3dx9_36: Add stub for DisassembleEffect. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/effect.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9b83135..b2511e8 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -119,7 +119,7 @@ @ stub D3DXCreateVolumeTextureFromResourceW(ptr long ptr ptr) @ stdcall D3DXDebugMute(long) @ stdcall D3DXDeclaratorFromFVF(long ptr) -@ stub D3DXDisassembleEffect(ptr long ptr) +@ stdcall D3DXDisassembleEffect(ptr long ptr) @ stub D3DXDisassembleShader(ptr long ptr ptr) @ stdcall D3DXFileCreate(ptr) @ stdcall D3DXFillCubeTexture(ptr ptr ptr) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c4afbe5..be80ede 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6196,3 +6196,10 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromResourceW(HMODULE srcmodule, const WC return D3DXERR_INVALIDDATA; } + +HRESULT WINAPI D3DXDisassembleEffect(ID3DXEffect *effect, BOOL enable_color_code, ID3DXBuffer **disassembly) +{ + FIXME("(%p, %u, %p): stub\n", effect, enable_color_code, disassembly); + + return D3DXERR_INVALIDDATA; +}

1 0

Hans Leidekker : fusion: Fix alignment in parse_clr_metadata.
by Alexandre Julliard May 6, 2013

May 6, 2013

Module: wine Branch: master Commit: aca88c2f80719bd6b5b3487b02c35de075cb49ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca88c2f80719bd6b5b3487b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 6 10:07:00 2013 +0200 fusion: Fix alignment in parse_clr_metadata. --- dlls/fusion/assembly.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 920d8db..c2f98ec 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -595,8 +595,7 @@ static HRESULT parse_clr_metadata(ASSEMBLY *assembly) else if (!lstrcmpA(stream, "#Blob") || !lstrcmpA(stream, "Blob")) assembly->blobs = assembly_data_offset(assembly, ofs); - ptr += lstrlenA(stream) + 1; - ptr = (BYTE *)(((UINT_PTR)ptr + 3) & ~3); /* align on DWORD boundary */ + ptr += ((lstrlenA(stream) + 1) + 3) & ~3; /* align on DWORD boundary */ } return S_OK;

1 0

Dmitry Timoshkov : gdiplus: Implement GdipEnumerateMetafileDestPoint and GdipEnumerateMetafileDestPointI .
by Alexandre Julliard May 6, 2013

May 6, 2013

Module: wine Branch: master Commit: 4c4c661bc0cb999a7c112f10bbb238792d8394c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4c661bc0cb999a7c112f10b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 12:09:24 2013 +0900 gdiplus: Implement GdipEnumerateMetafileDestPoint and GdipEnumerateMetafileDestPointI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/metafile.c | 30 ++++++++++++++++++++++++++++++ include/gdiplusflat.h | 4 ++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2fa1771..4f30ed1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -190,8 +190,8 @@ 190 stdcall GdipDrawString(ptr wstr long ptr ptr ptr ptr) 191 stdcall GdipEmfToWmfBits(ptr long ptr long long) 192 stdcall GdipEndContainer(ptr ptr) -193 stub GdipEnumerateMetafileDestPoint -194 stub GdipEnumerateMetafileDestPointI +193 stdcall GdipEnumerateMetafileDestPoint(ptr ptr ptr ptr ptr ptr) +194 stdcall GdipEnumerateMetafileDestPointI(ptr ptr ptr ptr ptr ptr) 195 stub GdipEnumerateMetafileDestPoints 196 stub GdipEnumerateMetafileDestPointsI 197 stdcall GdipEnumerateMetafileDestRect(ptr ptr ptr ptr ptr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 893fe6b..bcb5be7 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -584,6 +584,36 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics *graphics, return GdipEnumerateMetafileDestRect(graphics, metafile, &destf, callback, cb_data, attrs); } +GpStatus WINGDIPAPI GdipEnumerateMetafileDestPoint(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpPointF *dest, + EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpRectF destf; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + destf.X = dest->X; + destf.Y = dest->Y; + destf.Width = units_to_pixels(metafile->bounds.Width, metafile->unit, metafile->image.xres); + destf.Height = units_to_pixels(metafile->bounds.Height, metafile->unit, metafile->image.yres); + + return GdipEnumerateMetafileDestRect(graphics, metafile, &destf, callback, cb_data, attrs); +} + +GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpPoint *dest, + EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpPointF ptf; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + ptf.X = dest->X; + ptf.Y = dest->Y; + + return GdipEnumerateMetafileDestPoint(graphics, metafile, &ptf, callback, cb_data, attrs); +} + static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, int nObj, LPARAM lpData) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8e720f1..c622431 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -206,6 +206,10 @@ GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*, GDIPCONST GpBrush*); +GpStatus WINGDIPAPI GdipEnumerateMetafileDestPoint(GpGraphics*,GDIPCONST GpMetafile*, + GDIPCONST GpPointF*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); +GpStatus WINGDIPAPI GdipEnumerateMetafileDestPointI(GpGraphics*,GDIPCONST GpMetafile*, + GDIPCONST GpPoint*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics*,GDIPCONST GpMetafile*, GDIPCONST GpRectF*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics*,GDIPCONST GpMetafile*,

1 0

Dmitry Timoshkov : gdiplus: Implement GdipEnumerateMetafileDestRect and GdipEnumerateMetafileDestRectI .
by Alexandre Julliard May 6, 2013

May 6, 2013

Module: wine Branch: master Commit: 69d74ece533d1c62276a00e5601ff04920249088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d74ece533d1c62276a00e56… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 12:08:38 2013 +0900 gdiplus: Implement GdipEnumerateMetafileDestRect and GdipEnumerateMetafileDestRectI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 4 ++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 920d78e..2fa1771 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -194,8 +194,8 @@ 194 stub GdipEnumerateMetafileDestPointI 195 stub GdipEnumerateMetafileDestPoints 196 stub GdipEnumerateMetafileDestPointsI -197 stub GdipEnumerateMetafileDestRect -198 stub GdipEnumerateMetafileDestRectI +197 stdcall GdipEnumerateMetafileDestRect(ptr ptr ptr ptr ptr ptr) +198 stdcall GdipEnumerateMetafileDestRectI(ptr ptr ptr ptr ptr ptr) 199 stub GdipEnumerateMetafileSrcRectDestPoint 200 stub GdipEnumerateMetafileSrcRectDestPointI 201 stdcall GdipEnumerateMetafileSrcRectDestPoints(ptr ptr ptr long ptr long ptr ptr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f03557b..893fe6b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -551,6 +551,39 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, return stat; } +GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpRectF *dest, + EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpPointF points[3]; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + points[0].X = points[2].X = dest->X; + points[0].Y = points[1].Y = dest->Y; + points[1].X = dest->X + dest->Width; + points[2].Y = dest->Y + dest->Height; + + return GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, points, 3, + &metafile->bounds, metafile->unit, callback, cb_data, attrs); +} + +GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics *graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST GpRect *dest, + EnumerateMetafileProc callback, VOID *cb_data, GDIPCONST GpImageAttributes *attrs) +{ + GpRectF destf; + + if (!graphics || !metafile || !dest) return InvalidParameter; + + destf.X = dest->X; + destf.Y = dest->Y; + destf.Width = dest->Width; + destf.Height = dest->Height; + + return GdipEnumerateMetafileDestRect(graphics, metafile, &destf, callback, cb_data, attrs); +} + static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, int nObj, LPARAM lpData) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f4ecec6..8e720f1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -206,6 +206,10 @@ GpStatus WINGDIPAPI GdipDrawRectanglesI(GpGraphics*,GpPen*,GDIPCONST GpRect*,INT GpStatus WINGDIPAPI GdipDrawString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*, GDIPCONST GpStringFormat*, GDIPCONST GpBrush*); +GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics*,GDIPCONST GpMetafile*, + GDIPCONST GpRectF*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); +GpStatus WINGDIPAPI GdipEnumerateMetafileDestRectI(GpGraphics*,GDIPCONST GpMetafile*, + GDIPCONST GpRect*,EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*); GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics*, GDIPCONST GpMetafile*,GDIPCONST GpPointF*,INT,GDIPCONST GpRectF*,Unit, EnumerateMetafileProc,VOID*,GDIPCONST GpImageAttributes*);

1 0

Nikolay Sivov : msxml3: Always return False for nodes that can' t have children.
by Alexandre Julliard May 6, 2013

May 6, 2013

Module: wine Branch: master Commit: 6cc0e706dd7f5afa340470a77ef9488896e4e213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc0e706dd7f5afa340470a77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 16:03:06 2013 +0400 msxml3: Always return False for nodes that can't have children. --- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/msxml_private.h | 9 +++++++++ dlls/msxml3/text.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 7fd4a37..61c0ce2 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -333,7 +333,7 @@ static HRESULT WINAPI domcdata_hasChildNodes( { domcdata *This = impl_from_IXMLDOMCDATASection( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domcdata_get_ownerDocument( diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index be49e71..879ca48 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -332,7 +332,7 @@ static HRESULT WINAPI domcomment_hasChildNodes( { domcomment *This = impl_from_IXMLDOMComment( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domcomment_get_ownerDocument( diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 6c24119..17e19a7 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -475,6 +475,15 @@ static inline HRESULT return_null_bstr(BSTR *p) return S_FALSE; } +static inline HRESULT return_var_false(VARIANT_BOOL *p) +{ + if(!p) + return E_INVALIDARG; + + *p = VARIANT_FALSE; + return S_FALSE; +} + extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, LONG line, LONG linepos, LONG filepos ) DECLSPEC_HIDDEN; extern HRESULT DOMDocument_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index e9c64c1..fd8e33a 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -330,7 +330,7 @@ static HRESULT WINAPI domtext_hasChildNodes( { domtext *This = impl_from_IXMLDOMText( iface ); TRACE("(%p)->(%p)\n", This, ret); - return node_has_childnodes(&This->node, ret); + return return_var_false(ret); } static HRESULT WINAPI domtext_get_ownerDocument(

1 0

Piotr Caban : msvcp60: Export basic_streambuf::pubseekoff function.
by Alexandre Julliard May 6, 2013

May 6, 2013

Module: wine Branch: master Commit: a73c69700c9e3a179f5492edb1e0e1b710993053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73c69700c9e3a179f5492edb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 6 11:16:54 2013 +0200 msvcp60: Export basic_streambuf::pubseekoff function. --- dlls/msvcp60/ios.c | 14 ++++++++++++-- dlls/msvcp60/msvcp60.spec | 16 ++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index a5f573d..7e87607 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1277,7 +1277,12 @@ fpos_int* __thiscall basic_streambuf_char_seekoff(basic_streambuf_char *this, /* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ -static fpos_int* basic_streambuf_char_pubseekoff(basic_streambuf_char *this, +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z */ +/* ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_char_pubseekoff, 20) +fpos_int* __thiscall basic_streambuf_char_pubseekoff(basic_streambuf_char *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); @@ -2006,7 +2011,12 @@ fpos_int* __thiscall basic_streambuf_wchar_seekoff(basic_streambuf_wchar *this, /* ?pubseekoff@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JHH@Z */ -static fpos_int* basic_streambuf_wchar_pubseekoff(basic_streambuf_wchar *this, +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z */ +/* ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ioos_base(a)2@H(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar_pubseekoff, 20) +fpos_int* __thiscall basic_streambuf_wchar_pubseekoff(basic_streambuf_wchar *this, fpos_int *ret, streamoff off, int way, int mode) { TRACE("(%p %ld %d %d)\n", this, off, way, mode); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index e15d43c..4e5a28e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -3645,14 +3645,14 @@ @ cdecl -arch=win64 ?pubimbue@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z(ptr ptr ptr) basic_streambuf_char_pubimbue @ thiscall -arch=win32 ?pubimbue@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AVlocale(a)2@ABV32@@Z(ptr ptr ptr) basic_streambuf_wchar_pubimbue @ cdecl -arch=win64 ?pubimbue@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AVlocale(a)2@AEBV32@@Z(ptr ptr ptr) basic_streambuf_wchar_pubimbue -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z -@ stub -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z -@ stub -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_char_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JFF@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JFF@Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ thiscall -arch=win32 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAE?AV?$fpos(a)H@2(a)JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff +@ cdecl -arch=win64 ?pubseekoff@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAA?AV?$fpos(a)H@2(a)_JW4seekdir@ios_base(a)2@H(a)Z(ptr ptr long long long) basic_streambuf_wchar_pubseekoff @ stub -arch=win32 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)V32@F(a)Z @ stub -arch=win64 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAA?AV?$fpos(a)H@2(a)V32@F(a)Z @ thiscall -arch=win32 ?pubseekpos@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAE?AV?$fpos(a)H@2(a)V32@H(a)Z(ptr ptr long long int64 long long long) basic_streambuf_char_pubseekpos

1 0