[PATCH v4 0/7] Autoset GeoName/GeoID when lauching any program.

[João Diogo Ferreira]

v4! After meticulous editting and careful reviewing, I managed to trim
the fat out of some patches, improved readability, fixed bugs
and code style, and dealt with compiler warnings,
making it easy for YOU to review! (I hope.)

It's still a bit long though, with 7 patches. Sorry about that.

This is the ultimate version of this patchset and I will NOT be issuing
any later revisions (also so I don't look like a spammer.)

(What I'm trying to say is: please review my patches?)

Signed-off-by: João Diogo Craveiro Ferreira

João Diogo Craveiro Ferreira (7):
  kernel32: Move Get/SetUserGeoID() to after the geoinfo struct.
  kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.
  kernel32: Implement SetUserGeoName().
  kernel32: Implement GetUserDefaultGeoName().
  kernel32: Make GetUserGeoID() pretend we set a GeoID even if we
    didn't.
  kernel32: Autoinitialize geographic values when launching any program.
  kernel32/tests: Test GetUserGeoID(), GetUserDefaultGeoName().

dlls/kernel32/kernel32.spec    |   2 +
 dlls/kernel32/kernel_main.c    |   3 +
 dlls/kernel32/kernel_private.h |   1 +
 dlls/kernel32/locale.c         | 575 +++++++++++++++++++++++++++------
 dlls/kernel32/tests/locale.c   | 109 +++++++
 include/winnls.h               |   2 +
 6 files changed, 585 insertions(+), 107 deletions(-)

[PATCH v4 1/7] kernel32: Move Get/SetUserGeoID() to after the geoinfo struct.

[João Diogo Ferreira]

Necessary for proper implementation of next patches in series.

Changed code style to follow new rules after copy-and-pasting.
No changes to data or behaviour were made.

Signed-off-by: João Diogo Craveiro Ferreira 
---
Supersedes: 172355
V4: (no changes.)
V2: Change coding style in addition to copy-pasting.
---
 dlls/kernel32/locale.c | 149 ++++++++++++++++++++---------------------
 1 file changed, 74 insertions(+), 75 deletions(-)

diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index c690aa8d5e..884709730c 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -3643,81 +3643,6 @@ BOOL WINAPI InvalidateNLSCache(void)
   return FALSE;
 }

-/******************************************************************************
- *           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};
-    WCHAR bufferW[40], *end;
-    DWORD count;
-    HANDLE hkey, hSubkey = 0;
-    UNICODE_STRING keyW;
-    const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW;
-    RtlInitUnicodeString( &keyW, nationW );
-    count = sizeof(bufferW);
-
-    if(!(hkey = create_registry_key())) return ret;
-
-    switch( GeoClass ){
-    case GEOCLASS_NATION:
-        if ((hSubkey = NLS_RegOpenKey(hkey, geoW)))
-        {
-            if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation,
-                                bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength)
-                ret = strtolW((LPCWSTR)info->Data, &end, 10);
-        }
-        break;
-    case GEOCLASS_REGION:
-        FIXME("GEOCLASS_REGION not handled yet\n");
-        break;
-    }
-
-    NtClose(hkey);
-    if (hSubkey) NtClose(hSubkey);
-    return ret;
-}
-
-/******************************************************************************
- *           SetUserGeoID (KERNEL32.@)
- */
-BOOL WINAPI SetUserGeoID( GEOID GeoID )
-{
-    static const WCHAR geoW[] = {'G','e','o',0};
-    static const WCHAR nationW[] = {'N','a','t','i','o','n',0};
-    static const WCHAR formatW[] = {'%','i',0};
-    UNICODE_STRING nameW,keyW;
-    WCHAR bufferW[10];
-    OBJECT_ATTRIBUTES attr;
-    HANDLE hkey;
-
-    if(!(hkey = create_registry_key())) return FALSE;
-
-    attr.Length = sizeof(attr);
-    attr.RootDirectory = hkey;
-    attr.ObjectName = &nameW;
-    attr.Attributes = 0;
-    attr.SecurityDescriptor = NULL;
-    attr.SecurityQualityOfService = NULL;
-    RtlInitUnicodeString( &nameW, geoW );
-    RtlInitUnicodeString( &keyW, nationW );
-
-    if (NtCreateKey( &hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL ) != STATUS_SUCCESS)
-
-    {
-        NtClose(attr.RootDirectory);
-        return FALSE;
-    }
-
-    sprintfW(bufferW, formatW, GeoID);
-    NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR));
-    NtClose(attr.RootDirectory);
-    NtClose(hkey);
-    return TRUE;
-}
-
 /******************************************************************************
  *           EnumUILanguagesA (KERNEL32.@)
  */
@@ -4069,6 +3994,80 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid)
     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};
+    WCHAR bufferW[40], *end;
+    HANDLE hkey, hsubkey = 0;
+    UNICODE_STRING keyW;
+    const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW;
+    DWORD count = sizeof(bufferW);
+    RtlInitUnicodeString(&keyW, nationW);
+
+    if (!(hkey = create_registry_key())) return ret;
+
+    switch (geoclass) {
+    case GEOCLASS_NATION:
+        if ((hsubkey = NLS_RegOpenKey(hkey, geoW)))
+        {
+            if ((NtQueryValueKey(hsubkey, &keyW, KeyValuePartialInformation,
+                                 bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength)
+                ret = strtolW((const WCHAR*)info->Data, &end, 10);
+        }
+        break;
+    case GEOCLASS_REGION:
+        FIXME("GEOCLASS_REGION not handled yet\n");
+        break;
+    }
+
+    NtClose(hkey);
+    if (hsubkey) NtClose(hsubkey);
+    return ret;
+}
+
+/******************************************************************************
+ *           SetUserGeoID (KERNEL32.@)
+ */
+BOOL WINAPI SetUserGeoID(GEOID geoid)
+{
+    static const WCHAR geoW[] = {'G','e','o',0};
+    static const WCHAR nationW[] = {'N','a','t','i','o','n',0};
+    static const WCHAR formatW[] = {'%','i',0};
+    UNICODE_STRING nameW, keyW;
+    WCHAR bufferW[10];
+    OBJECT_ATTRIBUTES attr;
+    HANDLE hkey;
+
+    if (!(hkey = create_registry_key())) return FALSE;
+
+    attr.Length = sizeof(attr);
+    attr.RootDirectory = hkey;
+    attr.ObjectName = &nameW;
+    attr.Attributes = 0;
+    attr.SecurityDescriptor = NULL;
+    attr.SecurityQualityOfService = NULL;
+    RtlInitUnicodeString(&nameW, geoW);
+    RtlInitUnicodeString(&keyW, nationW);
+
+    if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS)
+
+    {
+        NtClose(attr.RootDirectory);
+        return FALSE;
+    }
+
+    sprintfW(bufferW, formatW, geoid);
+    NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR));
+    NtClose(attr.RootDirectory);
+    NtClose(hkey);
+    return TRUE;
+}
+
 /******************************************************************************
  *           GetGeoInfoW (KERNEL32.@)
  */

[PATCH v4 1/7] kernel32: Move Get/SetUserGeoID() to after the geoinfo struct.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=58779

Your paranoid android.

=== debian10 (32 bit Chinese:China report) ===

kernel32:
debugger.c:320: Test failed: GetThreadContext failed: 5