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

Huw Davies : iphlpapi: Rewrite ConvertInterfaceLuidToNameA/NameToLuidA() to call their unicode equivalents.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 363fc54a1c2cad567e53515d589968294c37008e URL: https://source.winehq.org/git/wine.git/?a=commit;h=363fc54a1c2cad567e53515d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 2 09:41:36 2021 +0100 iphlpapi: Rewrite ConvertInterfaceLuidToNameA/NameToLuidA() to call their unicode equivalents. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8540b594e53..b6b96165027 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3244,21 +3244,20 @@ DWORD WINAPI ConvertInterfaceLuidToIndex(const NET_LUID *luid, NET_IFINDEX *inde */ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_T len) { - DWORD ret; - MIB_IFROW row; + DWORD err; + WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - TRACE("(%p %p %u)\n", luid, name, (DWORD)len); + TRACE( "(%p %p %u)\n", luid, name, (DWORD)len ); if (!luid) return ERROR_INVALID_PARAMETER; + if (!name || !len) return ERROR_NOT_ENOUGH_MEMORY; - row.dwIndex = luid->Info.NetLuidIndex; - if ((ret = GetIfEntry( &row ))) return ret; - - if (!name || len < WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, NULL, 0, NULL, NULL )) - return ERROR_NOT_ENOUGH_MEMORY; + err = ConvertInterfaceLuidToNameW( luid, nameW, ARRAY_SIZE(nameW) ); + if (err) return err; - WideCharToMultiByte( CP_UNIXCP, 0, row.wszName, -1, name, len, NULL, NULL ); - return NO_ERROR; + if (!WideCharToMultiByte( CP_UNIXCP, 0, nameW, -1, name, len, NULL, NULL )) + err = GetLastError(); + return err; } /****************************************************************** @@ -3286,22 +3285,15 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE */ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) { - DWORD ret; - IF_INDEX index; - MIB_IFROW row; - - TRACE("(%s %p)\n", debugstr_a(name), luid); + WCHAR nameW[IF_MAX_STRING_SIZE]; - if ((ret = getInterfaceIndexByName( name, &index ))) return ERROR_INVALID_NAME; - if (!luid) return ERROR_INVALID_PARAMETER; + TRACE( "(%s %p)\n", debugstr_a(name), luid ); - row.dwIndex = index; - if ((ret = GetIfEntry( &row ))) return ret; + if (!name) return ERROR_INVALID_NAME; + if (!MultiByteToWideChar( CP_UNIXCP, 0, name, -1, nameW, ARRAY_SIZE(nameW) )) + return GetLastError(); - luid->Info.Reserved = 0; - luid->Info.NetLuidIndex = index; - luid->Info.IfType = row.dwType; - return NO_ERROR; + return ConvertInterfaceNameToLuidW( nameW, luid ); } /******************************************************************

1 0

Connor Abbott : winegcc: Recognize .obj files as objects.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: f1ab3c8d763d47b84769af2872fb27e74922ef91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ab3c8d763d47b84769af28… Author: Connor Abbott <cwabbott0(a)gmail.com> Date: Fri Jul 2 11:47:58 2021 +0200 winegcc: Recognize .obj files as objects. For more compatibility with mingw-gcc. Since meson always names object files with a .obj extension when using mingw, this improves compatibility with meson. Signed-off-by: Connor Abbott <cwabbott0(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 0b82af90683..63d675122c0 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -230,6 +230,7 @@ file_type get_file_type(const char* filename) if (cnt == sizeof(res_sig) && !memcmp(buf, res_sig, sizeof(res_sig))) return file_res; if (strendswith(filename, ".o")) return file_obj; + if (strendswith(filename, ".obj")) return file_obj; if (strendswith(filename, ".a")) return file_arh; if (strendswith(filename, ".res")) return file_res; if (strendswith(filename, ".so")) return file_so;

1 0

Connor Abbott : winegcc: Pass through -pthread.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: d209d9feb6ee63e45ecdb23d8d8440f88fe9a64a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d209d9feb6ee63e45ecdb23d… Author: Connor Abbott <cwabbott0(a)gmail.com> Date: Fri Jul 2 11:47:59 2021 +0200 winegcc: Pass through -pthread. While you could get 90% of the way with "-lpthread", supporting -pthread should be more reliable and is required for build systems like meson that have special handling for the threads dependency. Since this is both a compiler (really preprocessor) and linker option, we can't just add it to is_linker_arg(). Signed-off-by: Connor Abbott <cwabbott0(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bcabc4f7998..ebc60c1a2c8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1939,6 +1939,13 @@ int main(int argc, char **argv) opts.output_name = option_arg; raw_compiler_arg = 0; break; + case 'p': + if (strcmp("-pthread", opts.args->base[i]) == 0) + { + raw_compiler_arg = 1; + raw_linker_arg = 1; + } + break; case 's': if (strcmp("-static", opts.args->base[i]) == 0) linking = -1;

1 0

Connor Abbott : winegcc: Support -Wl,--start-group and -Wl,--end-group.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: b1fb07e1889ae6ca2cce4a897e140a9ae37a56bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1fb07e1889ae6ca2cce4a89… Author: Connor Abbott <cwabbott0(a)gmail.com> Date: Fri Jul 2 11:48:00 2021 +0200 winegcc: Support -Wl,--start-group and -Wl,--end-group. These arguments need to be in the correct position so they need to go in the files array. Signed-off-by: Connor Abbott <cwabbott0(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ebc60c1a2c8..fd2d2c2a794 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -2030,7 +2030,10 @@ int main(int argc, char **argv) opts.debug_file = strdup( Wl->base[++j] ); continue; } - if (!strcmp(Wl->base[j], "--whole-archive") || !strcmp(Wl->base[j], "--no-whole-archive")) + if (!strcmp(Wl->base[j], "--whole-archive") || + !strcmp(Wl->base[j], "--no-whole-archive") || + !strcmp(Wl->base[j], "--start-group") || + !strcmp(Wl->base[j], "--end-group")) { strarray_add( opts.files, strmake( "-Wl,%s", Wl->base[j] )); continue;

1 0

Connor Abbott : winegcc: Support -Wl,foo=... style linker options.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: fcda0afdd429e11d75dc61f628e40a6c8973ce44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcda0afdd429e11d75dc61f6… Author: Connor Abbott <cwabbott0(a)gmail.com> Date: Fri Jul 2 11:48:01 2021 +0200 winegcc: Support -Wl,foo=... style linker options. In particular meson uses -Wl,--out-implib=... Signed-off-by: Connor Abbott <cwabbott0(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index fd2d2c2a794..8c1e0d088ac 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1982,7 +1982,7 @@ int main(int argc, char **argv) if (strncmp("-Wl,", opts.args->base[i], 4) == 0) { unsigned int j; - strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ","); + strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",="); for (j = 0; j < Wl->size; j++) { if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1)

1 0

Eric Pouech : winedbg: Fix crash when no process attached in 'info wnd' command.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 5d8bad570d23fe7d69a04d8162fc3d4b76aad625 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d8bad570d23fe7d69a04d81… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Jul 2 09:43:32 2021 +0200 winedbg: Fix crash when no process attached in 'info wnd' command. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49625 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b7c765ac545..3733e1b410f 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -39,7 +39,7 @@ #include "oaidl.h" #include <wine/list.h> -#define ADDRSIZE (dbg_curr_process->be_cpu->pointer_size) +#define ADDRSIZE (dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : (int)sizeof(void*)) #define ADDRWIDTH (ADDRSIZE * 2) /* the debugger uses these exceptions for its internal use */

1 0

Eric Pouech : winedbg: Correct mapping read/write/execute information.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 6c91e61c40fac6b9c25f27f4132dfdaafc45fc5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c91e61c40fac6b9c25f27f4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Jul 2 09:49:25 2021 +0200 winedbg: Correct mapping read/write/execute information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 4 ++-- programs/winedbg/info.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 19fa86d44da..4ccff1ea894 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1452,13 +1452,13 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } memset(prot, ' ' , sizeof(prot)-1); prot[sizeof(prot)-1] = '\0'; - if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[0] = 'R'; if (mbi.AllocationProtect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) prot[1] = 'W'; if (mbi.AllocationProtect & (PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[1] = 'C'; - if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) prot[2] = 'X'; } else diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e1f3d269649..a6335092d84 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -769,13 +769,13 @@ void info_win32_virtual(DWORD pid) } memset(prot, ' ' , sizeof(prot) - 1); prot[sizeof(prot) - 1] = '\0'; - if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_READONLY|PAGE_READWRITE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[0] = 'R'; if (mbi.AllocationProtect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) prot[1] = 'W'; if (mbi.AllocationProtect & (PAGE_WRITECOPY|PAGE_EXECUTE_WRITECOPY)) prot[1] = 'C'; - if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE)) + if (mbi.AllocationProtect & (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY)) prot[2] = 'X'; } else

1 0

Eric Pouech : winedbg: Add helper in gdbproxy mode to get proper address width information.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 40587a620e8d6db7cba0a31eca6986b12f645cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40587a620e8d6db7cba0a31e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Jul 2 10:14:41 2021 +0200 winedbg: Add helper in gdbproxy mode to get proper address width information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 4ccff1ea894..b8a8a1da2f8 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -702,6 +702,13 @@ static void get_thread_info(struct gdb_context* gdbctx, unsigned tid, * =============================================== * */ +static int addr_width(struct gdb_context* gdbctx) +{ + int sz = (gdbctx && gdbctx->process && gdbctx->process->be_cpu) ? + gdbctx->process->be_cpu->pointer_size : (int)sizeof(void*); + return sz * 2; +} + enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; @@ -1343,7 +1350,7 @@ static void packet_query_monitor_wnd_helper(struct gdb_context* gdbctx, HWND hWn "%*s%04lx%*s%-17.17s %08x %0*lx %.14s\n", indent, "", (ULONG_PTR)hWnd, 13 - indent, "", clsName, GetWindowLongW(hWnd, GWL_STYLE), - ADDRWIDTH, (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), + addr_width(gdbctx), (ULONG_PTR)GetWindowLongPtrW(hWnd, GWLP_WNDPROC), wndName); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx); @@ -1468,8 +1475,8 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const } packet_reply_open(gdbctx); snprintf(buffer, sizeof(buffer), "%0*lx %0*lx %s %s %s\n", - (unsigned)sizeof(void*), (DWORD_PTR)addr, - (unsigned)sizeof(void*), mbi.RegionSize, state, type, prot); + addr_width(gdbctx), (DWORD_PTR)addr, + addr_width(gdbctx), mbi.RegionSize, state, type, prot); packet_reply_add(gdbctx, "O"); packet_reply_hex_to_str(gdbctx, buffer); packet_reply_close(gdbctx);

1 0

Damjan Jovanovic : wininet: Improve InternetGetLastResponseInfo() logging.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 5605e63cc19a9f80c461f934a132853ddb175a74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5605e63cc19a9f80c461f934… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 30 20:15:04 2021 +0200 wininet: Improve InternetGetLastResponseInfo() logging. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1b6f060d607..c3e68ce181b 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1083,7 +1083,7 @@ BOOL WINAPI InternetGetLastResponseInfoA(LPDWORD lpdwError, { LPWITHREADERROR lpwite = TlsGetValue(g_dwTlsErrIndex); - TRACE("\n"); + TRACE("(%p, %p, %p)\n", lpdwError, lpszBuffer, lpdwBufferLength); if (lpwite) { @@ -1120,7 +1120,7 @@ BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError, { LPWITHREADERROR lpwite = TlsGetValue(g_dwTlsErrIndex); - TRACE("\n"); + TRACE("(%p, %p, %p)\n", lpdwError, lpszBuffer, lpdwBufferLength); if (lpwite) {

1 0

Damjan Jovanovic : wininet: Validate InternetGetLastResponseInfo() parameters.
by Alexandre Julliard 02 Jul '21

02 Jul '21

Module: wine Branch: master Commit: 88e7ad5ab50bfe198c41baea3cee179901a2fc02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88e7ad5ab50bfe198c41baea… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Jun 30 20:15:22 2021 +0200 wininet: Validate InternetGetLastResponseInfo() parameters. 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 | 10 ++++++++++ dlls/wininet/tests/ftp.c | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c3e68ce181b..feb25bbc0c5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1085,6 +1085,11 @@ BOOL WINAPI InternetGetLastResponseInfoA(LPDWORD lpdwError, TRACE("(%p, %p, %p)\n", lpdwError, lpszBuffer, lpdwBufferLength); + if (!lpdwError || !lpdwBufferLength) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (lpwite) { *lpdwError = lpwite->dwError; @@ -1122,6 +1127,11 @@ BOOL WINAPI InternetGetLastResponseInfoW(LPDWORD lpdwError, TRACE("(%p, %p, %p)\n", lpdwError, lpszBuffer, lpdwBufferLength); + if (!lpdwError || !lpdwBufferLength) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (lpwite) { *lpdwError = lpwite->dwError; diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index c6d972a3523..eba7c180939 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -738,12 +738,19 @@ static void test_command(HINTERNET hFtp) for (i = 0; i < ARRAY_SIZE(command_test); i++) { + DWORD size; + SetLastError(0xdeadbeef); ret = pFtpCommandA(hFtp, FALSE, FTP_TRANSFER_TYPE_ASCII, command_test[i].cmd, 0, NULL); error = GetLastError(); 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); + + 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()); } }

1 0