July 2017 - Wine-commits - list.winehq.org

Hugh McMaster : regedit: Use the heap_*() functions in regedit.c where possible.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 9be3c537011c9edbfd5182c13cb440a0234355bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be3c537011c9edbfd5182c13… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:25:53 2017 +0000 regedit: Use the heap_*() functions in regedit.c where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index c563628..4dd889b 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -42,12 +42,11 @@ static void output_writeconsole(const WCHAR *str, DWORD wlen) * we should call WriteFile() and assume the console encoding is still correct. */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); - msgA = HeapAlloc(GetProcessHeap(), 0, len); - if (!msgA) return; + msgA = heap_xalloc(len); WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - HeapFree(GetProcessHeap(), 0, msgA); + heap_free(msgA); } } @@ -123,13 +122,13 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) size = SearchPathW(NULL, filename, NULL, 0, NULL, NULL); if (size > 0) { - realname = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + realname = heap_xalloc(size * sizeof(WCHAR)); size = SearchPathW(NULL, filename, NULL, size, realname, NULL); } if (size == 0) { output_message(STRING_FILE_NOT_FOUND, filename); - HeapFree(GetProcessHeap(), 0, realname); + heap_free(realname); return; } reg_file = _wfopen(realname, rb_mode); @@ -138,14 +137,14 @@ static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; _wperror(regedit); output_message(STRING_CANNOT_OPEN_FILE, filename); - HeapFree(GetProcessHeap(), 0, realname); + heap_free(realname); return; } } import_registry_file(reg_file); if (realname) { - HeapFree(GetProcessHeap(), 0, realname); + heap_free(realname); fclose(reg_file); } break;

1 0

Hugh McMaster : regedit: Remove commented code from resize_frame_rect().
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 792e7046a6e9e1507abd947010fe1976a9765cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792e7046a6e9e1507abd94701… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:26:09 2017 +0000 regedit: Remove commented code from resize_frame_rect(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c3cc996..b82eb10 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -57,16 +57,9 @@ static WCHAR modifyW[32], modify_binaryW[64]; static void resize_frame_rect(HWND hWnd, PRECT prect) { - RECT rt; - /* - if (IsWindowVisible(hToolBar)) { - SendMessageW(hToolBar, WM_SIZE, 0, 0); - GetClientRect(hToolBar, &rt); - prect->top = rt.bottom+3; - prect->bottom -= rt.bottom+3; - } - */ if (IsWindowVisible(hStatusBar)) { + RECT rt; + SetupStatusBar(hWnd, TRUE); GetClientRect(hStatusBar, &rt); prect->bottom -= rt.bottom;

1 0

Alistair Leslie-Hughes : rpcrt4/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: a5767fc1f37d12b3413d5993f294ed4a413f4158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5767fc1f37d12b3413d5993f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 27 04:44:59 2017 +0000 rpcrt4/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 01a61ae..31f5c4d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -912,7 +912,7 @@ basic_tests(void) x = sum_double_int(-78, 148.46); ok(x == 70, "RPC sum_double_int got %d\n", x); y = sum_hyper((hyper)0x12345678 << 16, (hyper)0x33557799 << 16); - ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %x%08x\n", (DWORD)(y >> 32), (DWORD)y); + ok(y == (hyper)0x4589ce11 << 16, "RPC hyper got %s\n", wine_dbgstr_longlong(y)); x = sum_hyper_int((hyper)0x24242424 << 16, -((hyper)0x24241212 << 16)); ok(x == 0x12120000, "RPC hyper_int got 0x%x\n", x); x = sum_char_hyper( 12, ((hyper)0x42424242 << 32) | 0x33334444 );

1 0

Alistair Leslie-Hughes : ucrtbase/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 56998d567edef8a354273b7c78cbd71917215694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56998d567edef8a354273b7c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 27 04:45:08 2017 +0000 ucrtbase/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 213700f..c70e4b6 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -468,8 +468,8 @@ static void test_lldiv(void) MSVCRT_lldiv_t r; r = p_lldiv((LONGLONG)0x111 << 32 | 0x222, (LONGLONG)1 << 32); - ok(r.quot == 0x111, "quot = %x%08x\n", (INT32)(r.quot >> 32), (UINT32)r.quot); - ok(r.rem == 0x222, "rem = %x%08x\n", (INT32)(r.rem >> 32), (UINT32)r.rem); + ok(r.quot == 0x111, "quot = %s\n", wine_dbgstr_longlong(r.quot)); + ok(r.rem == 0x222, "rem = %s\n", wine_dbgstr_longlong(r.rem)); } static void test_isblank(void)

1 0

Alexandre Julliard : server: Add a platform-specific entry point to initialize registers of a new thread.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 9a07d210f135c91dda89d888dcedac864ff36781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a07d210f135c91dda89d888d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 10:50:41 2017 +0200 server: Add a platform-specific entry point to initialize registers of a new thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mach.c | 5 +++++ server/procfs.c | 5 +++++ server/ptrace.c | 15 +++++++++++++++ server/thread.c | 1 + server/thread.h | 1 + 5 files changed, 27 insertions(+) diff --git a/server/mach.c b/server/mach.c index 2ef6e59..9d8d911 100644 --- a/server/mach.c +++ b/server/mach.c @@ -148,6 +148,11 @@ void finish_process_tracing( struct process *process ) } } +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { diff --git a/server/procfs.c b/server/procfs.c index 5caa02b..7b61b2a 100644 --- a/server/procfs.c +++ b/server/procfs.c @@ -202,6 +202,11 @@ error: close( fd ); } +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { diff --git a/server/ptrace.c b/server/ptrace.c index cb436b6..7de506b 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -542,6 +542,11 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, /* debug register offset in struct user */ #define DR_OFFSET(dr) ((((struct user *)0)->u_debugreg) + (dr)) +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { @@ -652,6 +657,11 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign #include <machine/reg.h> +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { @@ -726,6 +736,11 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign #else /* linux || __FreeBSD__ */ +/* initialize registers in new thread if necessary */ +void init_thread_context( struct thread *thread ) +{ +} + /* retrieve the thread x86 registers */ void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ) { diff --git a/server/thread.c b/server/thread.c index 70f5f28..24e9af5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1317,6 +1317,7 @@ DECL_HANDLER(init_thread) } if (process->unix_pid != current->unix_pid) process->unix_pid = -1; /* can happen with linuxthreads */ + init_thread_context( current ); stop_thread_if_suspended( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); set_thread_affinity( current, current->affinity ); diff --git a/server/thread.h b/server/thread.h index 2821991..2fdfd66 100644 --- a/server/thread.h +++ b/server/thread.h @@ -131,6 +131,7 @@ extern int is_cpu_supported( enum cpu_type cpu ); /* ptrace functions */ extern void sigchld_callback(void); +extern void init_thread_context( struct thread *thread ); extern void get_thread_context( struct thread *thread, context_t *context, unsigned int flags ); extern void set_thread_context( struct thread *thread, const context_t *context, unsigned int flags ); extern int send_thread_signal( struct thread *thread, int sig );

1 0

Alexandre Julliard : server: Initialize debug registers in new threads if necessary.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: abe0b1c57bbe9a952e55d4f821073b0a5197d746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe0b1c57bbe9a952e55d4f82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 27 10:55:30 2017 +0200 server: Initialize debug registers in new threads if necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 10 +++++----- server/ptrace.c | 34 +++++++++++++++++++++++++++++++--- server/thread.c | 2 ++ server/thread.h | 1 + 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 7cb704c..2308472 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -904,7 +904,7 @@ static void test_exceptions(void) res = pNtGetContextThread( h, &ctx ); ok( res == STATUS_SUCCESS, "NtGetContextThread failed with %x\n", res ); ok( ctx.Dr0 == 0, "dr0 %x\n", ctx.Dr0 ); - todo_wine ok( ctx.Dr7 == 0, "dr7 %x\n", ctx.Dr7 ); + ok( ctx.Dr7 == 0, "dr7 %x\n", ctx.Dr7 ); ctx.Dr0 = (DWORD)code_mem; ctx.Dr7 = 3; res = pNtSetContextThread( h, &ctx ); @@ -2168,8 +2168,8 @@ static DWORD WINAPI register_check_thread(void *arg) ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); - todo_wine ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); - todo_wine ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); + ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); + ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); return 0; } @@ -2238,8 +2238,8 @@ static void test_debug_registers(void) ok(!ctx.Dr1, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr1); ok(!ctx.Dr2, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr2); ok(!ctx.Dr3, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr3); - todo_wine ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); - todo_wine ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); + ok(!ctx.Dr6, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr6); + ok(!ctx.Dr7, "expected 0, got %lx\n", (DWORD_PTR)ctx.Dr7); ResumeThread(thread); WaitForSingleObject(thread, 10000); diff --git a/server/ptrace.c b/server/ptrace.c index 7de506b..a647df9 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -545,6 +545,8 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, /* initialize registers in new thread if necessary */ void init_thread_context( struct thread *thread ) { + /* Linux doesn't clear all registers, but hopefully enough to avoid spurious breakpoints */ + thread->system_regs = 0; } /* retrieve the thread x86 registers */ @@ -558,6 +560,13 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int if (!suspend_for_ptrace( thread )) return; + if (!(thread->system_regs & SERVER_CTX_DEBUG_REGISTERS)) + { + /* caller has initialized everything to 0 already, just return */ + context->flags |= SERVER_CTX_DEBUG_REGISTERS; + goto done; + } + for (i = 0; i < 8; i++) { if (i == 4 || i == 5) continue; @@ -625,6 +634,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.i386_regs.dr7 ) == -1) goto error; if (thread->context) thread->context->debug.i386_regs.dr7 = context->debug.i386_regs.dr7; + thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; case CPU_x86_64: if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 & 0xffff0000 ) == -1) goto error; @@ -641,6 +651,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 | 0x55 ); if (ptrace( PTRACE_POKEUSER, pid, DR_OFFSET(7), context->debug.x86_64_regs.dr7 ) == -1) goto error; if (thread->context) thread->context->debug.x86_64_regs.dr7 = context->debug.x86_64_regs.dr7; + thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; break; default: set_error( STATUS_INVALID_PARAMETER ); @@ -660,6 +671,18 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign /* initialize registers in new thread if necessary */ void init_thread_context( struct thread *thread ) { + if (!(thread->system_regs & SERVER_CTX_DEBUG_REGISTERS)) return; + + /* FreeBSD doesn't clear the debug registers in new threads */ + if (suspend_for_ptrace( thread )) + { + struct dbreg dbregs; + + memset( &dbregs, 0, sizeof(dbregs) ); + ptrace( PTRACE_SETDBREGS, get_ptrace_tid( thread ), (caddr_t)&dbregs, 0 ); + resume_after_ptrace( thread ); + } + thread->system_regs = 0; } /* retrieve the thread x86 registers */ @@ -728,9 +751,14 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign dbregs.dr6 = context->debug.i386_regs.dr6; dbregs.dr7 = context->debug.i386_regs.dr7; #endif - if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t) &dbregs, 0 ) == -1) file_set_error(); - else if (thread->context) - thread->context->debug.i386_regs = context->debug.i386_regs; /* update the cached values */ + if (ptrace( PTRACE_SETDBREGS, pid, (caddr_t)&dbregs, 0 ) != -1) + { + if (thread->context) + thread->context->debug.i386_regs = context->debug.i386_regs; /* update the cached values */ + thread->system_regs |= SERVER_CTX_DEBUG_REGISTERS; + } + else file_set_error(); + resume_after_ptrace( thread ); } diff --git a/server/thread.c b/server/thread.c index 24e9af5..903420b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -182,6 +182,7 @@ static inline void init_thread_structure( struct thread *thread ) thread->debug_ctx = NULL; thread->debug_event = NULL; thread->debug_break = 0; + thread->system_regs = 0; thread->queue = NULL; thread->wait = NULL; thread->error = 0; @@ -1245,6 +1246,7 @@ DECL_HANDLER(new_thread) if ((thread = create_thread( request_fd, current->process ))) { + thread->system_regs = current->system_regs; if (req->suspend) thread->suspend++; reply->tid = get_thread_id( thread ); if ((reply->handle = alloc_handle( current->process, thread, req->access, req->attributes ))) diff --git a/server/thread.h b/server/thread.h index 2fdfd66..1d81d61 100644 --- a/server/thread.h +++ b/server/thread.h @@ -57,6 +57,7 @@ struct thread struct debug_ctx *debug_ctx; /* debugger context if this thread is a debugger */ struct debug_event *debug_event; /* debug event being sent to debugger */ int debug_break; /* debug breakpoint pending? */ + unsigned int system_regs; /* which system regs have been set */ struct msg_queue *queue; /* message queue */ struct thread_wait *wait; /* current wait condition if sleeping */ struct list system_apc; /* queue of system async procedure calls */

1 0

Hugh McMaster : regedit: Use a helper function to allocate memory and check for a valid pointer.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: 79ff4148c2691e579ab17ce912a97d7f57627343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ff4148c2691e579ab17ce91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:24:49 2017 +0000 regedit: Use a helper function to allocate memory and check for a valid pointer. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 68 ++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e0393cc..4b21478 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -28,8 +28,11 @@ #include <io.h> #include <windows.h> #include <wine/unicode.h> +#include <wine/debug.h> #include "regproc.h" +WINE_DEFAULT_DEBUG_CHANNEL(regedit); + #define REG_VAL_BUF_SIZE 4096 extern const WCHAR* reg_class_namesW[]; @@ -41,6 +44,17 @@ static HKEY reg_class_keys[] = { #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) +static void *heap_xalloc(size_t size) +{ + void *buf = HeapAlloc(GetProcessHeap(), 0, size); + if (!buf) + { + ERR("Out of memory!\n"); + exit(1); + } + return buf; +} + /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller @@ -52,8 +66,7 @@ static WCHAR* GetWideString(const char* strA) WCHAR* strW; int len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); - strW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(strW); + strW = heap_xalloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, len); return strW; } @@ -71,8 +84,7 @@ static WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) WCHAR* strW; *len = MultiByteToWideChar(CP_ACP, 0, strA, chars, NULL, 0); - strW = HeapAlloc(GetProcessHeap(), 0, *len * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(strW); + strW = heap_xalloc(*len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, chars, strW, *len); return strW; } @@ -91,8 +103,7 @@ char* GetMultiByteString(const WCHAR* strW) char* strA; int len = WideCharToMultiByte(CP_ACP, 0, strW, -1, NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, len); - CHECK_ENOUGH_MEMORY(strA); + strA = heap_xalloc(len); WideCharToMultiByte(CP_ACP, 0, strW, -1, strA, len, NULL, NULL); return strA; } @@ -110,8 +121,7 @@ static char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len) char* strA; *len = WideCharToMultiByte(CP_ACP, 0, strW, chars, NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, *len); - CHECK_ENOUGH_MEMORY(strA); + strA = heap_xalloc(*len); WideCharToMultiByte(CP_ACP, 0, strW, chars, strA, *len, NULL, NULL); return strA; } @@ -476,8 +486,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) if (res == ERROR_SUCCESS) { - parser->key_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(path) + 1) * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(parser->key_name); + parser->key_name = heap_xalloc((lstrlenW(path) + 1) * sizeof(WCHAR)); lstrcpyW(parser->key_name, path); } else @@ -564,8 +573,7 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) if (!parser->is_unicode) { - header = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(line) + 3) * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(header); + header = heap_xalloc((lstrlenW(line) + 3) * sizeof(WCHAR)); header[0] = parser->two_wchars[0]; header[1] = parser->two_wchars[1]; lstrcpyW(header + 2, line); @@ -722,8 +730,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) goto invalid; /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ - parser->value_name = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(val_name) + 1) * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(parser->value_name); + parser->value_name = heap_xalloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); lstrcpyW(parser->value_name, val_name); set_state(parser, DATA_START); @@ -834,8 +841,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) { WCHAR *line = pos; - parser->data = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)); - CHECK_ENOUGH_MEMORY(parser->data); + parser->data = heap_xalloc(sizeof(DWORD)); if (!convert_hex_to_dword(line, parser->data)) goto invalid; @@ -958,8 +964,7 @@ static WCHAR *get_lineA(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = HeapAlloc(GetProcessHeap(), 0, size); - CHECK_ENOUGH_MEMORY(buf); + buf = heap_xalloc(size); *buf = 0; next = buf; } @@ -1016,8 +1021,7 @@ static WCHAR *get_lineW(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(buf); + buf = heap_xalloc(size * sizeof(WCHAR)); *buf = 0; next = buf; } @@ -1156,7 +1160,7 @@ static WCHAR *REGPROC_escape_string(WCHAR *str, size_t str_len, size_t *line_len escape_count++; } - buf = resize_buffer(NULL, (str_len + escape_count + 1) * sizeof(WCHAR)); + buf = heap_xalloc((str_len + escape_count + 1) * sizeof(WCHAR)); for (i = 0, pos = 0; i < str_len; i++, pos++) { @@ -1203,7 +1207,7 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) if (name && *name) { WCHAR *str = REGPROC_escape_string(name, len, &line_len); - WCHAR *buf = resize_buffer(NULL, (line_len + 4) * sizeof(WCHAR)); + WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); line_len = sprintfW(buf, quoted_fmt, str); REGPROC_write_line(fp, buf, unicode); HeapFree(GetProcessHeap(), 0, buf); @@ -1226,7 +1230,7 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) len = size / sizeof(WCHAR) - 1; str = REGPROC_escape_string(data, len, &line_len); - *buf = resize_buffer(NULL, (line_len + 3) * sizeof(WCHAR)); + *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); sprintfW(*buf, fmt, str); HeapFree(GetProcessHeap(), 0, str); } @@ -1235,7 +1239,7 @@ static void export_dword_data(WCHAR **buf, DWORD *data) { static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; - *buf = resize_buffer(NULL, 15 * sizeof(WCHAR)); + *buf = heap_xalloc(15 * sizeof(WCHAR)); sprintfW(*buf, fmt, *data); } @@ -1252,7 +1256,7 @@ static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) } else { - WCHAR *buf = resize_buffer(NULL, 15 * sizeof(WCHAR)); + WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); line_len = sprintfW(buf, hexp_fmt, type); REGPROC_write_line(fp, buf, unicode); HeapFree(GetProcessHeap(), 0, buf); @@ -1276,7 +1280,7 @@ static void export_hex_data(FILE *fp, WCHAR **buf, DWORD type, DWORD line_len, data = GetMultiByteStringN(data, size / sizeof(WCHAR), &size); num_commas = size - 1; - *buf = resize_buffer(NULL, (size * 3) * sizeof(WCHAR)); + *buf = heap_xalloc(size * 3 * sizeof(WCHAR)); for (i = 0, pos = 0; i < size; i++) { @@ -1336,7 +1340,7 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, WCHAR *subkey_path; static const WCHAR fmt[] = {'%','s','\\','%','s',0}; - subkey_path = resize_buffer(NULL, (path_len + subkey_len + 2) * sizeof(WCHAR)); + subkey_path = heap_xalloc((path_len + subkey_len + 2) * sizeof(WCHAR)); sprintfW(subkey_path, fmt, path, subkey_name); return subkey_path; @@ -1347,7 +1351,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; WCHAR *buf; - buf = resize_buffer(NULL, (lstrlenW(name) + 7) * sizeof(WCHAR)); + buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); sprintfW(buf, fmt, name); REGPROC_write_line(fp, buf, unicode); HeapFree(GetProcessHeap(), 0, buf); @@ -1368,8 +1372,8 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) export_key_name(fp, path, unicode); - value_name = resize_buffer(NULL, max_value_len * sizeof(WCHAR)); - data = resize_buffer(NULL, max_data_bytes); + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + data = heap_xalloc(max_data_bytes); i = 0; for (;;) @@ -1401,7 +1405,7 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, value_name); - subkey_name = resize_buffer(NULL, MAX_SUBKEY_LEN * sizeof(WCHAR)); + subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); @@ -1521,7 +1525,7 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; } - class_name = resize_buffer(NULL, (lstrlenW(reg_class_namesW[i]) + 1) * sizeof(WCHAR)); + class_name = heap_xalloc((lstrlenW(reg_class_namesW[i]) + 1) * sizeof(WCHAR)); lstrcpyW(class_name, reg_class_namesW[i]); export_registry_data(fp, classes[i], class_name, unicode);

1 0

Hugh McMaster : regedit: Use a helper function to free allocated memory.
by Alexandre Julliard 27 Jul '17

27 Jul '17

Module: wine Branch: master Commit: f7bdf34029a7f316ea8040ea2da78e38d7e31056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bdf34029a7f316ea8040ea2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 27 12:24:58 2017 +0000 regedit: Use a helper function to free allocated memory. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 49 +++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4b21478..b686714 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -55,6 +55,11 @@ static void *heap_xalloc(size_t size) return buf; } +static BOOL heap_free(void *buf) +{ + return HeapFree(GetProcessHeap(), 0, buf); +} + /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller @@ -457,7 +462,7 @@ static void close_key(struct parser *parser) { if (parser->hkey) { - HeapFree(GetProcessHeap(), 0, parser->key_name); + heap_free(parser->key_name); parser->key_name = NULL; RegCloseKey(parser->hkey); @@ -498,7 +503,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) static void free_parser_data(struct parser *parser) { if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - HeapFree(GetProcessHeap(), 0, parser->data); + heap_free(parser->data); parser->data = NULL; parser->data_size = 0; @@ -520,7 +525,7 @@ static void prepare_hex_string_data(struct parser *parser) { parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); parser->data_size *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); } } } @@ -578,7 +583,7 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) header[1] = parser->two_wchars[1]; lstrcpyW(header + 2, line); parser->reg_version = parse_file_header(header); - HeapFree(GetProcessHeap(), 0, header); + heap_free(header); } else parser->reg_version = parse_file_header(line); @@ -708,7 +713,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) /* handler for parser DEFAULT_VALUE_NAME state */ static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) { - HeapFree(GetProcessHeap(), 0, parser->value_name); + heap_free(parser->value_name); parser->value_name = NULL; set_state(parser, DATA_START); @@ -722,7 +727,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) if (parser->value_name) { - HeapFree(GetProcessHeap(), 0, parser->value_name); + heap_free(parser->value_name); parser->value_name = NULL; } @@ -957,7 +962,7 @@ static WCHAR *get_lineA(FILE *fp) static char *buf, *next; char *line; - HeapFree(GetProcessHeap(), 0, lineW); + heap_free(lineW); if (!fp) goto cleanup; @@ -1005,7 +1010,7 @@ static WCHAR *get_lineA(FILE *fp) cleanup: lineW = NULL; - if (size) HeapFree(GetProcessHeap(), 0, buf); + if (size) heap_free(buf); size = 0; return NULL; } @@ -1060,7 +1065,7 @@ static WCHAR *get_lineW(FILE *fp) } cleanup: - if (size) HeapFree(GetProcessHeap(), 0, buf); + if (size) heap_free(buf); size = 0; return NULL; } @@ -1103,7 +1108,7 @@ BOOL import_registry_file(FILE *reg_file) if (parser.reg_version == REG_VERSION_FUZZY || parser.reg_version == REG_VERSION_INVALID) return parser.reg_version == REG_VERSION_FUZZY; - HeapFree(GetProcessHeap(), 0, parser.value_name); + heap_free(parser.value_name); close_key(&parser); return TRUE; @@ -1144,7 +1149,7 @@ static void REGPROC_write_line(FILE *fp, const WCHAR *str, BOOL unicode) { char *strA = GetMultiByteString(str); fputs(strA, fp); - HeapFree(GetProcessHeap(), 0, strA); + heap_free(strA); } } @@ -1210,8 +1215,8 @@ static size_t export_value_name(FILE *fp, WCHAR *name, size_t len, BOOL unicode) WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); line_len = sprintfW(buf, quoted_fmt, str); REGPROC_write_line(fp, buf, unicode); - HeapFree(GetProcessHeap(), 0, buf); - HeapFree(GetProcessHeap(), 0, str); + heap_free(buf); + heap_free(str); } else { @@ -1232,7 +1237,7 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) str = REGPROC_escape_string(data, len, &line_len); *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); sprintfW(*buf, fmt, str); - HeapFree(GetProcessHeap(), 0, str); + heap_free(str); } static void export_dword_data(WCHAR **buf, DWORD *data) @@ -1259,7 +1264,7 @@ static size_t export_hex_data_type(FILE *fp, DWORD type, BOOL unicode) WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); line_len = sprintfW(buf, hexp_fmt, type); REGPROC_write_line(fp, buf, unicode); - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); } return line_len; @@ -1331,7 +1336,7 @@ static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type } REGPROC_write_line(fp, buf, unicode); - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); export_newline(fp, unicode); } @@ -1354,7 +1359,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); sprintfW(buf, fmt, name); REGPROC_write_line(fp, buf, unicode); - HeapFree(GetProcessHeap(), 0, buf); + heap_free(buf); } #define MAX_SUBKEY_LEN 257 @@ -1402,8 +1407,8 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) else break; } - HeapFree(GetProcessHeap(), 0, data); - HeapFree(GetProcessHeap(), 0, value_name); + heap_free(data); + heap_free(value_name); subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); @@ -1422,13 +1427,13 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) export_registry_data(fp, subkey, subkey_path, unicode); RegCloseKey(subkey); } - HeapFree(GetProcessHeap(), 0, subkey_path); + heap_free(subkey_path); i++; } else break; } - HeapFree(GetProcessHeap(), 0, subkey_name); + heap_free(subkey_name); return 0; } @@ -1530,7 +1535,7 @@ static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode) export_registry_data(fp, classes[i], class_name, unicode); - HeapFree(GetProcessHeap(), 0, class_name); + heap_free(class_name); RegCloseKey(key); }

1 0

Alexandre Julliard : ntdll: Remove support for relay debugging of register functions.
by Alexandre Julliard 26 Jul '17

26 Jul '17

Module: wine Branch: master Commit: ca20bddefc8c1c4331fc18cb0f7dc28f9288c7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca20bddefc8c1c4331fc18cb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 26 10:41:27 2017 +0200 ntdll: Remove support for relay debugging of register functions. The only remaining ones in krnl386 have been removed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll_misc.h | 12 -------- dlls/ntdll/relay.c | 81 +------------------------------------------------ 2 files changed, 1 insertion(+), 92 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index ba296d2..c97b1e1 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -239,18 +239,6 @@ static inline struct ntdll_thread_data *ntdll_get_thread_data(void) extern mode_t FILE_umask DECLSPEC_HIDDEN; extern HANDLE keyed_event DECLSPEC_HIDDEN; -/* Register functions */ - -#ifdef __i386__ -#define DEFINE_REGS_ENTRYPOINT( name, args ) \ - __ASM_GLOBAL_FUNC( name, \ - ".byte 0x68\n\t" /* pushl $__regs_func */ \ - ".long " __ASM_NAME("__regs_") #name "-.-11\n\t" \ - ".byte 0x6a," #args "\n\t" /* pushl $args */ \ - "call " __ASM_NAME("__wine_call_from_regs") "\n\t" \ - "ret $(4*" #args ")" ) /* fake ret to make copy protections happy */ -#endif - #define HASH_STRING_ALGORITHM_DEFAULT 0 #define HASH_STRING_ALGORITHM_X65599 1 #define HASH_STRING_ALGORITHM_INVALID 0xffffffff diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 30cb953..f16b4fc 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -47,7 +47,7 @@ struct relay_descr /* descriptor for a module */ { void *magic; /* signature */ void *relay_call; /* functions to call from relay thunks */ - void *relay_call_regs; + void *relay_call_regs; /* no longer used */ void *private; /* reserved for the relay code private data */ const char *entry_point_base; /* base address of entry point thunks */ const unsigned int *entry_point_offsets; /* offsets of entry points thunks */ @@ -481,70 +481,6 @@ __ASM_GLOBAL_FUNC( relay_call, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret $12" ) -void WINAPI DECLSPEC_HIDDEN __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, - unsigned int orig_eax, unsigned int ret_addr, - CONTEXT *context ) -{ - WORD ordinal = LOWORD(idx); - BYTE nb_args = LOBYTE(HIWORD(idx)); - struct relay_private_data *data = descr->private; - struct relay_entry_point *entry_point = data->entry_points + ordinal; - BYTE *orig_func = entry_point->orig_func; - INT_PTR *args = (INT_PTR *)context->Esp; - INT_PTR args_copy[32]; - - /* restore the context to what it was before the relay thunk */ - context->Eax = orig_eax; - context->Eip = ret_addr; - context->Esp += nb_args * sizeof(int); - - if (TRACE_ON(relay)) - { - if (entry_point->name) - DPRINTF( "%04x:Call %s.%s(", GetCurrentThreadId(), data->dllname, entry_point->name ); - else - DPRINTF( "%04x:Call %s.%u(", GetCurrentThreadId(), data->dllname, data->base + ordinal ); - RELAY_PrintArgs( args, nb_args, descr->arg_types[ordinal] ); - DPRINTF( ") ret=%08x\n", ret_addr ); - - DPRINTF( "%04x: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x " - "ebp=%08x esp=%08x ds=%04x es=%04x fs=%04x gs=%04x flags=%08x\n", - GetCurrentThreadId(), context->Eax, context->Ebx, context->Ecx, - context->Edx, context->Esi, context->Edi, context->Ebp, context->Esp, - context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); - - assert( orig_func[0] == 0x68 /* pushl func */ ); - assert( orig_func[5] == 0x6a /* pushl args */ ); - assert( orig_func[7] == 0xe8 /* call */ ); - } - - /* now call the real function */ - - memcpy( args_copy, args, nb_args * sizeof(args[0]) ); - args_copy[nb_args++] = (INT_PTR)context; /* append context argument */ - - call_entry_point( orig_func + 12 + *(int *)(orig_func + 1), nb_args, args_copy, 0 ); - - if (TRACE_ON(relay)) - { - if (entry_point->name) - DPRINTF( "%04x:Ret %s.%s() retval=%08x ret=%08x\n", - GetCurrentThreadId(), data->dllname, entry_point->name, - context->Eax, context->Eip ); - else - DPRINTF( "%04x:Ret %s.%u() retval=%08x ret=%08x\n", - GetCurrentThreadId(), data->dllname, data->base + ordinal, - context->Eax, context->Eip ); - DPRINTF( "%04x: eax=%08x ebx=%08x ecx=%08x edx=%08x esi=%08x edi=%08x " - "ebp=%08x esp=%08x ds=%04x es=%04x fs=%04x gs=%04x flags=%08x\n", - GetCurrentThreadId(), context->Eax, context->Ebx, context->Ecx, - context->Edx, context->Esi, context->Edi, context->Ebp, context->Esp, - context->SegDs, context->SegEs, context->SegFs, context->SegGs, context->EFlags ); - } -} -extern void WINAPI relay_call_regs(void); -DEFINE_REGS_ENTRYPOINT( relay_call_regs, 4 ) - #elif defined(__arm__) extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args, int flags ); @@ -591,10 +527,6 @@ static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, return ret; } -static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_PTR *stack ) -{ - assert(0); /* should never be called */ -} #elif defined(__aarch64__) extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args, int flags ); @@ -650,11 +582,6 @@ static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, return ret; } -static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_PTR *stack ) -{ - assert(0); /* should never be called */ -} - #elif defined(__x86_64__) extern void * WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ); @@ -719,11 +646,6 @@ __ASM_GLOBAL_FUNC( relay_call, __ASM_CFI(".cfi_same_value %rbp\n\t") "ret") -static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_PTR *stack ) -{ - assert(0); /* should never be called */ -} - #else #error Not supported on this CPU #endif @@ -776,7 +698,6 @@ void RELAY_SetupDLL( HMODULE module ) return; descr->relay_call = relay_call; - descr->relay_call_regs = relay_call_regs; descr->private = data; data->module = module;

1 0

Alexandre Julliard : winebuild: Disallow register functions in 32-bit modules.
by Alexandre Julliard 26 Jul '17

26 Jul '17

Module: wine Branch: master Commit: 9fd4647977b4ec17b827f563c675436e6ffe380b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd4647977b4ec17b827f563c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 26 10:42:48 2017 +0200 winebuild: Disallow register functions in 32-bit modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/parser.c | 12 ++++++++++++ tools/winebuild/spec32.c | 24 ++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 2762a8c..ad99654 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -498,6 +498,18 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp ) error( "Unknown flag '%s'\n", token ); return NULL; } + switch (1 << i) + { + case FLAG_RET16: + case FLAG_REGISTER: + if (spec->type == SPEC_WIN32) + error( "Flag '%s' is not supported in Win32\n", FlagNames[i] ); + break; + case FLAG_RET64: + if (spec->type == SPEC_WIN16) + error( "Flag '%s' is not supported in Win16\n", FlagNames[i] ); + break; + } odp->flags |= 1 << i; } token = GetToken(0); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 39733b2..6536cd8 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -68,8 +68,6 @@ static inline int needs_relay( const ORDDEF *odp ) } /* skip norelay and forward entry points */ if (odp->flags & (FLAG_NORELAY|FLAG_FORWARD)) return 0; - /* skip register entry points on x86_64 */ - if (target_cpu == CPU_x86_64 && (odp->flags & FLAG_REGISTER)) return 0; return 1; } @@ -179,10 +177,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tpushl %%eax\n" ); flags |= 2; } - if (odp->flags & FLAG_REGISTER) - output( "\tpushl %%eax\n" ); - else - output( "\tpushl %%esp\n" ); + output( "\tpushl %%esp\n" ); output_cfi( ".cfi_adjust_cfa_offset 4" ); if (odp->flags & FLAG_RET64) flags |= 1; @@ -199,19 +194,12 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tpushl %%eax\n" ); output_cfi( ".cfi_adjust_cfa_offset 4" ); - if (odp->flags & FLAG_REGISTER) - { - output( "\tcall *8(%%eax)\n" ); - } + output( "\tcall *4(%%eax)\n" ); + output_cfi( ".cfi_adjust_cfa_offset -12" ); + if (odp->type == TYPE_STDCALL || odp->type == TYPE_THISCALL) + output( "\tret $%u\n", args * get_ptr_size() ); else - { - output( "\tcall *4(%%eax)\n" ); - output_cfi( ".cfi_adjust_cfa_offset -12" ); - if (odp->type == TYPE_STDCALL || odp->type == TYPE_THISCALL) - output( "\tret $%u\n", args * get_ptr_size() ); - else - output( "\tret\n" ); - } + output( "\tret\n" ); break; case CPU_ARM:

1 0