[PATCH 02/12] kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.

[João Diogo Ferreira]

Signed-off-by: João Diogo Craveiro Ferreira 
---
 dlls/kernel32/locale.c | 51 +++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c
index b29cb01e0e..6a8eb0f478 100644
--- a/dlls/kernel32/locale.c
+++ b/dlls/kernel32/locale.c
@@ -4002,28 +4002,28 @@ 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;
     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;
+    if (GeoClass == GEOCLASS_NATION)
+        RtlInitUnicodeString( &keyW, nationW );
+    else if (GeoClass == GEOCLASS_REGION)
+        RtlInitUnicodeString( &keyW, regionW );
+    else
+        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;
+    if (!(hkey = create_registry_key())) return ret;
+
+    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);
     }

NtClose(hkey);
@@ -4036,15 +4036,26 @@ 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};
     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;
     WCHAR bufferW[10];
     OBJECT_ATTRIBUTES attr;
     HANDLE hkey;

-    if(!(hkey = create_registry_key())) return FALSE;
+    if (!geoinfo)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    if (!(hkey = create_registry_key()))
+    {
+        SetLastError(ERROR_INTERNAL_ERROR);
+        return FALSE;
+    }

attr.Length = sizeof(attr);
     attr.RootDirectory = hkey;
@@ -4053,16 +4064,20 @@ BOOL WINAPI SetUserGeoID( GEOID GeoID )
     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)
+    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, GeoID);
+    sprintfW(bufferW, formatW, geoinfo->id);
     NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR));
     NtClose(attr.RootDirectory);
     NtClose(hkey);

[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=58226

Your paranoid android.

=== debian10 (32 bit report) ===

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

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

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

=== debian10 (32 bit WoW report) ===

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

=== debian10 (64 bit WoW report) ===

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