December 2019 - Wine-Commits

Alexandre Julliard : server: Support passing a handle to get_console_wait_event.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 4118697829d55768528b44f217d118a2352fb64a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4118697829d55768528b44f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 11:46:39 2019 +0100 server: Support passing a handle to get_console_wait_event. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- include/wine/server_protocol.h | 6 +++--- server/console.c | 18 +++++++++++++++--- server/protocol.def | 3 ++- server/request.h | 3 ++- server/trace.c | 3 ++- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 0842bb71a6..86fdae0ecb 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -310,7 +310,7 @@ HANDLE WINAPI GetConsoleInputWaitHandle(void) SERVER_START_REQ(get_console_wait_event) { if (!wine_server_call_err( req )) - console_wait_event = wine_server_ptr_handle( reply->handle ); + console_wait_event = wine_server_ptr_handle( reply->event ); } SERVER_END_REQ; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index aaa5fd2e33..c5d6ce1796 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1922,12 +1922,12 @@ struct attach_console_reply struct get_console_wait_event_request { struct request_header __header; - char __pad_12[4]; + obj_handle_t handle; }; struct get_console_wait_event_reply { struct reply_header __header; - obj_handle_t handle; + obj_handle_t event; char __pad_12[4]; }; @@ -6702,6 +6702,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 593 +#define SERVER_PROTOCOL_VERSION 594 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/console.c b/server/console.c index 59f8843a75..b5f8992b8d 100644 --- a/server/console.c +++ b/server/console.c @@ -1905,14 +1905,26 @@ static int cgwe_enum( struct process* process, void* user) DECL_HANDLER(get_console_wait_event) { struct console_input* console = NULL; + struct object *obj; - if (current->process->console) - console = (struct console_input*)grab_object( (struct object*)current->process->console ); + if (req->handle) + { + if (!(obj = get_handle_obj( current->process, req->handle, FILE_READ_PROPERTIES, NULL ))) return; + if (obj->ops == &console_input_ops) + console = (struct console_input *)grab_object( obj ); + else if (obj->ops == &screen_buffer_ops) + console = (struct console_input *)grab_object( ((struct screen_buffer *)obj)->input ); + else + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + release_object( obj ); + } + else if (current->process->console) + console = (struct console_input *)grab_object( current->process->console ); else enum_processes(cgwe_enum, &console); if (console) { - reply->handle = alloc_handle( current->process, console->event, EVENT_ALL_ACCESS, 0 ); + reply->event = alloc_handle( current->process, console->event, EVENT_ALL_ACCESS, 0 ); release_object( console ); } else set_error( STATUS_INVALID_PARAMETER ); diff --git a/server/protocol.def b/server/protocol.def index 1cb1fea602..34fa38976d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1532,8 +1532,9 @@ struct console_renderer_event /* Get the input queue wait event */ @REQ(get_console_wait_event) + obj_handle_t handle; /* handle to the console */ @REPLY - obj_handle_t handle; + obj_handle_t event; @END /* Get a console mode (input or output) */ diff --git a/server/request.h b/server/request.h index 90a3180a6c..cc00cbdeb3 100644 --- a/server/request.h +++ b/server/request.h @@ -1144,8 +1144,9 @@ C_ASSERT( FIELD_OFFSET(struct attach_console_reply, std_in) == 8 ); C_ASSERT( FIELD_OFFSET(struct attach_console_reply, std_out) == 12 ); C_ASSERT( FIELD_OFFSET(struct attach_console_reply, std_err) == 16 ); C_ASSERT( sizeof(struct attach_console_reply) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_wait_event_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_reply, handle) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_reply, event) == 8 ); C_ASSERT( sizeof(struct get_console_wait_event_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_mode_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_mode_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index 5b1d3ddea9..f15ed8b37a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2031,11 +2031,12 @@ static void dump_attach_console_reply( const struct attach_console_reply *req ) static void dump_get_console_wait_event_request( const struct get_console_wait_event_request *req ) { + fprintf( stderr, " handle=%04x", req->handle ); } static void dump_get_console_wait_event_reply( const struct get_console_wait_event_reply *req ) { - fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, " event=%04x", req->event ); } static void dump_get_console_mode_request( const struct get_console_mode_request *req )

1 0

Alexandre Julliard : include: Move timezone definitions to timezoneapi.h.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 1d05798d9b38149d36d84463bb8be294ade9d515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d05798d9b38149d36d84463… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 14:54:54 2019 +0100 include: Move timezone definitions to timezoneapi.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/timezoneapi.h | 41 ++++++++++++++++++++++++++++++++++++++++- include/winbase.h | 44 ++++++-------------------------------------- 2 files changed, 46 insertions(+), 39 deletions(-) diff --git a/include/timezoneapi.h b/include/timezoneapi.h index 0bba897718..2cee93a55d 100644 --- a/include/timezoneapi.h +++ b/include/timezoneapi.h @@ -23,7 +23,46 @@ extern "C" { #endif -WINBASEAPI DWORD WINAPI EnumDynamicTimeZoneInformation(const DWORD, DYNAMIC_TIME_ZONE_INFORMATION *); +typedef struct _TIME_DYNAMIC_ZONE_INFORMATION +{ + LONG Bias; + WCHAR StandardName[32]; + SYSTEMTIME StandardDate; + LONG StandardBias; + WCHAR DaylightName[32]; + SYSTEMTIME DaylightDate; + LONG DaylightBias; + WCHAR TimeZoneKeyName[128]; + BOOLEAN DynamicDaylightTimeDisabled; +} DYNAMIC_TIME_ZONE_INFORMATION, *PDYNAMIC_TIME_ZONE_INFORMATION; + +typedef struct _TIME_ZONE_INFORMATION +{ + LONG Bias; + WCHAR StandardName[32]; + SYSTEMTIME StandardDate; + LONG StandardBias; + WCHAR DaylightName[32]; + SYSTEMTIME DaylightDate; + LONG DaylightBias; +} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; + +#define TIME_ZONE_ID_INVALID ((DWORD)0xFFFFFFFF) +#define TIME_ZONE_ID_UNKNOWN 0 +#define TIME_ZONE_ID_STANDARD 1 +#define TIME_ZONE_ID_DAYLIGHT 2 + +WINBASEAPI DWORD WINAPI EnumDynamicTimeZoneInformation(DWORD, DYNAMIC_TIME_ZONE_INFORMATION *); +WINBASEAPI DWORD WINAPI GetDynamicTimeZoneInformation(PDYNAMIC_TIME_ZONE_INFORMATION); +WINBASEAPI DWORD WINAPI GetDynamicTimeZoneInformationEffectiveYears(const DYNAMIC_TIME_ZONE_INFORMATION*,DWORD*,DWORD*); +WINBASEAPI DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION); +WINBASEAPI BOOL WINAPI GetTimeZoneInformationForYear(USHORT,DYNAMIC_TIME_ZONE_INFORMATION*,TIME_ZONE_INFORMATION*); +WINBASEAPI BOOL WINAPI SetDynamicTimeZoneInformation(const DYNAMIC_TIME_ZONE_INFORMATION*); +WINBASEAPI BOOL WINAPI SetTimeZoneInformation(const TIME_ZONE_INFORMATION *); +WINBASEAPI BOOL WINAPI SystemTimeToTzSpecificLocalTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); +WINBASEAPI BOOL WINAPI SystemTimeToTzSpecificLocalTimeEx(const DYNAMIC_TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); +WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); +WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTimeEx(const DYNAMIC_TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); #ifdef __cplusplus } diff --git a/include/winbase.h b/include/winbase.h index 7b7f9f26bd..320e243034 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -542,6 +542,8 @@ typedef struct _SYSTEMTIME{ } SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; #endif /* _SYSTEMTIME_ */ +#include <timezoneapi.h> + /* The 'overlapped' data structure used by async I/O functions. */ typedef struct _OVERLAPPED { @@ -643,34 +645,6 @@ typedef struct _PROCESS_INFORMATION{ DWORD dwThreadId; } PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION; -typedef struct _TIME_DYNAMIC_ZONE_INFORMATION -{ - LONG Bias; - WCHAR StandardName[32]; - SYSTEMTIME StandardDate; - LONG StandardBias; - WCHAR DaylightName[32]; - SYSTEMTIME DaylightDate; - LONG DaylightBias; - WCHAR TimeZoneKeyName[128]; - BOOLEAN DynamicDaylightTimeDisabled; -} DYNAMIC_TIME_ZONE_INFORMATION, *PDYNAMIC_TIME_ZONE_INFORMATION; - -typedef struct _TIME_ZONE_INFORMATION{ - LONG Bias; - WCHAR StandardName[32]; - SYSTEMTIME StandardDate; - LONG StandardBias; - WCHAR DaylightName[32]; - SYSTEMTIME DaylightDate; - LONG DaylightBias; -} TIME_ZONE_INFORMATION, *PTIME_ZONE_INFORMATION, *LPTIME_ZONE_INFORMATION; - -#define TIME_ZONE_ID_INVALID ((DWORD)0xFFFFFFFF) -#define TIME_ZONE_ID_UNKNOWN 0 -#define TIME_ZONE_ID_STANDARD 1 -#define TIME_ZONE_ID_DAYLIGHT 2 - /* CreateProcess: dwCreationFlag values */ #define DEBUG_PROCESS 0x00000001 @@ -2156,7 +2130,6 @@ WINBASEAPI DWORD WINAPI GetDllDirectoryW(DWORD,LPWSTR); WINBASEAPI UINT WINAPI GetDriveTypeA(LPCSTR); WINBASEAPI UINT WINAPI GetDriveTypeW(LPCWSTR); #define GetDriveType WINELIB_NAME_AW(GetDriveType) -WINBASEAPI DWORD WINAPI GetDynamicTimeZoneInformation(PDYNAMIC_TIME_ZONE_INFORMATION); WINBASEAPI LPSTR WINAPI GetEnvironmentStringsA(void); WINBASEAPI LPWSTR WINAPI GetEnvironmentStringsW(void); #define GetEnvironmentStrings WINELIB_NAME_AW(GetEnvironmentStrings) @@ -2320,17 +2293,16 @@ WINBASEAPI UINT WINAPI GetTempFileNameW(LPCWSTR,LPCWSTR,UINT,LPWSTR); WINBASEAPI DWORD WINAPI GetTempPathA(DWORD,LPSTR); WINBASEAPI DWORD WINAPI GetTempPathW(DWORD,LPWSTR); #define GetTempPath WINELIB_NAME_AW(GetTempPath) -WINBASEAPI DWORD WINAPI GetThreadId(HANDLE); -WINBASEAPI BOOL WINAPI GetThreadIOPendingFlag(HANDLE,PBOOL); -WINBASEAPI DWORD WINAPI GetTickCount(void); -WINBASEAPI ULONGLONG WINAPI GetTickCount64(void); -WINBASEAPI DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION); WINBASEAPI BOOL WINAPI GetThreadContext(HANDLE,CONTEXT *); WINBASEAPI DWORD WINAPI GetThreadErrorMode(void); +WINBASEAPI DWORD WINAPI GetThreadId(HANDLE); +WINBASEAPI BOOL WINAPI GetThreadIOPendingFlag(HANDLE,PBOOL); WINBASEAPI INT WINAPI GetThreadPriority(HANDLE); WINBASEAPI BOOL WINAPI GetThreadPriorityBoost(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI GetThreadSelectorEntry(HANDLE,DWORD,LPLDT_ENTRY); WINBASEAPI BOOL WINAPI GetThreadTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME); +WINBASEAPI DWORD WINAPI GetTickCount(void); +WINBASEAPI ULONGLONG WINAPI GetTickCount64(void); WINADVAPI BOOL WINAPI GetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,LPVOID,DWORD,LPDWORD); WINBASEAPI BOOL WINAPI GetUmsCompletionListEvent(PUMS_COMPLETION_LIST, PHANDLE); WINADVAPI BOOL WINAPI GetUserNameA(LPSTR,LPDWORD); @@ -2644,7 +2616,6 @@ WINBASEAPI BOOL WINAPI SetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,DWORD); WINBASEAPI BOOL WINAPI SetDllDirectoryA(LPCSTR); WINBASEAPI BOOL WINAPI SetDllDirectoryW(LPCWSTR); #define SetDllDirectory WINELIB_NAME_AW(SetDllDirectory) -WINBASEAPI BOOL WINAPI SetDynamicTimeZoneInformation(const DYNAMIC_TIME_ZONE_INFORMATION*); WINBASEAPI BOOL WINAPI SetEndOfFile(HANDLE); WINBASEAPI BOOL WINAPI SetEnvironmentVariableA(LPCSTR,LPCSTR); WINBASEAPI BOOL WINAPI SetEnvironmentVariableW(LPCWSTR,LPCWSTR); @@ -2703,7 +2674,6 @@ WINBASEAPI BOOL WINAPI SetThreadPriority(HANDLE,INT); WINBASEAPI BOOL WINAPI SetThreadPriorityBoost(HANDLE,BOOL); WINADVAPI BOOL WINAPI SetThreadToken(PHANDLE,HANDLE); WINBASEAPI HANDLE WINAPI SetTimerQueueTimer(HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,BOOL); -WINBASEAPI BOOL WINAPI SetTimeZoneInformation(const TIME_ZONE_INFORMATION *); WINADVAPI BOOL WINAPI SetTokenInformation(HANDLE,TOKEN_INFORMATION_CLASS,LPVOID,DWORD); WINBASEAPI LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER); WINBASEAPI BOOL WINAPI SetVolumeLabelA(LPCSTR,LPCSTR); @@ -2726,7 +2696,6 @@ WINBASEAPI DWORD WINAPI SuspendThread(HANDLE); WINBASEAPI void WINAPI SwitchToFiber(LPVOID); WINBASEAPI BOOL WINAPI SwitchToThread(void); WINBASEAPI BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME); -WINBASEAPI BOOL WINAPI SystemTimeToTzSpecificLocalTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); WINBASEAPI BOOL WINAPI TerminateJobObject(HANDLE,UINT); WINBASEAPI BOOL WINAPI TerminateProcess(HANDLE,DWORD); WINBASEAPI BOOL WINAPI TerminateThread(HANDLE,DWORD); @@ -2739,7 +2708,6 @@ WINBASEAPI BOOL WINAPI TransmitCommChar(HANDLE,CHAR); WINBASEAPI BOOLEAN WINAPI TryAcquireSRWLockExclusive(PSRWLOCK); WINBASEAPI BOOLEAN WINAPI TryAcquireSRWLockShared(PSRWLOCK); WINBASEAPI BOOL WINAPI TryEnterCriticalSection(CRITICAL_SECTION *lpCrit); -WINBASEAPI BOOL WINAPI TzSpecificLocalTimeToSystemTime(const TIME_ZONE_INFORMATION*,const SYSTEMTIME*,LPSYSTEMTIME); WINBASEAPI LONG WINAPI UnhandledExceptionFilter(PEXCEPTION_POINTERS); WINBASEAPI BOOL WINAPI UnlockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED);

1 0

Alexandre Julliard : kernelbase: Reimplement EnumDynamicTimeZoneInformation() using GetTimeZoneInformationForYear().
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 356d0fcc5b171cea536b351772da7429d7b7c5a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=356d0fcc5b171cea536b3517… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 14:55:34 2019 +0100 kernelbase: Reimplement EnumDynamicTimeZoneInformation() using GetTimeZoneInformationForYear(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 26 +++++++++++++++++++ dlls/kernelbase/registry.c | 63 ---------------------------------------------- 2 files changed, 26 insertions(+), 63 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 444affa6a3..fba15555d2 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2952,6 +2952,32 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumDateFormatsExEx( DATEFMT_ENUMPROCEXEX proc, co } + +/****************************************************************************** + * EnumDynamicTimeZoneInformation (kernelbase.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH EnumDynamicTimeZoneInformation( DWORD index, + DYNAMIC_TIME_ZONE_INFORMATION *info ) +{ + DYNAMIC_TIME_ZONE_INFORMATION tz; + LSTATUS ret; + DWORD size; + + if (!info) return ERROR_INVALID_PARAMETER; + + size = ARRAY_SIZE(tz.TimeZoneKeyName); + ret = RegEnumKeyExW( tz_key, index, tz.TimeZoneKeyName, &size, NULL, NULL, NULL, NULL ); + if (ret) return ret; + + tz.DynamicDaylightTimeDisabled = TRUE; + if (!GetTimeZoneInformationForYear( 0, &tz, (TIME_ZONE_INFORMATION *)info )) return GetLastError(); + + lstrcpyW( info->TimeZoneKeyName, tz.TimeZoneKeyName ); + info->DynamicDaylightTimeDisabled = FALSE; + return 0; +} + + /****************************************************************************** * EnumLanguageGroupLocalesW (kernelbase.@) */ diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 0961cb0850..e482d11cb2 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -3045,69 +3045,6 @@ LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD return ERROR_SUCCESS; } -/****************************************************************************** - * EnumDynamicTimeZoneInformation (kernelbase.@) - */ -DWORD WINAPI EnumDynamicTimeZoneInformation(const DWORD index, - DYNAMIC_TIME_ZONE_INFORMATION *dtzi) -{ - static const WCHAR mui_stdW[] = { 'M','U','I','_','S','t','d',0 }; - static const WCHAR mui_dltW[] = { 'M','U','I','_','D','l','t',0 }; - WCHAR keyname[ARRAY_SIZE(dtzi->TimeZoneKeyName)]; - HKEY time_zones_key, sub_key; - LSTATUS ret; - DWORD size; - 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; - - ret = RegOpenKeyExA( HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", 0, - KEY_ENUMERATE_SUB_KEYS|KEY_QUERY_VALUE, &time_zones_key ); - if (ret) return ret; - - sub_key = NULL; - size = ARRAY_SIZE(keyname); - ret = RegEnumKeyExW( time_zones_key, index, keyname, &size, NULL, NULL, NULL, NULL ); - if (ret) goto cleanup; - - ret = RegOpenKeyExW( time_zones_key, keyname, 0, KEY_QUERY_VALUE, &sub_key ); - if (ret) goto cleanup; - - size = sizeof(dtzi->StandardName); - ret = RegLoadMUIStringW( sub_key, mui_stdW, dtzi->StandardName, size, NULL, 0, system_dir ); - if (ret) goto cleanup; - - size = sizeof(dtzi->DaylightName); - ret = RegLoadMUIStringW( sub_key, mui_dltW, dtzi->DaylightName, size, NULL, 0, system_dir ); - if (ret) goto cleanup; - - size = sizeof(tz_data); - ret = RegQueryValueExA( sub_key, "TZI", NULL, NULL, (BYTE*)&tz_data, &size ); - if (ret) goto cleanup; - - 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, keyname ); - dtzi->DynamicDaylightTimeDisabled = FALSE; - -cleanup: - if (sub_key) RegCloseKey( sub_key ); - RegCloseKey( time_zones_key ); - return ret; -} - struct USKEY {

1 0

Alexandre Julliard : kernelbase: Implement DnsHostnameToComputerNameExW().
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: e2ab5b76c192ef1484acb41155ca07d998c79d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ab5b76c192ef1484acb411… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 17:48:18 2019 +0100 kernelbase: Implement DnsHostnameToComputerNameExW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/registry.c | 32 ++++++++++++++++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index a9ef04aa17..5b3e10f85b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -267,7 +267,7 @@ @ stdcall DisassociateCurrentThreadFromCallback(ptr) ntdll.TpDisassociateCallback # @ stub DiscardVirtualMemory @ stdcall DisconnectNamedPipe(long) -# @ stub DnsHostnameToComputerNameExW +@ stdcall DnsHostnameToComputerNameExW(wstr ptr ptr) # @ stub DsBindWithSpnExW # @ stub DsCrackNamesW # @ stub DsFreeDomainControllerInfoW diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index e482d11cb2..b3297a3ad5 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -3046,6 +3046,38 @@ LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD } +/*********************************************************************** + * DnsHostnameToComputerNameExW (kernelbase.@) + * + * FIXME: how is this different from the non-Ex function? + */ +BOOL WINAPI DECLSPEC_HOTPATCH DnsHostnameToComputerNameExW( const WCHAR *hostname, WCHAR *computername, + DWORD *size ) +{ + static const WCHAR allowed[] = L"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&')(-_{}"; + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD i, len; + + lstrcpynW( buffer, hostname, MAX_COMPUTERNAME_LENGTH + 1 ); + len = lstrlenW( buffer ); + if (*size < len + 1) + { + *size = len; + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + *size = len; + if (!computername) return FALSE; + for (i = 0; i < len; i++) + { + if (buffer[i] >= 'a' && buffer[i] <= 'z') computername[i] = buffer[i] + 'A' - 'a'; + else computername[i] = wcschr( allowed, buffer[i] ) ? buffer[i] : '_'; + } + computername[len] = 0; + return TRUE; +} + + struct USKEY { HKEY HKCUstart; /* Start key in CU hive */ diff --git a/include/winbase.h b/include/winbase.h index 320e243034..c550ed816d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1958,6 +1958,7 @@ WINBASEAPI BOOL WINAPI DisconnectNamedPipe(HANDLE); WINBASEAPI BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR,LPSTR,LPDWORD); WINBASEAPI BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR,LPWSTR,LPDWORD); #define DnsHostnameToComputerName WINELIB_NAME_AW(DnsHostnameToComputerName) +WINBASEAPI BOOL WINAPI DnsHostnameToComputerNameExW(LPCWSTR,LPWSTR,LPDWORD); WINBASEAPI BOOL WINAPI DosDateTimeToFileTime(WORD,WORD,LPFILETIME); WINBASEAPI BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD,BOOL,DWORD); WINADVAPI BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE);

1 0

Alexandre Julliard : kernelbase: Implement the Get/SetComputerName functions.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 7822b854110dd1da0471489beab8f6ce04eb418b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7822b854110dd1da0471489b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 19:18:15 2019 +0100 kernelbase: Implement the Get/SetComputerName functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/kernelbase.spec | 12 +-- dlls/kernelbase/registry.c | 216 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 221 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 5b3e10f85b..afa3b0192f 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -437,8 +437,8 @@ @ stdcall GetCommandLineW() @ stdcall GetCompressedFileSizeA(long ptr) @ stdcall GetCompressedFileSizeW(long ptr) -@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA -@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetComputerNameExA(long ptr ptr) +@ stdcall GetComputerNameExW(long ptr ptr) @ stdcall GetConsoleCP() @ stdcall GetConsoleCursorInfo(long ptr) @ stdcall GetConsoleInputExeNameA(long ptr) @@ -1397,11 +1397,11 @@ @ stdcall SetCommMask(long long) @ stdcall SetCommState(long ptr) @ stdcall SetCommTimeouts(long ptr) -@ stdcall SetComputerNameA(str) kernel32.SetComputerNameA +@ stdcall SetComputerNameA(str) # @ stub SetComputerNameEx2W -@ stdcall SetComputerNameExA(long str) kernel32.SetComputerNameExA -@ stdcall SetComputerNameExW(long wstr) kernel32.SetComputerNameExW -@ stdcall SetComputerNameW(wstr) kernel32.SetComputerNameW +@ stdcall SetComputerNameExA(long str) +@ stdcall SetComputerNameExW(long wstr) +@ stdcall SetComputerNameW(wstr) @ stdcall SetConsoleActiveScreenBuffer(long) @ stdcall SetConsoleCP(long) @ stdcall SetConsoleCtrlHandler(ptr long) kernel32.SetConsoleCtrlHandler diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index b3297a3ad5..72b7711714 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -109,6 +109,8 @@ static struct list reg_mui_cache = LIST_INIT(reg_mui_cache); /* MRU */ static unsigned int reg_mui_cache_count; #define REG_MUI_CACHE_SIZE 8 +#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + /* check if value type needs string conversion (Ansi<->Unicode) */ static inline BOOL is_string( DWORD type ) { @@ -1374,7 +1376,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD data = pdb + 1; pdb->SystemNameOffset = sizeof(*pdb); pdb->SystemNameLength = (data_size - sizeof(*pdb)) / sizeof(WCHAR); - if (!GetComputerNameW(data, &pdb->SystemNameLength)) + if (!GetComputerNameExW(ComputerNameNetBIOS, data, &pdb->SystemNameLength)) return ERROR_MORE_DATA; pdb->SystemNameLength++; @@ -3078,6 +3080,218 @@ BOOL WINAPI DECLSPEC_HOTPATCH DnsHostnameToComputerNameExW( const WCHAR *hostnam } +/*********************************************************************** + * GetComputerNameExA (kernelbase.@) + */ +BOOL WINAPI GetComputerNameExA( COMPUTER_NAME_FORMAT type, char *name, DWORD *len ) +{ + BOOL ret = FALSE; + DWORD lenA, lenW = 0; + WCHAR *buffer; + + GetComputerNameExW( type, NULL, &lenW ); + if (GetLastError() != ERROR_MORE_DATA) return FALSE; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + if (GetComputerNameExW( type, buffer, &lenW )) + { + lenA = WideCharToMultiByte( CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL ); + if (lenA > *len) + { + *len = lenA; + SetLastError( ERROR_MORE_DATA ); + } + else + { + WideCharToMultiByte( CP_ACP, 0, buffer, -1, name, *len, NULL, NULL ); + *len = lenA - 1; + ret = TRUE; + } + } + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + + +/*********************************************************************** + * GetComputerNameExW (kernelbase.@) + */ +BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, WCHAR *name, DWORD *len ) +{ + const WCHAR *keyname, *valuename; + LRESULT ret; + HKEY key; + + switch (type) + { + case ComputerNameNetBIOS: + case ComputerNamePhysicalNetBIOS: + keyname = L"System\\CurrentControlSet\\Control\\ComputerName\\ActiveComputerName"; + valuename = L"ComputerName"; + break; + case ComputerNameDnsHostname: + case ComputerNamePhysicalDnsHostname: + keyname = L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters"; + valuename = L"Hostname"; + break; + case ComputerNameDnsDomain: + case ComputerNamePhysicalDnsDomain: + keyname = L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters"; + valuename = L"Domain"; + break; + case ComputerNameDnsFullyQualified: + case ComputerNamePhysicalDnsFullyQualified: + { + WCHAR buffer[256]; + DWORD size = ARRAY_SIZE(buffer); + + if (!GetComputerNameExW( ComputerNameDnsHostname, buffer, &size )) return FALSE; + lstrcatW( buffer, L"." ); + size = ARRAY_SIZE(buffer) - lstrlenW(buffer); + if (!GetComputerNameExW( ComputerNameDnsDomain, buffer + lstrlenW(buffer), &size )) return FALSE; + size = lstrlenW(buffer); + if (name && size < *len) + { + if (name) lstrcpyW( name, buffer ); + *len = size; + return TRUE; + } + *len = size + 1; + SetLastError( ERROR_MORE_DATA ); + return FALSE; + } + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (!(ret = RegOpenKeyExW( HKEY_LOCAL_MACHINE, keyname, 0, KEY_READ, &key ))) + { + DWORD size = *len * sizeof(WCHAR); + ret = RegQueryValueExW( key, valuename, NULL, NULL, (BYTE *)name, &size ); + if (!name) ret = ERROR_MORE_DATA; + else if (!ret) size -= sizeof(WCHAR); + *len = size / sizeof(WCHAR); + RegCloseKey( key ); + } + TRACE("-> %lu %s\n", ret, debugstr_w(name) ); + if (ret) SetLastError( ret ); + return !ret; +} + + +/*********************************************************************** + * SetComputerNameA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetComputerNameA( const char *name ) +{ + BOOL ret; + DWORD len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); + WCHAR *nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); + ret = SetComputerNameExW( ComputerNamePhysicalNetBIOS, nameW ); + HeapFree( GetProcessHeap(), 0, nameW ); + return ret; +} + + +/*********************************************************************** + * SetComputerNameW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetComputerNameW( const WCHAR *name ) +{ + return SetComputerNameExW( ComputerNamePhysicalNetBIOS, name ); +} + + +/*********************************************************************** + * SetComputerNameExA (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetComputerNameExA( COMPUTER_NAME_FORMAT type, const char *name ) +{ + BOOL ret; + DWORD len = MultiByteToWideChar( CP_ACP, 0, name, -1, NULL, 0 ); + WCHAR *nameW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + + MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, len ); + ret = SetComputerNameExW( type, nameW ); + HeapFree( GetProcessHeap(), 0, nameW ); + return ret; +} + + +/*********************************************************************** + * SetComputerNameExW (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetComputerNameExW( COMPUTER_NAME_FORMAT type, const WCHAR *name ) +{ + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD size; + HKEY key; + LRESULT ret; + + TRACE( "%u %s\n", type, debugstr_w( name )); + + switch (type) + { + case ComputerNameDnsHostname: + case ComputerNamePhysicalDnsHostname: + ret = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + if (ret) break; + ret = RegSetValueExW( key, L"Hostname", 0, REG_SZ, + (BYTE *)name, (lstrlenW(name) + 1) * sizeof(WCHAR) ); + RegCloseKey( key ); + /* fall through */ + + case ComputerNameNetBIOS: + case ComputerNamePhysicalNetBIOS: + /* @@ Wine registry key: HKCU\Software\Wine\Network */ + if (!RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Wine\\Network", 0, KEY_READ, &key )) + { + BOOL use_dns = TRUE; + size = sizeof(buffer); + if (!RegQueryValueExW( key, L"UseDnsComputerName", NULL, NULL, (BYTE *)buffer, &size )) + use_dns = IS_OPTION_TRUE( buffer[0] ); + RegCloseKey( key ); + if (!use_dns) + { + ret = ERROR_ACCESS_DENIED; + break; + } + } + size = ARRAY_SIZE( buffer ); + if (!DnsHostnameToComputerNameExW( name, buffer, &size )) return FALSE; + ret = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\ComputerName\\ComputerName", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + if (ret) break; + ret = RegSetValueExW( key, L"ComputerName", 0, REG_SZ, + (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); + RegCloseKey( key ); + break; + + case ComputerNameDnsDomain: + case ComputerNamePhysicalDnsDomain: + ret = RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL ); + if (ret) break; + ret = RegSetValueExW( key, L"Domain", 0, REG_SZ, + (BYTE *)name, (lstrlenW(name) + 1) * sizeof(WCHAR) ); + RegCloseKey( key ); + break; + default: + ret = ERROR_INVALID_PARAMETER; + break; + } + if (ret) SetLastError( ret ); + return !ret; +} + struct USKEY { HKEY HKCUstart; /* Start key in CU hive */

1 0

Alexandre Julliard : kernel32: Use the Get/SetComputerName functions from kernelbase.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: f2e5b8070776268912e1886d4516d7ddec6969fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2e5b8070776268912e1886d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 19:19:12 2019 +0100 kernel32: Use the Get/SetComputerName functions from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/computername.c | 542 ++++-------------------------------------- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/tests/environ.c | 11 + 3 files changed, 61 insertions(+), 502 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2e5b8070776268912e1…

1 0

Alexandre Julliard : kernelbase: Save registry keys directly to the destination file.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 2d0e8ff672058336ce0ef48eeb99accbd51015ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d0e8ff672058336ce0ef48e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 12 11:16:59 2019 +0100 kernelbase: Save registry keys directly to the destination file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/registry.c | 51 ++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index ad9a2a3366..0961cb0850 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2263,12 +2263,10 @@ LSTATUS WINAPI RegLoadKeyA( HKEY hkey, LPCSTR subkey, LPCSTR filename ) */ LSTATUS WINAPI RegSaveKeyExW( HKEY hkey, LPCWSTR file, SECURITY_ATTRIBUTES *sa, DWORD flags ) { - static const WCHAR format[] = - {'r','e','g','%','0','4','x','.','t','m','p',0}; - WCHAR buffer[MAX_PATH]; - int count = 0; - LPWSTR nameW; - DWORD ret, err; + UNICODE_STRING nameW; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + NTSTATUS status; HANDLE handle; TRACE( "(%p,%s,%p)\n", hkey, debugstr_w(file), sa ); @@ -2276,39 +2274,20 @@ LSTATUS WINAPI RegSaveKeyExW( HKEY hkey, LPCWSTR file, SECURITY_ATTRIBUTES *sa, if (!file || !*file) return ERROR_INVALID_PARAMETER; if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; - err = GetLastError(); - GetFullPathNameW( file, ARRAY_SIZE( buffer ), buffer, &nameW ); - - for (;;) - { - swprintf( nameW, 16, format, count++ ); - handle = CreateFileW( buffer, GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); - if (handle != INVALID_HANDLE_VALUE) break; - if ((ret = GetLastError()) != ERROR_FILE_EXISTS) goto done; - - /* Something gone haywire ? Please report if this happens abnormally */ - if (count >= 100) - MESSAGE("Wow, we are already fiddling with a temp file %s with an ordinal as high as %d !\nYou might want to delete all corresponding temp files in that directory.\n", debugstr_w(buffer), count); - } - - ret = RtlNtStatusToDosError(NtSaveKey(hkey, handle)); + if ((status = RtlDosPathNameToNtPathName_U_WithStatus( file, &nameW, NULL, NULL ))) + return RtlNtStatusToDosError( status ); - CloseHandle( handle ); - if (!ret) + InitializeObjectAttributes( &attr, &nameW, OBJ_CASE_INSENSITIVE, 0, sa ); + status = NtCreateFile( &handle, GENERIC_WRITE | SYNCHRONIZE, &attr, &io, NULL, FILE_NON_DIRECTORY_FILE, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OVERWRITE_IF, + FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + RtlFreeUnicodeString( &nameW ); + if (!status) { - if (!MoveFileExW( buffer, file, MOVEFILE_REPLACE_EXISTING )) - { - ERR( "Failed to move %s to %s\n", debugstr_w(buffer), - debugstr_w(file) ); - ret = GetLastError(); - } + status = NtSaveKey( hkey, handle ); + CloseHandle( handle ); } - if (ret) DeleteFileW( buffer ); - -done: - SetLastError( err ); /* restore last error code */ - return ret; + return RtlNtStatusToDosError( status ); }

1 0

Alistair Leslie-Hughes : oledb32: Implement IDataSourceLocator PromptNew.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

1 0

Michael Stefaniuc : dmloader: Just use dump_DMUS_OBJECTDESC().
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: 55252b97ca4ed5133918a925730c97d01fba8514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55252b97ca4ed5133918a925… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 12 01:10:59 2019 +0100 dmloader: Just use dump_DMUS_OBJECTDESC(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/container.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 39b105a159..f7c7f3e951 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -307,23 +307,20 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS TRACE_(dmfile)(": GUID chunk\n"); IStream_Read (pStm, &This->dmobj.desc.guidObject, Chunk.dwSize, NULL); This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; - TRACE_(dmdump)(": GUID: %s\n", debugstr_guid(&This->dmobj.desc.guidObject)); break; } case DMUS_FOURCC_VERSION_CHUNK: { TRACE_(dmfile)(": version chunk\n"); IStream_Read (pStm, &This->dmobj.desc.vVersion, Chunk.dwSize, NULL); This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; - TRACE_(dmdump)(": version: %s\n", debugstr_dmversion(&This->dmobj.desc.vVersion)); break; } case DMUS_FOURCC_DATE_CHUNK: { TRACE_(dmfile)(": date chunk\n"); IStream_Read (pStm, &This->dmobj.desc.ftDate, Chunk.dwSize, NULL); This->dmobj.desc.dwValidData |= DMUS_OBJ_DATE; - TRACE_(dmdump)(": date: %s\n", debugstr_filetime(&This->dmobj.desc.ftDate)); break; - } + } case DMUS_FOURCC_CATEGORY_CHUNK: { TRACE_(dmfile)(": category chunk\n"); /* if it happens that string is too long, @@ -336,7 +333,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IStream_Read (pStm, This->dmobj.desc.wszCategory, Chunk.dwSize, NULL); } This->dmobj.desc.dwValidData |= DMUS_OBJ_CATEGORY; - TRACE_(dmdump)(": category: %s\n", debugstr_w(This->dmobj.desc.wszCategory)); break; } case FOURCC_LIST: { @@ -367,7 +363,6 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS IStream_Read (pStm, This->dmobj.desc.wszName, Chunk.dwSize, NULL); } This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; - TRACE_(dmdump)(": name: %s\n", debugstr_w(This->dmobj.desc.wszName)); break; } default: { @@ -606,6 +601,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS } TRACE_(dmfile)(": reading finished\n"); This->dmobj.desc.dwValidData |= DMUS_OBJ_LOADED; + dump_DMUS_OBJECTDESC(&This->dmobj.desc); break; } default: {

1 0

Jacek Caban : configure: Silence -Wincompatible-library-redeclaration warning.
by Alexandre Julliard Dec. 12, 2019

Dec. 12, 2019

Module: wine Branch: master Commit: ee9beb58639269074a4761fa67eaba95fb6fe149 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9beb58639269074a4761fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 10 20:19:33 2019 +0100 configure: Silence -Wincompatible-library-redeclaration warning. This is noisy on clang and we can't change declarations due to long double type incompatibility. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 31 +++++++++++++++++++++++++++++++ configure.ac | 2 ++ 2 files changed, 33 insertions(+) diff --git a/configure b/configure index a5c504b70b..3af68ca71c 100755 --- a/configure +++ b/configure @@ -10295,6 +10295,37 @@ $as_echo "$ac_cv_crosscflags__Wlogical_op" >&6; } if test "x$ac_cv_crosscflags__Wlogical_op" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wlogical-op" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wincompatible-library-redeclaration" >&5 +$as_echo_n "checking whether the cross-compiler supports -Wincompatible-library-redeclaration... " >&6; } +if ${ac_cv_crosscflags__Wincompatible_library_redeclaration+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -Wincompatible-library-redeclaration" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__Wincompatible_library_redeclaration=yes +else + ac_cv_crosscflags__Wincompatible_library_redeclaration=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wincompatible_library_redeclaration" >&5 +$as_echo "$ac_cv_crosscflags__Wincompatible_library_redeclaration" >&6; } +if test "x$ac_cv_crosscflags__Wincompatible_library_redeclaration" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-incompatible-library-redeclaration" +fi case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -fno-omit-frame-pointer" >&5 diff --git a/configure.ac b/configure.ac index 13f971866b..a3bece9e8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1074,6 +1074,8 @@ then WINE_TRY_CROSSCFLAGS([-Wwrite-strings]) WINE_TRY_CROSSCFLAGS([-Wpointer-arith]) WINE_TRY_CROSSCFLAGS([-Wlogical-op]) + WINE_TRY_CROSSCFLAGS([-Wincompatible-library-redeclaration], + [EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-incompatible-library-redeclaration"]) case $host_cpu in *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) ;;

1 0