February 2013 - Wine-Commits

Austin English : shlwapi: Add a stub for IsInternetESCEnabled.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: b8f072e910b34eebebf1eae3a978839880b7571d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f072e910b34eebebf1eae3a… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 11 11:52:27 2013 -0800 shlwapi: Add a stub for IsInternetESCEnabled. --- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/url.c | 9 +++++++++ include/shlwapi.h | 2 ++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index bf33e62..aad095e 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -567,6 +567,7 @@ @ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA @ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW @ stdcall IsCharSpaceA(long) +@ stdcall IsInternetESCEnabled() @ stdcall PathAddBackslashA (str) @ stdcall PathAddBackslashW (wstr) @ stdcall PathAddExtensionA (str str) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 70a0b87..102faf5 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2621,3 +2621,12 @@ HRESULT WINAPI UrlFixupW(LPCWSTR url, LPWSTR translatedUrl, DWORD maxChars) return S_OK; } + +/************************************************************************* + * IsInternetESCEnabled [SHLWAPI.@] + */ +BOOL WINAPI IsInternetESCEnabled(void) +{ + FIXME(": stub\n"); + return FALSE; +} diff --git a/include/shlwapi.h b/include/shlwapi.h index a1436fa..f3d6ca0 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -955,6 +955,8 @@ VOID WINAPI ColorRGBToHLS(COLORREF,LPWORD,LPWORD,LPWORD); #endif /* NO_SHLWAPI_GDI */ +/* Security functions */ +BOOL WINAPI IsInternetESCEnabled(void); /* Stream functions */ #ifndef NO_SHLWAPI_STREAM

1 0

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

Feb. 12, 2013

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 Feb. 12, 2013

Feb. 12, 2013

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: COM clean up of ITypeLib2 interface implementation.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

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

Alexandre Julliard : user32: Prefer loading color cursors in LoadImage.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

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

Andrew Talbot : kernel32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: ac79a3f9d372949de74942cc3b7f368a23db9296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac79a3f9d372949de74942cc3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 11 22:44:12 2013 +0000 kernel32: Avoid signed-unsigned integer comparisons. --- dlls/kernel32/debugger.c | 3 ++- dlls/kernel32/volume.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index 528ba76..5300fb5 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -51,7 +51,8 @@ BOOL WINAPI WaitForDebugEvent( DWORD timeout) { BOOL ret; - DWORD i, res; + DWORD res; + int i; for (;;) { diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 8ca4555..2e0cc8a 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -445,7 +445,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) */ static BOOL UDF_Find_PVD( HANDLE handle, BYTE pvd[] ) { - int i; + unsigned int i; DWORD offset; INT locations[] = { 256, -1, -257, 512 }; @@ -548,7 +548,7 @@ static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, HANDLE hand } else { - int i; + unsigned int i; label_len = 1 + pvd[24+32-1]; for(i=0; i<label_len && i<len; i+=2)

1 0

Andrew Talbot : mapi32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: d24dc4b884c8524cb9ccd795959ab92e084b4b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24dc4b884c8524cb9ccd7959… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 11 22:44:56 2013 +0000 mapi32: Avoid signed-unsigned integer comparisons. --- dlls/mapi32/sendmail.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index da19259..9ebb220 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -269,7 +269,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (message->nFileCount > 0) { ULONG num_attach = 0; - int i, j; + unsigned int i; for (i = 0; i < message->nFileCount; i++) { @@ -294,6 +294,8 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM if (!filename) { + int j; + filename = message->lpFiles[i].lpszPathName; for (j = lstrlenW(message->lpFiles[i].lpszPathName)-1; j >= 0; j--) @@ -307,7 +309,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM } } - TRACE("Attachment %d path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName), + TRACE("Attachment %u path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName), debugstr_w(filename)); /* Create the attachment */ @@ -504,7 +506,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { lpMapiFileDescW filesW; - int i; + unsigned int i; filesW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDescW) * message->nFileCount); @@ -522,7 +524,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, /* Now free everything we allocated */ if (message->nFileCount && message->lpFiles) { - int i; + unsigned int i; for (i = 0; i < message->nFileCount; i++) { @@ -623,7 +625,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nRecipCount && message->lpRecips) { lpMapiRecipDesc recipsA; - int i; + unsigned int i; recipsA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc) * message->nRecipCount); @@ -638,7 +640,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { lpMapiFileDesc filesA; - int i; + unsigned int i; filesA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDesc) * message->nFileCount); @@ -666,7 +668,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nRecipCount && message->lpRecips) { - int i; + unsigned int i; for (i = 0; i < message->nRecipCount; i++) { @@ -679,7 +681,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, if (message->nFileCount && message->lpFiles) { - int i; + unsigned int i; for (i = 0; i < message->nFileCount; i++) {

1 0

Dmitry Timoshkov : winspool.drv: There is no need to speculate about wineps .drv default DEVMODE.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: dc8d7e7d6248b0d89437fbf837bd9e886fdbca31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc8d7e7d6248b0d89437fbf83… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 12 15:21:26 2013 +0800 winspool.drv: There is no need to speculate about wineps.drv default DEVMODE. --- dlls/winspool.drv/info.c | 71 ++++++++-------------------------------- dlls/winspool.drv/tests/info.c | 2 +- 2 files changed, 15 insertions(+), 58 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 60b621e..27a6edd 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3986,63 +3986,20 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, * WINSPOOL_GetDefaultDevMode * * Get a default DevMode values for wineps. - * FIXME - use ppd. - */ - -static void WINSPOOL_GetDefaultDevMode( - LPBYTE ptr, - DWORD buflen, DWORD *needed) -{ - DEVMODEW dm; - static const WCHAR szWwps[] = {'w', 'i', 'n', 'e', 'p', 's', '.', 'd', 'r', 'v', 0 }; - - /* fill default DEVMODE - should be read from ppd... */ - ZeroMemory( &dm, sizeof(dm) ); - memcpy(dm.dmDeviceName,szWwps,sizeof szWwps); - dm.dmSpecVersion = DM_SPECVERSION; - dm.dmDriverVersion = 1; - dm.dmSize = sizeof(DEVMODEW); - dm.dmDriverExtra = 0; - dm.dmFields = - DM_ORIENTATION | DM_PAPERSIZE | - DM_PAPERLENGTH | DM_PAPERWIDTH | - DM_SCALE | - DM_COPIES | - DM_DEFAULTSOURCE | DM_PRINTQUALITY | - DM_YRESOLUTION | DM_TTOPTION; - - dm.u1.s1.dmOrientation = DMORIENT_PORTRAIT; - dm.u1.s1.dmPaperSize = DMPAPER_A4; - dm.u1.s1.dmPaperLength = 2970; - dm.u1.s1.dmPaperWidth = 2100; - - dm.u1.s1.dmScale = 100; - dm.u1.s1.dmCopies = 1; - dm.u1.s1.dmDefaultSource = DMBIN_AUTO; - dm.u1.s1.dmPrintQuality = DMRES_MEDIUM; - /* dm.dmColor */ - /* dm.dmDuplex */ - dm.dmYResolution = 300; /* 300dpi */ - dm.dmTTOption = DMTT_BITMAP; - /* dm.dmCollate */ - /* dm.dmFormName */ - /* dm.dmLogPixels */ - /* dm.dmBitsPerPel */ - /* dm.dmPelsWidth */ - /* dm.dmPelsHeight */ - /* dm.u2.dmDisplayFlags */ - /* dm.dmDisplayFrequency */ - /* dm.dmICMMethod */ - /* dm.dmICMIntent */ - /* dm.dmMediaType */ - /* dm.dmDitherType */ - /* dm.dmReserved1 */ - /* dm.dmReserved2 */ - /* dm.dmPanningWidth */ - /* dm.dmPanningHeight */ - - if(buflen >= sizeof(DEVMODEW)) - memcpy(ptr, &dm, sizeof(DEVMODEW)); + */ +static void WINSPOOL_GetDefaultDevMode(LPBYTE ptr, DWORD buflen, DWORD *needed) +{ + static const WCHAR winepsW[] = { 'w','i','n','e','p','s','.','d','r','v',0 }; + + if (buflen >= sizeof(DEVMODEW)) + { + DEVMODEW *dm = (DEVMODEW *)ptr; + + /* the driver will update registry with real values */ + memset(dm, 0, sizeof(*dm)); + dm->dmSize = sizeof(*dm); + lstrcpyW(dm->dmDeviceName, winepsW); + } *needed = sizeof(DEVMODEW); } diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 25ee9c4..1c98d4d 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2989,7 +2989,7 @@ todo_wine START_TEST(info) { - hwinspool = GetModuleHandleA("winspool.drv"); + hwinspool = LoadLibrary("winspool.drv"); pAddPortExA = (void *) GetProcAddress(hwinspool, "AddPortExA"); pEnumPrinterDriversW = (void *) GetProcAddress(hwinspool, "EnumPrinterDriversW"); pGetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "GetDefaultPrinterA");

1 0

Juan Lang : cryptui: Use add_usage_to_oid correctly.
by Alexandre Julliard Feb. 12, 2013

Feb. 12, 2013

Module: wine Branch: master Commit: ba7eebfd624666f35f4c4e95fd9ce8d860830f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba7eebfd624666f35f4c4e95f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 11 12:51:04 2013 -0800 cryptui: Use add_usage_to_oid correctly. Spotted by Marcus Meissner and Coverity. --- dlls/cryptui/main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 6481c1f..c3b0a0e 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -295,7 +295,7 @@ static CERT_ENHKEY_USAGE *convert_usages_str_to_usage(LPSTR usageStr) { if (comma) *comma = 0; - add_oid_to_usage(usage, ptr); + usage = add_oid_to_usage(usage, ptr); } } return usage; @@ -323,7 +323,7 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void) { PCCRYPT_OID_INFO *ptr; - for (ptr = usages; *ptr; ptr++) + for (ptr = usages; advancedUsage && *ptr; ptr++) { DWORD i; BOOL disabled = FALSE; @@ -334,7 +334,7 @@ static CERT_ENHKEY_USAGE *create_advanced_filter(void) (*ptr)->pszOID)) disabled = TRUE; if (!disabled) - add_oid_to_usage(advancedUsage, + advancedUsage = add_oid_to_usage(advancedUsage, (LPSTR)(*ptr)->pszOID); } /* The individual strings are pointers to disabledUsagesStr,

1 0

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

Feb. 12, 2013

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