- Wine-Commits - list.winehq.org

Tag wine-9.3 : Alexandre Julliard : Release 9.3
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: refs/tags/wine-9.3 Tag: 17e60d639d0261596b736e1bf82b6f611b87fbf1 URL: https://gitlab.winehq.org/wine/wine/-/tags/17e60d639d0261596b736e1bf82b6f61… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 22:19:13 2024 +0100 Release 9.3

1 0

Rémi Bernon : server: Use the startup info to connect the process winstation.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 74bf784b29ae03d97bc4b527526b3345f5335838 URL: https://gitlab.winehq.org/wine/wine/-/commit/74bf784b29ae03d97bc4b527526b33… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 21 20:11:55 2024 +0100 server: Use the startup info to connect the process winstation. This changes the todos in the tests as it fixes the thread input not being attached, but then exposes a different todo. --- dlls/dinput/tests/joystick8.c | 23 +++++++++-------------- dlls/user32/tests/input.c | 8 ++++---- server/process.c | 6 ++++-- server/user.h | 5 +++-- server/winstation.c | 27 +++++++++++++++++++++++++-- 5 files changed, 45 insertions(+), 24 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 0553cb96a63..428fc59c1af 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -5756,23 +5756,23 @@ static DWORD WINAPI test_rawinput_desktop_thread( void *args ) rawbuffer_size = sizeof(rawbuffer); memset( rawbuffer, 0, sizeof(rawbuffer) ); res = msg_wait_for_events( 1, &rawinput_event, 100 ); - todo_wine + todo_wine_if( params->input ) ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); - todo_wine + todo_wine_if( params->input ) ok( rawinput_calls == 1, "got %u WM_INPUT messages\n", rawinput_calls ); rawinput = (RAWINPUT *)rawbuffer; - todo_wine + todo_wine_if( params->input ) ok( rawinput->header.dwType == RIM_TYPEHID, "got dwType %lu\n", rawinput->header.dwType ); - todo_wine + todo_wine_if( params->input ) ok( rawinput->header.dwSize == offsetof(RAWINPUT, data.hid.bRawData[desc.caps.InputReportByteLength * rawinput->data.hid.dwCount]), "got header.dwSize %lu\n", rawinput->header.dwSize ); - todo_wine + todo_wine_if( params->input ) ok( rawinput->header.hDevice != 0, "got hDevice %p\n", rawinput->header.hDevice ); ok( rawinput->header.wParam == 0, "got wParam %#Ix\n", rawinput->header.wParam ); - todo_wine + todo_wine_if( params->input ) ok( rawinput->data.hid.dwSizeHid == desc.caps.InputReportByteLength, "got dwSizeHid %lu\n", rawinput->data.hid.dwSizeHid ); - todo_wine + todo_wine_if( params->input ) ok( rawinput->data.hid.dwCount >= 1, "got dwCount %lu\n", rawinput->data.hid.dwCount ); @@ -5864,28 +5864,23 @@ static void test_rawinput_desktop( const char *path, BOOL input ) res = msg_wait_for_events( 1, &rawinput_event, 100 ); if (input) { - todo_wine ok( res == 0, "WaitForSingleObject returned %#lx\n", res ); - todo_wine ok( rawinput_calls == 1, "got %u WM_INPUT messages\n", rawinput_calls ); rawinput = (RAWINPUT *)rawbuffer; - todo_wine ok( rawinput->header.dwType == RIM_TYPEHID, "got dwType %lu\n", rawinput->header.dwType ); - todo_wine ok( rawinput->header.dwSize == offsetof(RAWINPUT, data.hid.bRawData[desc.caps.InputReportByteLength * rawinput->data.hid.dwCount]), "got header.dwSize %lu\n", rawinput->header.dwSize ); - todo_wine ok( rawinput->header.hDevice != 0, "got hDevice %p\n", rawinput->header.hDevice ); ok( rawinput->header.wParam == 0, "got wParam %#Ix\n", rawinput->header.wParam ); - todo_wine ok( rawinput->data.hid.dwSizeHid == desc.caps.InputReportByteLength, "got dwSizeHid %lu\n", rawinput->data.hid.dwSizeHid ); - todo_wine ok( rawinput->data.hid.dwCount >= 1, "got dwCount %lu\n", rawinput->data.hid.dwCount ); } else { + todo_wine ok( res == WAIT_TIMEOUT, "WaitForSingleObject returned %#lx\n", res ); + todo_wine ok( rawinput_calls == 0, "got %u WM_INPUT messages\n", rawinput_calls ); } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index be95bd150b4..a78ea3b7c43 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3855,19 +3855,19 @@ static void test_SendInput_mouse_messages(void) ok_ne( NULL, thread, HANDLE, "%p" ); ok_ret( 0, WaitForSingleObject( params.start_event, 5000 ) ); - todo_wine ok_ret( 1, AttachThreadInput( thread_id, GetCurrentThreadId(), TRUE ) ); + ok_ret( 1, AttachThreadInput( thread_id, GetCurrentThreadId(), TRUE ) ); ok_ret( 0, SendMessageW( params.hwnd, WM_USER, 0, 0 ) ); mouse_event( MOUSEEVENTF_LEFTDOWN, 0, 0, 0, 0 ); wait_messages( 5, FALSE ); - button_down_hwnd[1].message.hwnd = hwnd; - ok_seq( button_down_hwnd ); + button_down_hwnd_todo[1].message.hwnd = hwnd; + ok_seq( button_down_hwnd_todo ); mouse_event( MOUSEEVENTF_LEFTUP, 0, 0, 0, 0 ); wait_messages( 5, FALSE ); button_up_hwnd[1].message.hwnd = hwnd; ok_seq( button_up_hwnd ); - todo_wine ok_ret( 1, AttachThreadInput( thread_id, GetCurrentThreadId(), FALSE ) ); + ok_ret( 1, AttachThreadInput( thread_id, GetCurrentThreadId(), FALSE ) ); ok_ret( 1, SetEvent( params.end_event ) ); ok_ret( 0, WaitForSingleObject( thread, 5000 ) ); ok_ret( 1, CloseHandle( thread ) ); diff --git a/server/process.c b/server/process.c index 3651696f505..b6c21d15752 100644 --- a/server/process.c +++ b/server/process.c @@ -1133,7 +1133,7 @@ DECL_HANDLER(new_process) { struct startup_info *info; const void *info_ptr; - struct unicode_str name; + struct unicode_str name, desktop_path = {0}; const struct security_descriptor *sd; const struct object_attributes *objattr = get_req_object_attributes( &sd, &name, NULL ); struct process *process = NULL; @@ -1276,7 +1276,9 @@ DECL_HANDLER(new_process) FIXUP_LEN( info->data->imagepath_len ); FIXUP_LEN( info->data->cmdline_len ); FIXUP_LEN( info->data->title_len ); + desktop_path.str = (WCHAR *)((char *)info->data + pos); FIXUP_LEN( info->data->desktop_len ); + desktop_path.len = info->data->desktop_len; FIXUP_LEN( info->data->shellinfo_len ); FIXUP_LEN( info->data->runtime_len ); #undef FIXUP_LEN @@ -1327,7 +1329,7 @@ DECL_HANDLER(new_process) } /* connect to the window station */ - connect_process_winstation( process, parent_thread, parent ); + connect_process_winstation( process, &desktop_path, parent_thread, parent ); /* inherit the process console, but keep pseudo handles (< 0), and 0 (= not attached to a console) as is */ if ((int)info->data->console > 0) diff --git a/server/user.h b/server/user.h index 8fa55e09b0f..bc58c93200d 100644 --- a/server/user.h +++ b/server/user.h @@ -22,6 +22,7 @@ #define __WINE_SERVER_USER_H #include "wine/server_protocol.h" +#include "unicode.h" struct thread; struct region; @@ -186,8 +187,8 @@ extern client_ptr_t get_class_client_ptr( struct window_class *class ); extern struct desktop *get_desktop_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern struct winstation *get_process_winstation( struct process *process, unsigned int access ); extern struct desktop *get_thread_desktop( struct thread *thread, unsigned int access ); -extern void connect_process_winstation( struct process *process, struct thread *parent_thread, - struct process *parent_process ); +extern void connect_process_winstation( struct process *process, struct unicode_str *desktop_path, + struct thread *parent_thread, struct process *parent_process ); extern void set_process_default_desktop( struct process *process, struct desktop *desktop, obj_handle_t handle ); extern void close_process_desktop( struct process *process ); diff --git a/server/winstation.c b/server/winstation.c index 930c5c90d97..c3ea69c8a29 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -373,18 +373,37 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt } /* connect a process to its window station */ -void connect_process_winstation( struct process *process, struct thread *parent_thread, - struct process *parent_process ) +void connect_process_winstation( struct process *process, struct unicode_str *desktop_path, + struct thread *parent_thread, struct process *parent_process ) { + struct unicode_str desktop_name = *desktop_path, winstation_name = {0}; + const int attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; struct winstation *winstation = NULL; struct desktop *desktop = NULL; + const WCHAR *wch, *end; obj_handle_t handle; + for (wch = desktop_name.str, end = wch + desktop_name.len / sizeof(WCHAR); wch != end; wch++) + { + if (*wch == '\\') + { + winstation_name.str = desktop_name.str; + winstation_name.len = (wch - winstation_name.str) * sizeof(WCHAR); + desktop_name.str = wch + 1; + desktop_name.len = (end - desktop_name.str) * sizeof(WCHAR); + break; + } + } + /* check for an inherited winstation handle (don't ask...) */ if ((handle = find_inherited_handle( process, &winstation_ops ))) { winstation = (struct winstation *)get_handle_obj( process, handle, 0, &winstation_ops ); } + else if (winstation_name.len && (winstation = open_named_object( NULL, &winstation_ops, &winstation_name, attributes ))) + { + handle = alloc_handle( process, winstation, STANDARD_RIGHTS_REQUIRED | WINSTA_ALL_ACCESS, 0 ); + } else if (parent_process->winstation) { handle = duplicate_handle( parent_process, parent_process->winstation, @@ -399,6 +418,10 @@ void connect_process_winstation( struct process *process, struct thread *parent_ desktop = get_desktop_obj( process, handle, 0 ); if (!desktop || desktop->winstation != winstation) goto done; } + else if (desktop_name.len && (desktop = open_named_object( &winstation->obj, &desktop_ops, &desktop_name, attributes ))) + { + handle = alloc_handle( process, desktop, STANDARD_RIGHTS_REQUIRED | DESKTOP_ALL_ACCESS, 0 ); + } else { if (parent_thread && parent_thread->desktop)

1 0

Paul Gofman : qmgr: Force debug info in critical sections.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: fae3b7a90f1efafeb352b9ae66039de88f22afdb URL: https://gitlab.winehq.org/wine/wine/-/commit/fae3b7a90f1efafeb352b9ae66039d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 21 21:54:43 2024 -0600 qmgr: Force debug info in critical sections. --- dlls/qmgr/job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index aa164051691..d3b26756198 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -1145,7 +1145,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->IBackgroundCopyJob4_iface.lpVtbl = &BackgroundCopyJobVtbl; This->IBackgroundCopyJobHttpOptions_iface.lpVtbl = &http_options_vtbl; - InitializeCriticalSection(&This->cs); + InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BackgroundCopyJobImpl.cs"); This->ref = 1;

1 0

Paul Gofman : wininet: Force debug info in critical sections.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: c55f5d87dbd5574a37ac0cf8ea74fa688e6837ee URL: https://gitlab.winehq.org/wine/wine/-/commit/c55f5d87dbd5574a37ac0cf8ea74fa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 21 22:01:19 2024 -0600 wininet: Force debug info in critical sections. --- dlls/wininet/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ac3a1955270..9a20a877cdc 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3465,10 +3465,10 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, request->send_timeout = session->send_timeout; request->receive_timeout = session->receive_timeout; - InitializeCriticalSection( &request->headers_section ); + InitializeCriticalSectionEx( &request->headers_section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); request->headers_section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": http_request_t.headers_section"); - InitializeCriticalSection( &request->read_section ); + InitializeCriticalSectionEx( &request->read_section, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); request->read_section.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": http_request_t.read_section"); WININET_AddRef( &session->hdr );

1 0

Alex Henrie : advapi32/tests: Use CRT allocation functions.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: ce6e298a68b33a60ac85d1c8ecbe0580a989943a URL: https://gitlab.winehq.org/wine/wine/-/commit/ce6e298a68b33a60ac85d1c8ecbe05… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 17 22:16:16 2024 -0700 advapi32/tests: Use CRT allocation functions. --- dlls/advapi32/tests/crypt.c | 4 +- dlls/advapi32/tests/eventlog.c | 42 +++--- dlls/advapi32/tests/lsa.c | 12 +- dlls/advapi32/tests/registry.c | 20 +-- dlls/advapi32/tests/security.c | 322 ++++++++++++++++++++--------------------- dlls/advapi32/tests/service.c | 86 +++++------ 6 files changed, 243 insertions(+), 243 deletions(-)

1 0

Paul Gofman : windowscodecs: Force debug info in critical sections.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 4e49c37028d2cc7822253a25ae26037102e2cd83 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e49c37028d2cc7822253a25ae2603… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 21 22:00:23 2024 -0600 windowscodecs: Force debug info in critical sections. --- dlls/windowscodecs/bitmap.c | 2 +- dlls/windowscodecs/bmpdecode.c | 2 +- dlls/windowscodecs/clipper.c | 2 +- dlls/windowscodecs/converter.c | 2 +- dlls/windowscodecs/ddsformat.c | 6 +++--- dlls/windowscodecs/decoder.c | 2 +- dlls/windowscodecs/encoder.c | 2 +- dlls/windowscodecs/fliprotate.c | 2 +- dlls/windowscodecs/gifformat.c | 4 ++-- dlls/windowscodecs/icoformat.c | 2 +- dlls/windowscodecs/info.c | 4 ++-- dlls/windowscodecs/metadatahandler.c | 2 +- dlls/windowscodecs/palette.c | 2 +- dlls/windowscodecs/scaler.c | 2 +- dlls/windowscodecs/stream.c | 4 ++-- dlls/windowscodecs/tgaformat.c | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-)

1 0

Paul Gofman : ntdll: Force debug info in critical sections.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 27e70ba8ecf3eeb4d048fc01b3380a0dda0168d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/27e70ba8ecf3eeb4d048fc01b3380a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 21 21:52:54 2024 -0600 ntdll: Force debug info in critical sections. --- dlls/ntdll/heap.c | 2 +- dlls/ntdll/rtl.c | 2 +- dlls/ntdll/threadpool.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ec4e376bd4b..7764b9f0e71 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1548,7 +1548,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T } else { - RtlInitializeCriticalSection( &heap->cs ); + RtlInitializeCriticalSectionEx( &heap->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); heap->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": heap.cs"); } diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index a077108b8d0..3d482ec2f92 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -120,7 +120,7 @@ void WINAPI RtlInitializeResource(LPRTL_RWLOCK rwl) rwl->uSharedWaiters = 0; rwl->hOwningThreadId = 0; rwl->dwTimeoutBoost = 0; /* no info on this one, default value is 0 */ - RtlInitializeCriticalSection( &rwl->rtlCS ); + RtlInitializeCriticalSectionEx( &rwl->rtlCS, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); rwl->rtlCS.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RTL_RWLOCK.rtlCS"); NtCreateSemaphore( &rwl->hExclusiveReleaseSemaphore, SEMAPHORE_ALL_ACCESS, NULL, 0, 65535 ); NtCreateSemaphore( &rwl->hSharedReleaseSemaphore, SEMAPHORE_ALL_ACCESS, NULL, 0, 65535 ); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 4f22114a55e..c6e40fc78f4 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1675,7 +1675,7 @@ static NTSTATUS tp_threadpool_alloc( struct threadpool **out ) pool->objcount = 0; pool->shutdown = FALSE; - RtlInitializeCriticalSection( &pool->cs ); + RtlInitializeCriticalSectionEx( &pool->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); pool->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threadpool.cs"); for (i = 0; i < ARRAY_SIZE(pool->pools); ++i) @@ -1839,7 +1839,7 @@ static NTSTATUS tp_group_alloc( struct threadpool_group **out ) group->refcount = 1; group->shutdown = FALSE; - RtlInitializeCriticalSection( &group->cs ); + RtlInitializeCriticalSectionEx( &group->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); group->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threadpool_group.cs"); list_init( &group->members );

1 0

Paul Gofman : mscoree: Force debug info in critical sections.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 7c2f6be10e3e8093f07f5b5dded74651a138f4ee URL: https://gitlab.winehq.org/wine/wine/-/commit/7c2f6be10e3e8093f07f5b5dded746… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 21 21:46:48 2024 -0600 mscoree: Force debug info in critical sections. --- dlls/mscoree/corruntimehost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c8d384730c0..1a546f343e0 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1592,7 +1592,7 @@ HRESULT RuntimeHost_Construct(CLRRuntimeInfo *runtime_version, RuntimeHost** res This->ref = 1; This->version = runtime_version; - InitializeCriticalSection(&This->lock); + InitializeCriticalSectionEx(&This->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RuntimeHost.lock"); *result = This;

1 0

Alexandre Julliard : winegcc: Stop passing ARM code generation options to winebuild.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: 0c0d18155130b1946e0bf8b801ef77cc8584ddd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c0d18155130b1946e0bf8b801ef77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 12:01:38 2024 +0100 winegcc: Stop passing ARM code generation options to winebuild. They are not needed for PE builds. --- tools/winegcc/winegcc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 56fe179c92b..533fb3c519b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1700,12 +1700,10 @@ int main(int argc, char **argv) else if (!strcmp("-marm", opts.args.str[i] ) || !strcmp("-mthumb", opts.args.str[i] )) { raw_linker_arg = 1; - raw_winebuild_arg = 1; } else if (!strncmp("-mcpu=", opts.args.str[i], 6) || !strncmp("-mfpu=", opts.args.str[i], 6) || - !strncmp("-march=", opts.args.str[i], 7) || - !strncmp("-mfloat-abi=", opts.args.str[i], 12)) + !strncmp("-march=", opts.args.str[i], 7)) raw_winebuild_arg = 1; break; case 'n':

1 0

Alexandre Julliard : winebuild: Remove ARM code generation option.
by Alexandre Julliard Feb. 23, 2024

Feb. 23, 2024

Module: wine Branch: master Commit: af64a8bb5c8c62890ef74374f48b9134af73869d URL: https://gitlab.winehq.org/wine/wine/-/commit/af64a8bb5c8c62890ef74374f48b91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 23 12:02:17 2024 +0100 winebuild: Remove ARM code generation option. They are not needed for PE builds. --- tools/winebuild/build.h | 2 -- tools/winebuild/main.c | 15 --------------- tools/winebuild/winebuild.man.in | 2 +- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 50559e7c98c..af7861275a3 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -392,8 +392,6 @@ extern struct strarray nm_command; extern char *cpu_option; extern char *fpu_option; extern char *arch_option; -extern const char *float_abi_option; -extern int thumb_mode; extern int needs_get_pc_thunk; #endif /* __WINE_BUILD_H */ diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index e9cbf58d84f..71e61522578 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -69,17 +69,6 @@ struct strarray nm_command = { 0 }; char *cpu_option = NULL; char *fpu_option = NULL; char *arch_option = NULL; -#ifdef __SOFTFP__ -const char *float_abi_option = "soft"; -#else -const char *float_abi_option = "softfp"; -#endif - -#ifdef __thumb__ -int thumb_mode = 1; -#else -int thumb_mode = 0; -#endif static struct strarray res_files; @@ -164,7 +153,6 @@ static void set_target( const char *name ) target_alias = xstrdup( name ); if (!parse_target( name, &target )) fatal_error( "Unrecognized target '%s'\n", name ); - thumb_mode = target.cpu == CPU_ARM && is_pe(); if (is_pe()) unwind_tables = 1; } @@ -396,14 +384,11 @@ static void option_callback( int optc, char *optarg ) if (!strcmp( optarg, "16" )) main_spec->type = SPEC_WIN16; else if (!strcmp( optarg, "32" )) force_pointer_size = 4; else if (!strcmp( optarg, "64" )) force_pointer_size = 8; - else if (!strcmp( optarg, "arm" )) thumb_mode = 0; - else if (!strcmp( optarg, "thumb" )) thumb_mode = 1; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 1; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); - else if (!strncmp( optarg, "float-abi=", 10 )) float_abi_option = xstrdup( optarg + 10 ); else fatal_error( "Unknown -m option '%s'\n", optarg ); break; case 'M': diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 23ef3495744..ac8900187f4 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -179,7 +179,7 @@ option. .B \-m16, -m32, -m64 Generate respectively 16-bit, 32-bit or 64-bit code. .TP -.BI \-marm,\ \-mthumb,\ \-march= option ,\ \-mcpu= option ,\ \-mfpu= option ,\ \-mfloat-abi= option +.BI \-march= option ,\ \-mcpu= option ,\ \-mfpu= option Set code generation options for the assembler. .TP .B \-mno-cygwin

1 0