July 2020 - Wine-Commits - list.winehq.org

Francois Gouget : mshtml: Fix the spelling of a MoveUnitBounded() parameter.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: a029551e7c533df2485a636596ce9b0ce99084b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a029551e7c533df2485a6365… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 17 13:22:45 2020 +0200 mshtml: Fix the spelling of a MoveUnitBounded() parameter. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/range.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index c15470c4ff..7db62f49a1 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -2343,10 +2343,10 @@ static HRESULT WINAPI MarkupPointer2_MoveToMarkupPosition(IMarkupPointer2 *iface return E_NOTIMPL; } -static HRESULT WINAPI MarkupPointer2_MoveUnitBounded(IMarkupPointer2 *iface, MOVEUNIT_ACTION action, IMarkupPointer *boundry) +static HRESULT WINAPI MarkupPointer2_MoveUnitBounded(IMarkupPointer2 *iface, MOVEUNIT_ACTION action, IMarkupPointer *boundary) { MarkupPointer *This = impl_from_IMarkupPointer2(iface); - FIXME("(%p)->(%u %p)\n", This, action, boundry); + FIXME("(%p)->(%u %p)\n", This, action, boundary); return E_NOTIMPL; }

1 0

Francois Gouget : kernel32: FILE_SetDosError() is not used anymore so remove it.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 500131b2f5fcdc09eb15bb5db740b6ae5dfd9390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=500131b2f5fcdc09eb15bb5d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jul 17 13:22:30 2020 +0200 kernel32: FILE_SetDosError() is not used anymore so remove it. The last user, RemoveDirectoryA/W(), has been moved to kernelbase. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 67 ------------------------------------------ dlls/kernel32/kernel_private.h | 1 - 2 files changed, 68 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 29dd5791af..949be6c303 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -92,73 +92,6 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) } -/*********************************************************************** - * FILE_SetDosError - * - * Set the DOS error code from errno. - */ -void FILE_SetDosError(void) -{ - int save_errno = errno; /* errno gets overwritten by printf */ - - TRACE("errno = %d %s\n", errno, strerror(errno)); - switch (save_errno) - { - case EAGAIN: - SetLastError( ERROR_SHARING_VIOLATION ); - break; - case EBADF: - SetLastError( ERROR_INVALID_HANDLE ); - break; - case ENOSPC: - SetLastError( ERROR_HANDLE_DISK_FULL ); - break; - case EACCES: - case EPERM: - case EROFS: - SetLastError( ERROR_ACCESS_DENIED ); - break; - case EBUSY: - SetLastError( ERROR_LOCK_VIOLATION ); - break; - case ENOENT: - SetLastError( ERROR_FILE_NOT_FOUND ); - break; - case EISDIR: - SetLastError( ERROR_CANNOT_MAKE ); - break; - case ENFILE: - case EMFILE: - SetLastError( ERROR_TOO_MANY_OPEN_FILES ); - break; - case EEXIST: - SetLastError( ERROR_FILE_EXISTS ); - break; - case EINVAL: - case ESPIPE: - SetLastError( ERROR_SEEK ); - break; - case ENOTEMPTY: - SetLastError( ERROR_DIR_NOT_EMPTY ); - break; - case ENOEXEC: - SetLastError( ERROR_BAD_FORMAT ); - break; - case ENOTDIR: - SetLastError( ERROR_PATH_NOT_FOUND ); - break; - case EXDEV: - SetLastError( ERROR_NOT_SAME_DEVICE ); - break; - default: - WARN("unknown file error: %s\n", strerror(save_errno) ); - SetLastError( ERROR_GEN_FAILURE ); - break; - } - errno = save_errno; -} - - /*********************************************************************** * FILE_name_AtoW * diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index bcf2ee9a52..2a0e524748 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -60,7 +60,6 @@ extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; extern const WCHAR DIR_Windows[] DECLSPEC_HIDDEN; extern const WCHAR DIR_System[] DECLSPEC_HIDDEN; -extern void FILE_SetDosError(void) DECLSPEC_HIDDEN; extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : dxgi: Implement IDXGIOutput5 and IDXGIOutput6 stubs.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: d806203850c9666ff32637f5215fbb21a0f2bc9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d806203850c9666ff32637f5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 16 17:26:52 2020 +0200 dxgi: Implement IDXGIOutput5 and IDXGIOutput6 stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 166 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 123 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d806203850c9666ff326…

1 0

Alexandre Julliard : ntdll: Move some power stub functions to the Unix library.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: e0a2f85b788b5cd764582a71fadaee11f06ab979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a2f85b788b5cd764582a71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 11:54:24 2020 +0200 ntdll: Move some power stub functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 65 ------------------------------------------------ dlls/ntdll/ntdll.spec | 20 +++++++-------- dlls/ntdll/unix/system.c | 55 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 75 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d27dca4be0..cc13672b2b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -885,71 +885,6 @@ NTSTATUS WINAPI NtDisplayString ( PUNICODE_STRING string ) return ret; } -/****************************************************************************** - * NtInitiatePowerAction [NTDLL.@] - * - */ -NTSTATUS WINAPI NtInitiatePowerAction( - IN POWER_ACTION SystemAction, - IN SYSTEM_POWER_STATE MinSystemState, - IN ULONG Flags, - IN BOOLEAN Asynchronous) -{ - FIXME("(%d,%d,0x%08x,%d),stub\n", - SystemAction,MinSystemState,Flags,Asynchronous); - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtSetThreadExecutionState [NTDLL.@] - * - */ -NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_STATE *old_state ) -{ - static EXECUTION_STATE current = - ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; - *old_state = current; - - WARN( "(0x%x, %p): stub, harmless.\n", new_state, old_state ); - - if (!(current & ES_CONTINUOUS) || (new_state & ES_CONTINUOUS)) - current = new_state; - return STATUS_SUCCESS; -} - -/****************************************************************************** - * NtCreatePowerRequest [NTDLL.@] - * - */ -NTSTATUS WINAPI NtCreatePowerRequest( HANDLE *handle, COUNTED_REASON_CONTEXT *context ) -{ - FIXME( "(%p, %p): stub\n", handle, context ); - - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtSetPowerRequest [NTDLL.@] - * - */ -NTSTATUS WINAPI NtSetPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) -{ - FIXME( "(%p, %u): stub\n", handle, type ); - - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtClearPowerRequest [NTDLL.@] - * - */ -NTSTATUS WINAPI NtClearPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) -{ - FIXME( "(%p, %u): stub\n", handle, type ); - - return STATUS_NOT_IMPLEMENTED; -} - /****************************************************************************** * NtAllocateLocallyUniqueId (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 22cb9d1942..6293dc81ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -149,7 +149,7 @@ @ stdcall -syscall NtCancelIoFileEx(long ptr ptr) @ stdcall -syscall NtCancelTimer(long ptr) @ stdcall -syscall NtClearEvent(long) -@ stdcall NtClearPowerRequest(long long) +@ stdcall -syscall NtClearPowerRequest(long long) @ stdcall NtClose(long) @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys @@ -175,7 +175,7 @@ @ stdcall -syscall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) @ stdcall NtCreatePagingFile(ptr ptr ptr ptr) @ stdcall NtCreatePort(ptr ptr long long ptr) -@ stdcall NtCreatePowerRequest(ptr ptr) +@ stdcall -syscall NtCreatePowerRequest(ptr ptr) @ stub NtCreateProcess # @ stub NtCreateProcessEx @ stub NtCreateProfile @@ -230,7 +230,7 @@ @ stub NtImpersonateClientOfPort @ stub NtImpersonateThread @ stub NtInitializeRegistry -@ stdcall NtInitiatePowerAction (long long long long) +@ stdcall -syscall NtInitiatePowerAction (long long long long) @ stdcall -syscall NtIsProcessInJob(long long) # @ stub NtIsSystemResumeAutomatic @ stdcall NtListenPort(ptr ptr) @@ -386,7 +386,7 @@ @ stub NtSetLowEventPair @ stub NtSetLowWaitHighEventPair @ stub NtSetLowWaitHighThread -@ stdcall NtSetPowerRequest(long long) +@ stdcall -syscall NtSetPowerRequest(long long) # @ stub NtSetQuotaInformationFile @ stdcall NtSetSecurityObject(long long ptr) @ stub NtSetSystemEnvironmentValue @@ -394,7 +394,7 @@ @ stdcall -syscall NtSetSystemInformation(long ptr long) @ stub NtSetSystemPowerState @ stdcall -syscall NtSetSystemTime(ptr ptr) -@ stdcall NtSetThreadExecutionState(long ptr) +@ stdcall -syscall NtSetThreadExecutionState(long ptr) @ stdcall -syscall NtSetTimer(long ptr ptr ptr long long ptr) @ stdcall -syscall NtSetTimerResolution(long long ptr) # @ stub NtSetUuidSeed @@ -1138,7 +1138,7 @@ @ stdcall -private -syscall ZwCancelIoFileEx(long ptr ptr) NtCancelIoFileEx @ stdcall -private -syscall ZwCancelTimer(long ptr) NtCancelTimer @ stdcall -private -syscall ZwClearEvent(long) NtClearEvent -@ stdcall -private ZwClearPowerRequest(long long) NtClearPowerRequest +@ stdcall -private -syscall ZwClearPowerRequest(long long) NtClearPowerRequest @ stdcall -private ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys @@ -1163,7 +1163,7 @@ @ stdcall -private -syscall ZwCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) NtCreateNamedPipeFile @ stdcall -private ZwCreatePagingFile(ptr ptr ptr ptr) NtCreatePagingFile @ stdcall -private ZwCreatePort(ptr ptr long long ptr) NtCreatePort -@ stdcall -private ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest +@ stdcall -private -syscall ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest @ stub ZwCreateProcess # @ stub ZwCreateProcessEx @ stub ZwCreateProfile @@ -1217,7 +1217,7 @@ @ stub ZwImpersonateClientOfPort @ stub ZwImpersonateThread @ stub ZwInitializeRegistry -@ stdcall -private ZwInitiatePowerAction(long long long long) NtInitiatePowerAction +@ stdcall -private -syscall ZwInitiatePowerAction(long long long long) NtInitiatePowerAction @ stdcall -private -syscall ZwIsProcessInJob(long long) NtIsProcessInJob # @ stub ZwIsSystemResumeAutomatic @ stdcall -private ZwListenPort(ptr ptr) NtListenPort @@ -1373,7 +1373,7 @@ @ stub ZwSetLowEventPair @ stub ZwSetLowWaitHighEventPair @ stub ZwSetLowWaitHighThread -@ stdcall -private ZwSetPowerRequest(long long) NtSetPowerRequest +@ stdcall -private -syscall ZwSetPowerRequest(long long) NtSetPowerRequest # @ stub ZwSetQuotaInformationFile @ stdcall -private ZwSetSecurityObject(long long ptr) NtSetSecurityObject @ stub ZwSetSystemEnvironmentValue @@ -1381,7 +1381,7 @@ @ stdcall -private -syscall ZwSetSystemInformation(long ptr long) NtSetSystemInformation @ stub ZwSetSystemPowerState @ stdcall -private -syscall ZwSetSystemTime(ptr ptr) NtSetSystemTime -@ stdcall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState +@ stdcall -private -syscall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @ stdcall -private -syscall ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer @ stdcall -private -syscall ZwSetTimerResolution(long long ptr) NtSetTimerResolution # @ stub ZwSetUuidSeed diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 80478c59ed..7f85b41645 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3019,3 +3019,58 @@ NTSTATUS WINAPI NtPowerInformation( POWER_INFORMATION_LEVEL level, void *input, return STATUS_NOT_IMPLEMENTED; } } + + +/****************************************************************************** + * NtInitiatePowerAction (NTDLL.@) + */ +NTSTATUS WINAPI NtInitiatePowerAction( POWER_ACTION action, SYSTEM_POWER_STATE state, + ULONG flags, BOOLEAN async ) +{ + FIXME( "(%d,%d,0x%08x,%d),stub\n", action, state, flags, async ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtCreatePowerRequest (NTDLL.@) + */ +NTSTATUS WINAPI NtCreatePowerRequest( HANDLE *handle, COUNTED_REASON_CONTEXT *context ) +{ + FIXME( "(%p, %p): stub\n", handle, context ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtSetPowerRequest (NTDLL.@) + */ +NTSTATUS WINAPI NtSetPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) +{ + FIXME( "(%p, %u): stub\n", handle, type ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtClearPowerRequest (NTDLL.@) + */ +NTSTATUS WINAPI NtClearPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) +{ + FIXME( "(%p, %u): stub\n", handle, type ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtSetThreadExecutionState (NTDLL.@) + */ +NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_STATE *old_state ) +{ + static EXECUTION_STATE current = ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; + + WARN( "(0x%x, %p): stub, harmless.\n", new_state, old_state ); + *old_state = current; + if (!(current & ES_CONTINUOUS) || (new_state & ES_CONTINUOUS)) current = new_state; + return STATUS_SUCCESS; +}

1 0

Alexandre Julliard : ntdll: Move some timer stub functions to the Unix library.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: e7c60141d616b609b99e59a19375fc9759c3e4fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7c60141d616b609b99e59a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 11:52:26 2020 +0200 ntdll: Move some timer stub functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 12 ------------ dlls/ntdll/ntdll.spec | 12 ++++++------ dlls/ntdll/sync.c | 33 --------------------------------- dlls/ntdll/unix/sync.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ed2f60333a..d27dca4be0 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -826,18 +826,6 @@ NTSTATUS WINAPI NtReplyWaitReceivePort( * Misc */ - /****************************************************************************** - * NtSetIntervalProfile [NTDLL.@] - * ZwSetIntervalProfile [NTDLL.@] - */ -NTSTATUS WINAPI NtSetIntervalProfile( - ULONG Interval, - KPROFILE_SOURCE Source) -{ - FIXME("%u,%d\n", Interval, Source); - return STATUS_SUCCESS; -} - /*********************************************************************** * RtlIsProcessorFeaturePresent [NTDLL.@] */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f6d8811ba8..22cb9d1942 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -320,7 +320,7 @@ @ stdcall -syscall NtQuerySystemInformationEx(long ptr long ptr long ptr) @ stdcall -syscall NtQuerySystemTime(ptr) @ stdcall -syscall NtQueryTimer(ptr long ptr long ptr) -@ stdcall NtQueryTimerResolution(ptr ptr ptr) +@ stdcall -syscall NtQueryTimerResolution(ptr ptr ptr) @ stdcall -syscall NtQueryValueKey(long ptr long ptr long ptr) @ stdcall -syscall NtQueryVirtualMemory(long ptr long ptr long ptr) @ stdcall -syscall NtQueryVolumeInformationFile(long ptr ptr long long) @@ -380,7 +380,7 @@ @ stdcall -syscall NtSetInformationProcess(long long ptr long) @ stdcall -syscall NtSetInformationThread(long long ptr long) @ stdcall NtSetInformationToken(long long ptr long) -@ stdcall NtSetIntervalProfile(long long) +@ stdcall -syscall NtSetIntervalProfile(long long) @ stdcall -syscall NtSetIoCompletion(ptr long long long long) @ stdcall -syscall NtSetLdtEntries(long int64 long int64) @ stub NtSetLowEventPair @@ -396,7 +396,7 @@ @ stdcall -syscall NtSetSystemTime(ptr ptr) @ stdcall NtSetThreadExecutionState(long ptr) @ stdcall -syscall NtSetTimer(long ptr ptr ptr long long ptr) -@ stdcall NtSetTimerResolution(long long ptr) +@ stdcall -syscall NtSetTimerResolution(long long ptr) # @ stub NtSetUuidSeed @ stdcall -syscall NtSetValueKey(long ptr long long ptr long) @ stdcall -syscall NtSetVolumeInformationFile(long ptr ptr long long) @@ -1307,7 +1307,7 @@ @ stdcall -private -syscall ZwQuerySystemInformationEx(long ptr long ptr long ptr) NtQuerySystemInformationEx @ stdcall -private -syscall ZwQuerySystemTime(ptr) NtQuerySystemTime @ stdcall -private -syscall ZwQueryTimer(ptr long ptr long ptr) NtQueryTimer -@ stdcall -private ZwQueryTimerResolution(ptr ptr ptr) NtQueryTimerResolution +@ stdcall -private -syscall ZwQueryTimerResolution(ptr ptr ptr) NtQueryTimerResolution @ stdcall -private -syscall ZwQueryValueKey(long ptr long ptr long ptr) NtQueryValueKey @ stdcall -private -syscall ZwQueryVirtualMemory(long ptr long ptr long ptr) NtQueryVirtualMemory @ stdcall -private -syscall ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile @@ -1367,7 +1367,7 @@ @ stdcall -private -syscall ZwSetInformationProcess(long long ptr long) NtSetInformationProcess @ stdcall -private -syscall ZwSetInformationThread(long long ptr long) NtSetInformationThread @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken -@ stdcall -private ZwSetIntervalProfile(long long) NtSetIntervalProfile +@ stdcall -private -syscall ZwSetIntervalProfile(long long) NtSetIntervalProfile @ stdcall -private -syscall ZwSetIoCompletion(ptr long long long long) NtSetIoCompletion @ stdcall -private -syscall ZwSetLdtEntries(long int64 long int64) NtSetLdtEntries @ stub ZwSetLowEventPair @@ -1383,7 +1383,7 @@ @ stdcall -private -syscall ZwSetSystemTime(ptr ptr) NtSetSystemTime @ stdcall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @ stdcall -private -syscall ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer -@ stdcall -private ZwSetTimerResolution(long long ptr) NtSetTimerResolution +@ stdcall -private -syscall ZwSetTimerResolution(long long ptr) NtSetTimerResolution # @ stub ZwSetUuidSeed @ stdcall -private -syscall ZwSetValueKey(long ptr long long ptr long) NtSetValueKey @ stdcall -private -syscall ZwSetVolumeInformationFile(long ptr ptr long long) NtSetVolumeInformationFile diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b5768f244d..8aa36c75eb 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -37,8 +37,6 @@ #include "wine/debug.h" #include "ntdll_misc.h" -WINE_DEFAULT_DEBUG_CHANNEL(sync); - /* creates a struct security_descriptor and contained information in one contiguous piece of memory */ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_attributes **ret, data_size_t *ret_len ) @@ -122,37 +120,6 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a return STATUS_SUCCESS; } -/* - * Timers - */ - -/****************************************************************************** - * NtQueryTimerResolution [NTDLL.@] - */ -NTSTATUS WINAPI NtQueryTimerResolution(OUT ULONG* min_resolution, - OUT ULONG* max_resolution, - OUT ULONG* current_resolution) -{ - FIXME("(%p,%p,%p), stub!\n", - min_resolution, max_resolution, current_resolution); - - return STATUS_NOT_IMPLEMENTED; -} - -/****************************************************************************** - * NtSetTimerResolution [NTDLL.@] - */ -NTSTATUS WINAPI NtSetTimerResolution(IN ULONG resolution, - IN BOOLEAN set_resolution, - OUT ULONG* current_resolution ) -{ - FIXME("(%u,%u,%p), stub!\n", - resolution, set_resolution, current_resolution); - - return STATUS_NOT_IMPLEMENTED; -} - - /****************************************************************** * RtlRunOnceInitialize (NTDLL.@) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 7dda01923c..cdfb8295c0 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1424,6 +1424,36 @@ NTSTATUS WINAPI NtSetSystemTime( const LARGE_INTEGER *new, LARGE_INTEGER *old ) } +/*********************************************************************** + * NtQueryTimerResolution (NTDLL.@) + */ +NTSTATUS WINAPI NtQueryTimerResolution( ULONG *min_res, ULONG *max_res, ULONG *current_res ) +{ + FIXME( "(%p,%p,%p), stub!\n", min_res, max_res, current_res ); + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** + * NtSetTimerResolution (NTDLL.@) + */ +NTSTATUS WINAPI NtSetTimerResolution( ULONG res, BOOLEAN set, ULONG *current_res ) +{ + FIXME( "(%u,%u,%p), stub!\n", res, set, current_res ); + return STATUS_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * NtSetIntervalProfile (NTDLL.@) + */ +NTSTATUS WINAPI NtSetIntervalProfile( ULONG interval, KPROFILE_SOURCE source ) +{ + FIXME( "%u,%d\n", interval, source ); + return STATUS_SUCCESS; +} + + /****************************************************************************** * NtGetTickCount (NTDLL.@) */

1 0

Brendan Shanks : user32: Handle GET_SOURCE_NAME in DisplayConfigGetDeviceInfo().
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 8949f570865fe72e28b4b7ef57c5c903d9a711b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8949f570865fe72e28b4b7ef… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:24 2020 -0700 user32: Handle GET_SOURCE_NAME in DisplayConfigGetDeviceInfo(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/monitor.c | 2 -- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3ec6c54023..6c0c3e76db 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4815,23 +4815,67 @@ done: */ LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) { + LONG ret = ERROR_GEN_FAILURE; + HANDLE mutex; + HDEVINFO devinfo; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + DWORD index = 0, type; + LUID gpu_luid; + TRACE("(%p)\n", packet); if (!packet || packet->size < sizeof(*packet)) return ERROR_GEN_FAILURE; + wait_graphics_driver_ready(); switch (packet->type) { case DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: { DISPLAYCONFIG_SOURCE_DEVICE_NAME *source_name = (DISPLAYCONFIG_SOURCE_DEVICE_NAME *)packet; + WCHAR device_name[CCHDEVICENAME]; + LONG source_id; - FIXME("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME: stub\n"); + TRACE("DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME\n"); if (packet->size < sizeof(*source_name)) return ERROR_INVALID_PARAMETER; - return ERROR_NOT_SUPPORTED; + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + { + release_display_device_init_mutex(mutex); + return ret; + } + + while (SetupDiEnumDeviceInfo(devinfo, index++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_GPU_LUID, + &type, (BYTE *)&gpu_luid, sizeof(gpu_luid), NULL, 0)) + continue; + + if ((source_name->header.adapterId.LowPart != gpu_luid.LowPart) || + (source_name->header.adapterId.HighPart != gpu_luid.HighPart)) + continue; + + /* QueryDisplayConfig() derives the source ID from the adapter name. */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, + &type, (BYTE *)device_name, sizeof(device_name), NULL, 0)) + continue; + + source_id = strtolW(device_name + ARRAY_SIZE(ADAPTER_PREFIX), NULL, 10); + source_id--; + if (source_name->header.id != source_id) + continue; + + lstrcpyW(source_name->viewGdiDeviceName, device_name); + ret = ERROR_SUCCESS; + break; + } + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + return ret; } case DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME: { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index f469111a26..8fe4701d00 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1300,7 +1300,6 @@ static void test_QueryDisplayConfig_result(UINT32 flags, for (i = 0; i < paths; i++) { - todo_wine { source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; source_name.header.size = sizeof(source_name); source_name.header.adapterId = pi[i].sourceInfo.adapterId; @@ -1309,7 +1308,6 @@ static void test_QueryDisplayConfig_result(UINT32 flags, ret = pDisplayConfigGetDeviceInfo(&source_name.header); ok(!ret, "Expected 0, got %d\n", ret); ok(source_name.viewGdiDeviceName[0] != '\0', "Expected GDI device name, got empty string\n"); - } todo_wine { target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME;

1 0

Rémi Bernon : dxgi: Implement IDXGISwapChain4 stub.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 5079d31e3a3e64a6cea9340f8d87814001fa6d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5079d31e3a3e64a6cea9340f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 16 17:26:53 2020 +0200 dxgi: Implement IDXGISwapChain4 stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 157 +++++++++++++++++++++++++++----------------------- 1 file changed, 85 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5079d31e3a3e64a6cea9…

1 0

Brendan Shanks : user32/tests: Test DisplayConfigGetDeviceInfo() GET_SOURCE_NAME with valid ID and invalid LUID.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 894c6566ab25d0fb4a1a6d7e061041fc14906662 URL: https://source.winehq.org/git/wine.git/?a=commit;h=894c6566ab25d0fb4a1a6d7e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jul 14 13:34:25 2020 -0700 user32/tests: Test DisplayConfigGetDeviceInfo() GET_SOURCE_NAME with valid ID and invalid LUID. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 8fe4701d00..6e8c9a275d 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1309,6 +1309,15 @@ static void test_QueryDisplayConfig_result(UINT32 flags, ok(!ret, "Expected 0, got %d\n", ret); ok(source_name.viewGdiDeviceName[0] != '\0', "Expected GDI device name, got empty string\n"); + /* Test with an invalid adapter LUID */ + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name); + source_name.header.adapterId.LowPart = 0xFFFF; + source_name.header.adapterId.HighPart = 0xFFFF; + source_name.header.id = pi[i].sourceInfo.id; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(ret == ERROR_GEN_FAILURE, "Expected GEN_FAILURE, got %d\n", ret); + todo_wine { target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; target_name.header.size = sizeof(target_name);

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_ACTIVATE in SetConsoleActiveScreenBuffer.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: f4d7d8955098a0255733ae304349415fa373049c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4d7d8955098a0255733ae30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:55:52 2020 +0200 kernelbase: Use IOCTL_CONDRV_ACTIVATE in SetConsoleActiveScreenBuffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 1aeb45d89c..d1fc8a4de1 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1063,19 +1063,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH ScrollConsoleScreenBufferW( HANDLE handle, SMALL_R */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleActiveScreenBuffer( HANDLE handle ) { - BOOL ret; - TRACE( "(%p)\n", handle ); - - SERVER_START_REQ( set_console_input_info ) - { - req->handle = 0; - req->mask = SET_CONSOLE_INPUT_INFO_ACTIVE_SB; - req->active_sb = wine_server_obj_handle( handle ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return console_ioctl( handle, IOCTL_CONDRV_ACTIVATE, NULL, 0, NULL, 0, NULL ); }

1 0

Jacek Caban : kernelbase: Avoid unneeded GetConsoleOutputCP calls.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 6039b785947088d379672c709c227b96ce3be1e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6039b785947088d379672c70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 13:55:20 2020 +0200 kernelbase: Avoid unneeded GetConsoleOutputCP calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 27918d8370..1aeb45d89c 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -133,9 +133,8 @@ static void input_records_AtoW( INPUT_RECORD *buffer, int count ) } /* map char infos to ASCII */ -static void char_info_WtoA( CHAR_INFO *buffer, int count ) +static void char_info_WtoA( UINT cp, CHAR_INFO *buffer, int count ) { - UINT cp = GetConsoleOutputCP(); char ch; while (count-- > 0) @@ -889,8 +888,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputA( HANDLE handle, CHAR_INFO *buff ret = ReadConsoleOutputW( handle, buffer, size, coord, region ); if (ret && region->Right >= region->Left) { + UINT cp = GetConsoleOutputCP(); for (y = 0; y <= region->Bottom - region->Top; y++) - char_info_WtoA( &buffer[(coord.Y + y) * size.X + coord.X], region->Right - region->Left + 1 ); + char_info_WtoA( cp, &buffer[(coord.Y + y) * size.X + coord.X], region->Right - region->Left + 1 ); } return ret; } @@ -1583,19 +1583,20 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA( HANDLE handle, LPCST if (length > 0) { + UINT cp = GetConsoleOutputCP(); if (!str) { SetLastError( ERROR_INVALID_ACCESS ); return FALSE; } - lenW = MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, NULL, 0 ); + lenW = MultiByteToWideChar( cp, 0, str, length, NULL, 0 ); if (!(strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return FALSE; } - MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, strW, lenW ); + MultiByteToWideChar( cp, 0, str, length, strW, lenW ); } ret = WriteConsoleOutputCharacterW( handle, strW, lenW, coord, written ); HeapFree( GetProcessHeap(), 0, strW );

1 0