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

[PATCH 3/9] ntoskrnl.exe: Introduce common kernel object allocator and use it for driver object.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 ++++++++++++++++++++++------ dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + 2 files changed, 47 insertions(+), 11 deletions(-)

1 0

[PATCH 2/9] ntoskrnl.exe: Export object type values.
by Jacek Caban 26 Feb '19

26 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 61 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 16 ++++---- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 ++ dlls/ntoskrnl.exe/sync.c | 17 ++++++++ 4 files changed, 90 insertions(+), 8 deletions(-)

1 0

[PATCH] msi: Don't use globals to manage assembly cache state.
by Hans Leidekker 26 Feb '19

26 Feb '19

Based on a patch by Zebediah Figura. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46719 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/assembly.c | 124 +++++++++++++++++++++----------------------- dlls/msi/msipriv.h | 8 +++ 2 files changed, 68 insertions(+), 64 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 73977ee8ac..2a293956c8 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -31,18 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -static HRESULT (WINAPI *pCreateAssemblyCacheNet10)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); -static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); -static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); - -static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree; -static BOOL assembly_caches_initialized; - -static BOOL init_function_pointers( void ) +static BOOL load_fusion_dlls( MSIPACKAGE *package ) { static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; static const WCHAR szMscoree[] = {'\\','m','s','c','o','r','e','e','.','d','l','l',0}; @@ -50,49 +39,60 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; - HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); + HRESULT (WINAPI *pLoadLibraryShim)( const WCHAR *, const WCHAR *, void *, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); strcpyW( path + len, szMscoree ); - if (hmscoree || !(hmscoree = LoadLibraryW( path ))) return TRUE; - pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ - if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) + if (package->hmscoree || !(package->hmscoree = LoadLibraryW( path ))) return TRUE; + if (!(pLoadLibraryShim = (void *)GetProcAddress( package->hmscoree, "LoadLibraryShim" ))) { - FreeLibrary( hmscoree ); - hmscoree = NULL; + FreeLibrary( package->hmscoree ); + package->hmscoree = NULL; return TRUE; } - if (!pLoadLibraryShim( szFusion, szVersion10, NULL, &hfusion10 )) - pCreateAssemblyCacheNet10 = (void *)GetProcAddress( hfusion10, "CreateAssemblyCache" ); - if (!pLoadLibraryShim( szFusion, szVersion11, NULL, &hfusion11 )) - pCreateAssemblyCacheNet11 = (void *)GetProcAddress( hfusion11, "CreateAssemblyCache" ); + pLoadLibraryShim( szFusion, szVersion10, NULL, &package->hfusion10 ); + pLoadLibraryShim( szFusion, szVersion11, NULL, &package->hfusion11 ); + pLoadLibraryShim( szFusion, szVersion20, NULL, &package->hfusion20 ); + pLoadLibraryShim( szFusion, szVersion40, NULL, &package->hfusion40 ); - if (!pLoadLibraryShim( szFusion, szVersion20, NULL, &hfusion20 )) - pCreateAssemblyCacheNet20 = (void *)GetProcAddress( hfusion20, "CreateAssemblyCache" ); - - if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) - { - pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); - pCreateAssemblyNameObject = (void *)GetProcAddress( hfusion40, "CreateAssemblyNameObject" ); - pCreateAssemblyEnum = (void *)GetProcAddress( hfusion40, "CreateAssemblyEnum" ); - } return TRUE; } BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { - if (assembly_caches_initialized) return TRUE; - if (!init_function_pointers()) return FALSE; + HRESULT (WINAPI *pCreateAssemblyCache)( IAssemblyCache **, DWORD ); + if (package->cache_sxs) return TRUE; if (CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; - if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); - if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); - if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); - if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); - assembly_caches_initialized = TRUE; + if (!load_fusion_dlls( package )) return FALSE; + package->pGetFileVersion = (void *)GetProcAddress( package->hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ + + if (package->hfusion10) + { + pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion10, "CreateAssemblyCache" ); + pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V10], 0 ); + } + if (package->hfusion11) + { + pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion11, "CreateAssemblyCache" ); + pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V11], 0 ); + } + if (package->hfusion20) + { + pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion20, "CreateAssemblyCache" ); + pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V20], 0 ); + } + if (package->hfusion40) + { + pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion40, "CreateAssemblyCache" ); + pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V40], 0 ); + package->pCreateAssemblyNameObject = (void *)GetProcAddress( package->hfusion40, "CreateAssemblyNameObject" ); + package->pCreateAssemblyEnum = (void *)GetProcAddress( package->hfusion40, "CreateAssemblyEnum" ); + } + return TRUE; } @@ -113,23 +113,19 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) package->cache_net[i] = NULL; } } - pCreateAssemblyCacheNet10 = NULL; - pCreateAssemblyCacheNet11 = NULL; - pCreateAssemblyCacheNet20 = NULL; - pCreateAssemblyCacheNet40 = NULL; - pGetFileVersion = NULL; - pCreateAssemblyNameObject = NULL; - pCreateAssemblyEnum = NULL; - FreeLibrary( hfusion10 ); - FreeLibrary( hfusion11 ); - FreeLibrary( hfusion20 ); - FreeLibrary( hfusion40 ); - FreeLibrary( hmscoree ); - hfusion10 = NULL; - hfusion11 = NULL; - hfusion20 = NULL; - hfusion40 = NULL; - hmscoree = NULL; + package->pGetFileVersion = NULL; + package->pCreateAssemblyNameObject = NULL; + package->pCreateAssemblyEnum = NULL; + FreeLibrary( package->hfusion10 ); + FreeLibrary( package->hfusion11 ); + FreeLibrary( package->hfusion20 ); + FreeLibrary( package->hfusion40 ); + FreeLibrary( package->hmscoree ); + package->hfusion10 = NULL; + package->hfusion11 = NULL; + package->hfusion20 = NULL; + package->hfusion40 = NULL; + package->hmscoree = NULL; } static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) @@ -294,9 +290,9 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ WCHAR *str; UINT len = 0; - if (!pCreateAssemblyNameObject || !pCreateAssemblyEnum) return NULL; + if (!package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) return NULL; - hr = pCreateAssemblyNameObject( &name, displayname, CANOF_PARSE_DISPLAY_NAME, NULL ); + hr = package->pCreateAssemblyNameObject( &name, displayname, CANOF_PARSE_DISPLAY_NAME, NULL ); if (FAILED( hr )) return NULL; hr = IAssemblyName_GetName( name, &len, NULL ); @@ -314,11 +310,11 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ return NULL; } - hr = pCreateAssemblyNameObject( &name, str, 0, NULL ); + hr = package->pCreateAssemblyNameObject( &name, str, 0, NULL ); msi_free( str ); if (FAILED( hr )) return NULL; - hr = pCreateAssemblyEnum( &ret, NULL, name, ASM_CACHE_GAC, NULL ); + hr = package->pCreateAssemblyEnum( &ret, NULL, name, ASM_CACHE_GAC, NULL ); IAssemblyName_Release( name ); if (FAILED( hr )) return NULL; @@ -413,20 +409,20 @@ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) return a; } -static enum clr_version get_clr_version( const WCHAR *filename ) +static enum clr_version get_clr_version( MSIPACKAGE *package, const WCHAR *filename ) { DWORD len; HRESULT hr; enum clr_version version = CLR_VERSION_V11; WCHAR *strW; - if (!pGetFileVersion) return CLR_VERSION_V10; + if (!package->pGetFileVersion) return CLR_VERSION_V10; - hr = pGetFileVersion( filename, NULL, 0, &len ); + hr = package->pGetFileVersion( filename, NULL, 0, &len ); if (hr != E_NOT_SUFFICIENT_BUFFER) return CLR_VERSION_V11; if ((strW = msi_alloc( len * sizeof(WCHAR) ))) { - hr = pGetFileVersion( filename, strW, len, &len ); + hr = package->pGetFileVersion( filename, strW, len, &len ); if (hr == S_OK) { UINT i; @@ -467,7 +463,7 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) else { manifest = msi_get_loaded_file( package, comp->KeyPath )->TargetPath; - cache = package->cache_net[get_clr_version( manifest )]; + cache = package->cache_net[get_clr_version( package, manifest )]; if (!cache) return ERROR_SUCCESS; } TRACE("installing assembly %s\n", debugstr_w(manifest)); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e4d2a625f7..4b2b65a13b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -404,6 +404,14 @@ typedef struct tagMSIPACKAGE UINT LastActionResult; UINT action_progress_increment; HANDLE log_file; + HMODULE hfusion10; + HMODULE hfusion11; + HMODULE hfusion20; + HMODULE hfusion40; + HMODULE hmscoree; + HRESULT (WINAPI *pGetFileVersion)( const WCHAR *, WCHAR *, DWORD, DWORD * ); + HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, const WCHAR *, DWORD, void * ); + HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, void * ); IAssemblyCache *cache_net[CLR_VERSION_MAX]; IAssemblyCache *cache_sxs; -- 2.20.1

1 0

[PATCH] server: Disallow duplicating file handle to elevate access.
by Daniel Lehman 26 Feb '19

26 Feb '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/kernel32/tests/file.c | 7 ------- server/file.c | 5 +++++ server/file.h | 2 ++ server/handle.c | 8 ++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33b17aa327..641fcc1750 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4679,15 +4679,8 @@ static void test_file_access(void) ok(ret, "DuplicateHandle(%#x => %#x) error %d\n", td[i].access, td[j].access, GetLastError()); else { - /* FIXME: Remove once Wine is fixed */ - todo_wine_if((td[j].access & (GENERIC_READ | GENERIC_WRITE) || - (!(td[i].access & (GENERIC_WRITE | FILE_WRITE_DATA)) && (td[j].access & FILE_WRITE_DATA)) || - (!(td[i].access & (GENERIC_READ | FILE_READ_DATA)) && (td[j].access & FILE_READ_DATA)) || - (!(td[i].access & (GENERIC_WRITE)) && (td[j].access & FILE_APPEND_DATA)))) - { ok(!ret, "DuplicateHandle(%#x => %#x) should fail\n", td[i].access, td[j].access); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - } } if (ret) CloseHandle(hdup); } diff --git a/server/file.c b/server/file.c index 8d39f303bd..a526467332 100644 --- a/server/file.c +++ b/server/file.c @@ -772,3 +772,8 @@ DECL_HANDLER(unlock_file) release_object( file ); } } + +int is_file_object( const struct object *obj ) +{ + return obj->ops == &file_ops; +} diff --git a/server/file.h b/server/file.h index 6b67866d3f..82c5eac03b 100644 --- a/server/file.h +++ b/server/file.h @@ -224,4 +224,6 @@ static inline int async_queued( struct async_queue *queue ) #define FILE_MAPPING_WRITE 0x40000000 /* set for writable shared mappings */ #define FILE_MAPPING_ACCESS 0x20000000 /* set for all mappings */ +int is_file_object( const struct object * ); + #endif /* __WINE_SERVER_FILE_H */ diff --git a/server/handle.c b/server/handle.c index 35ab8607c8..4f915ea3f8 100644 --- a/server/handle.c +++ b/server/handle.c @@ -38,6 +38,7 @@ #include "thread.h" #include "security.h" #include "request.h" +#include "file.h" struct handle_entry { @@ -555,6 +556,13 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str /* asking for the more access rights than src_access? */ if (access & ~src_access) { + if (is_file_object( obj )) + { + set_error( STATUS_ACCESS_DENIED ); + release_object( obj ); + return 0; + } + if (options & DUP_HANDLE_MAKE_GLOBAL) res = alloc_global_handle( obj, access ); else -- 2.17.1

2 1

[PATCH 0/3] Enable ppc64 support in winelib
by Timothy Pearson 26 Feb '19

26 Feb '19

1 0

[PATCH v5] winetest: Add GUI to display results of individual tests.
by Isira Seneviratne 26 Feb '19

26 Feb '19

3 4

[PATCH] kernel32: Allow double quote style escape in argv
by Brendan McGrath 26 Feb '19

26 Feb '19

In Windows, two quotes together (within outer quotes) represents a single quote (with the first quote acting as an escape character) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46721 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/kernel32/process.c | 17 +++++++++++++---- dlls/kernel32/tests/process.c | 7 ++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ad257a054e4..89b561ef811 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1505,9 +1505,13 @@ static char **build_argv( const UNICODE_STRING *cmdlineW, int reserved ) /* '\', count them */ bcount++; } else if ((*s=='"') && ((bcount & 1)==0)) { - /* unescaped '"' */ - in_quotes=!in_quotes; - bcount=0; + if (in_quotes && s[1] == '"') { + s++; + } else { + /* unescaped '"' */ + in_quotes=!in_quotes; + bcount=0; + } } else { /* a regular character */ bcount=0; @@ -1551,7 +1555,12 @@ static char **build_argv( const UNICODE_STRING *cmdlineW, int reserved ) */ d-=bcount/2; s++; - in_quotes=!in_quotes; + if(in_quotes && *s == '"') { + *d++='"'; + s++; + } else { + in_quotes=!in_quotes; + } } else { /* Preceded by an odd number of '\', this is half that * number of '\' followed by a '"' diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index fe68d28e914..f62f8fb0ba1 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -896,7 +896,7 @@ static void test_CommandLine(void) /* the basics */ get_file_name(resfile); - sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" \"C:\\Program Files\\my nice app.exe\"", selfname, resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); @@ -905,9 +905,10 @@ static void test_CommandLine(void) CloseHandle(info.hThread); CloseHandle(info.hProcess); - okChildInt("Arguments", "argcA", 5); + okChildInt("Arguments", "argcA", 6); okChildString("Arguments", "argvA4", "C:\\Program Files\\my nice app.exe"); - okChildString("Arguments", "argvA5", NULL); + okChildString("Arguments", "argvA5", "\""); + okChildString("Arguments", "argvA6", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); DeleteFileA(resfile); -- 2.17.1

1 0

To disable PRs on GitHub mirror?
by Yurii Kolesnykov 26 Feb '19

26 Feb '19

There is a GitHub mirror located at https://github.com/wine-mirror/wine/, which has 13 PRs sent already. I think it will be better to disable PR feature for now and even more, provide some mention of wine-devel mailing-lists to which pathes should be sent.

2 1

[PATCH] advapi32: Implement EnumDynamicTimeZoneInformation.
by Daniel Lehman 26 Feb '19

26 Feb '19

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/advapi32/advapi32.spec | 2 +- .../api-ms-win-core-timezone-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/main.c | 115 ++++++++++++ dlls/kernelbase/tests/Makefile.in | 4 +- dlls/kernelbase/tests/time.c | 168 ++++++++++++++++++ include/timezoneapi.h | 32 ++++ 7 files changed, 321 insertions(+), 4 deletions(-) create mode 100644 dlls/kernelbase/tests/time.c create mode 100644 include/timezoneapi.h diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e870a5d3e2..038467ec1d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -272,7 +272,7 @@ # @ stub EncryptionDisable @ stdcall EnumDependentServicesA(long long ptr long ptr ptr) @ stdcall EnumDependentServicesW(long long ptr long ptr ptr) -# @ stub EnumDynamicTimeZoneInformation +@ stdcall EnumDynamicTimeZoneInformation(long ptr) kernelbase.EnumDynamicTimeZoneInformation @ stub EnumServiceGroupA @ stub EnumServiceGroupW @ stdcall EnumServicesStatusA (long long long ptr long ptr ptr ptr) diff --git a/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec b/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec index 3e38d70596..0f42eda5d8 100644 --- a/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec +++ b/dlls/api-ms-win-core-timezone-l1-1-0/api-ms-win-core-timezone-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub EnumDynamicTimeZoneInformation +@ stdcall EnumDynamicTimeZoneInformation(long ptr) kernelbase.EnumDynamicTimeZoneInformation @ stdcall FileTimeToSystemTime(ptr ptr) kernel32.FileTimeToSystemTime @ stdcall GetDynamicTimeZoneInformation(ptr) kernel32.GetDynamicTimeZoneInformation @ stdcall GetDynamicTimeZoneInformationEffectiveYears(ptr ptr ptr) kernel32.GetDynamicTimeZoneInformationEffectiveYears diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 45b375ce2f..bea57303df 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -297,7 +297,7 @@ @ stdcall EnumDateFormatsExW(ptr long long) kernel32.EnumDateFormatsExW @ stdcall EnumDateFormatsW(ptr long long) kernel32.EnumDateFormatsW # @ stub EnumDeviceDrivers -# @ stub EnumDynamicTimeZoneInformation +@ stdcall EnumDynamicTimeZoneInformation(long ptr) @ stdcall EnumLanguageGroupLocalesW(ptr long long ptr) kernel32.EnumLanguageGroupLocalesW # @ stub EnumPageFilesA # @ stub EnumPageFilesW diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c index 5192dfb3f2..2823e977c0 100644 --- a/dlls/kernelbase/main.c +++ b/dlls/kernelbase/main.c @@ -125,3 +125,118 @@ BOOL WINAPI WaitOnAddress(volatile void *addr, void *cmp, SIZE_T size, DWORD tim return TRUE; } + +static NTSTATUS reg_query_value(HKEY hkey, const WCHAR *name, DWORD type, + void *data, DWORD count) +{ + UNICODE_STRING nameW; + char buf[256]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buf; + NTSTATUS status; + + RtlInitUnicodeString( &nameW, name ); + if ((status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, + buf, sizeof(buf), &count ))) + return status; + + if (info->Type != type) + return ERROR_DATATYPE_MISMATCH; + + memcpy( data, info->Data, info->DataLength ); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * EnumDynamicTimeZoneInformation (KERNELBASE.@) + */ +DWORD WINAPI EnumDynamicTimeZoneInformation(const DWORD index, + DYNAMIC_TIME_ZONE_INFORMATION *dtzi) +{ + static const WCHAR Time_ZonesW[] = { '\\','R','E','G','I','S','T','R','Y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'T','i','m','e',' ','Z','o','n','e','s',0 }; + static const WCHAR stdW[] = {'S','t','d',0}; + static const WCHAR dltW[] = {'D','l','t',0}; + static const WCHAR tziW[] = {'T','Z','I',0}; + char node_buf[sizeof(KEY_NODE_INFORMATION) + ARRAY_SIZE(dtzi->TimeZoneKeyName)]; + KEY_NODE_INFORMATION *info = (KEY_NODE_INFORMATION *)node_buf; + HANDLE time_zones_key, sub_key; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + DWORD size; + NTSTATUS status; + struct tz_reg_data + { + LONG bias; + LONG std_bias; + LONG dlt_bias; + SYSTEMTIME std_date; + SYSTEMTIME dlt_date; + } tz_data; + + if (!dtzi) + return ERROR_INVALID_PARAMETER; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, Time_ZonesW ); + status = NtOpenKeyEx( &time_zones_key, KEY_READ, &attr, KEY_ENUMERATE_SUB_KEYS ); + if (status) return RtlNtStatusToDosError( status ); + + status = NtEnumerateKey( time_zones_key, index, KeyNodeInformation, + node_buf, sizeof(node_buf), &size ); + if (status) + { + NtClose( time_zones_key ); + return RtlNtStatusToDosError( status ); + } + + attr.RootDirectory = time_zones_key; + info->Name[info->NameLength / sizeof(WCHAR)] = 0; + RtlInitUnicodeString( &nameW, info->Name ); + status = NtOpenKeyEx( &sub_key, KEY_READ, &attr, KEY_QUERY_VALUE ); + if (status) + { + NtClose( time_zones_key ); + return RtlNtStatusToDosError( status ); + } + + status = reg_query_value( sub_key, stdW, REG_SZ, + dtzi->StandardName, sizeof(dtzi->StandardName) ); + if (status) + goto done; + + status = reg_query_value( sub_key, dltW, REG_SZ, + dtzi->DaylightName, sizeof(dtzi->DaylightName) ); + if (status) + goto done; + + status = reg_query_value( sub_key, tziW, REG_BINARY, &tz_data, sizeof(tz_data) ); + if (status) + goto done; + + dtzi->Bias = tz_data.bias; + dtzi->StandardBias = tz_data.std_bias; + dtzi->DaylightBias = tz_data.dlt_bias; + memcpy( &dtzi->StandardDate, &tz_data.std_date, sizeof(tz_data.std_date) ); + memcpy( &dtzi->DaylightDate, &tz_data.dlt_date, sizeof(tz_data.dlt_date) ); + lstrcpyW( dtzi->TimeZoneKeyName, info->Name ); + dtzi->DynamicDaylightTimeDisabled = FALSE; + + status = STATUS_SUCCESS; + +done: + NtClose( sub_key ); + NtClose( time_zones_key ); + + SetLastError( RtlNtStatusToDosError( status ) ); + return 0; +} diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in index 22e4a17a58..19d7792f86 100644 --- a/dlls/kernelbase/tests/Makefile.in +++ b/dlls/kernelbase/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = kernelbase.dll +IMPORTS = advapi32 C_SRCS = \ path.c \ - sync.c + sync.c \ + time.c diff --git a/dlls/kernelbase/tests/time.c b/dlls/kernelbase/tests/time.c new file mode 100644 index 0000000000..de61c5795b --- /dev/null +++ b/dlls/kernelbase/tests/time.c @@ -0,0 +1,168 @@ +/* + * Time tests + * + * Copyright 2019 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <stdlib.h> +#include <stdio.h> +#include <winerror.h> + +#include "wine/test.h" + +static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD, + DYNAMIC_TIME_ZONE_INFORMATION*); + +static const char *printSystemTime(const SYSTEMTIME *st) +{ + static int index; + static char buf[2][64]; + + index++; + index %= ARRAY_SIZE(buf); + snprintf(buf[index], ARRAY_SIZE(buf[0]), "%02d-%02d-%04d %02d:%02d:%02d.%03d", + st->wMonth, st->wDay, st->wYear, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); + return buf[index]; +} + +static void test_EnumDynamicTimeZoneInformation(void) +{ + HKEY hkey; + WCHAR stdname[32]; + WCHAR dltname[32]; + WCHAR keyname[128]; + DWORD index, gle, ret, size; + static const WCHAR stdW[] = {'S','t','d',0}; + static const WCHAR dltW[] = {'D','l','t',0}; + static const WCHAR tziW[] = {'T','Z','I',0}; + static const WCHAR volgogradW[] = {'V','o','l','g','o','g','r','a','d'}; + DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi; + DYNAMIC_TIME_ZONE_INFORMATION dtzi; + struct tz_reg_data + { + LONG bias; + LONG std_bias; + LONG dlt_bias; + SYSTEMTIME std_date; + SYSTEMTIME dlt_date; + } tz_data; + + if (!pEnumDynamicTimeZoneInformation) + { + win_skip("EnumDynamicTimeZoneInformation is not supported.\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pEnumDynamicTimeZoneInformation(0, NULL); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "got 0x%x\n", gle); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + + memset(&bogus_dtzi, 0xcc, sizeof(bogus_dtzi)); + memset(&dtzi, 0xcc, sizeof(dtzi)); + SetLastError(0xdeadbeef); + ret = pEnumDynamicTimeZoneInformation(-1, &dtzi); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "got 0x%x\n", gle); + ok(ret == ERROR_NO_MORE_ITEMS, "got %d\n", ret); + ok(!memcmp(&dtzi, &bogus_dtzi, sizeof(dtzi)), "mismatch\n"); + + ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", 0, + KEY_ENUMERATE_SUB_KEYS, &hkey); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + index = 0; + while (!(ret = RegEnumKeyW(hkey, index, keyname, sizeof(keyname)))) + { + memset(&dtzi, 0xcc, sizeof(dtzi)); + SetLastError(0xdeadbeef); + ret = pEnumDynamicTimeZoneInformation(index, &dtzi); + gle = GetLastError(); + ok(gle == ERROR_SUCCESS || + (!memcmp(keyname, volgogradW, sizeof(volgogradW)) && gle == ERROR_MUI_FILE_NOT_FOUND), + "got 0x%x for %s\n", gle, wine_dbgstr_w(keyname)); + ok(!ret, "got %d\n", ret); + + ok(!dtzi.DynamicDaylightTimeDisabled, "got %d\n", dtzi.DynamicDaylightTimeDisabled); + + ok(!lstrcmpW(dtzi.TimeZoneKeyName, keyname), "expected %s, got %s\n", + wine_dbgstr_w(dtzi.TimeZoneKeyName), wine_dbgstr_w(keyname)); + + size = sizeof(stdname); + ret = RegGetValueW(hkey, keyname, stdW, RRF_RT_REG_SZ, NULL, stdname, &size); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(!memcmp(&dtzi.StandardName, stdname, size) || + broken(!memcmp(stdname, volgogradW, sizeof(volgogradW))), /* Windows 10 */ + "expected %s, got %s\n", wine_dbgstr_w(dtzi.StandardName), wine_dbgstr_w(stdname)); + + size = sizeof(dltname); + ret = RegGetValueW(hkey, keyname, dltW, RRF_RT_REG_SZ, NULL, dltname, &size); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(!memcmp(&dtzi.DaylightName, dltname, size) || + broken(!memcmp(stdname, volgogradW, sizeof(volgogradW))), /* Windows 10 */ + "expected %s, got %s\n", wine_dbgstr_w(dtzi.DaylightName), wine_dbgstr_w(dltname)); + + size = sizeof(tz_data); + ret = RegGetValueW(hkey, keyname, tziW, RRF_RT_REG_BINARY, NULL, &tz_data, &size); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + + ok(dtzi.Bias == tz_data.bias, "expected %d, got %d\n", + dtzi.Bias, tz_data.bias); + ok(dtzi.StandardBias == tz_data.std_bias, "expected %d, got %d\n", + dtzi.StandardBias, tz_data.std_bias); + ok(dtzi.DaylightBias == tz_data.dlt_bias, "expected %d, got %d\n", + dtzi.DaylightBias, tz_data.dlt_bias); + + ok(!memcmp(&dtzi.StandardDate, &tz_data.std_date, sizeof(dtzi.StandardDate)), + "expected %s, got %s\n", + printSystemTime(&dtzi.StandardDate), printSystemTime(&tz_data.std_date)); + + ok(!memcmp(&dtzi.DaylightDate, &tz_data.dlt_date, sizeof(dtzi.DaylightDate)), + "expected %s, got %s\n", + printSystemTime(&dtzi.DaylightDate), printSystemTime(&tz_data.dlt_date)); + + index++; + } + ok(ret == ERROR_NO_MORE_ITEMS, "got %d\n", ret); + + memset(&dtzi, 0xcc, sizeof(dtzi)); + SetLastError(0xdeadbeef); + ret = pEnumDynamicTimeZoneInformation(index, &dtzi); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "got 0x%x\n", gle); + ok(ret == ERROR_NO_MORE_ITEMS, "got %d\n", ret); + ok(!memcmp(&dtzi, &bogus_dtzi, sizeof(dtzi)), "mismatch\n"); + + RegCloseKey(hkey); +} + +START_TEST(time) +{ + HMODULE hmod; + + hmod = LoadLibraryA("kernelbase.dll"); + pEnumDynamicTimeZoneInformation = (void *)GetProcAddress(hmod, "EnumDynamicTimeZoneInformation"); + + test_EnumDynamicTimeZoneInformation(); +} diff --git a/include/timezoneapi.h b/include/timezoneapi.h new file mode 100644 index 0000000000..0bba897718 --- /dev/null +++ b/include/timezoneapi.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2019 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _APISETTIMEZONE_ +#define _APISETTIMEZONE_ + +#ifdef __cplusplus +extern "C" { +#endif + +WINBASEAPI DWORD WINAPI EnumDynamicTimeZoneInformation(const DWORD, DYNAMIC_TIME_ZONE_INFORMATION *); + +#ifdef __cplusplus +} +#endif + +#endif /* _APISETTIMEZONE_ */ -- 2.17.1

2 1

Wine-DXVK Integration
by Yurii Kolesnykov 26 Feb '19

26 Feb '19

Please consider a PR sent here by Derek Lesho <dereklesho52(a)Gmail.com> https://github.com/wine-mirror/wine/pull/13

2 1