wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Jeff Smith : ucrtbase: Add support for strftime format %r.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: c6bafaa6d92b78c82be5b955cae455f581750a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6bafaa6d92b78c82be5b955… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 28 01:57:42 2019 -0600 ucrtbase: Add support for strftime format %r. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 28 ++++++++++++++++++++++++++++ dlls/ucrtbase/tests/misc.c | 7 +++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4283566102..ef4f228554 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1386,6 +1386,34 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; break; #if _MSVCR_VER>=140 + case 'r': + if(time_data == MSVCRT_locale->locinfo->lc_time_curr) + { + if(!MSVCRT_CHECK_PMT(mstm->tm_hour>=0 && mstm->tm_hour<=23)) + goto einval_error; + if(!strftime_int(str, &ret, max, (mstm->tm_hour + 11) % 12 + 1, + alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, MAX_SECONDS)) + return 0; + if(ret < max) + str[ret++] = ' '; + if(!strftime_str(str, &ret, max, mstm->tm_hour<12 ? + STRFTIME_TD(time_data, am) : STRFTIME_TD(time_data, pm))) + return 0; + } + else + { + if(!strftime_format(str, &ret, max, mstm, time_data, STRFTIME_TD(time_data, time))) + return 0; + } + break; case 'R': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c1ab7f216a..083be42f42 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -974,8 +974,10 @@ static void test_strftime(void) {"%I", "11", { 0, 0, 23, 1, 0, 70, 4, 0, 0 }}, {"%I", "", { 0, 0, 24, 1, 0, 70, 4, 0, 0 }}, {"%n", "\n", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE, TRUE}, - {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE, TRUE}, + {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }}, + {"%#r", "12:0:0 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%#r", "2:0:0 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }}, {"%t", "\t", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%g", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }}, {"%g", "", { 0, 0, 0, 1, 0, -1901, 3, 364, 0 }}, @@ -1077,6 +1079,7 @@ static void test_strftime(void) { "%#x", "y70", 0, L"yyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%#x", "1970", 0, L"yyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%#x", "y1970", 0, L"yyyyy", 0, { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%r", "z", L"x", L"y", L"z", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, }; const struct {

1 0

Francois Gouget : gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 40f5cffadde76fa1a6adc065f7d46b9411379180 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f5cffadde76fa1a6adc065… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 16:08:46 2019 +0100 gdi32/tests: CloseMetaFile() no longer destroys the metafile hdc. Windows 10 1507 still deleted it but 1607 no longer does. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ca433b33c0..231d6a4d35 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2082,7 +2082,9 @@ static void test_mf_Blank(void) ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); type = GetObjectType(hMetafile); ok(type == OBJ_METAFILE, "CloseMetaFile created object with type %d\n", type); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_BLANK_BITS, sizeof(MF_BLANK_BITS), "mf_blank") != 0) @@ -2249,6 +2251,7 @@ static void test_mf_Graphics(void) HDC hdcMetafile; HMETAFILE hMetafile; POINT oldpoint; + INT type; BOOL ret; hdcMetafile = CreateMetaFileA(NULL); @@ -2275,7 +2278,9 @@ static void test_mf_Graphics(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS), "mf_Graphics") != 0) @@ -2296,6 +2301,7 @@ static void test_mf_PatternBrush(void) LOGBRUSH *orig_lb; HBRUSH hBrush; BOOL ret; + INT type; orig_lb = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LOGBRUSH)); @@ -2316,7 +2322,9 @@ static void test_mf_PatternBrush(void) hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseMetaFile error %d\n", GetLastError()); - ok(!GetObjectType(hdcMetafile), "CloseMetaFile has to destroy metafile hdc\n"); + type = GetObjectType(hdcMetafile); + ok(type == 0 || broken(type == OBJ_METADC) /* win10 >=1607 */, + "CloseMetaFile has to destroy metafile hdc (%d)\n", type); if (compare_mf_bits (hMetafile, MF_PATTERN_BRUSH_BITS, sizeof(MF_PATTERN_BRUSH_BITS), "mf_Pattern_Brush") != 0)

1 0

Alexandre Julliard : ntdll: Keep a valid DOS name if the initial current directory is a Unix dir.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: f2060812418bc049105c2a30ceb039ee6d5f0fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2060812418bc049105c2a30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 19:16:56 2019 +0100 ntdll: Keep a valid DOS name if the initial current directory is a Unix dir. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48114 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 79a1805618..ebeda01ff8 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -622,8 +622,17 @@ static void get_current_directory( UNICODE_STRING *dir ) if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) { /* skip the \??\ prefix */ - dir->Length = nt_name.Length - 4 * sizeof(WCHAR); - memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + if (nt_name.Length > 6 * sizeof(WCHAR*) && nt_name.Buffer[5] == ':') + { + dir->Length = nt_name.Length - 4 * sizeof(WCHAR); + memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); + } + else /* change \??\ to \\?\ */ + { + dir->Length = nt_name.Length; + memcpy( dir->Buffer, nt_name.Buffer, dir->Length ); + dir->Buffer[1] = '\\'; + } RtlFreeUnicodeString( &nt_name ); } }

1 0

Alexandre Julliard : ntdll: Don't fail to load data file when the registry key is missing.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 1902ab4d85049d39a439c49a16fc4a5c2bceba3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1902ab4d85049d39a439c49a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:51:35 2019 +0100 ntdll: Don't fail to load data file when the registry key is missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48188 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 26b2f4203c..16287c83a1 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -160,17 +160,19 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) RtlInitUnicodeString( &nameW, buffer ); RtlInitUnicodeString( &valueW, value ); InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); - if ((status = NtOpenKey( &handle, KEY_READ, &attr ))) return status; - info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - size = sizeof(buffer) - sizeof(WCHAR); - status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ); - NtClose( handle ); - if (!status) + if (!(status = NtOpenKey( &handle, KEY_READ, &attr ))) { - ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; - name = (WCHAR *)info->Data; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + size = sizeof(buffer) - sizeof(WCHAR); + if (!(status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ))) + { + ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; + name = (WCHAR *)info->Data; + } + NtClose( handle ); } - else /* otherwise some hardcoded defaults */ + + if (!name) /* otherwise some hardcoded defaults */ { switch (type) {

1 0

Alexandre Julliard : kernel32: Move FoldStringW() function to kernelbase.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 7bb286ad9d04b456325f3ddedd893fbe8b9270b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bb286ad9d04b456325f3dde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:05:13 2019 +0100 kernel32: Move FoldStringW() function to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 165 --------- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/digitmap.c | 787 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 164 +++++++++ tools/make_unicode | 14 +- 7 files changed, 963 insertions(+), 172 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bb286ad9d04b456325f…

1 0

Alexandre Julliard : kernel32: Reimplement FoldStringW() to support composition.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: e89bbd52444050b0b37b8efedc35c4d04355a8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e89bbd52444050b0b37b8efe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 09:04:33 2019 +0100 kernel32: Reimplement FoldStringW() to support composition. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 170 +++++++++++++++++++++++++++++++++++++------ dlls/kernel32/tests/locale.c | 38 +++------- 2 files changed, 159 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e89bbd52444050b0b37b…

1 0

Alexandre Julliard : wineboot: Keep config directory path in Unicode.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 95c9dee30aa34020079ff0a614d34761db504333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95c9dee30aa34020079ff0a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:51:17 2019 +0100 wineboot: Keep config directory path in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0a404c74a8..dd9a5bd8f6 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -160,21 +160,21 @@ done: } /* print the config directory in a more Unix-ish way */ -static const char *prettyprint_configdir(void) +static const WCHAR *prettyprint_configdir(void) { - static char buffer[MAX_PATH]; - WCHAR *path = _wgetenv( wineconfigdirW ); - char *p; + static WCHAR buffer[MAX_PATH]; + WCHAR *p, *path = _wgetenv( wineconfigdirW ); - if (!WideCharToMultiByte( CP_UNIXCP, 0, path, -1, buffer, ARRAY_SIZE(buffer), NULL, NULL )) - strcpy( buffer + ARRAY_SIZE(buffer) - 4, "..." ); + lstrcpynW( buffer, path, ARRAY_SIZE(buffer) ); + if (lstrlenW( wineconfigdirW ) >= ARRAY_SIZE(buffer) ) + lstrcpyW( buffer + ARRAY_SIZE(buffer) - 4, L"..." ); - if (!strncmp( buffer, "\\??\\unix\\", 9 )) + if (!wcsncmp( buffer, L"\\??\\unix\\", 9 )) { for (p = buffer + 9; *p; p++) if (*p == '\\') *p = '/'; return buffer + 9; } - else if (!strncmp( buffer, "\\??\\Z:\\", 7 )) + else if (!wcsncmp( buffer, L"\\??\\Z:\\", 7 )) { for (p = buffer + 6; *p; p++) if (*p == '\\') *p = '/'; return buffer + 6; @@ -1064,18 +1064,9 @@ static INT_PTR CALLBACK wait_dlgproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp static HWND show_wait_window(void) { - const char *config_dir = prettyprint_configdir(); - WCHAR *name; - HWND hwnd; - DWORD len; - - len = MultiByteToWideChar( CP_UNIXCP, 0, config_dir, -1, NULL, 0 ); - name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_UNIXCP, 0, config_dir, -1, name, len ); - hwnd = CreateDialogParamW( GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_WAITDLG), 0, - wait_dlgproc, (LPARAM)name ); + HWND hwnd = CreateDialogParamW( GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_WAITDLG), 0, + wait_dlgproc, (LPARAM)prettyprint_configdir() ); ShowWindow( hwnd, SW_SHOWNORMAL ); - HeapFree( GetProcessHeap(), 0, name ); return hwnd; } @@ -1227,13 +1218,13 @@ static void update_wineprefix( BOOL force ) if (!inf_path) { - WINE_MESSAGE( "wine: failed to update %s, wine.inf not found\n", prettyprint_configdir() ); + WINE_MESSAGE( "wine: failed to update %s, wine.inf not found\n", debugstr_w( config_dir )); return; } if ((fd = _wopen( inf_path, O_RDONLY )) == -1) { WINE_MESSAGE( "wine: failed to update %s with %s: %s\n", - prettyprint_configdir(), debugstr_w(inf_path), strerror(errno) ); + debugstr_w(config_dir), debugstr_w(inf_path), strerror(errno) ); goto done; } fstat( fd, &st ); @@ -1263,7 +1254,7 @@ static void update_wineprefix( BOOL force ) install_root_pnp_devices(); update_user_profile(); - WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", prettyprint_configdir() ); + WINE_MESSAGE( "wine: configuration in %s has been updated.\n", debugstr_w(prettyprint_configdir()) ); } done:

1 0

Alexandre Julliard : cabarc: Avoid some conversion to Unix codepage.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: e87c84f56d505dba2e2ecc76a831458e9650c686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87c84f56d505dba2e2ecc76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:50:49 2019 +0100 cabarc: Avoid some conversion to Unix codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cabarc/cabarc.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 5337b1e009..d244d6ce27 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -335,21 +335,19 @@ static INT_PTR CDECL list_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pf nameW = strdupAtoW( (pfdin->attribs & _A_NAME_IS_UTF) ? CP_UTF8 : CP_ACP, pfdin->psz1 ); if (match_files( nameW )) { - char *nameU = strdupWtoA( CP_UNIXCP, nameW ); if (opt_verbose) { - char attrs[] = "rxash"; + WCHAR attrs[] = L"rxash"; if (!(pfdin->attribs & _A_RDONLY)) attrs[0] = '-'; if (!(pfdin->attribs & _A_EXEC)) attrs[1] = '-'; if (!(pfdin->attribs & _A_ARCH)) attrs[2] = '-'; if (!(pfdin->attribs & _A_SYSTEM)) attrs[3] = '-'; if (!(pfdin->attribs & _A_HIDDEN)) attrs[4] = '-'; - printf( " %s %9u %04u/%02u/%02u %02u:%02u:%02u ", attrs, pfdin->cb, + wprintf( L" %s %9u %04u/%02u/%02u %02u:%02u:%02u ", attrs, pfdin->cb, (pfdin->date >> 9) + 1980, (pfdin->date >> 5) & 0x0f, pfdin->date & 0x1f, pfdin->time >> 11, (pfdin->time >> 5) & 0x3f, (pfdin->time & 0x1f) * 2 ); } - printf( "%s\n", nameU ); - cab_free( nameU ); + wprintf( L"%s\n", nameW ); } cab_free( nameW ); return 0; @@ -404,12 +402,7 @@ static INT_PTR CDECL extract_notify( FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION if (match_files( file )) { - if (opt_verbose) - { - char *nameU = strdupWtoA( CP_UNIXCP, path ); - printf( "extracting %s\n", nameU ); - cab_free( nameU ); - } + if (opt_verbose) wprintf( L"extracting %s\n", path ); create_directories( path ); /* FIXME: check for existing file and overwrite mode */ ret = (INT_PTR)CreateFileW( path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -628,8 +621,7 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; else { - char *arg = strdupWtoA( CP_ACP, argv[1] ); - WINE_MESSAGE( "cabarc: Unknown compression type '%s'\n", arg); + WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1])); return 1; } break;

1 0

Alexandre Julliard : wininet: Handle http_proxy variable entirely in Unicode.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: cadad89d106186a9d0377607096a58677496ec50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cadad89d106186a9d0377607… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:49:07 2019 +0100 wininet: Handle http_proxy variable entirely in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index c7e88c83ff..16dc200c13 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -541,7 +541,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { HKEY key; DWORD type, len; - LPCSTR envproxy; + const WCHAR *envproxy; LONG ret; memset( lpwpi, 0, sizeof(*lpwpi) ); @@ -573,7 +573,7 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } } - if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled) + if (!(envproxy = _wgetenv( L"http_proxy" )) || lpwpi->proxyEnabled) { /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) @@ -615,18 +615,8 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } else if (envproxy) { - WCHAR *envproxyW; - - len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); - if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) - { - RegCloseKey( key ); - return ERROR_OUTOFMEMORY; - } - MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); - FreeProxyInfo( lpwpi ); - if (parse_proxy_url( lpwpi, envproxyW )) + if (parse_proxy_url( lpwpi, envproxy )) { TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy)); lpwpi->proxyEnabled = 1; @@ -634,19 +624,18 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) } else { - WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxyW)); + WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxy)); lpwpi->proxyEnabled = 0; lpwpi->proxy = NULL; lpwpi->proxyBypass = NULL; } - heap_free( envproxyW ); } if (lpwpi->proxyEnabled) { TRACE("Proxy is enabled.\n"); - if (!(envproxy = getenv( "no_proxy" ))) + if (!(envproxy = _wgetenv( L"no_proxy" ))) { /* figure out how much memory the proxy setting takes */ if (!RegQueryValueExW( key, szProxyOverride, NULL, &type, NULL, &len ) && len && (type == REG_SZ)) @@ -677,13 +666,12 @@ static LONG INTERNET_LoadProxySettings( proxyinfo_t *lpwpi ) { WCHAR *envproxyW; - len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); - if (!(envproxyW = heap_alloc(len * sizeof(WCHAR)))) + if (!(envproxyW = heap_alloc(lstrlenW(envproxy) * sizeof(WCHAR)))) { RegCloseKey( key ); return ERROR_OUTOFMEMORY; } - MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + lstrcpyW( envproxyW, envproxy ); heap_free( lpwpi->proxyBypass ); lpwpi->proxyBypass = envproxyW;

1 0

Alexandre Julliard : winhttp: Handle http_proxy variable entirely in Unicode.
by Alexandre Julliard 28 Nov '19

28 Nov '19

Module: wine Branch: master Commit: 86f43b693a48f94f965ed088a82e20bd1ffde273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f43b693a48f94f965ed088… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 28 08:48:32 2019 +0100 winhttp: Handle http_proxy variable entirely in Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3f8acf0e02..22aa285a44 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1534,7 +1534,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) LONG l; HKEY key; BOOL got_from_reg = FALSE, direct = TRUE; - char *envproxy; + WCHAR *envproxy; TRACE("%p\n", info); @@ -1610,37 +1610,30 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } RegCloseKey( key ); } - if (!got_from_reg && (envproxy = getenv( "http_proxy" ))) + if (!got_from_reg && (envproxy = _wgetenv( L"http_proxy" ))) { - char *colon, *http_proxy = NULL; + WCHAR *colon, *http_proxy = NULL; - if (!(colon = strchr( envproxy, ':' ))) http_proxy = envproxy; + if (!(colon = wcschr( envproxy, ':' ))) http_proxy = envproxy; else { if (*(colon + 1) == '/' && *(colon + 2) == '/') { /* It's a scheme, check that it's http */ - if (!strncmp( envproxy, "http://", 7 )) http_proxy = envproxy + 7; - else WARN("unsupported scheme in $http_proxy: %s\n", envproxy); + if (!wcsncmp( envproxy, L"http://", 7 )) http_proxy = envproxy + 7; + else WARN("unsupported scheme in $http_proxy: %s\n", debugstr_w(envproxy)); } else http_proxy = envproxy; } if (http_proxy && http_proxy[0]) { - WCHAR *http_proxyW; - int len; - - len = MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, NULL, 0 ); - if ((http_proxyW = GlobalAlloc( 0, len * sizeof(WCHAR)))) - { - MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, http_proxyW, len ); - direct = FALSE; - info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; - info->lpszProxy = http_proxyW; - info->lpszProxyBypass = NULL; - TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy)); - } + direct = FALSE; + info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + info->lpszProxy = GlobalAlloc( 0, (lstrlenW(http_proxy) + 1) * sizeof(WCHAR) ); + wcscpy( info->lpszProxy, http_proxy ); + info->lpszProxyBypass = NULL; + TRACE("http proxy (from environment) = %s\n", debugstr_w(info->lpszProxy)); } } if (direct)

1 0

← Newer
1
2
3
4
5
6
7
8
...
90
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 November 2019