November 2019 - Wine-devel - list.winehq.org

[PATCH v5 6/7] kernel32: Autoinitialize geographic values when launching any program.
by João Diogo Ferreira 07 Nov '19

07 Nov '19

We ask Wine for the country code of the current locale and then set it with SetUserGeoName(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172518 V5: Removed superfluous TRACE logs. V4: Removed opt-out mechanism. --- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/locale.c | 14 ++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index dfa66f0295..206972c210 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -88,6 +88,9 @@ static BOOL process_attach( HMODULE module ) /* Setup registry locale information */ LOCALE_InitRegistry(); + /* Setup registry geographic information */ + LOCALE_InitGeo(); + /* Setup registry timezone information */ TIMEZONE_InitRegistry(); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index af85bee84d..6b93add056 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -76,6 +76,7 @@ extern void COMPUTERNAME_Init(void) DECLSPEC_HIDDEN; /* locale.c */ extern void LOCALE_Init(void) DECLSPEC_HIDDEN; extern void LOCALE_InitRegistry(void) DECLSPEC_HIDDEN; +extern void LOCALE_InitGeo(void) DECLSPEC_HIDDEN; /* time.c */ extern void TIMEZONE_InitRegistry(void) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f4aaee25f9..20ba0f781a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -846,6 +846,20 @@ void LOCALE_InitRegistry(void) NtClose( hkey ); } +/* Initialize the geographic information in the registry. */ +void LOCALE_InitGeo(void) +{ + WCHAR name[4]; + static WCHAR fallback[] = {'0','0','1',0}; /* World */ + int result; + + if ((result = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SISO3166CTRYNAME, + name, ARRAY_SIZE(name)))) + result = SetUserGeoName(name); + + if (!result) + SetUserGeoName(fallback); +} #ifdef __APPLE__ /*********************************************************************** -- 2.23.0

2 1

[PATCH 4/4] jscript/tests: Add tests for pending and executed code persistence.
by Jacek Caban 07 Nov '19

07 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/jscript.c | 254 +++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+)

1 0

[PATCH 3/4] jscript/tests: Use integers instead of booleans for counting call expectations.
by Jacek Caban 07 Nov '19

07 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/jscript.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH 2/4] jscript: Implement script persistence.
by Jacek Caban 07 Nov '19

07 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Persistent code has to be re-executed if the script is uninitialized and then reinitialized and restarted. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.h | 1 + dlls/jscript/jscript.c | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] jscript: Use standard list for the queued code.
by Jacek Caban 07 Nov '19

07 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.h | 2 +- dlls/jscript/jscript.c | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-)

1 0

configure: Copy mmacosx-version-min option from CFLAGS to WINEPRELOADER_LDFLAGS.
by Piotr Caban 07 Nov '19

07 Nov '19

We fail to link preloader when CFLAGS="-mmacosx-version-min=10.7" (because configure check also includes CFLAGS). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+)

2 4

[PATCH v5 5/7] kernel32: Make GetUserGeoID() pretend we set a GeoID even if we didn't.
by João Diogo Ferreira 07 Nov '19

07 Nov '19

In Windows 10, with the changes introduced in v1709, this function now always returns a good GeoID if the provided geoclass is valid. If that class didn't have a GeoID set yet, it now returns 39070, which is the ID for the very neutral "World" region. This behaviour matches Windows 10 v1709-v1909 and also prevents at least one game from crashing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 (partial fix: game no longer crashes.) Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172517 V5: (no changes.) --- dlls/kernel32/locale.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 8c7099e99e..7a6d05c968 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4097,10 +4097,14 @@ static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) * RETURNS * SUCCESS: The ID of the specified geographic class. * FAILURE: GEOID_NOT_AVAILABLE. + * + * NOTES + * This function only fails if the specified geoclass is invalid; + * otherwise, a valid GeoID will always be returned. */ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) { - GEOID ret = GEOID_NOT_AVAILABLE; + GEOID ret = 39070; /* World */ static const WCHAR geoW[] = {'G','e','o',0}; static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; @@ -4124,7 +4128,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) else { WARN("Unknown geoclass %d\n", geoclass); - return ret; + return GEOID_NOT_AVAILABLE; } if (!(hkey = create_registry_key())) return ret; -- 2.23.0

2 1

[PATCH 4/4] scrrun/tests: Add test of lost trailing byte in unicode srteam.
by Jacek Caban 07 Nov '19

07 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrrun/tests/filesystem.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)

1 0

[PATCH 3/4] scrrun/tests: Add ITextStream::ReadLine tests.
by Jacek Caban 07 Nov '19

07 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrrun/tests/filesystem.c | 71 ++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+)

1 0

[PATCH 2/4] scrrun: Add ITextStream::ReadLine implementation.
by Jacek Caban 07 Nov '19

07 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrrun/filesystem.c | 33 ++++++++++++++++++++++++--------- dlls/scrrun/tests/filesystem.c | 6 ------ 2 files changed, 24 insertions(+), 15 deletions(-)

1 0