wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Jacek Caban : gdi32: Use NtGdiGetFontFileData for GetFontFileData.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 6dfa2e3740fd791d546d4a5c9b2f20dc428de9e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dfa2e3740fd791d546d4a5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:54:44 2021 +0200 gdi32: Use NtGdiGetFontFileData for GetFontFileData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 9 +++++---- dlls/gdi32/text.c | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 90673fb5d24..de3787988d8 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6753,9 +6753,10 @@ BOOL WINAPI NtGdiGetRasterizerCaps( RASTERIZER_STATUS *status, UINT size ) } /************************************************************************* - * GetFontFileData (GDI32.@) + * NtGdiGetFontFileData (win32u.@) */ -BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, void *buff, DWORD buff_size ) +BOOL WINAPI NtGdiGetFontFileData( DWORD instance_id, DWORD file_index, UINT64 *offset, + void *buff, DWORD buff_size ) { struct gdi_font *font; DWORD tag = 0, size; @@ -6767,8 +6768,8 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, { if (font->ttc_item_offset) tag = MS_TTCF_TAG; size = font_funcs->get_font_data( font, tag, 0, NULL, 0 ); - if (size != GDI_ERROR && size >= buff_size && offset <= size - buff_size) - ret = font_funcs->get_font_data( font, tag, offset, buff, buff_size ) != GDI_ERROR; + if (size != GDI_ERROR && size >= buff_size && *offset <= size - buff_size) + ret = font_funcs->get_font_data( font, tag, *offset, buff, buff_size ) != GDI_ERROR; else SetLastError( ERROR_INVALID_PARAMETER ); } diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 98840af111d..22c67e79c71 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1968,3 +1968,12 @@ BOOL WINAPI EnableEUDC( BOOL enable ) FIXME( "(%d): stub\n", enable ); return FALSE; } + +/************************************************************************* + * GetFontFileData (GDI32.@) + */ +BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset, + void *buff, DWORD buff_size ) +{ + return NtGdiGetFontFileData( instance_id, file_index, &offset, buff, buff_size ); +}

1 0

Jacek Caban : gdi32: Use ntgdi names for a few more font functions.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: e7814627be0faeff062d78112fca5b7068a873a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7814627be0faeff062d7811… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:54:30 2021 +0200 gdi32: Use ntgdi names for a few more font functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 43 +++++++++++++++++-------------------------- dlls/gdi32/gdi32.spec | 12 ++++++------ dlls/gdi32/ntgdi_private.h | 20 -------------------- include/ntgdi.h | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7814627be0faeff062d…

1 0

Jacek Caban : gdi32: Move a few font functions to text.c.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 23345fe0557bdd6e6f6bc129529ca5f6e24baaa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23345fe0557bdd6e6f6bc129… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:54:09 2021 +0200 gdi32: Move a few font functions to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 62 ------------------------------------------------------- dlls/gdi32/text.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e5aae614f3b..0be27eb0978 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5518,16 +5518,6 @@ done: } -/*********************************************************************** - * GetAspectRatioFilterEx (GDI32.@) - */ -BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) -{ - FIXME("(%p, %p): -- Empty Stub !\n", hdc, pAspectRatio); - return FALSE; -} - - /****************************************************************************** * NtGdiGetCharABCWidthsW (win32u.@) * @@ -6682,58 +6672,6 @@ BOOL WINAPI GetFontResourceInfoW( LPCWSTR str, LPDWORD size, PVOID buffer, DWORD return FALSE; } -/*********************************************************************** - * GetTextCharset (GDI32.@) - */ -UINT WINAPI GetTextCharset(HDC hdc) -{ - /* MSDN docs say this is equivalent */ - return NtGdiGetTextCharsetInfo( hdc, NULL, 0 ); -} - -/*********************************************************************** - * GdiGetCharDimensions (GDI32.@) - * - * Gets the average width of the characters in the English alphabet. - * - * PARAMS - * hdc [I] Handle to the device context to measure on. - * lptm [O] Pointer to memory to store the text metrics into. - * height [O] On exit, the maximum height of characters in the English alphabet. - * - * RETURNS - * The average width of characters in the English alphabet. - * - * NOTES - * This function is used by the dialog manager to get the size of a dialog - * unit. It should also be used by other pieces of code that need to know - * the size of a dialog unit in logical units without having access to the - * window handle of the dialog. - * Windows caches the font metrics from this function, but we don't and - * there doesn't appear to be an immediate advantage to do so. - * - * SEE ALSO - * GetTextExtentPointW, GetTextMetricsW, MapDialogRect. - */ -LONG WINAPI GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, LONG *height) -{ - SIZE sz; - - if(lptm && !GetTextMetricsW(hdc, lptm)) return 0; - - if(!GetTextExtentPointW(hdc, L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 52, &sz)) - return 0; - - if (height) *height = sz.cy; - return (sz.cx / 26 + 1) / 2; -} - -BOOL WINAPI EnableEUDC(BOOL fEnableEUDC) -{ - FIXME("(%d): stub\n", fEnableEUDC); - return FALSE; -} - /*********************************************************************** * GetFontUnicodeRanges (GDI32.@) * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 149b7f081ed..98840af111d 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1914,3 +1914,57 @@ DWORD WINAPI GetGlyphIndicesA( HDC hdc, const char *str, INT count, WORD *indice HeapFree( GetProcessHeap(), 0, strW ); return ret; } + +/*********************************************************************** + * GetAspectRatioFilterEx (GDI32.@) + */ +BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, SIZE *aspect_ratio ) +{ + FIXME( "(%p, %p): stub\n", hdc, aspect_ratio ); + return FALSE; +} + +/*********************************************************************** + * GetTextCharset (GDI32.@) + */ +UINT WINAPI GetTextCharset( HDC hdc ) +{ + /* MSDN docs say this is equivalent */ + return NtGdiGetTextCharsetInfo( hdc, NULL, 0 ); +} + +/*********************************************************************** + * GdiGetCharDimensions (GDI32.@) + * + * Gets the average width of the characters in the English alphabet. + * + * NOTES + * This function is used by the dialog manager to get the size of a dialog + * unit. It should also be used by other pieces of code that need to know + * the size of a dialog unit in logical units without having access to the + * window handle of the dialog. + * Windows caches the font metrics from this function, but we don't and + * there doesn't appear to be an immediate advantage to do so. + */ +LONG WINAPI GdiGetCharDimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) +{ + SIZE sz; + + if (metric && !GetTextMetricsW( hdc, metric )) return 0; + + if (!GetTextExtentPointW( hdc, L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", + 52, &sz )) + return 0; + + if (height) *height = sz.cy; + return (sz.cx / 26 + 1) / 2; +} + +/*********************************************************************** + * EnableEUDC (GDI32.@) + */ +BOOL WINAPI EnableEUDC( BOOL enable ) +{ + FIXME( "(%d): stub\n", enable ); + return FALSE; +}

1 0

Jacek Caban : gdi32: Use NtGdiGetGlyphIndicesW for GetGlyphIndicesW.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: f801e27d32bcdea6badde1265fcce2f960e86693 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f801e27d32bcdea6badde126… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:52:36 2021 +0200 gdi32: Use NtGdiGetGlyphIndicesW for GetGlyphIndicesW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 61 ++++------------------------------------- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/text.c | 19 ++++++++++++- dlls/gdi32/uniscribe/opentype.c | 2 +- dlls/gdi32/uniscribe/shape.c | 30 ++++++++++---------- dlls/gdi32/uniscribe/usp10.c | 5 ++-- include/ntgdi.h | 2 ++ 7 files changed, 46 insertions(+), 75 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f801e27d32bcdea6badd…

1 0

Alexandre Julliard : ntdll: Don't use winebuild for the Unix part.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 5a7505e839e31e6703a8d8e53885b0c797123ccb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a7505e839e31e6703a8d8e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:39:35 2021 +0200 ntdll: Don't use winebuild for the Unix part. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index da849d55b4d..4562c21fd20 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -3,7 +3,7 @@ MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 EXTRAINCL = $(UNWIND_CFLAGS) -EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) +EXTRALIBS = -lwinecrt0 -Wl,--subsystem,unixlib $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wl,--image-base,0x7bc00000 C_SRCS = \

1 0

Alexandre Julliard : ntdll: Declare the syscall functions array explicitly.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: ea6308e364b669adfcb8b1e448c8b08d715bcf6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea6308e364b669adfcb8b1e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:38:31 2021 +0200 ntdll: Declare the syscall functions array explicitly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 1 + tools/winebuild/import.c | 14 +-- 3 files changed, 242 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 266d53f0eca..b15824346b7 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -116,13 +116,248 @@ SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); static void *p__wine_syscall_dispatcher; -extern SYSTEM_SERVICE_TABLE __wine_syscall_table DECLSPEC_HIDDEN; +static void * const syscalls[] = +{ + NtAcceptConnectPort, + NtAccessCheck, + NtAccessCheckAndAuditAlarm, + NtAddAtom, + NtAdjustGroupsToken, + NtAdjustPrivilegesToken, + NtAlertResumeThread, + NtAlertThread, + NtAllocateLocallyUniqueId, + NtAllocateUuids, + NtAllocateVirtualMemory, + NtAllocateVirtualMemoryEx, + NtAreMappedFilesTheSame, + NtAssignProcessToJobObject, + NtCallbackReturn, + NtCancelIoFile, + NtCancelIoFileEx, + NtCancelTimer, + NtClearEvent, + NtClearPowerRequest, + NtClose, + NtCompleteConnectPort, + NtConnectPort, + NtContinue, + NtCreateDebugObject, + NtCreateDirectoryObject, + NtCreateEvent, + NtCreateFile, + NtCreateIoCompletion, + NtCreateJobObject, + NtCreateKey, + NtCreateKeyTransacted, + NtCreateKeyedEvent, + NtCreateLowBoxToken, + NtCreateMailslotFile, + NtCreateMutant, + NtCreateNamedPipeFile, + NtCreatePagingFile, + NtCreatePort, + NtCreatePowerRequest, + NtCreateSection, + NtCreateSemaphore, + NtCreateSymbolicLinkObject, + NtCreateThread, + NtCreateThreadEx, + NtCreateTimer, + NtCreateUserProcess, + NtDebugActiveProcess, + NtDebugContinue, + NtDelayExecution, + NtDeleteAtom, + NtDeleteFile, + NtDeleteKey, + NtDeleteValueKey, + NtDeviceIoControlFile, + NtDisplayString, + NtDuplicateObject, + NtDuplicateToken, + NtEnumerateKey, + NtEnumerateValueKey, + NtFilterToken, + NtFindAtom, + NtFlushBuffersFile, + NtFlushInstructionCache, + NtFlushKey, + NtFlushProcessWriteBuffers, + NtFlushVirtualMemory, + NtFreeVirtualMemory, + NtFsControlFile, + NtGetContextThread, + NtGetCurrentProcessorNumber, + NtGetNextThread, + NtGetNlsSectionPtr, + NtGetWriteWatch, + NtImpersonateAnonymousToken, + NtInitiatePowerAction , + NtIsProcessInJob, + NtListenPort, + NtLoadDriver, + NtLoadKey, + NtLoadKey2, + NtLockFile, + NtLockVirtualMemory, + NtMakeTemporaryObject, + NtMapViewOfSection, + NtNotifyChangeDirectoryFile, + NtNotifyChangeKey, + NtNotifyChangeMultipleKeys, + NtOpenDirectoryObject, + NtOpenEvent, + NtOpenFile, + NtOpenIoCompletion, + NtOpenJobObject, + NtOpenKey, + NtOpenKeyEx, + NtOpenKeyTransacted, + NtOpenKeyTransactedEx, + NtOpenKeyedEvent, + NtOpenMutant, + NtOpenProcess, + NtOpenProcessToken, + NtOpenProcessTokenEx, + NtOpenSection, + NtOpenSemaphore, + NtOpenSymbolicLinkObject , + NtOpenThread, + NtOpenThreadToken, + NtOpenThreadTokenEx, + NtOpenTimer, + NtPowerInformation, + NtPrivilegeCheck, + NtProtectVirtualMemory, + NtPulseEvent, + NtQueryAttributesFile, + NtQueryDefaultLocale, + NtQueryDefaultUILanguage, + NtQueryDirectoryFile, + NtQueryDirectoryObject, + NtQueryEaFile, + NtQueryEvent, + NtQueryFullAttributesFile, + NtQueryInformationAtom, + NtQueryInformationFile, + NtQueryInformationJobObject, + NtQueryInformationProcess, + NtQueryInformationThread, + NtQueryInformationToken, + NtQueryInstallUILanguage, + NtQueryIoCompletion, + NtQueryKey, + NtQueryLicenseValue, + NtQueryMultipleValueKey, + NtQueryMutant, + NtQueryObject, + NtQueryPerformanceCounter, + NtQuerySection, + NtQuerySecurityObject, + NtQuerySemaphore , + NtQuerySymbolicLinkObject, + NtQuerySystemEnvironmentValue, + NtQuerySystemEnvironmentValueEx, + NtQuerySystemInformation, + NtQuerySystemInformationEx, + NtQuerySystemTime, + NtQueryTimer, + NtQueryTimerResolution, + NtQueryValueKey, + NtQueryVirtualMemory, + NtQueryVolumeInformationFile, + NtQueueApcThread, + NtRaiseException, + NtRaiseHardError, + NtReadFile, + NtReadFileScatter, + NtReadVirtualMemory, + NtRegisterThreadTerminatePort, + NtReleaseKeyedEvent, + NtReleaseMutant, + NtReleaseSemaphore, + NtRemoveIoCompletion, + NtRemoveIoCompletionEx, + NtRemoveProcessDebug, + NtRenameKey, + NtReplaceKey, + NtReplyWaitReceivePort, + NtRequestWaitReplyPort, + NtResetEvent, + NtResetWriteWatch, + NtRestoreKey, + NtResumeProcess, + NtResumeThread, + NtSaveKey, + NtSecureConnectPort, + NtSetContextThread, + NtSetDefaultLocale, + NtSetDefaultUILanguage, + NtSetEaFile, + NtSetEvent, + NtSetInformationDebugObject, + NtSetInformationFile, + NtSetInformationJobObject, + NtSetInformationKey, + NtSetInformationObject, + NtSetInformationProcess, + NtSetInformationThread, + NtSetInformationToken, + NtSetIntervalProfile, + NtSetIoCompletion, + NtSetLdtEntries, + NtSetPowerRequest, + NtSetSecurityObject, + NtSetSystemInformation, + NtSetSystemTime, + NtSetThreadExecutionState, + NtSetTimer, + NtSetTimerResolution, + NtSetValueKey, + NtSetVolumeInformationFile, + NtShutdownSystem, + NtSignalAndWaitForSingleObject, + NtSuspendProcess, + NtSuspendThread, + NtSystemDebugControl, + NtTerminateJobObject, + NtTerminateProcess, + NtTerminateThread, + NtTestAlert, + NtTraceControl, + NtUnloadDriver, + NtUnloadKey, + NtUnlockFile, + NtUnlockVirtualMemory, + NtUnmapViewOfSection, + NtWaitForDebugEvent, + NtWaitForKeyedEvent, + NtWaitForMultipleObjects, + NtWaitForSingleObject, +#ifndef _WIN64 + NtWow64AllocateVirtualMemory64, + NtWow64GetNativeSystemInformation, + NtWow64ReadVirtualMemory64, + NtWow64WriteVirtualMemory64, +#endif + NtWriteFile, + NtWriteFileGather, + NtWriteVirtualMemory, + NtYieldExecution, + __wine_dbg_write, + __wine_unix_call, + wine_nt_to_unix_file_name, + wine_server_call, + wine_server_fd_to_handle, + wine_server_handle_to_fd, + wine_unix_to_nt_file_name, +}; -static BYTE syscall_args[4096]; +static BYTE syscall_args[ARRAY_SIZE(syscalls)]; SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; - #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); #endif @@ -1947,7 +2182,7 @@ static struct unix_funcs unix_funcs = */ static void start_main_thread(void) { - SYSTEM_SERVICE_TABLE syscall_table = __wine_syscall_table; + SYSTEM_SERVICE_TABLE syscall_table = { (ULONG_PTR *)syscalls, NULL, ARRAY_SIZE(syscalls), syscall_args }; NTSTATUS status; TEB *teb = virtual_alloc_first_teb(); @@ -1970,7 +2205,6 @@ static void start_main_thread(void) NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); - syscall_table.ArgumentTable = syscall_args; ntdll_init_syscalls( 0, &syscall_table, p__wine_syscall_dispatcher ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH) diff --git a/include/winternl.h b/include/winternl.h index ec2c95e99bc..fea9e9df117 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3847,6 +3847,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATT NTSYSAPI NTSTATUS WINAPI NtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtCreateKeyTransacted(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,HANDLE,ULONG*); NTSYSAPI NTSTATUS WINAPI NtCreateKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); +NTSYSAPI NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE*,HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,SID*,ULONG,SID_AND_ATTRIBUTES*,ULONG,HANDLE*); NTSYSAPI NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index d9d6fcae0c6..fcd27117780 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1426,6 +1426,8 @@ void output_syscalls( DLLSPEC *spec ) int i, count; ORDDEF **syscalls = NULL; + if (unix_lib) return; + for (i = count = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -1439,18 +1441,6 @@ void output_syscalls( DLLSPEC *spec ) output( "\n/* system calls */\n\n" ); output( "\t.text\n" ); - if (unix_lib) - { - output( "\t.data\n" ); - output( "\t.align %d\n", get_alignment( get_ptr_size() ) ); - output( "%s\n", asm_globl("__wine_syscall_table") ); - output( "\t%s .Lsyscall_table, 0, %u, 0\n", get_asm_ptr_keyword(), count ); - output( ".Lsyscall_table:\n" ); - for (i = 0; i < count; i++) - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( syscalls[i] ))); - return; - } - for (i = 0; i < count; i++) { ORDDEF *odp = syscalls[i];

1 0

Alexandre Julliard : ntdll: Store the syscall argument table on the PE side.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 7ae1c396acd3649b2482f20992cc2c65159fbd05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ae1c396acd3649b2482f209… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:27:08 2021 +0200 ntdll: Store the syscall argument table on the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 21 +++++++++++++++++++-- tools/winebuild/import.c | 7 +++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 53df7c87878..266d53f0eca 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -118,6 +118,8 @@ static void *p__wine_syscall_dispatcher; extern SYSTEM_SERVICE_TABLE __wine_syscall_table DECLSPEC_HIDDEN; +static BYTE syscall_args[4096]; + SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; @@ -1148,8 +1150,21 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr */ NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher ) { + struct syscall_info + { + void *dispatcher; + USHORT limit; + BYTE args[1]; + } *info = (struct syscall_info *)dispatcher; + if (id > 3) return STATUS_INVALID_PARAMETER; - *dispatcher = __wine_syscall_dispatcher; + if (info->limit != table->ServiceLimit) + { + ERR( "syscall count mismatch %u / %lu\n", info->limit, table->ServiceLimit ); + NtTerminateProcess( GetCurrentProcess(), STATUS_INVALID_PARAMETER ); + } + info->dispatcher = __wine_syscall_dispatcher; + memcpy( table->ArgumentTable, info->args, table->ServiceLimit ); KeServiceDescriptorTable[id] = *table; return STATUS_SUCCESS; } @@ -1932,6 +1947,7 @@ static struct unix_funcs unix_funcs = */ static void start_main_thread(void) { + SYSTEM_SERVICE_TABLE syscall_table = __wine_syscall_table; NTSTATUS status; TEB *teb = virtual_alloc_first_teb(); @@ -1954,7 +1970,8 @@ static void start_main_thread(void) NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); - ntdll_init_syscalls( 0, &__wine_syscall_table, p__wine_syscall_dispatcher ); + syscall_table.ArgumentTable = syscall_args; + ntdll_init_syscalls( 0, &syscall_table, p__wine_syscall_dispatcher ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH) { diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 84738fc9135..d9d6fcae0c6 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1444,13 +1444,10 @@ void output_syscalls( DLLSPEC *spec ) output( "\t.data\n" ); output( "\t.align %d\n", get_alignment( get_ptr_size() ) ); output( "%s\n", asm_globl("__wine_syscall_table") ); - output( "\t%s .Lsyscall_table, 0, %u, .Lsyscall_args\n", get_asm_ptr_keyword(), count ); + output( "\t%s .Lsyscall_table, 0, %u, 0\n", get_asm_ptr_keyword(), count ); output( ".Lsyscall_table:\n" ); for (i = 0; i < count; i++) output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( syscalls[i] ))); - output( ".Lsyscall_args:\n" ); - for (i = 0; i < count; i++) - output( "\t.byte %u\n", get_args_size( syscalls[i] )); return; } @@ -1574,6 +1571,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment( get_ptr_size() ) ); output( "%s\n", asm_globl("__wine_syscall_dispatcher") ); output( "\t%s 0\n", get_asm_ptr_keyword() ); + output( "\t.short %u\n", count ); + for (i = 0; i < count; i++) output( "\t.byte %u\n", get_args_size( syscalls[i] )); }

1 0

Alexandre Julliard : ntdll: Add a helper function to set a syscall table.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: d017c704f0131110f96b65e0edac0adf62be1d55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d017c704f0131110f96b65e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:20:03 2021 +0200 ntdll: Add a helper function to set a syscall table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 32 +++++++++++++++++++++----------- dlls/ntdll/unix/unix_private.h | 1 + include/wine/unixlib.h | 3 +-- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bdd54314540..53df7c87878 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -114,6 +114,7 @@ void (WINAPI *p__wine_ctrl_routine)(void*); SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); +static void *p__wine_syscall_dispatcher; extern SYSTEM_SERVICE_TABLE __wine_syscall_table DECLSPEC_HIDDEN; @@ -825,8 +826,6 @@ static NTSTATUS fixup_ntdll_imports( const char *name, HMODULE module ) static void load_ntdll_functions( HMODULE module ) { - void **ptr; - ntdll_exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); assert( ntdll_exports ); @@ -844,16 +843,15 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( RtlUserThreadStart ); GET_FUNC( __wine_ctrl_routine ); GET_FUNC( __wine_set_unix_funcs ); -#undef GET_FUNC -#define SET_PTR(name,val) \ - if ((ptr = (void *)find_named_export( module, ntdll_exports, #name ))) *ptr = val; \ - else ERR( "%s not found\n", #name ) - - SET_PTR( __wine_syscall_dispatcher, __wine_syscall_dispatcher ); + GET_FUNC( __wine_syscall_dispatcher ); #ifdef __i386__ - SET_PTR( __wine_ldt_copy, &__wine_ldt_copy ); + { + void **p__wine_ldt_copy; + GET_FUNC( __wine_ldt_copy ); + *p__wine_ldt_copy = &__wine_ldt_copy; + } #endif -#undef SET_PTR +#undef GET_FUNC } static void load_ntdll_wow64_functions( HMODULE module ) @@ -1145,6 +1143,18 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr } +/*********************************************************************** + * ntdll_init_syscalls + */ +NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher ) +{ + if (id > 3) return STATUS_INVALID_PARAMETER; + *dispatcher = __wine_syscall_dispatcher; + KeServiceDescriptorTable[id] = *table; + return STATUS_SUCCESS; +} + + /*********************************************************************** * __wine_unix_call */ @@ -1944,7 +1954,7 @@ static void start_main_thread(void) NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); - KeServiceDescriptorTable[0] = __wine_syscall_table; + ntdll_init_syscalls( 0, &__wine_syscall_table, p__wine_syscall_dispatcher ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH) { diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 731b12d332c..b2bcd423d4b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -250,6 +250,7 @@ extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN; +extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4] DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void WINAPI DECLSPEC_NORETURN __wine_syscall_dispatcher_return( void *frame, ULONG_PTR retval ) DECLSPEC_HIDDEN; extern NTSTATUS signal_set_full_context( CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 1f5308cb434..072401a0714 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -26,10 +26,9 @@ typedef UINT64 unixlib_handle_t; extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); -extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; - /* some useful helpers from ntdll */ extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ); extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); +extern NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher ); #endif /* __WINE_WINE_UNIXLIB_H */

1 0

Alexandre Julliard : winebuild: Add an option to set the syscall table id.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 3513a176fd325492e5b5e498e4eebf3f820f8cc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3513a176fd325492e5b5e498… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 11:46:51 2021 +0200 winebuild: Add an option to set the syscall table id. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 12 +++++++----- tools/winebuild/main.c | 15 +++++++++++++++ tools/winebuild/utils.c | 1 + tools/winebuild/winebuild.man.in | 5 +++++ 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 1918932ad1f..52472958d31 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -136,6 +136,7 @@ typedef struct int subsystem; /* subsystem id */ int subsystem_major; /* subsystem version major number */ int subsystem_minor; /* subsystem version minor number */ + int syscall_table; /* syscall table id */ int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* dll entry points */ ORDDEF **names; /* array of entry point names (points into entry_points) */ diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 6a158578143..84738fc9135 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1458,6 +1458,8 @@ void output_syscalls( DLLSPEC *spec ) { ORDDEF *odp = syscalls[i]; const char *name = get_link_name(odp); + unsigned int id = (spec->syscall_table << 12) + i; + output( "\t.align %d\n", get_alignment(16) ); output( "\t%s\n", func_declaration(name) ); output( "%s\n", asm_globl(name) ); @@ -1469,12 +1471,12 @@ void output_syscalls( DLLSPEC *spec ) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); output( "1:\tmovl %s-1b(%%eax),%%edx\n", asm_name("__wine_syscall_dispatcher") ); - output( "\tmovl $%u,%%eax\n", i ); + output( "\tmovl $%u,%%eax\n", id ); needs_get_pc_thunk = 1; } else { - output( "\tmovl $%u,%%eax\n", i ); + output( "\tmovl $%u,%%eax\n", id ); output( "\tmovl $%s,%%edx\n", asm_name("__wine_syscall") ); } output( "\tcall *%%edx\n" ); @@ -1488,7 +1490,7 @@ void output_syscalls( DLLSPEC *spec ) * validate that instruction, we can just put a jmp there instead. */ output( "\t.byte 0x4c,0x8b,0xd1\n" ); /* movq %rcx,%r10 */ output( "\t.byte 0xb8\n" ); /* movl $i,%eax */ - output( "\t.long %u\n", i ); + output( "\t.long %u\n", id ); output( "\t.byte 0xf6,0x04,0x25,0x08,0x03,0xfe,0x7f,0x01\n" ); /* testb $1,0x7ffe0308 */ output( "\t.byte 0x75,0x03\n" ); /* jne 1f */ output( "\t.byte 0x0f,0x05\n" ); /* syscall */ @@ -1509,14 +1511,14 @@ void output_syscalls( DLLSPEC *spec ) break; case CPU_ARM: output( "\tpush {r0-r3}\n" ); - output( "\tmovw ip, #%u\n", i ); + output( "\tmovw ip, #%u\n", id ); output( "\tmov r3, lr\n" ); output( "\tbl %s\n", asm_name("__wine_syscall") ); output( "\tadd sp, #16\n" ); output( "\tbx lr\n" ); break; case CPU_ARM64: - output( "\tmov x8, #%u\n", i ); + output( "\tmov x8, #%u\n", id ); output( "\tmov x9, x30\n" ); output( "\tbl %s\n", asm_name("__wine_syscall" )); output( "\tret\n" ); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 8c0e77030b6..84923249c66 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -202,6 +202,15 @@ static void set_subsystem( const char *subsystem, DLLSPEC *spec ) free( str ); } +/* set the syscall table id */ +static void set_syscall_table( const char *id, DLLSPEC *spec ) +{ + int val = atoi( id ); + + if (val < 0 || val > 3) fatal_error( "Invalid syscall table id '%s', must be 0-3\n", id ); + spec->syscall_table = val; +} + /* set the target CPU and platform */ static void set_target( const char *target ) { @@ -303,6 +312,7 @@ static const char usage_str[] = " --safeseh Mark object files as SEH compatible\n" " --save-temps Do not delete the generated intermediate files\n" " --subsystem=SUBSYS Set the subsystem (one of native, windows, console, wince)\n" +" --syscall-table=ID Set the syscall table id (between 0 and 3)\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" " -v, --verbose Display the programs invoked\n" " --version Print the version and exit\n" @@ -340,6 +350,7 @@ enum long_options_values LONG_OPT_SAVE_TEMPS, LONG_OPT_STATICLIB, LONG_OPT_SUBSYSTEM, + LONG_OPT_SYSCALL_TABLE, LONG_OPT_VERSION }; @@ -367,6 +378,7 @@ static const struct option long_options[] = { "safeseh", 0, 0, LONG_OPT_SAFE_SEH }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, + { "syscall-table", 1, 0, LONG_OPT_SYSCALL_TABLE }, { "version", 0, 0, LONG_OPT_VERSION }, /* aliases for short options */ { "target", 1, 0, 'b' }, @@ -595,6 +607,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_SUBSYSTEM: set_subsystem( optarg, spec ); break; + case LONG_OPT_SYSCALL_TABLE: + set_syscall_table( optarg, spec ); + break; case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 441e84aa092..709ffb9e28d 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -911,6 +911,7 @@ DLLSPEC *alloc_dll_spec(void) spec->subsystem = 0; spec->subsystem_major = 4; spec->subsystem_minor = 0; + spec->syscall_table = 0; if (get_ptr_size() > 4) spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; else diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index d55c00b2d24..d9a05fc99d9 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -255,6 +255,11 @@ argument array to use Unicode strings. A graphical executable has a Optionally a major and minor subsystem version can also be specified; the default subsystem version is 4.0. .TP +.BI --syscall-table= id +Set the system call table id, between 0 and 3. The default is 0, the +ntdll syscall table. Only useful in modules that define syscall entry +points. +.TP .BI \-u,\ --undefined= symbol Add \fIsymbol\fR to the list of undefined symbols when invoking the linker. This makes it possible to force a specific module of a static

1 0

Alexandre Julliard : ntdll/tests: Fix a size check for older Windows versions.
by Alexandre Julliard 30 Aug '21

30 Aug '21

Module: wine Branch: master Commit: 411a8858acb35459a68a6b5a0ab26aad364a16e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=411a8858acb35459a68a6b5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 10:51:12 2021 +0200 ntdll/tests: Fix a size check for older Windows versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51693 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e642427bffb..7b6f947569a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -883,7 +883,7 @@ static void test_query_cache(void) status = pNtQuerySystemInformation(SystemFileCacheInformation, sci, i, &ReturnLength); if (!status) { - expected = offsetof(SYSTEM_CACHE_INFORMATION, MinimumWorkingSet); + expected = 3 * sizeof(ULONG); for (; i>= expected; i--) { ReturnLength = 0xdeadbeef;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
106
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021