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

Jacek Caban : gdi32: Move region helper functions to objects.c.
by Alexandre Julliard July 7, 2021

July 7, 2021

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 July 7, 2021

July 7, 2021

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

Jacek Caban : gdi32: Use ntgdi names for region functions.
by Alexandre Julliard July 7, 2021

July 7, 2021

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: Introduce NtGdiDeleteObjectApp.
by Alexandre Julliard July 7, 2021

July 7, 2021

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

Rémi Bernon : wine.inf: Consistently quote shell open and print commands.
by Alexandre Julliard July 7, 2021

July 7, 2021

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

Hugh McMaster : reg/tests: Test use of registry views when importing keys and values.
by Alexandre Julliard July 7, 2021

July 7, 2021

Module: wine Branch: master Commit: f2ce614d85091500c071f9b7234f17d5d6418727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2ce614d85091500c071f9b7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jul 7 22:02:57 2021 +1000 reg/tests: Test use of registry views when importing keys and values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 3 +- programs/reg/tests/import.c | 272 ++++++++++++++++++++++++++++++++++++++++-- programs/reg/tests/reg_test.h | 3 + 3 files changed, 267 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2ce614d85091500c071…

1 0

Damjan Jovanovic : wininet: The buffer is returned from InternetGetLastResponseInfo() even when the error is 0.
by Alexandre Julliard July 7, 2021

July 7, 2021

Module: wine Branch: master Commit: 0f958ec3b0518f65cc5a57a2c2dda49986a6ec39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f958ec3b0518f65cc5a57a2… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jul 6 20:24:19 2021 +0200 wininet: The buffer is returned from InternetGetLastResponseInfo() even when the error is 0. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 8 ++------ dlls/wininet/tests/ftp.c | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a38326d8fb1..cef151c7bf2 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1099,14 +1099,12 @@ BOOL WINAPI InternetGetLastResponseInfoA(LPDWORD lpdwError, return FALSE; } *lpdwError = lpwite->dwError; - if (lpwite->dwError && *lpdwBufferLength) + if (*lpdwBufferLength) { memcpy(lpszBuffer, lpwite->response, *lpdwBufferLength); lpszBuffer[*lpdwBufferLength - 1] = 0; *lpdwBufferLength = strlen(lpszBuffer); } - else - *lpdwBufferLength = 0; } else { @@ -1149,10 +1147,8 @@ BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError, return FALSE; } *lpdwError = lpwite->dwError; - if (lpwite->dwError && *lpdwBufferLength) + if (*lpdwBufferLength) *lpdwBufferLength = MultiByteToWideChar(CP_ACP, 0, lpwite->response, -1, lpszBuffer, *lpdwBufferLength); - else - *lpdwBufferLength = 0; } else { diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 16fbbcb2ed3..c7c4febf379 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -706,6 +706,8 @@ static void test_command(HINTERNET hFtp) BOOL ret; DWORD error; unsigned int i; + BOOL had_error_zero = FALSE; + BOOL had_error_zero_size_positive = FALSE; static const struct { BOOL ret; @@ -776,8 +778,12 @@ static void test_command(HINTERNET hFtp) ret = InternetGetLastResponseInfoA(&error, buffer, &size); ok(ret, "%d: got ret %d\n", i, ret); ok(size == 0 || strlen(buffer) == size, "%d: size %d, buffer size %d\n", i, size, size ? strlen(buffer) : 0); + had_error_zero |= (error == 0); + had_error_zero_size_positive |= (error == 0 && size > 0); HeapFree(GetProcessHeap(), 0, buffer); } + + ok(!had_error_zero || had_error_zero_size_positive, "never observed error 0 with positive size\n"); } static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect)

1 0

Alexandre Julliard : ntdll: Fix iosb handling in NtCancelIoFile().
by Alexandre Julliard July 7, 2021

July 7, 2021

Module: wine Branch: master Commit: 27ecc6ba5f66a60767d70adbc0c815b57ce62af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27ecc6ba5f66a60767d70adb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 7 11:51:25 2021 +0200 ntdll: Fix iosb handling in NtCancelIoFile(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/change.c | 18 +++++++++++++++--- dlls/ntdll/unix/file.c | 22 ++++++++++++++++++---- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index 1e643fc3eee..e7201b52a3c 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -168,7 +168,7 @@ static void test_ntncdf_async(void) HANDLE hdir, hEvent; char buffer[0x1000]; DWORD fflags, filter = 0; - IO_STATUS_BLOCK iosb, iosb2; + IO_STATUS_BLOCK iosb, iosb2, iosb3; WCHAR path[MAX_PATH], subdir[MAX_PATH]; static const WCHAR szBoo[] = { '\\','b','o','o',0 }; static const WCHAR szHoo[] = { '\\','h','o','o',0 }; @@ -293,16 +293,28 @@ static void test_ntncdf_async(void) ok(U(iosb).Status == 0x01234567, "status set too soon\n"); ok(iosb.Information == 0x12345678, "info set too soon\n"); - r = pNtCancelIoFile(hdir, &iosb); + U(iosb3).Status = 0x111111; + iosb3.Information = 0x222222; + + r = pNtCancelIoFile(hdir, &iosb3); ok( r == STATUS_SUCCESS, "cancel failed\n"); CloseHandle(hdir); - ok(U(iosb).Status == STATUS_SUCCESS, "status wrong\n"); + ok(U(iosb).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb).Status); ok(U(iosb2).Status == STATUS_CANCELLED, "status wrong %x\n",U(iosb2).Status); + ok(U(iosb3).Status == STATUS_SUCCESS, "status wrong %x\n",U(iosb3).Status); ok(iosb.Information == 0, "info wrong\n"); ok(iosb2.Information == 0, "info wrong\n"); + ok(iosb3.Information == 0, "info wrong\n"); + + U(iosb3).Status = 0x111111; + iosb3.Information = 0x222222; + r = pNtCancelIoFile(hdir, &iosb3); + ok( r == STATUS_INVALID_HANDLE, "cancel failed %x\n", r); + ok(U(iosb3).Status == 0x111111, "status wrong %x\n",U(iosb3).Status); + ok(iosb3.Information == 0x222222, "info wrong\n"); r = RemoveDirectoryW( path ); ok( r == TRUE, "failed to remove directory\n"); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 21bcb215385..626a0957644 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5931,16 +5931,23 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) */ NTSTATUS WINAPI NtCancelIoFile( HANDLE handle, IO_STATUS_BLOCK *io_status ) { + NTSTATUS status; + TRACE( "%p %p\n", handle, io_status ); SERVER_START_REQ( cancel_async ) { req->handle = wine_server_obj_handle( handle ); req->only_thread = TRUE; - io_status->u.Status = wine_server_call( req ); + if (!(status = wine_server_call( req ))) + { + io_status->u.Status = status; + io_status->Information = 0; + } } SERVER_END_REQ; - return io_status->u.Status; + + return status; } @@ -5949,16 +5956,23 @@ NTSTATUS WINAPI NtCancelIoFile( HANDLE handle, IO_STATUS_BLOCK *io_status ) */ NTSTATUS WINAPI NtCancelIoFileEx( HANDLE handle, IO_STATUS_BLOCK *io, IO_STATUS_BLOCK *io_status ) { + NTSTATUS status; + TRACE( "%p %p %p\n", handle, io, io_status ); SERVER_START_REQ( cancel_async ) { req->handle = wine_server_obj_handle( handle ); req->iosb = wine_server_client_ptr( io ); - io_status->u.Status = wine_server_call( req ); + if (!(status = wine_server_call( req ))) + { + io_status->u.Status = status; + io_status->Information = 0; + } } SERVER_END_REQ; - return io_status->u.Status; + + return status; }

1 0

Jacek Caban : gdi32: Use ntgdi names for region constructors.
by Alexandre Julliard July 7, 2021

July 7, 2021

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

Adrian Thiele : mfplat: Use D3DFORMAT for dxgi buffer copy function.
by Alexandre Julliard July 7, 2021

July 7, 2021

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