wine-devel October 2019

wine-devel@winehq.org

80 participants
669 discussions

[PATCH] ntdll: Use SIZE_T to store passed buffer size in sprintf.
by Piotr Caban 30 Oct '19

30 Oct '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/printf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

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

30 Oct '19

2 1

[PATCH] ntdll: Add a shortcut to NtReadVirtualMemory for the local process
by Martin Storsjo 30 Oct '19

30 Oct '19

EnumProcessModules uses ReadProcessMemory (which forwards to NtReadVirtualMemory) for reading the tables of a process, even for the current process. When running wine within docker, NtReadVirtualMemory currently fails unless the SYS_PTRACE capability is explicitly added. LLVM's libunwind uses EnumProcessModules for locating .eh_frame sections in all loaded modules when unwinding dwarf exceptions (used on i686). As it is used for locating sections within the current process, libunwind only calls EnumProcessModules for the current process. Therefore, exception handling in executables with libunwind on i686 doesn't work when run with wine within docker. Even for setups where NtReadVirtualMemory is allowed, it is significantly slower than just reading the memory directly within the process. Currently, handling 10000 thrown exceptions with libunwind on i686 takes 24 seconds when run in wine, while it runs in around 1.4 seconds with this patch. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/ntdll/virtual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d15b49f6fd..566b5982a7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3521,6 +3521,26 @@ NTSTATUS WINAPI NtReadVirtualMemory( HANDLE process, const void *addr, void *buf if (virtual_check_buffer_for_write( buffer, size )) { + if (process == GetCurrentProcess()) + { + sigset_t sigset; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if (virtual_check_buffer_for_read( addr, size )) + { + memcpy(buffer, addr, size); + status = STATUS_SUCCESS; + } + else + { + size = 0; + status = STATUS_ACCESS_VIOLATION; + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + if (bytes_read) *bytes_read = size; + return status; + } + SERVER_START_REQ( read_process_memory ) { req->handle = wine_server_obj_handle( process ); -- 2.17.1

3 5

[PATCH] msvcrt: Set errno in _lseeki64.
by Daniel Lehman 30 Oct '19

30 Oct '19

3 2

[PATCH] ucrtbase: Implement %g format for strftime.
by Vijay Kiran Kamuju 30 Oct '19

30 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/time.c | 11 +++++++++-- dlls/ucrtbase/tests/misc.c | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 8f4d64b3618c..9787d18e3f4e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1196,14 +1196,21 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; + case 'g': case 'G': tmp = 1900 + mstm->tm_year; if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0) tmp--; else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(tmp)) tmp++; - if (!strftime_int(str, &ret, max, tmp, 4, 0, 9999)) - return 0; + if(*format == 'G') + { + if (!strftime_int(str, &ret, max, tmp, 4, 0, 9999)) + return 0; + } else { + if (!strftime_int(str, &ret, max, tmp%100, 2, 0, 99)) + return 0; + } break; #endif case 'H': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 9cfe532560d8..8a6fb7b8e11b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -968,6 +968,14 @@ static void test_strftime(void) ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%g", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "70"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%g", &tm1); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "16"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%G", &epoch); ok(retA == 4, "expected 4, got %d\n", (int)retA); ok(!strcmp(bufA, "1970"), "got %s\n", bufA); @@ -981,6 +989,13 @@ static void test_strftime(void) __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; struct tm tm = *p__gmtime32(&t); + retA = p_strftime(bufA, sizeof(bufA), "%g", &tm); + ok(retA == 2, "%d) retA = %d\n", i, (int)retA); + if (i <= 8) + ok(!strcmp(bufA, "71"), "%d) got %s, expected 71\n", i, bufA); + else + ok(!strcmp(bufA, "72"), "%d) got %s, expected 72\n", i, bufA); + retA = p_strftime(bufA, sizeof(bufA), "%G", &tm); ok(retA == 4, "%d) retA = %d\n", i, (int)retA); if (i <= 8) -- 2.21.0

2 1

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

30 Oct '19

2 1

[PATCH 1/3] d3dx9: Don't pass usage flags for staging texture in D3DXCreateCubeTextureFromFileInMemoryEx().
by Paul Gofman 30 Oct '19

30 Oct '19

Spotted in https://bugs.winehq.org/show_bug.cgi?id=47974 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dx9_36/tests/texture.c | 17 ++++++++++++----- dlls/d3dx9_36/texture.c | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3416a3318b..3e4d5e5df9 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2061,8 +2061,14 @@ static void test_D3DXCreateCubeTextureFromFileInMemory(IDirect3DDevice9 *device) static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device) { - HRESULT hr; IDirect3DCubeTexture9 *cube_texture; + HRESULT hr; + + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DUSAGE_RENDERTARGET, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DCubeTexture9_Release(cube_texture); if (!is_autogenmipmap_supported(device, D3DRTYPE_CUBETEXTURE)) { @@ -2070,10 +2076,11 @@ static void test_D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic return; } - hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, D3DX_DEFAULT, - D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); - ok(hr == D3D_OK, "D3DXCreateCubeTextureFromFileInMemoryEx returned %#x, expected %#x.\n", hr, D3D_OK); - if (SUCCEEDED(hr)) IDirect3DCubeTexture9_Release(cube_texture); + hr = D3DXCreateCubeTextureFromFileInMemoryEx(device, dds_cube_map, sizeof(dds_cube_map), D3DX_DEFAULT, + D3DX_DEFAULT, D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, &cube_texture); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DCubeTexture9_Release(cube_texture); } static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *device) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 6ee7d72e38..12cb2f3983 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1481,7 +1481,7 @@ HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemoryEx(IDirect3DDevice9 *device, dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { - hr = D3DXCreateCubeTexture(device, size, mip_levels, usage, format, D3DPOOL_SYSTEMMEM, &buftex); + hr = D3DXCreateCubeTexture(device, size, mip_levels, 0, format, D3DPOOL_SYSTEMMEM, &buftex); tex = buftex; } else -- 2.21.0

3 4

[PATCH 1/2] d3dx10_43: Add D3DX10LoadTextureFromTexture definitions.
by Connor McAdams 30 Oct '19

30 Oct '19

Add the function definition for D3DX10LoadTextureFromTexture to the header file, as well as the structure definition for D3DX10_TEXTURE_LOAD_INFO. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- include/d3dx10tex.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 25ad490949..282f245e8e 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -103,6 +103,36 @@ typedef struct D3DX10_IMAGE_LOAD_INFO #endif } D3DX10_IMAGE_LOAD_INFO; +typedef struct _D3DX10_TEXTURE_LOAD_INFO +{ + D3D10_BOX *pSrcBox; + D3D10_BOX *pDstBox; + UINT SrcFirstMip; + UINT DstFirstMip; + UINT NumMips; + UINT SrcFirstElement; + UINT DstFirstElement; + UINT NumElements; + UINT Filter; + UINT MipFilter; + +#ifdef __cplusplus + _D3DX10_TEXTURE_LOAD_INFO() + { + pSrcBox = NULL; + pDstBox = NULL; + SrcFirstMip = 0; + DstFirstMip = 0; + NumMips = D3DX10_DEFAULT; + SrcFirstElement = 0; + DstFirstElement = 0; + NumElements = D3DX10_DEFAULT; + Filter = D3DX10_DEFAULT; + MipFilter = D3DX10_DEFAULT; + } +#endif +} D3DX10_TEXTURE_LOAD_INFO; + #ifdef __cplusplus extern "C" { #endif @@ -115,6 +145,9 @@ HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); +HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_tex, D3DX10_TEXTURE_LOAD_INFO *tex_load_info, + ID3D10Resource *dst_tex); + #ifdef __cplusplus } #endif -- 2.20.1

2 2

[PATCH v4 00/11] Move DX10 Shader Reflection into d3dcompiler.
by Connor McAdams 30 Oct '19

30 Oct '19

Patch series four, now includes the d3d10 GetConstantBuffer, ShaderReflectionVariable, and ShaderReflectionType methods. Also removed utils.c altogether, and moved the functions remaining into the files that they're used in. Connor McAdams (11): d3d10: move parse_dxbc + helpers into effects.c d3d10: Delete utils.c, move remaining functions into respective files. d3d10+d3dcompiler: add PARENTSRC and fix definition conflicts d3d10+d3dcompiler: Move d3d10 reflection into d3dcompiler. d3dcompiler: Add shader init to D3D10ReflectShader d3dcompiler: implement d3d10 reflection GetDesc method. d3dcompiler: Implement Input/OutputParameterDesc method d3dcompiler: GetResourceBindingDesc for d3d10 reflect shader. d3dcompiler: Implement d3d10 reflect GetConstantBuffer methods. d3dcompiler: implement d3d10 ShaderReflectionVariable methods. d3dcompiler: implement d3d10 ShaderReflectionType methods. dlls/d3d10/Makefile.in | 4 +- dlls/d3d10/d3d10_main.c | 41 ++- dlls/d3d10/d3d10_private.h | 20 -- dlls/d3d10/effect.c | 160 ++++++++++ dlls/d3d10/shader.c | 112 ------- dlls/d3d10/stateblock.c | 38 +++ dlls/d3d10/utils.c | 231 -------------- dlls/d3dcompiler_43/reflection.c | 518 ++++++++++++++++++++++++++++++- dlls/d3dcompiler_43/utils.c | 2 + 9 files changed, 734 insertions(+), 392 deletions(-) delete mode 100644 dlls/d3d10/utils.c -- 2.20.1

4 27

[PATCH 1/3] ole32/tests: Add some more tests for interface redirection handling.
by Nikolay Sivov 30 Oct '19

30 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/Makefile.in | 2 + dlls/ole32/tests/compobj.c | 81 ++++++++++++++++++++++++++--------- dlls/ole32/tests/testlib.c | 17 ++++++++ dlls/ole32/tests/testlib.spec | 1 + 4 files changed, 80 insertions(+), 21 deletions(-) create mode 100644 dlls/ole32/tests/testlib.c create mode 100644 dlls/ole32/tests/testlib.spec diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index 6bf57e3e41..8f116147a1 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -15,4 +15,6 @@ C_SRCS = \ propvariant.c \ stg_prop.c \ storage32.c \ + testlib.c \ + testlib.spec \ usrmarshal.c diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index ea5ea35a11..5e72eb650e 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -82,9 +82,7 @@ static LONG (WINAPI * pRegOverridePredefKey)(HKEY key, HKEY override); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); -static BOOL (WINAPI *pDeactivateActCtx)(DWORD,ULONG_PTR); static BOOL (WINAPI *pIsWow64Process)(HANDLE, LPBOOL); -static void (WINAPI *pReleaseActCtx)(HANDLE); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) @@ -98,6 +96,8 @@ static const GUID IID_Testiface3 = { 0x42222222, 0x1234, 0x1234, { 0x12, 0x34, 0 static const GUID IID_Testiface4 = { 0x52222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID IID_Testiface5 = { 0x62222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID IID_Testiface6 = { 0x72222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface7 = { 0x82222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; +static const GUID IID_Testiface8 = { 0x92222222, 0x1234, 0x1234, { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0 } }; static const GUID IID_TestPS = { 0x66666666, 0x8888, 0x7777, { 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55 } }; DEFINE_GUID(CLSID_testclsid, 0xacd014c7,0x9535,0x4fac,0x8b,0x53,0xa4,0x8c,0xa7,0xf4,0xd7,0x26); @@ -214,6 +214,26 @@ static BOOL create_manifest_file(const char *filename, const char *manifest) return TRUE; } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to create a file at %s, error %d.\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok(res != 0, "Failed to find resource.\n"); + ptr = LockResource(LoadResource(GetModuleHandleA(NULL), res)); + WriteFile(file, ptr, SizeofResource(GetModuleHandleA(NULL), res), &written, NULL); + ok(written == SizeofResource(GetModuleHandleA(NULL), res), "Failed to write file.\n" ); + CloseHandle(file); +} + +static char testlib[MAX_PATH]; + static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) { WCHAR path[MAX_PATH]; @@ -235,7 +255,7 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); if (handle == INVALID_HANDLE_VALUE) { - win_skip("activation context generation failed, some tests will be skipped\n"); + win_skip("activation context generation failed, some tests will be skipped. Error %d\n", GetLastError()); handle = NULL; } @@ -260,6 +280,15 @@ static HANDLE activate_context(const char *manifest, ULONG_PTR *cookie) return handle; } +static void deactivate_context(HANDLE handle, ULONG_PTR cookie) +{ + BOOL ret; + + ret = DeactivateActCtx(0, cookie); + ok(ret, "Failed to deactivate context, error %d.\n", GetLastError()); + ReleaseActCtx(handle); +} + static const char actctx_manifest[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" "<assemblyIdentity version=\"1.2.3.4\" name=\"Wine.Test\" type=\"win32\"" @@ -294,6 +323,10 @@ static const char actctx_manifest[] = " iid=\"{22222222-1234-1234-1234-56789abcdef0}\"" " proxyStubClsid32=\"{66666666-8888-7777-6666-555555555555}\"" " />" +" <comInterfaceProxyStub " +" name=\"Iifaceps5\"" +" iid=\"{82222222-1234-1234-1234-56789abcdef0}\"" +" />" "</file>" " <comInterfaceExternalProxyStub " " name=\"Iifaceps2\"" @@ -367,8 +400,7 @@ static void test_ProgIDFromCLSID(void) hr = ProgIDFromCLSID(&IID_Testiface6, &progid); ok(hr == REGDB_E_CLASSNOTREG && progid == NULL, "got 0x%08x, progid %p\n", hr, progid); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } } @@ -434,8 +466,7 @@ static void test_CLSIDFromProgID(void) ok(!IsEqualCLSID(&clsid, &CLSID_StdFont) && !IsEqualCLSID(&clsid, &CLSID_NULL) && !IsEqualCLSID(&clsid, &clsid1), "got %s\n", wine_dbgstr_guid(&clsid)); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } } @@ -725,8 +756,14 @@ static void test_CoGetClassObject(void) ok(hr == S_OK, "got 0x%08x\n", hr); IUnknown_Release(pUnk); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + hr = CoGetClassObject(&IID_Testiface7, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + todo_wine + ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + + hr = CoGetClassObject(&IID_Testiface8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); + ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); + + deactivate_context(handle, cookie); } CoUninitialize(); @@ -1267,6 +1304,11 @@ static void test_CoGetPSClsid(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", wine_dbgstr_guid(&clsid)); + memset(&clsid, 0xaa, sizeof(clsid)); + hr = CoGetPSClsid(&IID_Testiface7, &clsid); + ok(hr == S_OK, "Failed to get PS CLSID, hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &IID_Testiface7), "Unexpected CLSID %s.\n", wine_dbgstr_guid(&clsid)); + /* register same interface and try to get CLSID back */ hr = CoRegisterPSClsid(&IID_Testiface, &IID_Testiface4); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1275,8 +1317,7 @@ static void test_CoGetPSClsid(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&clsid, &IID_Testiface4), "got clsid %s\n", wine_dbgstr_guid(&clsid)); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } if (pRegDeleteKeyExA && @@ -1533,11 +1574,9 @@ static void test_CoRegisterClassObject(void) if ((handle = activate_context(actctx_manifest, &ctxcookie))) { hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&pcf); -todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND), "got 0x%08x\n", hr); + ok(hr == 0x80001234, "Unexpected hr %#x.\n", hr); - pDeactivateActCtx(0, ctxcookie); - pReleaseActCtx(handle); + deactivate_context(handle, ctxcookie); } hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&pcf); @@ -2264,8 +2303,7 @@ static void test_OleRegGetMiscStatus(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(status == 0, "got 0x%08x\n", status); - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } } @@ -2332,8 +2370,7 @@ static void test_OleRegGetUserType(void) CoTaskMemFree(str); } - pDeactivateActCtx(0, cookie); - pReleaseActCtx(handle); + deactivate_context(handle, cookie); } /* test using registered CLSID */ @@ -3789,9 +3826,7 @@ static void init_funcs(void) pActivateActCtx = (void*)GetProcAddress(hkernel32, "ActivateActCtx"); pCreateActCtxW = (void*)GetProcAddress(hkernel32, "CreateActCtxW"); - pDeactivateActCtx = (void*)GetProcAddress(hkernel32, "DeactivateActCtx"); pIsWow64Process = (void*)GetProcAddress(hkernel32, "IsWow64Process"); - pReleaseActCtx = (void*)GetProcAddress(hkernel32, "ReleaseActCtx"); } static DWORD CALLBACK implicit_mta_proc(void *param) @@ -3869,6 +3904,10 @@ START_TEST(compobj) return; } + GetCurrentDirectoryA(ARRAY_SIZE(testlib), testlib); + lstrcatA(testlib, "\\testlib.dll"); + extract_resource("testlib.dll", "TESTDLL", testlib); + if (!pCreateActCtxW) win_skip("Activation contexts are not supported, some tests will be skipped.\n"); diff --git a/dlls/ole32/tests/testlib.c b/dlls/ole32/tests/testlib.c new file mode 100644 index 0000000000..d28147b750 --- /dev/null +++ b/dlls/ole32/tests/testlib.c @@ -0,0 +1,17 @@ +#include <stdio.h> +#include <windows.h> +#include <initguid.h> + +DEFINE_GUID(CLSID_WineOOPTest, 0x5201163f, 0x8164, 0x4fd0, 0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd); +DEFINE_GUID(IID_Testiface7, 0x82222222, 0x1234, 0x1234, 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0xde, 0xf0); + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **obj) +{ + if (IsEqualGUID(clsid, &CLSID_WineOOPTest)) + return 0x80001234; + + if (IsEqualGUID(clsid, &IID_Testiface7)) + return 0x80001235; + + return E_NOTIMPL; +} diff --git a/dlls/ole32/tests/testlib.spec b/dlls/ole32/tests/testlib.spec new file mode 100644 index 0000000000..8737274e9c --- /dev/null +++ b/dlls/ole32/tests/testlib.spec @@ -0,0 +1 @@ +@ stdcall DllGetClassObject(ptr ptr ptr) -- 2.23.0

3 7

[PATCH v3 3/6] d3dx9: Factor our check_texture_requirements() function.
by Paul Gofman 30 Oct '19

30 Oct '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v3: - leave TRACE() in place. dlls/d3dx9_36/texture.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 3f22b050b6..2da4e9955e 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -210,8 +210,8 @@ static D3DFORMAT get_replacement_format(D3DFORMAT format) return format; } -HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height, - UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool) +static HRESULT check_texture_requirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height, + UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool, D3DRESOURCETYPE resource_type) { UINT w = (width && *width) ? *width : 1; UINT h = (height && *height) ? *height : 1; @@ -223,8 +223,6 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN D3DFORMAT usedformat = D3DFMT_UNKNOWN; const struct pixel_format_desc *fmt; - TRACE("(%p, %p, %p, %p, %u, %p, %u)\n", device, width, height, miplevels, usage, format, pool); - if (!device) return D3DERR_INVALIDCALL; @@ -266,7 +264,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN fmt = get_format_info(usedformat); hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format, - usage, D3DRTYPE_TEXTURE, usedformat); + usage, resource_type, usedformat); if (FAILED(hr)) { BOOL allow_24bits; @@ -301,7 +299,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN continue; hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, - mode.Format, usage, D3DRTYPE_TEXTURE, curfmt->format); + mode.Format, usage, resource_type, curfmt->format); if (FAILED(hr)) continue; @@ -420,6 +418,15 @@ cleanup: return D3D_OK; } +HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height, + UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool) +{ + TRACE("device %p, width %p, height %p, miplevels %p, usage %u, format %p, pool %u.\n", + device, width, height, miplevels, usage, format, pool); + + return check_texture_requirements(device, width, height, miplevels, usage, format, pool, D3DRTYPE_TEXTURE); +} + HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, UINT *size, UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool) { -- 2.21.0

2 1

[PATCH v2 1/6] d3dx9: Don't pass usage flags for staging texture in D3DXCreateCubeTextureFromFileInMemoryEx().
by Paul Gofman 30 Oct '19

30 Oct '19

2 11

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

30 Oct '19

2 1

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

30 Oct '19

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' could cause real loss of functionality. To opt-out: * Create HKCU\\Control Panel\\International\\Geo\\WineDisableAutoConfig * Type is REG_DWORD. * This key is created automatically if it doesn't yet exist. * Set to "1" to disable, "0" to enable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 171866 --- dlls/kernel32/kernel_main.c | 3 +++ dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/locale.c | 47 ++++++++++++++++++++++++++++++++++ 3 files changed, 51 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 e9d46949d1..cc8ca45a05 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -877,6 +877,53 @@ 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 + { + 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; + + 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"); + } + else + TRACE("Skipping: disabled by user.\n"); +} #ifdef __APPLE__ /*********************************************************************** -- 2.23.0

2 1

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

30 Oct '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, this will return 39070, which is the ID for the very neutral "World" region. This behaviour also helps prevent bugs with at least one app. 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: 171984 --- dlls/kernel32/locale.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index abb3ecd773..e9d46949d1 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4090,6 +4090,19 @@ 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) { @@ -4116,7 +4129,7 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) else { WARN("Unknown geoclass %d\n", geoclass); - return ret; + return GEOID_NOT_AVAILABLE; } if (!(hkey = create_geo_regkey())) return ret; -- 2.23.0

2 2

[PATCH v2 4/7] kernel32: Implement GetUserDefaultGeoName().
by João Diogo Ferreira 30 Oct '19

30 Oct '19

I wrote some documentation. This is my original work and/or work copied from the Wine source itself and does not include any other copyrighted material, nor does it copy any content owned or written by Microsoft. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 171867 --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 129 ++++++++++++++++++++++++++++++++++-- include/winnls.h | 1 + 3 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9898bdec6e..c2dd727135 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 5bb314b595..abb3ecd773 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4130,13 +4130,134 @@ 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 geoname_len is 0, this function will return the minimum length + * required for a buffer to hold the name. + * + * PARAMS + * buffer [O] Pointer to a buffer to hold the name. + * buffer_len [I] Length of the buffer, including null terminator, measured in WCHARs. + * + * RETURNS + * SUCCESS: Number of WCHARs written to the buffer -OR- + * minimum length for the buffer, if buffer_len 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 occured and Wine couldn't retrieve the name. + * - ERROR_NOT_ENOUGH_MEMORY: (Wine implementation) could not allocate more memory. */ +int WINAPI GetUserDefaultGeoName(WCHAR *buffer, int buffer_len) +{ + int ret = 0, name_len; + WCHAR fallback[] = {'0','0','1',0}; /* World */ + int fallback_len = ARRAY_SIZE(fallback); + int use_fallback = 0; + HANDLE hkey = create_geo_regkey(); + KEY_VALUE_PARTIAL_INFORMATION kvi = {0}; + WCHAR valuename[] = {'N','a','m','e',0}; + UNICODE_STRING uvaluename; + DWORD reg_written_bytes; + + TRACE("(%p, %d)\n", buffer, buffer_len); + + if (buffer_len < 0 || (buffer_len && !buffer)) + { + SetLastError(ERROR_INVALID_PARAMETER); + if (hkey) NtClose(hkey); + return 0; + } + + RtlInitUnicodeString(&uvaluename, valuename); + + /* If we don't get an overflow, it's the wrong value. */ + if (hkey && NtQueryValueKey(hkey, &uvaluename, KeyValuePartialInformation, + &kvi, sizeof(kvi), &reg_written_bytes) == STATUS_BUFFER_OVERFLOW) + name_len = kvi.DataLength / sizeof(WCHAR); + else + { + if (!hkey) ERR("Couldn't create geo regkey; please report.\n"); + TRACE("We've fallen back to our hardcoded value.\n"); + use_fallback = 1; + } + + if (!use_fallback) + { + if (!buffer_len) + ret = name_len; + else if (buffer_len < name_len) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = 0; + } + else if (buffer_len >= name_len) + { + KEY_VALUE_PARTIAL_INFORMATION *kvi; + DWORD kvi_size = sizeof(*kvi) + (name_len * sizeof(WCHAR)); + + if ((kvi = HeapAlloc(GetProcessHeap(), 0, kvi_size))) + { + NTSTATUS status = NtQueryValueKey(hkey, &uvaluename, KeyValuePartialInformation, + kvi, kvi_size, &reg_written_bytes); + if (status == STATUS_SUCCESS) + { + memcpy(buffer, kvi->Data, name_len); + ret = name_len; + } + else + { + ERR("Failure: status=0x%x, kvi_size=%d, reg_written_bytes=%d, DataLength=%u\n", + status, kvi_size, reg_written_bytes, kvi->DataLength); + SetLastError(ERROR_BADDB); + ret = 0; + } + HeapFree(GetProcessHeap(), 0, kvi); + } + else + { + ERR("We couldn't allocate memory somehow.\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ret = 0; + } + } + } + else + { + if (!buffer_len) + ret = fallback_len; + else if (buffer_len < fallback_len) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = 0; + } + else if (buffer_len >= fallback_len) + { + strcpyW(buffer, fallback); + ret = fallback_len; + } + } + + if (hkey) 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 a60dd1f1b0..798db570c5 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(WCHAR*,int); WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); -- 2.23.0

2 1

[PATCH] ole32: improve a string format.
by Serge Gautherie 30 Oct '19

30 Oct '19

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/ole32/stg_prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 9e13c13..dfe6a6a 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -958,7 +958,7 @@ static void PropertyStorage_PropNameDestroy(void *k, void *d, void *extra) static int PropertyStorage_PropCompare(const void *a, const void *b, void *extra) { - TRACE("(%d, %d)\n", PtrToUlong(a), PtrToUlong(b)); + TRACE("(%u, %u)\n", PtrToUlong(a), PtrToUlong(b)); return PtrToUlong(a) - PtrToUlong(b); } -- 2.10.0.windows.1

2 2

[PATCH v3 1/7] ddraw: Give exact name for devices in Enumdevices
by David Adam 30 Oct '19

30 Oct '19

This patch allows the game Donald Duck couak attack to start. Bug was spotted by Andrew D'Addesio in bug 19153

1 0

[PATCH v2 2/7] kernel32: Handle GEOCLASS_REGION in Get/SetUserGeoID.
by João Diogo Ferreira 30 Oct '19

30 Oct '19

Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 170933, 171825 V2: Introduce trace logs. --- dlls/kernel32/locale.c | 57 ++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 7c97915199..cd7ec45da3 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4002,6 +4002,7 @@ 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; HANDLE hkey, hsubkey = 0; UNICODE_STRING keyW; @@ -4009,20 +4010,29 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) DWORD count = sizeof(bufferW); RtlInitUnicodeString(&keyW, nationW); + if (geoclass == GEOCLASS_NATION) + { + TRACE("(GEOCLASS_NATION)\n"); + RtlInitUnicodeString(&keyW, nationW); + } + else if (geoclass == GEOCLASS_REGION) + { + TRACE("(GEOCLASS_REGION)\n"); + RtlInitUnicodeString(&keyW, regionW); + } + else + { + WARN("Unknown geoclass %d\n", geoclass); + return ret; + } + 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; + 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); } NtClose(hkey); @@ -4035,15 +4045,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; @@ -4052,16 +4073,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); -- 2.23.0

2 2

[PATCH v2 3/7] kernel32: Implement SetUserGeoName() and clean-up locale.c.
by João Diogo Ferreira 30 Oct '19

30 Oct '19

The new UN codes (required for SetUserGeoName()) were tested and confirmed to match with Windows 10 v1909. Introduced new helpers to keep this file clean. I wrote some documentation. This is my original work and/or work copied from the Wine source itself and does not include any other copyrighted material, nor does it copy any content owned or written by Microsoft. Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 171823, 171824, 171827 V2: Squash UN codes and clean-up into this commit. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 336 ++++++++++++++++++++++++++---------- include/winnls.h | 1 + 3 files changed, 251 insertions(+), 87 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 23c25b7acd..9898bdec6e 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(wstr) @ stub SetVDMCurrentDirectories @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index cd7ec45da3..5bb314b595 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.@) */ @@ -3889,7 +3905,7 @@ static const struct geoinfo_t geoinfodata[] = { { 305, {'X','X',0}, {'X','X',0}, 161832256 }, /* Baker Island */ { 306, {'B','V',0}, {'B','V','T',0}, 39070, 74 }, /* Bouvet Island */ { 307, {'K','Y',0}, {'C','Y','M',0}, 10039880, 136 }, /* Cayman Islands */ - { 308, {'X','X',0}, {'X','X',0}, 10210824, 0, LOCATION_BOTH }, /* Channel Islands */ + { 308, {'X','X',0}, {'X','X',0}, 10210824, 830, LOCATION_BOTH }, /* Channel Islands */ { 309, {'C','X',0}, {'C','X','R',0}, 12, 162 }, /* Christmas Island */ { 310, {'X','X',0}, {'X','X',0}, 27114 }, /* Clipperton Island */ { 311, {'C','C',0}, {'C','C','K',0}, 10210825, 166 }, /* Cocos (Keeling) Islands */ @@ -3929,47 +3945,54 @@ static const struct geoinfo_t geoinfodata[] = { { 349, {'T','C',0}, {'T','C','A',0}, 10039880, 796 }, /* Turks and Caicos Islands */ { 351, {'V','G',0}, {'V','G','B',0}, 10039880, 92 }, /* Virgin Islands, British */ { 352, {'W','F',0}, {'W','L','F',0}, 26286, 876 }, /* Wallis and Futuna */ - { 742, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Africa */ - { 2129, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Asia */ - { 10541, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Europe */ + { 742, {'X','X',0}, {'X','X',0}, 39070, 2, LOCATION_REGION }, /* Africa */ + { 2129, {'X','X',0}, {'X','X',0}, 39070, 142, LOCATION_REGION }, /* Asia */ + { 10541, {'X','X',0}, {'X','X',0}, 39070, 150, LOCATION_REGION }, /* Europe */ { 15126, {'I','M',0}, {'I','M','N',0}, 10039882, 833 }, /* Man, Isle of */ { 19618, {'M','K',0}, {'M','K','D',0}, 47610, 807 }, /* Macedonia, Former Yugoslav Republic of */ - { 20900, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Melanesia */ - { 21206, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Micronesia */ + { 20900, {'X','X',0}, {'X','X',0}, 27114, 54, LOCATION_REGION }, /* Melanesia */ + { 21206, {'X','X',0}, {'X','X',0}, 27114, 57, LOCATION_REGION }, /* Micronesia */ { 21242, {'X','X',0}, {'X','X',0}, 161832256 }, /* Midway Islands */ - { 23581, {'X','X',0}, {'X','X',0}, 10026358, 0, LOCATION_REGION }, /* Northern America */ - { 26286, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Polynesia */ - { 27082, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* Central America */ - { 27114, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Oceania */ + { 23581, {'X','X',0}, {'X','X',0}, 10026358, 21, LOCATION_REGION }, /* Northern America */ + { 26286, {'X','X',0}, {'X','X',0}, 27114, 61, LOCATION_REGION }, /* Polynesia */ + { 27082, {'X','X',0}, {'X','X',0}, 161832257, 13, LOCATION_REGION }, /* Central America */ + { 27114, {'X','X',0}, {'X','X',0}, 39070, 9, LOCATION_REGION }, /* Oceania */ { 30967, {'S','X',0}, {'S','X','M',0}, 10039880, 534 }, /* Sint Maarten (Dutch part) */ - { 31396, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* South America */ + { 31396, {'X','X',0}, {'X','X',0}, 161832257, 5, LOCATION_REGION }, /* South America */ { 31706, {'M','F',0}, {'M','A','F',0}, 10039880, 663 }, /* Saint Martin (French part) */ - { 39070, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* World */ - { 42483, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Western Africa */ - { 42484, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Middle Africa */ - { 42487, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Northern Africa */ - { 47590, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Central Asia */ - { 47599, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* South-Eastern Asia */ - { 47600, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Eastern Asia */ - { 47603, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Eastern Africa */ - { 47609, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Eastern Europe */ - { 47610, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Southern Europe */ - { 47611, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Middle East */ - { 47614, {'X','X',0}, {'X','X',0}, 2129, 0, LOCATION_REGION }, /* Southern Asia */ + { 39070, {'X','X',0}, {'X','X',0}, 39070, 1, LOCATION_REGION }, /* World */ + { 42483, {'X','X',0}, {'X','X',0}, 742, 11, LOCATION_REGION }, /* Western Africa */ + { 42484, {'X','X',0}, {'X','X',0}, 742, 17, LOCATION_REGION }, /* Middle Africa */ + { 42487, {'X','X',0}, {'X','X',0}, 742, 15, LOCATION_REGION }, /* Northern Africa */ + { 47590, {'X','X',0}, {'X','X',0}, 2129, 143, LOCATION_REGION }, /* Central Asia */ + { 47599, {'X','X',0}, {'X','X',0}, 2129, 35, LOCATION_REGION }, /* South-Eastern Asia */ + { 47600, {'X','X',0}, {'X','X',0}, 2129, 30, LOCATION_REGION }, /* Eastern Asia */ + { 47603, {'X','X',0}, {'X','X',0}, 742, 14, LOCATION_REGION }, /* Eastern Africa */ + { 47609, {'X','X',0}, {'X','X',0}, 10541, 151, LOCATION_REGION }, /* Eastern Europe */ + { 47610, {'X','X',0}, {'X','X',0}, 10541, 39, LOCATION_REGION }, /* Southern Europe */ + { 47611, {'X','X',0}, {'X','X',0}, 2129, 145, LOCATION_REGION }, /* Middle East */ + { 47614, {'X','X',0}, {'X','X',0}, 2129, 34, LOCATION_REGION }, /* Southern Asia */ { 7299303, {'T','L',0}, {'T','L','S',0}, 47599, 626 }, /* Democratic Republic of Timor-Leste */ - { 10026358, {'X','X',0}, {'X','X',0}, 39070, 0, LOCATION_REGION }, /* Americas */ + { 10026358, {'X','X',0}, {'X','X',0}, 39070, 19, LOCATION_REGION }, /* Americas */ { 10028789, {'A','X',0}, {'A','L','A',0}, 10039882, 248 }, /* Åland Islands */ - { 10039880, {'X','X',0}, {'X','X',0}, 161832257, 0, LOCATION_REGION }, /* Caribbean */ - { 10039882, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Northern Europe */ - { 10039883, {'X','X',0}, {'X','X',0}, 742, 0, LOCATION_REGION }, /* Southern Africa */ - { 10210824, {'X','X',0}, {'X','X',0}, 10541, 0, LOCATION_REGION }, /* Western Europe */ - { 10210825, {'X','X',0}, {'X','X',0}, 27114, 0, LOCATION_REGION }, /* Australia and New Zealand */ + { 10039880, {'X','X',0}, {'X','X',0}, 161832257, 29, LOCATION_REGION }, /* Caribbean */ + { 10039882, {'X','X',0}, {'X','X',0}, 10541, 154, LOCATION_REGION }, /* Northern Europe */ + { 10039883, {'X','X',0}, {'X','X',0}, 742, 18, LOCATION_REGION }, /* Southern Africa */ + { 10210824, {'X','X',0}, {'X','X',0}, 10541, 155, LOCATION_REGION }, /* Western Europe */ + { 10210825, {'X','X',0}, {'X','X',0}, 27114, 53, LOCATION_REGION }, /* Australia and New Zealand */ { 161832015, {'B','L',0}, {'B','L','M',0}, 10039880, 652 }, /* Saint Barthélemy */ { 161832256, {'U','M',0}, {'U','M','I',0}, 27114, 581 }, /* U.S. Minor Outlying Islands */ - { 161832257, {'X','X',0}, {'X','X',0}, 10026358, 0, LOCATION_REGION }, /* Latin America and the Caribbean */ + { 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,17 +4017,87 @@ 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_name + * + * 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; - HANDLE hkey, hsubkey = 0; + HANDLE hkey; UNICODE_STRING keyW; const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; DWORD count = sizeof(bufferW); @@ -4026,33 +4119,33 @@ GEOID WINAPI GetUserGeoID(GEOCLASS geoclass) 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, - bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + if((NtQueryValueKey(hkey, &keyW, KeyValuePartialInformation, + bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) ret = strtolW((const WCHAR*)info->Data, &end, 10); - } NtClose(hkey); - if (hsubkey) NtClose(hsubkey); return ret; } /****************************************************************************** - * 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_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; + 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) @@ -4060,39 +4153,108 @@ 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); - + /* 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); - if (NtCreateKey(&hkey, KEY_ALL_ACCESS, &attr, 0, NULL, 0, NULL) != STATUS_SUCCESS) + /* Now prepare GeoName */ + RtlInitUnicodeString( &namekeyW, nameW ); + + if (geoinfo->kind == LOCATION_REGION) { - NtClose(attr.RootDirectory); - SetLastError(ERROR_INTERNAL_ERROR); - return FALSE; + sprintfW(geonameW, geoname_uncode_fmtW, geoinfo->uncode); + namelen = 4; + } + else + { + strcpyW(geonameW, geoinfo->iso2W); + namelen = 3; } - sprintfW(bufferW, formatW, geoinfo->id); - NtSetValueKey(hkey, &keyW, 0, REG_SZ, bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR)); - NtClose(attr.RootDirectory); + 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)); + 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(const WCHAR *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.@) */ @@ -4106,7 +4268,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; } diff --git a/include/winnls.h b/include/winnls.h index e810c44af7..a60dd1f1b0 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(const WCHAR*); 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 v2 0/7] Autoset GeoID/GeoName on every app startup.
by João Diogo Ferreira 30 Oct '19

30 Oct '19

Hello all, Here comes V2. Learning from my previous mistakes, I now took extra care with my coding style, and made sure no unused code was left in any of the patches. This patchset improves Wine both by increasing convenience and preventing bugs from happening. Windows doesn't allow GeoIDs to _not_ be set, and at least one app is crashing because of this; this bug cannot be reproduced on Windows. (Win10 tries really hard to make sure a GeoID is always set!) But before we can do that, we must bring the relevant infrastructure up to spec. (It's currently rather subpar...) Patches 1 through 5 bring important functions up to spec; Patch 6 implements the autoconfigure; Patch 7 are the conformance tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46196 Signed-off-by: João Diogo Craveiro Ferreira <devilj(a)outlook.pt> --- Supersedes: 171821 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() and clean-up locale.c. 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 | 621 ++++++++++++++++++++++++++------- dlls/kernel32/tests/locale.c | 110 ++++++ include/winnls.h | 2 + 6 files changed, 612 insertions(+), 127 deletions(-) -- 2.23.0

2 2

[PATCH resend 1/4] include: Add comments with physical units to SYSTEM_BATTERY_STATE
by Alex Henrie 30 Oct '19

30 Oct '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/winnt.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 9c39eb7e4d..c78d504b70 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5619,12 +5619,12 @@ typedef struct { BOOLEAN Discharging; BOOLEAN Spare1[3]; BYTE Tag; - ULONG MaxCapacity; - ULONG RemainingCapacity; - ULONG Rate; - ULONG EstimatedTime; - ULONG DefaultAlert1; - ULONG DefaultAlert2; + ULONG MaxCapacity; /* milliwatt-hours */ + ULONG RemainingCapacity; /* milliwatt-hours */ + ULONG Rate; /* milliwatts */ + ULONG EstimatedTime; /* seconds */ + ULONG DefaultAlert1; /* milliwatt-hours */ + ULONG DefaultAlert2; /* milliwatt-hours */ } SYSTEM_BATTERY_STATE, *PSYSTEM_BATTERY_STATE; -- 2.23.0

2 4

[PATCH v3] atl: Fix a MSVC-x64 warning about wci.
by Serge Gautherie 30 Oct '19

30 Oct '19

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\atl30.c(316): warning C4477: 'sprintf' : format string '%08lx' requires an argument of type 'unsigned long', but variadic argument 1 has type 'UINT_PTR'" and m_szAutoName is a [14], so a 64bit value would overflow it. --- dlls/atl/atl30.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl30.c b/dlls/atl/atl30.c index c2db138..29b29d4 100644 --- a/dlls/atl/atl30.c +++ b/dlls/atl/atl30.c @@ -313,7 +313,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoA(_ATL_MODULEA *pm, _ATL_WNDCLASSINFOA if (!wci->m_wc.lpszClassName) { - sprintf(wci->m_szAutoName, "ATL%08lx", (UINT_PTR)wci); + sprintf(wci->m_szAutoName, "ATL%08x", PtrToUint(wci)); TRACE("auto-generated class name %s\n", wci->m_szAutoName); wci->m_wc.lpszClassName = wci->m_szAutoName; } @@ -372,8 +372,8 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { - static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - swprintf(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, (UINT_PTR)wci); + static const WCHAR szFormat[] = {'A','T','L','%','0','8','x',0}; + swprintf(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, PtrToUint(wci)); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } -- 2.10.0.windows.1

1 0

[PATCH] msvcrt/tests: Fix _lseek arguments.
by Daniel Lehman 29 Oct '19

29 Oct '19

3 2

[PATCH 4/4] vbscript/tests: Add with statement tests.
by Jacek Caban 29 Oct '19

29 Oct '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/tests/error.vbs | 71 +++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 15 ++++++++ dlls/vbscript/tests/run.c | 12 ++++++ 3 files changed, 98 insertions(+)

2 1

← Newer
1
2
3
4
5
6
7
8
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2019