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

Drew Ronneberg : oleaut32: Remove obsolete -D_OLEAUT32_ from Makefile.in.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 75f6f22d5b1f7e9c40595c2fa35131c8f3e636c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75f6f22d5b1f7e9c40595c2f… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:08 2022 -0400 oleaut32: Remove obsolete -D_OLEAUT32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index a7dea7a37c7..3e760b8d835 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -2,7 +2,6 @@ MODULE = oleaut32.dll IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs -EXTRADEFS = -D_OLEAUT32_ C_SRCS = \ connpt.c \

1 0

Eric Pouech : regsvr32: Use OEM code page for output.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: de5487252495785465e877b455b20f2958dc4a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de5487252495785465e877b4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 regsvr32: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 0efa6bcd839..81caeb2c820 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -41,7 +41,7 @@ static void WINAPIV output_write(UINT id, ...) WCHAR fmt[1024]; va_list va_args; WCHAR *str; - DWORD len, nOut, ret; + DWORD len, nOut; if (Silent) return; @@ -61,21 +61,19 @@ static void WINAPIV output_write(UINT id, ...) return; } - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL); - /* WriteConsole fails if its output is redirected to a file. * If this occurs, we should use an OEM codepage and call WriteFile. */ - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL)) { DWORD lenA; char *strA; - lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, NULL, 0, NULL, NULL); + lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); strA = HeapAlloc(GetProcessHeap(), 0, lenA); if (strA) { - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &nOut, FALSE); HeapFree(GetProcessHeap(), 0, strA); }

1 0

Eric Pouech : netstat: Use OEM code page for output.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: b421477d339d7bfcd02a339d2f7de45870a307f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b421477d339d7bfcd02a339d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 netstat: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/netstat.c | 2 +- programs/reg/reg.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 16238ee097f..2c1ef89c231 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -125,7 +125,7 @@ static int WINAPIV NETSTAT_wprintf(const WCHAR *format, ...) } /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, + convertedChars = WideCharToMultiByte(GetOEMCP(), 0, output_bufW, len, output_bufA, MAX_WRITECONSOLE_SIZE, "?", &usedDefaultChar); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars, diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 16c05f958c7..4fd374579e9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -51,22 +51,20 @@ const struct reg_type_rels type_rels[] = void output_writeconsole(const WCHAR *str, DWORD wlen) { - DWORD count, ret; + DWORD count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL)) { DWORD len; char *msgA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. + * back to WriteFile() with OEM code page. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetOEMCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = malloc(len); - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); free(msgA); }

1 0

Eric Pouech : icinfo: Use OEM code page for output.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: f2c4b9fe0793277e8cac11e1a07538799d2daaf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c4b9fe0793277e8cac11e1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 icinfo: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/icinfo.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 01ddbfb6833..bd309bfb623 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -35,17 +35,13 @@ static int WINAPIV mywprintf(const WCHAR *format, ...) vswprintf(output_bufW, ARRAY_SIZE(output_bufW), format, parms); va_end(parms); - /* Try to write as unicode whenever we think it's a console */ - if (((DWORD_PTR)hout & 3) == 3) - { - res = WriteConsoleW(hout, output_bufW, lstrlenW(output_bufW), &nOut, NULL); - } - else + res = WriteConsoleW(hout, output_bufW, lstrlenW(output_bufW), &nOut, NULL); + if (!res) { DWORD convertedChars; /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, -1, + convertedChars = WideCharToMultiByte(GetOEMCP(), 0, output_bufW, -1, output_bufA, sizeof(output_bufA), NULL, NULL); res = WriteFile(hout, output_bufA, convertedChars, &nOut, FALSE);

1 0

Eric Pouech : fsutil: Use OEM code page for output.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 92135f66a8d0b4c5df84af53c8dec291e2e8c6ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=92135f66a8d0b4c5df84af53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 fsutil: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index 94151ae9b42..8de7027ee0e 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -26,23 +26,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(fsutil); static void output_write(const WCHAR *str, DWORD wlen) { - DWORD count, ret; + DWORD count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL)) { DWORD len; char *msgA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. + * back to WriteFile() with OEM code page. */ - len = WideCharToMultiByte(CP_ACP, 0, str, wlen, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetOEMCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); if (!msgA) return; - WideCharToMultiByte(CP_ACP, 0, str, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); }

1 0

Eric Pouech : chcp: Use OEM code page for output.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: ebd24cbbc04d523dbd62232d3971339208a87dc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebd24cbbc04d523dbd62232d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 chcp: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/chcp.com/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/chcp.com/main.c b/programs/chcp.com/main.c index 6c5864d0e19..b4309ff086d 100644 --- a/programs/chcp.com/main.c +++ b/programs/chcp.com/main.c @@ -26,10 +26,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(chcp); static void output_writeconsole(const WCHAR *str, DWORD wlen) { - DWORD count, ret; + DWORD count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL)) { DWORD len; char *msgA; @@ -38,10 +37,11 @@ static void output_writeconsole(const WCHAR *str, DWORD wlen) * back to WriteFile(), assuming the console encoding is still the right * one in that case. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetOEMCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = malloc(len); + if (!msgA) return; - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); free(msgA); }

1 0

Eric Pouech : attrib: Use OEM code page for output.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 8f06c1c641d14d9c03d6ad8b10decaf2b60618d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f06c1c641d14d9c03d6ad8b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 attrib: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 4344200b3ec..f4bcc7df779 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -104,7 +104,7 @@ static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) } /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(CP_ACP, 0, output_bufW, + convertedChars = WideCharToMultiByte(GetOEMCP(), 0, output_bufW, len, output_bufA, MAX_WRITECONSOLE_SIZE, "?", &usedDefaultChar); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars,

1 0

Drew Ronneberg : winmm: Remove obsolete -D_WINMM_ from Makefile.in.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: f20771e76cb0720b677a1428d5b92a88e3684542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f20771e76cb0720b677a1428… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:11 2022 -0400 winmm: Remove obsolete -D_WINMM_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index c515a3aba2e..81519a58853 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm IMPORTS = uuid user32 advapi32 ole32 msacm32

1 0

Drew Ronneberg : shdocvw: Remove obsolete -D_SHDOCVW_ from Makefile.in.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 842b0eb511be7ae9826c25b890460dc7db6da659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842b0eb511be7ae9826c25b8… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Fri Apr 29 06:14:31 2022 -0400 shdocvw: Remove obsolete -D_SHDOCVW_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 30b0a1a299c..9523f299ce1 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SHDOCVW_ MODULE = shdocvw.dll IMPORTLIB = shdocvw IMPORTS = uuid shlwapi advapi32

1 0

Drew Ronneberg : netapi32: Remove obsolete -D_SVRAPI_ from Makefile.in.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: cacf4d1a55ad657eb05dd55661da048e789fb3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cacf4d1a55ad657eb05dd556… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Sun May 1 05:59:07 2022 -0400 netapi32: Remove obsolete -D_SVRAPI_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 1f97d9797b9..cb0ea5168b5 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll UNIXLIB = netapi32.so IMPORTLIB = netapi32

1 0