October 2019 - Wine-Devel - list.winehq.org

[PATCH 11/12] kernel32: Handle GEOCLASS_ALL in EnumSystemGeoID().
by João Diogo Ferreira Oct. 22, 2019

Oct. 22, 2019

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 752136be07..fd0c283790 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4611,21 +4611,24 @@ int WINAPI GetGeoInfoEx(PWSTR location, GEOTYPE geotype, PWSTR geoData, int geoD /****************************************************************************** * EnumSystemGeoID (KERNEL32.@) * - * Call a users function for every location available on the system. + * Call a user's function for every location available on the system. * * PARAMS - * geoclass [I] Type of information desired (SYSGEOTYPE enum from "winnls.h") + * geoclass [I] Type of location desired (SYSGEOTYPE enum from "winnls.h") * parent [I] GEOID for the parent * enumproc [I] Callback function to call for each location * * RETURNS * Success: TRUE. * Failure: FALSE. Use GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: enumproc was NULL; + * - ERROR_INVALID_FLAGS: The geoclass argument was invalid. */ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumproc) { - INT i; - TRACE("(%d, %d, %p)\n", geoclass, parent, enumproc); if (!enumproc) { @@ -4633,15 +4636,15 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return FALSE; } - if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION) { + if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION && geoclass != GEOCLASS_ALL) { SetLastError(ERROR_INVALID_FLAGS); return FALSE; } - for (i = 0; i < ARRAY_SIZE(geoinfodata); i++) { + for (int i = 0; i < ARRAY_SIZE(geoinfodata); i++) { const struct geoinfo_t *ptr = &geoinfodata[i]; - if (geoclass == GEOCLASS_NATION && (ptr->kind == LOCATION_REGION)) + if (geoclass == GEOCLASS_NATION && (ptr->kind != LOCATION_NATION)) continue; if (geoclass == GEOCLASS_REGION && (ptr->kind == LOCATION_NATION)) -- 2.23.0

2 1

[PATCH 1/5] strmbase: Return S_FALSE from IBaseFilter::Pause() when performing asynchronous state change.
by Zebediah Figura Oct. 22, 2019

Oct. 22, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/renderer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 3a5fa19ace..9908e693e7 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -461,6 +461,7 @@ out: HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) { BaseRenderer *This = impl_from_IBaseFilter(iface); + HRESULT hr = S_OK; TRACE("(%p)->()\n", This); @@ -471,7 +472,10 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) if (This->filter.state == State_Stopped) { if (This->sink.pin.peer) + { ResetEvent(This->state_event); + hr = S_FALSE; + } This->sink.end_of_stream = FALSE; } else if (This->sink.pin.peer && This->pFuncsTable->renderer_stop_stream) @@ -485,7 +489,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) } LeaveCriticalSection(&This->csRenderLock); - return S_OK; + return hr; } HRESULT WINAPI BaseRendererImpl_SetSyncSource(IBaseFilter *iface, IReferenceClock *clock) -- 2.20.1

1 4

[PATCH] msvcrt: Fix fscanf return when EOF is immediately after an end of line.
by Erich E. Hoover Oct. 22, 2019

Oct. 22, 2019

Spotted while compiling VTK for Python under Wine.

5 21

[PATCH 10/12] kernel32: Handle geotypes GEO_ID and GEO_NAME in GetGeoInfoA/W/Ex().
by João Diogo Ferreira Oct. 22, 2019

Oct. 22, 2019

Also added three other geotypes to the list of known FIXME cases. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ea0d7dd30b..752136be07 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4432,6 +4432,7 @@ static int get_geo_info(const struct geoinfo_t *geoinfo, GEOTYPE geotype, WCHAR } switch (geotype) { + case GEO_ID: case GEO_NATION: val = geoinfo->id; break; @@ -4441,6 +4442,14 @@ static int get_geo_info(const struct geoinfo_t *geoinfo, GEOTYPE geotype, WCHAR case GEO_PARENT: val = geoinfo->parent; break; + case GEO_NAME: + if (geoinfo->kind == LOCATION_REGION) { + sprintfW(buffW, geoname_uncode_fmtW, geoinfo->uncode); + str = buffW; + } + else + str = geoinfo->iso2W; + break; case GEO_ISO2: case GEO_ISO3: { @@ -4455,6 +4464,9 @@ static int get_geo_info(const struct geoinfo_t *geoinfo, GEOTYPE geotype, WCHAR case GEO_OFFICIALLANGUAGES: case GEO_LATITUDE: case GEO_LONGITUDE: + case GEO_DIALINGCODE: + case GEO_CURRENCYCODE: + case GEO_CURRENCYSYMBOL: FIXME("type %d is not supported\n", geotype); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; -- 2.23.0

2 1

[PATCH 09/12] kernel32: Implement EnumSystemGeoNames().
by João Diogo Ferreira Oct. 22, 2019

Oct. 22, 2019

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 57 +++++++++++++++++++++++++++++++++++++ include/winnls.h | 2 ++ 3 files changed, 60 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 765f65c867..dcb24ed893 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -420,6 +420,7 @@ @ stdcall -import EnumSystemCodePagesW(ptr long) @ stdcall EnumSystemFirmwareTables(long ptr long) @ stdcall EnumSystemGeoID(long long ptr) +@ stdcall EnumSystemGeoNames(long ptr long) @ stdcall EnumSystemLanguageGroupsA(ptr long ptr) @ stdcall -import EnumSystemLanguageGroupsW(ptr long ptr) @ stdcall -import EnumSystemLocalesA(ptr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index adb3b9b3d9..ea0d7dd30b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4645,6 +4645,63 @@ BOOL WINAPI EnumSystemGeoID(GEOCLASS geoclass, GEOID parent, GEO_ENUMPROC enumpr return TRUE; } +/****************************************************************************** + * EnumSystemGeoNames (KERNEL32.@) + * + * Call a user's function for every location available on the system. + * + * PARAMS + * geoclass [I] Type of location desired (SYSGEOTYPE enum from "winnls.h") + * enumproc [I] Callback function to call for each location + * data [I] Any user-defined data to be passed to the enumproc callback function. + * + * RETURNS + * Success: TRUE. + * Failure: FALSE. Use GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: enumproc was NULL; + * - ERROR_INVALID_FLAGS: the geoclass argument was invalid. + */ +BOOL WINAPI EnumSystemGeoNames(GEOCLASS geoclass, GEO_ENUMNAMEPROC enumproc, LPARAM data) +{ + TRACE("(%d, %p, %ld)\n", geoclass, enumproc, data); + + if (!enumproc) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (geoclass != GEOCLASS_NATION && geoclass != GEOCLASS_REGION && geoclass != GEOCLASS_ALL) + { + SetLastError(ERROR_INVALID_FLAGS); + return FALSE; + } + + for (int i = 0; i < ARRAY_SIZE(geoinfodata); i++) + { + const struct geoinfo_t *ptr = &geoinfodata[i]; + WCHAR name[4]; + + if (ptr->kind == LOCATION_NATION && geoclass == GEOCLASS_REGION) + continue; + if (ptr->kind != LOCATION_NATION && geoclass == GEOCLASS_NATION) + continue; + + if (ptr->kind == LOCATION_REGION) + sprintfW(name, geoname_uncode_fmtW, ptr->uncode); + else + strcpyW(name, ptr->iso2W); + + if (!enumproc(name, data)) + return TRUE; + } + + return TRUE; +} + /****************************************************************************** * NormalizeString (KERNEL32.@) */ diff --git a/include/winnls.h b/include/winnls.h index 63583f9a6c..aca57030ec 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -762,6 +762,7 @@ typedef BOOL (CALLBACK *DATEFMT_ENUMPROCW)(LPWSTR); typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXA)(LPSTR,CALID); typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXW)(LPWSTR,CALID); typedef BOOL (CALLBACK *GEO_ENUMPROC)(GEOID); +typedef BOOL (CALLBACK *GEO_ENUMNAMEPROC)(PWSTR,LPARAM); typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCA)(LGRPID,LCID,LPSTR,LONG_PTR); typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCW)(LGRPID,LCID,LPWSTR,LONG_PTR); typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCA)(LGRPID,LPSTR,LPSTR,DWORD,LONG_PTR); @@ -868,6 +869,7 @@ WINBASEAPI BOOL WINAPI EnumSystemCodePagesA(CODEPAGE_ENUMPROCA,DWORD); WINBASEAPI BOOL WINAPI EnumSystemCodePagesW(CODEPAGE_ENUMPROCW,DWORD); #define EnumSystemCodePages WINELIB_NAME_AW(EnumSystemCodePages) WINBASEAPI BOOL WINAPI EnumSystemGeoID(GEOCLASS,GEOID,GEO_ENUMPROC); +WINBASEAPI BOOL WINAPI EnumSystemGeoNames(GEOCLASS,GEO_ENUMNAMEPROC,LPARAM); WINBASEAPI BOOL WINAPI EnumSystemLocalesA(LOCALE_ENUMPROCA,DWORD); WINBASEAPI BOOL WINAPI EnumSystemLocalesW(LOCALE_ENUMPROCW,DWORD); #define EnumSystemLocales WINELIB_NAME_AW(EnumSystemLocales) -- 2.23.0

2 1

[PATCH 08/12] kernel32: Implement GetGeoInfoEx(), add helper get_geo_info().
by João Diogo Ferreira Oct. 22, 2019

Oct. 22, 2019

Once again, this required hiring a new helper "get_geo_info" that implements behavior for all A, W and Ex variants, since the three have basically the same behaviour. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 105 ++++++++++++++++++++++++++++++++---- include/winnls.h | 1 + 3 files changed, 97 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9a8e33eb9a..765f65c867 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -694,6 +694,7 @@ @ stdcall -import GetFullPathNameW(wstr long ptr ptr) @ stdcall GetGeoInfoA(long long ptr long long) @ stdcall GetGeoInfoW(long long ptr long long) +@ stdcall GetGeoInfoEx(ptr long ptr long) @ stdcall GetHandleContext(long) @ stdcall -import GetHandleInformation(long ptr) @ stub -i386 GetLSCallbackTarget diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 90698a0e10..adb3b9b3d9 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4412,37 +4412,39 @@ BOOL WINAPI SetUserGeoName(LPWSTR geoName) } /****************************************************************************** - * GetGeoInfoW (KERNEL32.@) + * get_geo_info + * + * Implements GetGeoInfoW() and GetGeoInfoEx(). + * + * The return value and last error set here can (and probably should) + * be returned to the caller of those two functions. */ -INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, LANGID lang) +static int get_geo_info(const struct geoinfo_t *geoinfo, GEOTYPE geotype, WCHAR *data, int data_len, LANGID lang) { - const struct geoinfo_t *ptr; const WCHAR *str = NULL; WCHAR buffW[12]; LONG val = 0; INT len; - TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); - - if (!(ptr = get_geoinfoptr_by_id(geoid))) { + if (!geoinfo) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } switch (geotype) { case GEO_NATION: - val = geoid; + val = geoinfo->id; break; case GEO_ISO_UN_NUMBER: - val = ptr->uncode; + val = geoinfo->uncode; break; case GEO_PARENT: - val = ptr->parent; + val = geoinfo->parent; break; case GEO_ISO2: case GEO_ISO3: { - str = geotype == GEO_ISO2 ? ptr->iso2W : ptr->iso3W; + str = geotype == GEO_ISO2 ? geoinfo->iso2W : geoinfo->iso3W; break; } case GEO_RFC1766: @@ -4478,8 +4480,41 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, return data_len < len ? 0 : len; } +/****************************************************************************** + * GetGeoInfoW (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * PARAMS + * geoid [I] The GeoID of the location to learn about. + * geotype [I] The type of information to be retrieved. + * data [O] The output buffer to store the information. + * data_len [I] The length of the buffer, measured in WCHARs and including the null terminator. + * lang [I] Language identifier. Must be 0 if geotype is different than GEO_RFC1766 or GEO_LCID. + * + * RETURNS + * SUCCESS: The number of WCHARs (including null) written to the buffer -OR- + * If no buffer was provided, the minimum required length to hold the full data. + * FAILURE: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the location name provided was invalid. + * - ERROR_INVALID_FLAGS: the specified geotype was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. + */ +INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, INT data_len, LANGID lang) +{ + TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); + return get_geo_info(get_geoinfoptr_by_id(geoid), geotype, data, data_len, lang); +} + /****************************************************************************** * GetGeoInfoA (KERNEL32.@) + * + * Retrieves information about a geographic location by its GeoID. + * + * ANSI variant of GetGeoInfoW(). Please refer to that function for documentation. */ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, LANGID lang) { @@ -4511,6 +4546,56 @@ INT WINAPI GetGeoInfoA(GEOID geoid, GEOTYPE geotype, LPSTR data, int data_len, L return data_len < len ? 0 : len; } +/****************************************************************************** + * GetGeoInfoEx (KERNEL32.@) + * + * Retrieves information about a geographic location by its ISO or UN code. + * + * This name is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * PARAMS + * location [I] ISO 3166 or UN M.49 code of the location to learn about. + * geotype [I] Type of information to be retrieved (except GEO_LCID, GEO_NATION and GEO_RFC1766). + * geoData [O] Output buffer to store the information. + * geoDataCount [I] Length of the buffer, measured in WCHARs and including the null terminator. + * + * RETURNS + * SUCCESS: The number of WCHARs (including null) written to the buffer -OR- + * If no buffer was provided, the minimum required length to hold the full data. + * FAILURE: Zero. Call GetLastError() to determine the cause. + * + * NOTES + * This function diallows GEO_LCID, GEO_NATION and GEO_RFC1766 to be passed as geotype. + * Use GetGeoInfoW() if you need those values. + * + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the location name provided was invalid. + * - ERROR_INVALID_FLAGS: the specified geotype was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the provided buffer was too small to hold the full data. + */ +int WINAPI GetGeoInfoEx(PWSTR location, GEOTYPE geotype, PWSTR geoData, int geoDataCount) +{ + if (!location || !*location) + { + TRACE("%p=null %d %p %d\n", location, geotype, geoData, geoDataCount); + return 0; + } + TRACE("%p=%s %d %p %d\n", location, wine_dbgstr_w(location), geotype, geoData, geoDataCount); + + switch (geotype) + { + case GEO_LCID: + case GEO_NATION: + case GEO_RFC1766: + SetLastError(ERROR_INVALID_FLAGS); + return 0; + default: + return get_geo_info(get_geoinfoptr_by_name(location), + geotype, geoData, geoDataCount, 0); + } +} + /****************************************************************************** * EnumSystemGeoID (KERNEL32.@) * diff --git a/include/winnls.h b/include/winnls.h index 059a459153..63583f9a6c 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -909,6 +909,7 @@ WINBASEAPI BOOL WINAPI GetFileMUIPath(DWORD,PCWSTR,PWSTR,PULONG,PWSTR,PUL WINBASEAPI INT WINAPI GetGeoInfoA(GEOID,GEOTYPE,LPSTR,INT,LANGID); WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); #define GetGeoInfo WINELIB_NAME_AW(GetGeoInfo) +WINBASEAPI int WINAPI GetGeoInfoEx(PWSTR,GEOTYPE,PWSTR,int); WINBASEAPI INT WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT); WINBASEAPI INT WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT); #define GetLocaleInfo WINELIB_NAME_AW(GetLocaleInfo) -- 2.23.0

2 1

[PATCH 07/12] kernel32: Autoinitialize geographic values when launching any program.
by João Diogo Ferreira Oct. 22, 2019

Oct. 22, 2019

FIXES BUG: 46196 https://bugs.winehq.org/show_bug.cgi?id=46196 Autodetects the correct GeoName and GeoID based on Wine's current locale. This should be more than satisfactory for almost everyone. That being said, it may come in handy to bypass this in some scenarios: * When testing geo behaviour without wanting to change the languague; * Users who use a foreign language but want Wine and programs knows the actual country they live in; * Users in countries not represented by Linux or Wine locales. The last case is, I think, particularly important, as that's where this patch could cause real loss of functionality. To opt-out: * Set HKCU\\Control Panel\\International\\Geo\\WineDisableAutoConfig to 1. * Type is REG_DWORD. * This key is created automatically if it doesn't exist yet. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/locale.c | 42 ++++++++++++++++++++++++++++++++++ 3 files changed, 46 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 87cf9b402e..90698a0e10 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -877,6 +877,48 @@ void LOCALE_InitRegistry(void) NtClose( hkey ); } +/* Initialize the geo values in the registry. */ +void LOCALE_InitGeo(void) +{ + int enabled = 1; + HANDLE hkey = create_geo_regkey(); + + if (hkey) + { + WCHAR value[] = {'W','i','n','e','D','i','s','a','b','l','e','A','u','t','o','C','o','n','f','i','g',0}; + UNICODE_STRING uvalue; + KEY_VALUE_PARTIAL_INFORMATION kvi; + DWORD count; + NTSTATUS status; + RtlInitUnicodeString(&uvalue, value); + + status = NtQueryValueKey(hkey, &uvalue, KeyValuePartialInformation, &kvi, sizeof(kvi), &count); + if (status == STATUS_SUCCESS) + enabled = !kvi.Data[0]; + else if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + DWORD d = 0; + NtSetValueKey(hkey, &uvalue, 0, REG_DWORD, &d, sizeof(d)); + } + + NtClose(hkey); + } + + if (enabled) + { + 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); + } + else + TRACE("Skipping: disabled by user.\n"); +} #ifdef __APPLE__ /*********************************************************************** -- 2.23.0

2 1

[PATCH 06/12] kernel32: Implement GetUserDefaultGeoName().
by João Diogo Ferreira Oct. 22, 2019

Oct. 22, 2019

I also changed the default return value of GetUserGeoID() to make it more compliant with the new APIs. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 137 ++++++++++++++++++++++++++++++++++-- include/winnls.h | 1 + 3 files changed, 132 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index beebea9c1c..9a8e33eb9a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -869,6 +869,7 @@ # @ stub GetUILanguageInfo @ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr) # @ stub -arch=x86_64 GetUmsSystemThreadInformation +@ stdcall GetUserDefaultGeoName(ptr long) @ stdcall -import GetUserDefaultLCID() @ stdcall -import GetUserDefaultLangID() @ stdcall -import GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 4957e8df5e..87cf9b402e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4090,10 +4090,23 @@ static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) /****************************************************************************** * GetUserGeoID (KERNEL32.@) + * + * Retrieves the ID of the user's geographic nation or region. + * + * PARAMS + * GeoClass [I] One of GEOCLASS_NATION or GEOCLASS_REGION (SYSGEOCLASS enum from "winnls.h"). + * + * RETURNS + * SUCCESS: The ID of the specified geographic class. + * FAILURE: GEOID_NOT_AVAILABLE. + * + * NOTES + * This function only fails if the geoclass specified is invalid; + * otherwise, a valid GeoID is always returned. */ -GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) +GEOID WINAPI GetUserGeoID(GEOCLASS GeoClass) { - GEOID ret = GEOID_NOT_AVAILABLE; + GEOID ret = 39070; /* World */ static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; WCHAR bufferW[40], *end; @@ -4104,11 +4117,20 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) count = sizeof(bufferW); if (GeoClass == GEOCLASS_NATION) + { + TRACE("(GEOCLASS_NATION)\n"); RtlInitUnicodeString( &keyW, nationW ); + } else if (GeoClass == GEOCLASS_REGION) + { + TRACE("(GEOCLASS_REGION)\n"); RtlInitUnicodeString( &keyW, regionW ); + } else - return ret; + { + WARN("Unknown geoclass %d\n", GeoClass); + return GEOID_NOT_AVAILABLE; + } if (!(hkey = create_geo_regkey())) return ret; @@ -4121,13 +4143,114 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) } /****************************************************************************** - * set_geo_reg + * GetUserDefaultGeoName (KERNEL32.@) * - * Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). + * Retrieves the name of the user's geographic location. * - * The return value and last error set here can (and probably should) - * be returned to the callers of those two functions. + * This name is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * If geoNameCount is 0, this function will return the minimum length + * required for a buffer to hold the name. + * + * PARAMS + * geoName [O] Pointer to a buffer to hold the name. + * geoNameCount [I] Length of the buffer, including null, measured in WCHARs. + * + * RETURNS + * SUCCESS: Number of WCHARs written to the buffer -OR- + * minimum length for the buffer, if geoNameCount was 0. + * FAILURE: Zero. Call GetLastError() to determine the cause. + * + * NOTES: + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: one of the parameters was invalid. + * - ERROR_INSUFFICIENT_BUFFER: the specified buffer was too small to hold the name. + * - ERROR_BADDB: an internal error caused Wine to be unable to read the name. */ +int WINAPI GetUserDefaultGeoName(LPWSTR geoName, int geoNameCount) +{ + int ret = 0, size = 0; + DWORD count; + static const WCHAR nameW[] = {'N','a','m','e',0}; + KEY_VALUE_PARTIAL_INFORMATION kvi; + UNICODE_STRING keyname; + HANDLE hkey = create_geo_regkey(); + RtlInitUnicodeString(&keyname, nameW); + + TRACE("(%p, %d)\n", geoName, geoNameCount); + + if (!hkey) + { + SetLastError(ERROR_BADDB); + return 0; + } + + if (geoNameCount < 0 || (!geoName && geoNameCount)) + { + NtClose(hkey); + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (NtQueryValueKey(hkey, &keyname, KeyValuePartialInformation, &kvi, sizeof(kvi), &count) + == STATUS_BUFFER_OVERFLOW && kvi.DataLength) + size = kvi.DataLength / sizeof(WCHAR); + else + SetLastError(ERROR_BADDB); + + + if (size) + { + if (!geoNameCount) + ret = size; + else if (geoNameCount < size) + SetLastError(ERROR_INSUFFICIENT_BUFFER); + else if (geoNameCount >= size) + { + size_t kvi_size = 0; + KEY_VALUE_PARTIAL_INFORMATION *kvi = NULL; + + TRACE("==== geoNameCount: %d ===\n", geoNameCount); + + kvi_size = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + (geoNameCount * sizeof(WCHAR)); + if (!(kvi = HeapAlloc(GetProcessHeap(), 0, kvi_size))) + { + ERR("Couldn't allocate memory for KeyValuePartialInformation. Bailing.\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + else + { + NTSTATUS status = NtQueryValueKey(hkey, &keyname, KeyValuePartialInformation, + kvi, kvi_size, &count); + if (status == STATUS_SUCCESS) + { + ret = size; + memcpy(geoName, kvi->Data, kvi->DataLength); + } + else + { + ERR("Unexpected error retrieving geoname: status=0x%x, kvi->DataLength=%u, kvi->Data=%s\n", + status, kvi->DataLength, wine_dbgstr_w((WCHAR*)kvi->Data)); + SetLastError(ERROR_BADDB); + } + HeapFree(GetProcessHeap(), 0, kvi); + } + } + } + + NtClose(hkey); + return ret; +} + +/****************************************************************************** +* set_geo_reg +* +* Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). +* +* The return value and last error set here can (and probably should) +* be returned to the callers of those two functions. +*/ static int set_geo_reg(const struct geoinfo_t *geoinfo) { static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; diff --git a/include/winnls.h b/include/winnls.h index 3aeb47c9e4..059a459153 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -935,6 +935,7 @@ WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) +WINBASEAPI int WINAPI GetUserDefaultGeoName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); -- 2.23.0

2 1

[PATCH 05/12] kernel32: Implement SetUserGeoName(), add helper set_geo_reg().
by João Diogo Ferreira Oct. 22, 2019

Oct. 22, 2019

The new helper implements behaviour for both SetUserGeoName() and SetUserGeoID(), seeing as they behave the same. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 111 ++++++++++++++++++++++++++++++++---- include/winnls.h | 1 + 3 files changed, 103 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23c25b7acd..beebea9c1c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1469,6 +1469,7 @@ @ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) @ stdcall -import SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) +@ stdcall SetUserGeoName(ptr) @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b582324978..4957e8df5e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4121,16 +4121,22 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) } /****************************************************************************** - * SetUserGeoID (KERNEL32.@) + * set_geo_reg + * + * Does the heavy lifting for SetUserGeoName() and SetUserGeoID(). + * + * The return value and last error set here can (and probably should) + * be returned to the callers of those two functions. */ -BOOL WINAPI SetUserGeoID( GEOID GeoID ) +static int set_geo_reg(const struct geoinfo_t *geoinfo) { - const struct geoinfo_t *geoinfo = get_geoinfoptr_by_id(GeoID); static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; - static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING keyW; - WCHAR bufferW[10]; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR id_formatW[] = {'%','i',0}; + UNICODE_STRING idkeyW, namekeyW; + WCHAR geoidW[10], geonameW[4]; + int namelen; HANDLE hkey; if (!geoinfo) @@ -4144,17 +4150,102 @@ BOOL WINAPI SetUserGeoID( GEOID GeoID ) return FALSE; } + /* Prepare GeoID */ if (geoinfo->kind == LOCATION_NATION) - RtlInitUnicodeString( &keyW, nationW ); + RtlInitUnicodeString(&idkeyW, nationW); else - RtlInitUnicodeString( &keyW, regionW ); + RtlInitUnicodeString(&idkeyW, regionW); + + sprintfW(geoidW, id_formatW, geoinfo->id); + + /* Now prepare GeoName */ + RtlInitUnicodeString( &namekeyW, nameW ); + + if (geoinfo->kind == LOCATION_REGION) + { + sprintfW(geonameW, geoname_uncode_fmtW, geoinfo->uncode); + namelen = 4; + } + else + { + strcpyW(geonameW, geoinfo->iso2W); + namelen = 3; + } + + NtSetValueKey(hkey, &idkeyW, 0, REG_SZ, geoidW, (strlenW(geoidW) + 1) * sizeof(WCHAR)); + NtSetValueKey(hkey, &namekeyW, 0, REG_SZ, geonameW, namelen * sizeof(WCHAR)); + + TRACE("Set %s to ID %d; set Name to %s\n", + wine_dbgstr_w(idkeyW.Buffer), geoinfo->id, wine_dbgstr_w(geonameW)); - sprintfW(bufferW, formatW, geoinfo->id); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); NtClose(hkey); return TRUE; } +/****************************************************************************** + * SetUserGeoID (KERNEL32.@) + * + * Sets the ID of the user's geographic location. + * + * PARAMS + * GeoID [I] The geographic ID to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: FALSE. Call GetLastError() to determine the cause. + * + * NOTES + * On success, the geographic name will be set to the location of the specified GeoID. + * + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the specified GeoID was invalid. + * - ERROR_INTERNAL_ERROR: an internal error prevented Wine from setting the GeoID. + */ +BOOL WINAPI SetUserGeoID(GEOID GeoID) +{ + TRACE("(%d)\n", GeoID); + return set_geo_reg(get_geoinfoptr_by_id(GeoID)); +} + +/****************************************************************************** + * SetUserGeoName (KERNEL32.@) + * + * Sets the name of the user's geographic location. + * + * This name is a two-letter ISO 3166 country code + * or a three-digit UN M.49 code for anything other than countries (e.g. continents). + * + * PARAMS + * geoName [I] The name to be set. + * + * RETURNS + * SUCCESS: TRUE. + * FAILURE: FALSE. Call GetLastError() to determine the cause. + * + * NOTES + * If you specify the UN code of a valid country, its two-letter ISO code + * will be used instead. + * + * On success, the geographic ID for the relevant class will be set to + * the location of the specified name. + * + * On failure, GetLastError() will return one of the following values: + * - ERROR_INVALID_PARAMETER: the specified GeoID was invalid. + * - ERROR_INTERNAL_ERROR: an internal error prevented Wine from setting the name. + */ +BOOL WINAPI SetUserGeoName(LPWSTR geoName) +{ + if (!geoName || !*geoName) + { + TRACE("(%p = (null))\n", geoName); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + TRACE("(%p = %s)\n", geoName, wine_dbgstr_w(geoName)); + return set_geo_reg(get_geoinfoptr_by_name(geoName)); +} + /****************************************************************************** * GetGeoInfoW (KERNEL32.@) */ diff --git a/include/winnls.h b/include/winnls.h index e810c44af7..3aeb47c9e4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -968,6 +968,7 @@ WINBASEAPI BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); +WINBASEAPI BOOL WINAPI SetUserGeoName(LPWSTR); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); WINBASEAPI INT WINAPI FindNLSStringEx(const WCHAR *,DWORD,const WCHAR *,INT,const WCHAR *,INT,INT *,NLSVERSIONINFO *,void *,LPARAM); -- 2.23.0

2 1

[PATCH 04/12] kernel32: Add new Geo helper functions and constants.
by João Diogo Ferreira Oct. 22, 2019

Oct. 22, 2019

Things were about to get pretty chaotic without these handy helpers. New constant: * geoname_uncode_fmtW: format string for UN codes in GeoNames. Registry helper functions: * create_geo_regkey * Renamed create_registry_key to create_intl_regkey. Geoinfo helper functions: * get_geoinfoptr_by_str: find geoinfo by GEOTYPE (ISO2 or UNCODE currently) * get_geoinfoptr_by_name: parse geoname and find geoinfo; * Renamed get_geoinfo_dataptr to get_geoinfoptr_by_id. I also removed NLS_RegOpenKey() as it was no longer in use. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- dlls/kernel32/locale.c | 173 +++++++++++++++++++++++++++++------------ 1 file changed, 122 insertions(+), 51 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 2ac1694cdc..b582324978 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -645,11 +645,11 @@ static BOOL is_genitive_name_supported( LCTYPE lctype ) } /*********************************************************************** - * create_registry_key + * create_intl_regkey * * Create the Control Panel\\International registry key. */ -static inline HANDLE create_registry_key(void) +static inline HANDLE create_intl_regkey(void) { static const WCHAR cplW[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l',0}; static const WCHAR intlW[] = {'I','n','t','e','r','n','a','t','i','o','n','a','l',0}; @@ -678,6 +678,37 @@ static inline HANDLE create_registry_key(void) return hkey; } +/*********************************************************************** + * create_geo_regkey + * + * Create the Control Panel\\International\\Geo registry key. + */ + +static inline HANDLE create_geo_regkey(void) +{ + static const WCHAR geoW[] = {'G','e','o',0}; + UNICODE_STRING name; + OBJECT_ATTRIBUTES attr; + HANDLE intl_key, hkey; + + if (!(intl_key = create_intl_regkey())) + return 0; + + attr.Length = sizeof(attr); + attr.RootDirectory = intl_key; + attr.ObjectName = &name; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString(&name, geoW); + + if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) + hkey = 0; + + NtClose(intl_key); + return hkey; +} + /* update the registry settings for a given locale parameter */ /* return TRUE if an update was needed */ @@ -790,7 +821,7 @@ void LOCALE_InitRegistry(void) HANDLE hkey; LCID lcid = GetUserDefaultLCID(); - if (!(hkey = create_registry_key())) + if (!(hkey = create_intl_regkey())) return; /* don't do anything if we can't create the registry key */ locale_update_registry( hkey, localeW, lcid_LC_MESSAGES, lc_messages_values, @@ -1240,7 +1271,7 @@ static INT get_registry_locale_info( struct registry_value *registry_value, LPWS if (!registry_value->cached_value) { - if (!(hkey = create_registry_key())) + if (!(hkey = create_intl_regkey())) { RtlLeaveCriticalSection( &cache_section ); return -1; @@ -1686,7 +1717,7 @@ BOOL WINAPI SetLocaleInfoW( LCID lcid, LCTYPE lctype, LPCWSTR data ) /* FIXME: profile functions should map to registry */ WriteProfileStringW( intlW, value->name, data ); - if (!(hkey = create_registry_key())) return FALSE; + if (!(hkey = create_intl_regkey())) return FALSE; RtlInitUnicodeString( &valueW, value->name ); status = NtSetValueKey( hkey, &valueW, 0, REG_SZ, data, (strlenW(data)+1)*sizeof(WCHAR) ); @@ -3593,21 +3624,6 @@ void LOCALE_Init(void) setlocale(LC_NUMERIC, "C"); /* FIXME: oleaut32 depends on this */ } -static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName) -{ - UNICODE_STRING keyName; - OBJECT_ATTRIBUTES attr; - HANDLE hkey; - - RtlInitUnicodeString( &keyName, szKeyName ); - InitializeObjectAttributes(&attr, &keyName, 0, hRootKey, NULL); - - if (NtOpenKey( &hkey, KEY_READ, &attr ) != STATUS_SUCCESS) - hkey = 0; - - return hkey; -} - /****************************************************************************** * EnumSystemLanguageGroupsA (KERNEL32.@) */ @@ -3969,7 +3985,14 @@ static const struct geoinfo_t geoinfodata[] = { { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 419, LOCATION_REGION }, /* Latin America and the Caribbean */ }; -static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) +static const WCHAR geoname_uncode_fmtW[] = {'%','0','3','i',0}; + +/****************************************************************************** + * get_geoinfoptr_by_id + * + * Returns a pointer to a geoinfo struct by finding its GeoID. + */ +static const struct geoinfo_t *get_geoinfoptr_by_id(GEOID geoid) { int min, max; @@ -3994,18 +4017,88 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) return NULL; } +/****************************************************************************** + * get_geoinfoptr_by_str + * + * Returns a pointer to a geoinfo struct by + * matching a string to the specified geotype. + */ + +static const struct geoinfo_t *get_geoinfoptr_by_str(const WCHAR *str, GEOTYPE geotype) +{ + int num; + + if (!str) + return NULL; + + switch (geotype) + { + case GEO_ISO2: + for (int i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (!(strcmpW(geoinfodata[i].iso2W, str))) return &geoinfodata[i]; + break; + case GEO_ISO_UN_NUMBER: + if (!(num = atoiW(str))) return NULL; + for (int i = 0; i < ARRAY_SIZE(geoinfodata); i++) + if (num == geoinfodata[i].uncode) return &geoinfodata[i]; + break; + } + return NULL; +} + +/****************************************************************************** + * get_geoinfoptr_by_geoname + * + * Automatically parse and fix a geoname and + * return a pointer to the matching geoinfo struct. + */ + +static inline const struct geoinfo_t *get_geoinfoptr_by_name(const WCHAR *name) +{ + WCHAR buffer[3]; + int written = 0, len = 0; + + /* Check if str is a 2-letter country code (and make it uppercase) */ + for (int i = 0; i <= 2; i++) + if ((name[i] <= 127 && isalphaW(name[i]))) + { + buffer[i] = toupperW(name[i]); + written++; + } + else + { + if (!name[i]) + { + buffer[i] = 0; + len = i; + } + break; + } + if (written == 2 && len == 2) + return get_geoinfoptr_by_str(buffer, GEO_ISO2); + + /* Now check if it's a numerical code, up to three digits */ + for (int i = 0; i <= 3; i++) + if (isdigitW(name[i])) continue; + else if (!name[i]) + return get_geoinfoptr_by_str(name, GEO_ISO_UN_NUMBER); + else + break; + + return NULL; +} + /****************************************************************************** * GetUserGeoID (KERNEL32.@) */ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) { GEOID ret = GEOID_NOT_AVAILABLE; - 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}; WCHAR bufferW[40], *end; DWORD count; - HANDLE hkey, hSubkey = 0; + HANDLE hkey; UNICODE_STRING keyW; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; count = sizeof(bufferW); @@ -4017,17 +4110,13 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) else return ret; - if (!(hkey = create_registry_key())) return ret; + if (!(hkey = create_geo_regkey())) return ret; - if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) - { - if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, + if((NtQueryValueKey(hkey, &keyW, KeyValuePartialInformation, bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) ret = strtolW((LPCWSTR)info->Data, &end, 10); - } NtClose(hkey); - if (hSubkey) NtClose(hSubkey); return ret; } @@ -4036,14 +4125,12 @@ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) */ BOOL WINAPI SetUserGeoID( GEOID GeoID ) { - const struct geoinfo_t *geoinfo = get_geoinfo_dataptr(GeoID); - static const WCHAR geoW[] = {'G','e','o',0}; + const struct geoinfo_t *geoinfo = get_geoinfoptr_by_id(GeoID); static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; static const WCHAR regionW[] = {'R','e','g','i','o','n',0}; static const WCHAR formatW[] = {'%','i',0}; - UNICODE_STRING nameW,keyW; + UNICODE_STRING keyW; WCHAR bufferW[10]; - OBJECT_ATTRIBUTES attr; HANDLE hkey; if (!geoinfo) @@ -4051,35 +4138,19 @@ BOOL WINAPI SetUserGeoID( GEOID GeoID ) SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (!(hkey = create_registry_key())) + if (!(hkey = create_geo_regkey())) { SetLastError(ERROR_INTERNAL_ERROR); return FALSE; } - attr.Length = sizeof(attr); - attr.RootDirectory = hkey; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - RtlInitUnicodeString( &nameW, geoW ); - if (geoinfo->kind == LOCATION_NATION) RtlInitUnicodeString( &keyW, nationW ); else RtlInitUnicodeString( &keyW, regionW ); - if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS) - { - NtClose(attr.RootDirectory); - SetLastError(ERROR_INTERNAL_ERROR); - return FALSE; - } - sprintfW(bufferW, formatW, geoinfo->id); NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); - NtClose(attr.RootDirectory); NtClose(hkey); return TRUE; } @@ -4097,7 +4168,7 @@ INT WINAPI GetGeoInfoW(GEOID geoid, GEOTYPE geotype, LPWSTR data, int data_len, TRACE("%d %d %p %d %d\n", geoid, geotype, data, data_len, lang); - if (!(ptr = get_geoinfo_dataptr(geoid))) { + if (!(ptr = get_geoinfoptr_by_id(geoid))) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } -- 2.23.0

2 1