wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

André Hentschel : make_xftmpl: Avoid comparing a char with EOF.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: a32199b3f3b755cd21b7135db05962a67ac318d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32199b3f3b755cd21b7135db… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Feb 12 16:21:04 2013 +0100 make_xftmpl: Avoid comparing a char with EOF. --- tools/make_xftmpl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 85b373f..b5751ce 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -336,7 +336,7 @@ static BOOL parse_token(struct parser *parser) if (len + 1 < sizeof(buffer)) buffer[len++] = c; } - if (c == EOF) { + if (c != '"') { fprintf(stderr, "%s: Unterminated string (line %d).\n", program_name, parser->line_no); parser->error = TRUE;

1 0

Alexandre Julliard : ntdll: Check for invalid %gs value in 32-bit code.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 64ddb263d25dfceeeae8457a0131f1a2af292383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ddb263d25dfceeeae8457a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 15:21:15 2013 +0100 ntdll: Check for invalid %gs value in 32-bit code. Suggested by Alessandro Pignotti. --- dlls/ntdll/signal_i386.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 18fe3da..05ede34 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1507,6 +1507,47 @@ static inline DWORD is_privileged_instr( CONTEXT *context ) } } +/*********************************************************************** + * check_invalid_gs + * + * Check for fault caused by invalid %gs value (some copy protection schemes mess with it). + */ +static inline BOOL check_invalid_gs( CONTEXT *context ) +{ + unsigned int prefix_count = 0; + const BYTE *instr = (BYTE *)context->Eip; + WORD system_gs = ntdll_get_thread_data()->gs; + + if (context->SegGs == system_gs) return FALSE; + if (!wine_ldt_is_system( context->SegCs )) return FALSE; + /* only handle faults in system libraries */ + if (virtual_is_valid_code_address( instr, 1 )) return FALSE; + + for (;;) switch(*instr) + { + /* instruction prefixes */ + case 0x2e: /* %cs: */ + case 0x36: /* %ss: */ + case 0x3e: /* %ds: */ + case 0x26: /* %es: */ + case 0x64: /* %fs: */ + case 0x66: /* opcode size */ + case 0x67: /* addr size */ + case 0xf0: /* lock */ + case 0xf2: /* repne */ + case 0xf3: /* repe */ + if (++prefix_count >= 15) return FALSE; + instr++; + continue; + case 0x65: /* %gs: */ + TRACE( "%04x/%04x at %p, fixing up\n", context->SegGs, system_gs, instr ); + context->SegGs = system_gs; + return TRUE; + default: + return FALSE; + } +} + #include "pshpack1.h" struct atl_thunk @@ -1716,6 +1757,8 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context { if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT && check_atl_thunk( rec, context )) goto done; + if (rec->ExceptionInformation[1] == 0xffffffff && check_invalid_gs( context )) + goto done; if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] ))) goto done;

1 0

Alexandre Julliard : ntdll: Add a helper function to check that a fault address lies in a known virtual memory view .
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 99d89b347fd3cf6281817ff6fe884be8b359f944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d89b347fd3cf6281817ff6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 19:56:08 2013 +0100 ntdll: Add a helper function to check that a fault address lies in a known virtual memory view. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 2 ++ dlls/ntdll/virtual.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e56d4b4..b4f7dbd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -166,6 +166,7 @@ extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size ) DECLSPEC_HIDDEN; extern void virtual_clear_thread_stack(void) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; +extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4a83a70..18fe3da 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1528,6 +1528,8 @@ static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; BOOL ret = FALSE; + if (!virtual_is_valid_code_address( thunk, sizeof(thunk) )) return FALSE; + __TRY { if (thunk->movl == 0x042444c7 && thunk->jmp == 0xe9) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 4f8b3c9..924ec46 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1617,6 +1617,23 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) /*********************************************************************** + * virtual_is_valid_code_address + */ +BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) +{ + struct file_view *view; + BOOL ret = FALSE; + sigset_t sigset; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if ((view = VIRTUAL_FindView( addr, size ))) + ret = !(view->protect & VPROT_SYSTEM); /* system views are not visible to the app */ + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return ret; +} + + +/*********************************************************************** * virtual_handle_stack_fault * * Handle an access fault inside the current thread stack.

1 0

Jacek Caban : oleaut32: Return error if VT_HRESULT is used as return type in DispCallFunc.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 88367a3c58df9993164124c3abd558d6e4ffb12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88367a3c58df9993164124c3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 14:52:30 2013 +0100 oleaut32: Return error if VT_HRESULT is used as return type in DispCallFunc. --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++++ dlls/oleaut32/typelib.c | 8 ++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1bcc584..077c59c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -923,6 +923,11 @@ static int WINAPI inst_func( void *inst, int a ) return a * 2; } +static HRESULT WINAPI ret_false_func(void) +{ + return S_FALSE; +} + static const void *vtable[] = { NULL, NULL, NULL, inst_func }; static void test_DispCallFunc(void) @@ -1038,6 +1043,17 @@ static void test_DispCallFunc(void) ok( res == S_OK, "DispCallFunc failed %x\n", res ); ok( V_VT(&result) == VT_I4, "wrong result type %d\n", V_VT(&result) ); ok( V_I4(&result) == 6, "wrong result %08x\n", V_I4(&result) ); + + memset( &result, 0xcc, sizeof(result) ); + res = DispCallFunc(NULL, (ULONG_PTR)ret_false_func, CC_STDCALL, VT_ERROR, 0, NULL, NULL, &result); + ok(res == S_OK, "DispCallFunc failed: %08x\n", res); + ok(V_VT(&result) == VT_ERROR, "V_VT(result) = %u\n", V_VT(&result)); + ok(V_ERROR(&result) == S_FALSE, "V_ERROR(result) = %08x\n", V_ERROR(&result)); + + memset( &result, 0xcc, sizeof(result) ); + res = DispCallFunc(NULL, (ULONG_PTR)ret_false_func, CC_STDCALL, VT_HRESULT, 0, NULL, NULL, &result); + ok(res == E_INVALIDARG, "DispCallFunc failed: %08x\n", res); + ok(V_VT(&result) == 0xcccc, "V_VT(result) = %u\n", V_VT(&result)); } /* RegDeleteTreeW from dlls/advapi32/registry.c */ diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 97f07d2..0f3ca6b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6185,6 +6185,10 @@ DispCallFunc( case VT_CY: V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset ); break; + case VT_HRESULT: + WARN("invalid return type %u\n", vtReturn); + heap_free( args ); + return E_INVALIDARG; default: V_UI4(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset ); break; @@ -6263,6 +6267,10 @@ DispCallFunc( args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ call_method( func, argspos, args ); break; + case VT_HRESULT: + WARN("invalid return type %u\n", vtReturn); + heap_free( args ); + return E_INVALIDARG; default: V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1 ); break;

1 0

Jacek Caban : mshtml: Use VT_ERROR as return type in DispCallFunc call.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 6b0e2c8fdff9dd316762e5f83ea5733f3eb8ae82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0e2c8fdff9dd316762e5f83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 14:36:48 2013 +0100 mshtml: Use VT_ERROR as return type in DispCallFunc call. --- dlls/mshtml/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ed799d2..38d9df4 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1066,7 +1066,7 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP } V_VT(&vhres) = VT_ERROR; - hres = DispCallFunc(iface, func->call_vtbl_off*sizeof(void*), CC_STDCALL, VT_HRESULT, + hres = DispCallFunc(iface, func->call_vtbl_off*sizeof(void*), CC_STDCALL, VT_ERROR, func->argc + (func->prop_vt == VT_VOID ? 0 : 1), func->arg_types, arg_ptrs, &vhres); }

1 0

Jacek Caban : oleaut32: COM clean up of ITypeLib2 interface implementation.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 253fdf157413a8752bf8007d2b6014f5d34103d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253fdf157413a8752bf8007d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 12 14:36:36 2013 +0100 oleaut32: COM clean up of ITypeLib2 interface implementation. --- dlls/oleaut32/typelib.c | 107 +++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=253fdf157413a8752bf80…

1 0

Hans Leidekker : msiexec: Convert DoRegServer to Unicode.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 0800f29b25b1a4260bae82156f2832c4cafc232b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0800f29b25b1a4260bae82156… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 14:33:23 2013 +0100 msiexec: Convert DoRegServer to Unicode. --- programs/msiexec/msiexec.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 13a55c2..0944955 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -344,26 +344,25 @@ static DWORD DoDllUnregisterServer(LPCWSTR DllName) static DWORD DoRegServer(void) { + static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; + static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c',' ','/','V',0}; SC_HANDLE scm, service; - CHAR path[MAX_PATH+12]; - DWORD ret = 0; + WCHAR path[MAX_PATH+12]; + DWORD len, ret = 0; - scm = OpenSCManagerA(NULL, SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CREATE_SERVICE); - if (!scm) + if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CREATE_SERVICE))) { fprintf(stderr, "Failed to open the service control manager.\n"); return 1; } - - GetSystemDirectoryA(path, MAX_PATH); - lstrcatA(path, "\\msiexec.exe /V"); - - service = CreateServiceA(scm, "MSIServer", "MSIServer", GENERIC_ALL, - SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, path, NULL, NULL, - NULL, NULL, NULL); - - if (service) CloseServiceHandle(service); + len = GetSystemDirectoryW(path, MAX_PATH); + lstrcpyW(path + len, msiexecW); + if ((service = CreateServiceW(scm, msiserverW, msiserverW, GENERIC_ALL, + SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, path, NULL, NULL, NULL, NULL, NULL))) + { + CloseServiceHandle(service); + } else if (GetLastError() != ERROR_SERVICE_EXISTS) { fprintf(stderr, "Failed to create MSI service\n");

1 0

Hans Leidekker : msiexec: Add /unregserver support.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 6cd2ffae0220fe0d16d48d4534d623e9d951f71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd2ffae0220fe0d16d48d453… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 12 14:32:45 2013 +0100 msiexec: Add /unregserver support. --- programs/msiexec/msiexec.c | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 9b378c6..13a55c2 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -373,6 +373,35 @@ static DWORD DoRegServer(void) return ret; } +static DWORD DoUnregServer(void) +{ + static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; + SC_HANDLE scm, service; + DWORD ret = 0; + + if (!(scm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, SC_MANAGER_CONNECT))) + { + fprintf(stderr, "Failed to open service control manager\n"); + return 1; + } + if ((service = OpenServiceW(scm, msiserverW, DELETE))) + { + if (!DeleteService(service)) + { + fprintf(stderr, "Failed to delete MSI service\n"); + ret = 1; + } + CloseServiceHandle(service); + } + else if (GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST) + { + fprintf(stderr, "Failed to open MSI service\n"); + ret = 1; + } + CloseServiceHandle(scm); + return ret; +} + static INT DoEmbedding( LPWSTR key ) { printf("Remote custom actions are not supported yet\n"); @@ -982,7 +1011,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else if (FunctionUnregServer) { - WINE_FIXME( "/unregserver not implemented yet, ignoring\n" ); + ReturnCode = DoUnregServer(); } else if (FunctionServer) {

1 0

Alexandre Julliard : wininet: Don' t reset the available size after the async has been queued.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: dc82cf9d3873535698fe1b6d6f04c6ff6ec13b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc82cf9d3873535698fe1b6d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 10:19:26 2013 +0100 wininet: Don't reset the available size after the async has been queued. --- dlls/wininet/ftp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index f0a6257..1b67211 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1284,7 +1284,6 @@ static DWORD FTPFILE_QueryDataAvailable(object_header_t *hdr, DWORD *available, task = alloc_async_task(&file->hdr, FTPFILE_AsyncQueryDataAvailableProc, sizeof(*task)); INTERNET_AsyncCall(task); - *available = 0; return ERROR_IO_PENDING; } }

1 0

Alexandre Julliard : user32: Prefer loading color cursors in LoadImage.
by Alexandre Julliard 12 Feb '13

12 Feb '13

Module: wine Branch: master Commit: 550e53b6bb685e806ccce392c6c6acb52cd17a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=550e53b6bb685e806ccce392c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 12 13:56:41 2013 +0100 user32: Prefer loading color cursors in LoadImage. --- dlls/user32/cursoricon.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 5b21101..df11f56 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2619,6 +2619,8 @@ HANDLE WINAPI LoadImageA( HINSTANCE hinst, LPCSTR name, UINT type, HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, INT desiredx, INT desiredy, UINT loadflags ) { + int depth; + TRACE_(resource)("(%p,%s,%d,%d,%d,0x%08x)\n", hinst,debugstr_w(name),type,desiredx,desiredy,loadflags); @@ -2628,18 +2630,14 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, return BITMAP_Load( hinst, name, desiredx, desiredy, loadflags ); case IMAGE_ICON: - if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); - if (screen_dc) + case IMAGE_CURSOR: + depth = 1; + if (!(loadflags & LR_MONOCHROME)) { - return CURSORICON_Load(hinst, name, desiredx, desiredy, - GetDeviceCaps(screen_dc, BITSPIXEL), - FALSE, loadflags); + if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); + if (screen_dc) depth = GetDeviceCaps( screen_dc, BITSPIXEL ); } - break; - - case IMAGE_CURSOR: - return CURSORICON_Load(hinst, name, desiredx, desiredy, - 1, TRUE, loadflags); + return CURSORICON_Load(hinst, name, desiredx, desiredy, depth, (type == IMAGE_CURSOR), loadflags); } return 0; }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
46
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 February 2013