wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

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: 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: 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

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

Hugh McMaster : reg/tests: Test use of registry views when importing keys and values.
by Alexandre Julliard 07 Jul '21

07 Jul '21

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 07 Jul '21

07 Jul '21

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

Damjan Jovanovic : wininet: Return the required buffer size from InternetGetLastResponseInfo() when it's too small.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: e4e2e33806fd6da6341bc500908f919087eb133b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e2e33806fd6da6341bc500… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jul 6 20:23:50 2021 +0200 wininet: Return the required buffer size from InternetGetLastResponseInfo() when it's too small. 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 | 18 ++++++++++++++++-- dlls/wininet/tests/ftp.c | 28 +++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 27640e3ab27..a38326d8fb1 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1092,10 +1092,17 @@ BOOL WINAPI InternetGetLastResponseInfoA(LPDWORD lpdwError, } if (lpwite) { + if (lpszBuffer == NULL || *lpdwBufferLength < strlen(lpwite->response)) + { + *lpdwBufferLength = strlen(lpwite->response); + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } *lpdwError = lpwite->dwError; - if (lpwite->dwError) + if (lpwite->dwError && *lpdwBufferLength) { memcpy(lpszBuffer, lpwite->response, *lpdwBufferLength); + lpszBuffer[*lpdwBufferLength - 1] = 0; *lpdwBufferLength = strlen(lpszBuffer); } else @@ -1134,8 +1141,15 @@ BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError, } if (lpwite) { + int required_size = MultiByteToWideChar(CP_ACP, 0, lpwite->response, -1, NULL, 0) - 1; + if (lpszBuffer == NULL || *lpdwBufferLength < required_size) + { + *lpdwBufferLength = required_size; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } *lpdwError = lpwite->dwError; - if (lpwite->dwError) + if (lpwite->dwError && *lpdwBufferLength) *lpdwBufferLength = MultiByteToWideChar(CP_ACP, 0, lpwite->response, -1, lpszBuffer, *lpdwBufferLength); else *lpdwBufferLength = 0; diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index eba7c180939..16fbbcb2ed3 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -738,7 +738,8 @@ static void test_command(HINTERNET hFtp) for (i = 0; i < ARRAY_SIZE(command_test); i++) { - DWORD size; + DWORD size, orig_size; + char *buffer; SetLastError(0xdeadbeef); ret = pFtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, command_test[i].cmd, 0, NULL); @@ -747,10 +748,35 @@ static void test_command(HINTERNET hFtp) ok(ret == command_test[i].ret, "%d: expected FtpCommandA to %s\n", i, command_test[i].ret ? "succeed" : "fail"); ok(error == command_test[i].error, "%d: expected error %u, got %u\n", i, command_test[i].error, error); + size = 0; ret = InternetGetLastResponseInfoA(&error, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "%d: ret %d, lasterr %d\n", i, ret, GetLastError()); ret = InternetGetLastResponseInfoA(NULL, NULL, &size); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "%d: ret %d, lasterr %d\n", i, ret, GetLastError()); + /* Zero size */ + size = 0; + ret = InternetGetLastResponseInfoA(&error, NULL, &size); + ok((ret && size == 0) || (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER), "%d: got ret %d, size %d, lasterr %d\n", i, ret, size, GetLastError()); + /* Positive size, NULL buffer */ + size++; + ret = InternetGetLastResponseInfoA(&error, NULL, &size); + ok((ret && size == 0) || (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER), "%d: got ret %d, size %u, lasterr %d\n", i, ret, size, GetLastError()); + /* When buffer is 1 char too short, it succeeds but trims the string: */ + orig_size = size; + buffer = HeapAlloc(GetProcessHeap(), 0, size); + ok(buffer != NULL, "%d: no memory\n", i); + ret = InternetGetLastResponseInfoA(&error, buffer, &size); + ok(ret, "%d: got ret %d\n", i, ret); + ok(orig_size == 0 ? size == 0 : size == orig_size - 1, "%d: got orig_size %d, size %d\n", i, orig_size, size); + ok(size == 0 || strlen(buffer) == size, "%d: size %d, buffer size %d\n", i, size, size ? strlen(buffer) : 0); + HeapFree(GetProcessHeap(), 0, buffer); + /* Long enough buffer */ + buffer = HeapAlloc(GetProcessHeap(), 0, ++size); + ok(buffer != NULL, "%d: no memory\n", i); + 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); + HeapFree(GetProcessHeap(), 0, buffer); } }

1 0

Damjan Jovanovic : wininet: InternetGetLastResponseInfoW() returns wide chars, not ASCII.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 2f2a5d5ccb1be735d08a7e8442e306da2e65eb42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2a5d5ccb1be735d08a7e84… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Jul 6 20:23:15 2021 +0200 wininet: InternetGetLastResponseInfoW() returns wide chars, not ASCII. 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 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 00e199b66d5..27640e3ab27 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1136,10 +1136,7 @@ BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError, { *lpdwError = lpwite->dwError; if (lpwite->dwError) - { - memcpy(lpszBuffer, lpwite->response, *lpdwBufferLength); - *lpdwBufferLength = lstrlenW(lpszBuffer); - } + *lpdwBufferLength = MultiByteToWideChar(CP_ACP, 0, lpwite->response, -1, lpszBuffer, *lpdwBufferLength); else *lpdwBufferLength = 0; }

1 0

Alexandre Julliard : ntdll: Fix iosb handling in NtCancelIoFile().
by Alexandre Julliard 07 Jul '21

07 Jul '21

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

Alexandre Julliard : ntdll: Add support for LdrSystemDllInitBlock.
by Alexandre Julliard 07 Jul '21

07 Jul '21

Module: wine Branch: master Commit: 3a32ea8e91431b1269a82fbc4d6844f2a80dacc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a32ea8e91431b1269a82fbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 7 11:39:57 2021 +0200 ntdll: Add support for LdrSystemDllInitBlock. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 14 +++++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 4 ++ dlls/ntdll/signal_arm64.c | 3 +- dlls/ntdll/tests/wow64.c | 116 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/loader.c | 28 ++++++++++ dlls/ntdll/unix/unix_private.h | 2 + include/winternl.h | 20 +++++++ 8 files changed, 187 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a32ea8e91431b1269a8…

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021