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

[PATCH] testbot/WineRunTask: Use a trampoline script to capture cmd errors.
by Francois Gouget 31 Oct '19

31 Oct '19

This side-steps the console / redirection bug in the currently deployed versions of TestAgentd. This also side-steps cmd's command line parsing bug. When given ["cmd". "/c", "script.bat >Task.log"] TestAgent would build a command line of the form '"cmd" "/c" "script.bat >Task.log"' which would lead cmd to try to run '"script.bat >Task.log'. This would fail because of the extraneous double quote. Note that cmd fails in the same way for 'cmd "/c" "script.bat >Task.log"'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunTask.pl | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index be0b0f673..ea3ad4eb1 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -502,14 +502,19 @@ if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE)) FatalTAError($TA, "Could not send the task script to the VM"); } +my $Logger = "script.bat >Task.log 2>&1\r\n"; +if (!$TA->SendFileFromString($Logger, "cmdlogger.bat", $TestAgent::SENDFILE_EXE)) +{ + FatalTAError($TA, "Could not send the logging script to the VM"); +} + # # Run the test # Debug(Elapsed($Start), " Starting the script\n"); -my $TaskLog = $TA->HasMinVersion(1, 7) ? "Task.log" : undef; -my $Pid = $TA->Run(["./script.bat"], 0, undef, $TaskLog, $TaskLog); +my $Pid = $TA->Run(["./cmdlogger.bat"], 0); if (!$Pid) { FatalTAError($TA, "Failed to start the test"); @@ -540,13 +545,10 @@ if (!defined $TA->Wait($Pid, $Timeout, $Keepalive)) } } -if (defined $TaskLog) +Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); +if (!$TA->GetFile("Task.log", "$TaskDir/log") and !defined $TAError) { - Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); - if (!$TA->GetFile($TaskLog, "$TaskDir/log") and !defined $TAError) - { - $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); - } + $TAError = "An error occurred while retrieving the task log: ". $TA->GetLastError(); } Debug(Elapsed($Start), " Retrieving the report file to '$RptFileName'\n"); -- 2.20.1

1 0

[PATCH v4 5/7] ddraw/tests: Test available devices in Enumdevices
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 4/7] ddraw/tests: Port life time tests in Enumdevices to ddraw*.c files
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 3/7] ddraw/tests: Port tests for the cancellation of enumeration in Enumdevices in ddraw*.c files
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 2/7] ddraw/tests: Test the name of devices in Enumdevices
by David Adam 31 Oct '19

31 Oct '19

2 1

[PATCH v4 7/7] kernel32/tests: Test GetUserGeoID(), GetUserDefaultGeoName().
by João Diogo Ferreira 31 Oct '19

31 Oct '19

Tests for SetUserGeoID() and SetUserGeoName() are not included, since normal programs shouldn't call those anyway. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 172361 V4: Fix compiler warning (removed ARRAY_SIZE() from trace call). --- dlls/kernel32/tests/locale.c | 109 +++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 81e74531ea..b40df611ca 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -98,6 +98,8 @@ static INT (WINAPI *pCompareStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT static INT (WINAPI *pGetGeoInfoA)(GEOID, GEOTYPE, LPSTR, INT, LANGID); static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); +static GEOID (WINAPI *pGetUserGeoID)(GEOCLASS); +static int (WINAPI *pGetUserDefaultGeoName)(WCHAR*, int); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetUserPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); @@ -136,6 +138,8 @@ static void InitFunctionPointers(void) X(GetGeoInfoA); X(GetGeoInfoW); X(EnumSystemGeoID); + X(GetUserGeoID); + X(GetUserDefaultGeoName); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); X(GetUserPreferredUILanguages); @@ -4893,6 +4897,109 @@ static void test_EnumSystemGeoID(void) } } +static void test_GetUserGeoID(void) +{ + GEOID id; + + if (pGetUserDefaultGeoName) + { + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_NATION), + "GEOCLASS_NATION: should never return GEOID_NOT_AVAILABLE in this platform.\n"); + ok(GEOID_NOT_AVAILABLE != GetUserGeoID(GEOCLASS_REGION), + "GEOCLASS_REGION: should never return GEOID_NOT_AVAILABLE in this platform.\n"); + } + else + win_skip("This platform allows returning GEOID_NOT_AVAILABLE on success.\n"); + + id = GetUserGeoID(GEOCLASS_ALL); + ok(id == GEOID_NOT_AVAILABLE, + "GEOCLASS_ALL: expected GEOID_NOT_AVAILABLE, got %d.\n", id); + + id = GetUserGeoID(0xdeadbeef); + ok(id == GEOID_NOT_AVAILABLE, + "Gibberish argument: expected GEOID_NOT_AVAILABLE, got %d.\n", id); +} + +static void test_GetUserDefaultGeoName(void) +{ + WCHAR name[10] = {0}; + int result, count; + + if (!pGetUserDefaultGeoName) + { + win_skip("GetUserDefaultGeoName: not implemented on this platform.\n"); + return; + } + + SetLastError(ERROR_SUCCESS); + count = result = pGetUserDefaultGeoName(NULL, 0); + ok(result > 0, + "(NULL, 0): Expected ret > 0, got %d; last error was %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, 0); + ok(result == count, + "(buffer, 0): Expected ret to match previous result (%d), got %d; last error was %d.\n", + result, count, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(NULL, 10); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(NULL, 10): Expected ret=0, got %d; and expected last error = 87, got %d\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(NULL, -1); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(NULL, -1): Expected ret=0, got %d; and expected last error = 87, got %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, 1); + ok(result == 0 && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(buffer, 1): Expected ret == 0, got %d; and expected last error = 122, got %d.\n", + result, GetLastError()); + + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, -1); + ok(result == 0 && (GetLastError() == ERROR_INVALID_PARAMETER), + "(buffer, -1): Expected ret=0, got %d; and expected last error = 87, got %d.\n", + result, GetLastError()); + + if (count <= ARRAY_SIZE(name)) + { + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, count); + ok(result, + "(buffer, reported length): Expected non-zero ret, got otherwise with error = %d.\n", + GetLastError()); + ok(result == count, + "(buffer, reported length): Expected charcount == %d, got %d; last error was %d.\n", + count, result, GetLastError()); + ok(result == strlenW(name) + 1, + "(buffer, reported length): Expected string length to match ret (%d), got %d.\n", + result, strlenW(name) + 1); + + if (count < ARRAY_SIZE(name)) + { + SetLastError(ERROR_SUCCESS); + result = pGetUserDefaultGeoName(name, ARRAY_SIZE(name)); + ok(result, + "(buffer, larger length): Expected non-zero ret, got otherwise with error = %d.\n", + GetLastError()); + ok(result == count, + "(buffer, larger length): Expected charcount == %d, got %d; last error was %d.\n", + count, result, GetLastError()); + ok(result == strlenW(name) + 1, + "(buffer, larger length): Expected string length to match ret (%d), got %d.\n", + result, strlenW(name) + 1); + } + } + else + skip("GetUserDefaultGeoName: string length (%d) too large to test.\n", count); +} + struct invariant_entry { const char *name; int id; @@ -6048,6 +6155,8 @@ START_TEST(locale) test_IsValidLocaleName(); test_CompareStringOrdinal(); test_GetGeoInfo(); + test_GetUserGeoID(); + test_GetUserDefaultGeoName(); test_EnumSystemGeoID(); test_invariant(); test_GetSystemPreferredUILanguages(); -- 2.23.0

2 1

[PATCH 1/4] wined3d: Introduce wined3d_stateblock_set_material().
by Zebediah Figura 31 Oct '19

31 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 98986c735b..24fd551adc 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1537,6 +1537,15 @@ HRESULT CDECL wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *state return S_OK; } +void CDECL wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, + const struct wined3d_material *material) +{ + TRACE("stateblock %p, material %p.\n", stateblock, material); + + stateblock->stateblock_state.material = *material; + stateblock->changed.material = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 43b6112714..4f3cdf9b7b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -265,6 +265,7 @@ @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) +@ cdecl wined3d_stateblock_set_material(ptr ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fabcdcb0d7..27a0e58a28 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2670,6 +2670,7 @@ void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stat const struct wined3d_color *blend_factor); HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, UINT plane_idx, const struct wined3d_vec4 *plane); +void __cdecl wined3d_stateblock_set_material(struct wined3d_stateblock *stateblock, const struct wined3d_material *material); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants); -- 2.23.0

3 8

[PATCH 1/2] wined3d: Introduce a separate use_legacy_fragment_output() helper.
by Matteo Bruni 31 Oct '19

31 Oct '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0e0977e1d48..b1930d9a882 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2030,9 +2030,17 @@ static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_ } } +static BOOL use_legacy_fragment_output(const struct wined3d_gl_info *gl_info) +{ + /* Technically 1.30 does support user-defined fragment shader outputs but + * we might not have glBindFragDataLocation() available (i.e. GL version + * might be < 3.0). */ + return gl_info->glsl_version <= MAKEDWORD_VERSION(1, 30); +} + static const char *get_fragment_output(const struct wined3d_gl_info *gl_info) { - return needs_legacy_glsl_syntax(gl_info) ? "gl_FragData" : "ps_out"; + return use_legacy_fragment_output(gl_info) ? "gl_FragData" : "ps_out"; } static const char *glsl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) @@ -7545,7 +7553,7 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in if (reg_maps->sample_mask) shader_addline(buffer, "gl_SampleMask[0] = floatBitsToInt(sample_mask);\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_glsl_generate_color_output(buffer, gl_info, shader, args, string_buffers); } @@ -7650,7 +7658,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, " float scale;\n"); shader_addline(buffer, "} ffp_fog;\n"); - if (needs_legacy_glsl_syntax(gl_info)) + if (legacy_syntax) { if (glsl_is_color_reg_read(shader, 0)) shader_addline(buffer, "vec4 ffp_varying_diffuse;\n"); @@ -7731,7 +7739,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (args->alpha_test_func + 1 != WINED3D_CMP_ALWAYS) shader_addline(buffer, "uniform float alpha_test_ref;\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { const struct wined3d_shader_signature *output_signature = &shader->output_signature; @@ -9482,7 +9490,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { shader_addline(buffer, "vec4 ps_out[1];\n"); if (shader_glsl_use_explicit_attrib_location(gl_info)) @@ -9793,7 +9801,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_glsl_generate_fog_code(buffer, gl_info, settings->fog); shader_glsl_generate_alpha_test(buffer, gl_info, alpha_test_func); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_addline(buffer, "color_out0 = ps_out[0];\n"); shader_addline(buffer, "}\n"); @@ -10338,7 +10346,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, } checkGLcall("glBindAttribLocation"); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) { for (i = 0; i < MAX_RENDER_TARGET_VIEWS; ++i) { @@ -12763,7 +12771,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter declare_in_varying(gl_info, buffer, FALSE, "vec3 out_texcoord;\n"); /* TODO: Declare the out variable with the correct type (and put it in the * blitter args). */ - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) shader_addline(buffer, "out vec4 ps_out[1];\n"); output = string_buffer_get(&blitter->string_buffers); @@ -12795,7 +12803,7 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter GL_EXTCALL(glBindAttribLocation(program, 0, "pos")); GL_EXTCALL(glBindAttribLocation(program, 1, "texcoord")); - if (!needs_legacy_glsl_syntax(gl_info)) + if (!use_legacy_fragment_output(gl_info)) GL_EXTCALL(glBindFragDataLocation(program, 0, "ps_out")); GL_EXTCALL(glCompileShader(vshader_id)); -- 2.21.0

2 3

[PATCH 1/2] advapi32: Add EventRegister and EventUnregister tests
by Andrew Eikum 31 Oct '19

31 Oct '19

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/advapi32/tests/eventlog.c | 35 ++++++++++++++++++++++++++++++++++ dlls/ntdll/misc.c | 2 ++ 2 files changed, 37 insertions(+) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index d613c95315e..f12a6a157bd 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -28,12 +28,15 @@ #include "winreg.h" #include "sddl.h" #include "wmistr.h" +#include "evntprov.h" #include "evntrace.h" #include "wine/test.h" static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); static BOOL (WINAPI *pGetEventLogInformation)(HANDLE,DWORD,LPVOID,DWORD,LPDWORD); +static ULONG (WINAPI *pEventRegister)(const GUID *,PENABLECALLBACK,void *,REGHANDLE *); +static ULONG (WINAPI *pEventUnregister)(REGHANDLE); static BOOL (WINAPI *pGetComputerNameExA)(COMPUTER_NAME_FORMAT,LPSTR,LPDWORD); static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *); @@ -46,6 +49,8 @@ static void init_function_pointers(void) pCreateWellKnownSid = (void*)GetProcAddress(hadvapi32, "CreateWellKnownSid"); pGetEventLogInformation = (void*)GetProcAddress(hadvapi32, "GetEventLogInformation"); + pEventRegister = (void*)GetProcAddress(hadvapi32, "EventRegister"); + pEventUnregister = (void*)GetProcAddress(hadvapi32, "EventUnregister"); pGetComputerNameExA = (void*)GetProcAddress(hkernel32, "GetComputerNameExA"); pWow64DisableWow64FsRedirection = (void*)GetProcAddress(hkernel32, "Wow64DisableWow64FsRedirection"); @@ -1146,6 +1151,35 @@ static void cleanup_eventlog(void) ok(bret, "Expected MoveFileEx to succeed: %d\n", GetLastError()); } +static void test_trace_event_params(void) +{ + static const GUID test_guid = {0x57696E65, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x01}}; + + REGHANDLE reg_handle; + ULONG uret; + + if (!pEventRegister) + { + win_skip("advapi32.EventRegister is missing, skipping trace event tests\n"); + return; + } + + uret = pEventRegister(NULL, NULL, NULL, &reg_handle); + todo_wine ok(uret == ERROR_INVALID_PARAMETER, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventRegister(&test_guid, NULL, NULL, NULL); + ok(uret == ERROR_INVALID_PARAMETER, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventRegister(&test_guid, NULL, NULL, &reg_handle); + ok(uret == ERROR_SUCCESS, "EventRegister gave wrong error: %#x\n", uret); + + uret = pEventUnregister(0); + todo_wine ok(uret == ERROR_INVALID_HANDLE, "EventUnregister gave wrong error: %#x\n", uret); + + uret = pEventUnregister(reg_handle); + ok(uret == ERROR_SUCCESS, "EventUnregister gave wrong error: %#x\n", uret); +} + static void test_start_trace(void) { const char sessionname[] = "wine"; @@ -1259,6 +1293,7 @@ START_TEST(eventlog) test_openbackup(); test_read(); test_clear(); + test_trace_event_params(); /* Functional tests */ if (create_new_eventlog()) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 2a135518e75..c29a1c26c26 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -403,6 +403,8 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID { FIXME("(%s, %p, %p, %p) stub.\n", debugstr_guid(provider), callback, context, handle); + if (!handle) return ERROR_INVALID_PARAMETER; + *handle = 0xdeadbeef; return ERROR_SUCCESS; } -- 2.23.0

1 0

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

31 Oct '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: 172358 V4: Removed opt-out mechanism. --- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/locale.c | 16 ++++++++++++++++ 3 files changed, 20 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 7d481a2a48..4d5a0880ad 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -846,6 +846,22 @@ 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; + + TRACE("Initializing geographic data...\n"); + if ((result = GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SISO3166CTRYNAME, + name, ARRAY_SIZE(name)))) + result = SetUserGeoName(name); + + if (!result) + SetUserGeoName(fallback); + TRACE("Finished initializing geographic data.\n"); +} #ifdef __APPLE__ /*********************************************************************** -- 2.23.0

2 1