July 2021 - Wine-commits - list.winehq.org

Rémi Bernon : wine.inf: Consistently quote shell open and print commands.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 23d2d0c5a7421f3c71db430356fdaed7606fea00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23d2d0c5a7421f3c71db4303… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jul 7 11:33:47 2021 +0200 wine.inf: Consistently quote shell open and print commands. Sometimes the program path is quoted, sometimes it isn't, same for the file argument. This can cause issues when there's spaces in the path. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 426fe8b1595..49e4f45da27 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -250,7 +250,7 @@ HKCR,.wri,,2,"wrifile" HKCR,*\shellex\ContextMenuHandlers,,16 HKCR,chm.file,,2,"Compiled HTML Help File" HKCR,chm.file\DefaultIcon,,2,"%10%\hh.exe,0" -HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" +HKCR,chm.file\shell\open\command,,2,"""%10%\hh.exe"" ""%1""" HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" @@ -263,13 +263,13 @@ HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" HKCR,folder\shellex\ContextMenuHandlers,,16 HKCR,hlpfile,,2,"Help File" -HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" -HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,hlpfile\shell\open\command,,2,"""%11%\winhlp32.exe"" ""%1""" +HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" HKCR,inffile,,2,"Setup Information" HKCR,inffile\shell\install\command,,2,"%11%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" HKCR,inifile,,2,"Configuration Settings" -HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1" -HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1" +HKCR,inifile\shell\open\command,,2,"""%11%\notepad.exe"" ""%1""" +HKCR,inifile\shell\print\command,,2,"""%11%\notepad.exe"" /p ""%1""" HKCR,lnkfile,,2,"Shortcut" HKCR,lnkfile,"NeverShowExt",2,"" HKCR,lnkfile,"IsShortcut",2,"yes" @@ -286,21 +286,21 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,pdffile,,2,"PDF Document" -HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" HKCR,rtffile,,2,"Rich Text Document" -HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" -HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" +HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" ""%1""" +HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p ""%1""" HKCR,txtfile,,2,"Text Document" -HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" -HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" -HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" -HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" +HKCR,txtfile\shell\open\command,,2,"""%11%\notepad.exe"" ""%1""" +HKCR,txtfile\shell\print\command,,2,"""%11%\notepad.exe"" /p ""%1""" +HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" ""%1""" +HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p ""%1""" HKCR,xmlfile,,2,"XML Document" -HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" -HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" -HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" -HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" -HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" +HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" +HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" +HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" +HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" +HKCR,mailto\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"Codepage",0x10003,932 HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"InternetEncoding",0x10003,50221

1 0

Jacek Caban : gdi32: Introduce NtGdiDeleteObjectApp.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 18e9da8a8dc5a660ee8f09b799498ef6f749a439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e9da8a8dc5a660ee8f09b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 7 15:02:17 2021 +0200 gdi32: Introduce NtGdiDeleteObjectApp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 4 ++-- dlls/gdi32/objects.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index af74071aa6d..7068bc5bb91 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -882,7 +882,7 @@ void GDI_CheckNotLock(void) /*********************************************************************** - * DeleteObject (GDI32.@) + * NtGdiDeleteObjectApp (win32u.@) * * Delete a Gdi object. * @@ -895,7 +895,7 @@ void GDI_CheckNotLock(void) * Failure: FALSE, if obj is not a valid Gdi object, or is currently selected * into a DC. */ -BOOL WINAPI DeleteObject( HGDIOBJ obj ) +BOOL WINAPI NtGdiDeleteObjectApp( HGDIOBJ obj ) { GDI_HANDLE_ENTRY *entry; struct hdc_list *hdcs_head; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b83ee139387..16c03f56508 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -76,6 +76,16 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) return result; } +/*********************************************************************** + * DeleteObject (GDI32.@) + * + * Delete a Gdi object. + */ +BOOL WINAPI DeleteObject( HGDIOBJ obj ) +{ + return NtGdiDeleteObjectApp( obj ); +} + /*********************************************************************** * SelectObject (GDI32.@) *

1 0

Jacek Caban : gdi32: Introduce NtGdiExtCreateRegion.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 94876d81ce4b7e8ae1080a02b943a5557bce72c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94876d81ce4b7e8ae1080a02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 7 15:02:26 2021 +0200 gdi32: Introduce NtGdiExtCreateRegion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 16 ++++++++++++++++ dlls/gdi32/region.c | 18 ++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 16c03f56508..54a5fcef585 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -235,3 +235,19 @@ HBITMAP WINAPI CreateDiscardableBitmap( HDC hdc, INT width, INT height ) { return CreateCompatibleBitmap( hdc, width, height ); } + +/*********************************************************************** + * ExtCreateRegion (GDI32.@) + * + * Creates a region as specified by the transformation data and region data. + */ +HRGN WINAPI ExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *data ) +{ + if (!data) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + return NtGdiExtCreateRegion( xform, count, data ); +} diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 2e90e82180e..dadb9b80ac9 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -920,7 +920,7 @@ static void translate( POINT *pt, UINT count, const XFORM *xform ) /*********************************************************************** - * ExtCreateRegion (GDI32.@) + * NtGdiExtCreateRegion (win32u.@) * * Creates a region as specified by the transformation data and region data. * @@ -936,26 +936,20 @@ static void translate( POINT *pt, UINT count, const XFORM *xform ) * NOTES * See GetRegionData(). */ -HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* rgndata) +HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *rgndata ) { HRGN hrgn = 0; WINEREGION *obj; const RECT *pCurRect, *pEndRect; - if (!rgndata) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return 0; - } - - if (rgndata->rdh.dwSize < sizeof(RGNDATAHEADER)) + if (!rgndata || rgndata->rdh.dwSize < sizeof(RGNDATAHEADER)) return 0; /* XP doesn't care about the type */ if( rgndata->rdh.iType != RDH_RECTANGLES ) WARN("(Unsupported region data type: %u)\n", rgndata->rdh.iType); - if (lpXform) + if (xform) { const RECT *pCurRect, *pEndRect; @@ -977,7 +971,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* pt[3].x = pCurRect->left; pt[3].y = pCurRect->bottom; - translate( pt, 4, lpXform ); + translate( pt, 4, xform ); poly_hrgn = CreatePolyPolygonRgn( pt, &count, 1, WINDING ); CombineRgn( hrgn, hrgn, poly_hrgn, RGN_OR ); DeleteObject( poly_hrgn ); @@ -1000,7 +994,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* done: if (!hrgn) free_region( obj ); - TRACE("%p %d %p returning %p\n", lpXform, dwCount, rgndata, hrgn ); + TRACE("%p %d %p returning %p\n", xform, count, rgndata, hrgn ); return hrgn; }

1 0

Jacek Caban : gdi32: Use ntgdi names for region constructors.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 8df14dac7a9efc26952b6eedb6bd61bc2a7d4d10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8df14dac7a9efc26952b6eed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 7 15:02:38 2021 +0200 gdi32: Use ntgdi names for region constructors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 8 ++++---- dlls/gdi32/clipping.c | 4 ++-- dlls/gdi32/dc.c | 8 ++++---- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 20 ++++++++++---------- dlls/gdi32/dibdrv/objects.c | 8 ++++---- dlls/gdi32/enhmetafile.c | 2 +- dlls/gdi32/gdi32.spec | 6 +++--- dlls/gdi32/metafile.c | 6 +++--- dlls/gdi32/painting.c | 2 +- dlls/gdi32/region.c | 34 +++++++++++++++------------------- include/ntgdi.h | 1 + 14 files changed, 52 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8df14dac7a9efc26952b…

1 0

Jacek Caban : gdi32: Use ntgdi names for region functions.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 0a42d6a915a526ceb7995e1cd7109e717ccdcf4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a42d6a915a526ceb7995e1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 7 15:02:59 2021 +0200 gdi32: Use ntgdi names for region functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/clipping.c | 50 +++++++++++++++++++++--------------------- dlls/gdi32/dc.c | 8 +++---- dlls/gdi32/dib.c | 8 +++---- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/graphics.c | 20 ++++++++--------- dlls/gdi32/dibdrv/objects.c | 20 ++++++++--------- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/graphics.c | 12 +++++----- dlls/gdi32/gdi32.spec | 16 +++++++------- dlls/gdi32/metafile.c | 6 ++--- dlls/gdi32/mfdrv/graphics.c | 4 ++-- dlls/gdi32/region.c | 37 +++++++++++++++---------------- 14 files changed, 95 insertions(+), 96 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a42d6a915a526ceb799…

1 0

Jacek Caban : gdi32: Move region helper functions to objects.c.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: b2e70ed03a9fc736621c675dd2da36117b612ea7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2e70ed03a9fc736621c675d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 7 15:03:25 2021 +0200 gdi32: Move region helper functions to objects.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 28 ++++++++++++++++++++++++++++ dlls/gdi32/region.c | 49 ------------------------------------------------- 2 files changed, 28 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 54a5fcef585..d425517cd7f 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -251,3 +251,31 @@ HRGN WINAPI ExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA *dat return NtGdiExtCreateRegion( xform, count, data ); } + +/*********************************************************************** + * CreateRectRgnIndirect (GDI32.@) + * + * Creates a simple rectangular region. + */ +HRGN WINAPI CreateRectRgnIndirect( const RECT* rect ) +{ + return NtGdiCreateRectRgn( rect->left, rect->top, rect->right, rect->bottom ); +} + +/*********************************************************************** + * CreateEllipticRgnIndirect (GDI32.@) + * + * Creates an elliptical region. + */ +HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect ) +{ + return NtGdiCreateEllipticRgn( rect->left, rect->top, rect->right, rect->bottom ); +} + +/*********************************************************************** + * CreatePolygonRgn (GDI32.@) + */ +HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) +{ + return CreatePolyPolygonRgn( points, &count, 1, mode ); +} diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index ce76d09a6a2..f799221e311 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -622,24 +622,6 @@ HRGN WINAPI NtGdiCreateRectRgn( INT left, INT top, INT right, INT bottom ) } -/*********************************************************************** - * CreateRectRgnIndirect (GDI32.@) - * - * Creates a simple rectangular region. - * - * PARAMS - * rect [I] Coordinates of rectangular region. - * - * RETURNS - * Success: Handle to region. - * Failure: NULL. - */ -HRGN WINAPI CreateRectRgnIndirect( const RECT* rect ) -{ - return NtGdiCreateRectRgn( rect->left, rect->top, rect->right, rect->bottom ); -} - - /*********************************************************************** * NtGdiSetRectRgn (win32u.@) * @@ -822,28 +804,6 @@ HRGN WINAPI NtGdiCreateEllipticRgn( INT left, INT top, INT right, INT bottom ) } -/*********************************************************************** - * CreateEllipticRgnIndirect (GDI32.@) - * - * Creates an elliptical region. - * - * PARAMS - * rect [I] Pointer to bounding rectangle of the ellipse. - * - * RETURNS - * Success: Handle to region. - * Failure: NULL. - * - * NOTES - * This is a special case of CreateRoundRectRgn() where the width of the - * ellipse at each corner is equal to the width the rectangle and - * the same for the height. - */ -HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect ) -{ - return NtGdiCreateEllipticRgn( rect->left, rect->top, rect->right, rect->bottom ); -} - /*********************************************************************** * NtGdiGetRegionData (win32u.@) * @@ -2741,12 +2701,3 @@ HRGN WINAPI CreatePolyPolygonRgn( const POINT *pts, const INT *count, INT nbpoly { return create_polypolygon_region( pts, count, nbpolygons, mode, NULL ); } - - -/*********************************************************************** - * CreatePolygonRgn (GDI32.@) - */ -HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) -{ - return create_polypolygon_region( points, &count, 1, mode, NULL ); -}

1 0

Zebediah Figura : wined3d: Introduce a wined3d_bound_range() helper.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 9fdc3fd8bbfe9d2a763cc997ada7c79d59df660a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fdc3fd8bbfe9d2a763cc997… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 6 20:43:42 2021 -0500 wined3d: Introduce a wined3d_bound_range() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 4 ++-- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/viewport.c | 8 ++++---- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/palette.c | 2 +- dlls/wined3d/stateblock.c | 6 ++---- dlls/wined3d/view.c | 9 +++------ include/wine/wined3d.h | 11 +++++++++++ 9 files changed, 30 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9fdc3fd8bbfe9d2a763c…

1 0

Zebediah Figura : wined3d: Set an array of UAVs as a single CS operation.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 393ea20679d1955decff8f892acc20b3dd66ebb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=393ea20679d1955decff8f89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 6 20:43:43 2021 -0500 wined3d: Set an array of UAVs as a single CS operation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 63 +++++++++++++++++++++---------------- dlls/wined3d/cs.c | 70 ++++++++++++++++++++++++++---------------- dlls/wined3d/device.c | 45 ++++++++++++++------------- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 6 ++-- include/wine/wined3d.h | 6 ++-- 6 files changed, 109 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=393ea20679d1955decff…

1 0

Adrian Thiele : mfplat: Use D3DFORMAT for dxgi buffer copy function.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 5c687f5d9a05f923f8eada65e69a77dfb6ea3c0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c687f5d9a05f923f8eada65… Author: Adrian Thiele <adrian.thiele(a)live.de> Date: Wed Jul 7 17:27:08 2021 +0200 mfplat: Use D3DFORMAT for dxgi buffer copy function. Signed-off-by: Adrian Thiele <adrian.thiele(a)live.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index c1829043e1b..9081dc39eab 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1473,7 +1473,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re object->_2d.width = stride; object->_2d.height = desc.Height; object->max_length = object->_2d.plane_size; - object->_2d.copy_image = get_2d_buffer_copy_func(desc.Format); + object->_2d.copy_image = get_2d_buffer_copy_func(format); if (FAILED(hr = init_attributes_object(&object->dxgi_surface.attributes, 0))) {

1 0

Francois Gouget : oleaut32: Fix a trace containing a null character.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 6763ed84cf0629dd7d1495263e1e3ea9aaf3d663 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6763ed84cf0629dd7d149526… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 7 19:13:53 2021 +0200 oleaut32: Fix a trace containing a null character. printf("%c Hello\n", 0) works but not TRACE("%c Hello\n", 0) because the string is formatted before printing. Work around the issue with wine_dbgstr_w(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index ace33a006f4..129e13da17d 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1554,8 +1554,8 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID break; default: WARN("buffer too small for LOCALE_SCURRENCY\n"); } - TRACE("lcid 0x%x, cCurrencyLocal =%d,%d '%c','%c'\n", lcid, lpChars->cCurrencyLocal, - lpChars->cCurrencyLocal2, lpChars->cCurrencyLocal, lpChars->cCurrencyLocal2); + TRACE("lcid 0x%x, cCurrencyLocal=%d,%d %s\n", lcid, lpChars->cCurrencyLocal, + lpChars->cCurrencyLocal2, wine_dbgstr_w(buff)); memcpy(&lastChars, lpChars, sizeof(defaultChars)); lastLcid = lcid;

1 0