October 2009 - Wine-Commits

Alexandre Julliard : winedump: Use consistent prototypes for option callbacks.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 19c0b3ee4800d5f5566bd85c6462201126205a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19c0b3ee4800d5f5566bd85c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 14:52:17 2009 +0200 winedump: Use consistent prototypes for option callbacks. --- tools/winedump/main.c | 26 +++++++++++++------------- tools/winedump/winedump.h | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 2aba30a..3524a1e 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -80,13 +80,13 @@ static void do_dump (const char *arg) } -static void do_code (void) +static void do_code (const char *arg) { globals.do_code = 1; } -static void do_trace (void) +static void do_trace (const char *arg) { globals.do_trace = 1; globals.do_code = 1; @@ -100,18 +100,18 @@ static void do_forward (const char *arg) globals.do_code = 1; } -static void do_document (void) +static void do_document (const char *arg) { globals.do_documentation = 1; } -static void do_cdecl (void) +static void do_cdecl (const char *arg) { globals.do_cdecl = 1; } -static void do_quiet (void) +static void do_quiet (const char *arg) { globals.do_quiet = 1; } @@ -157,18 +157,18 @@ static void do_symfile (const char *arg) } -static void do_verbose (void) +static void do_verbose (const char *arg) { globals.do_verbose = 1; } -static void do_symdmngl (void) +static void do_symdmngl (const char *arg) { globals.do_demangle = 1; } -static void do_dumphead (void) +static void do_dumphead (const char *arg) { globals.do_dumpheader = 1; } @@ -178,12 +178,12 @@ static void do_dumpsect (const char* arg) globals.dumpsect = arg; } -static void do_rawdebug (void) +static void do_rawdebug (const char *arg) { globals.do_debug = 1; } -static void do_dumpall(void) +static void do_dumpall(const char *arg) { globals.do_dumpheader = 1; globals.do_dump_rawdata = 1; @@ -195,7 +195,7 @@ struct my_option const char *name; Mode mode; int has_arg; - void (*func) (); + void (*func)(const char *arg); const char *usage; }; @@ -226,7 +226,7 @@ static const struct my_option option_table[] = { {NULL, NONE, 0, NULL, NULL} }; -void do_usage (void) +void do_usage (const char *arg) { const struct my_option *opt; printf ("Usage: winedump [-h | sym <sym> | spec <dll> | dump <file>]\n"); @@ -466,7 +466,7 @@ int main (int argc, char *argv[]) return 1; break; case NONE: - do_usage(); + do_usage(0); break; case DUMP: if (globals.input_name == NULL) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 4b89842..15a8cdb 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -268,10 +268,10 @@ void dump_frame_pointer_omission(unsigned long base, unsigned long len); FILE *open_file (const char *name, const char *ext, const char *mode); #ifdef __GNUC__ -void do_usage (void) __attribute__ ((noreturn)); +void do_usage (const char *arg) __attribute__ ((noreturn)); void fatal (const char *message) __attribute__ ((noreturn)); #else -void do_usage (void); +void do_usage (const char *arg); void fatal (const char *message); #endif

1 0

Juan Lang : wininet: Unload OpenSSL when unloading wininet.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 41592569fdc28ffb665ecf834205416cb577d938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41592569fdc28ffb665ecf834… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 2 07:43:45 2009 -0700 wininet: Unload OpenSSL when unloading wininet. --- dlls/wininet/internet.c | 2 ++ dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 1f08c49..619674e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -290,6 +290,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_DETACH: + NETCON_unload(); + URLCacheContainers_DeleteAll(); if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 39d8083..75568fa 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -429,6 +429,7 @@ VOID INTERNET_SendCallback(object_header_t *hdr, DWORD_PTR dwContext, BOOL NETCON_connected(WININET_NETCONNECTION *connection); BOOL NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); +void NETCON_unload(void); BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain, int type, int protocol); BOOL NETCON_close(WININET_NETCONNECTION *connection); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index d54e3ac..1a9d7a2 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -120,6 +120,7 @@ static SSL_CTX *ctx; MAKE_FUNCPTR(SSL_library_init); MAKE_FUNCPTR(SSL_load_error_strings); MAKE_FUNCPTR(SSLv23_method); +MAKE_FUNCPTR(SSL_CTX_free); MAKE_FUNCPTR(SSL_CTX_new); MAKE_FUNCPTR(SSL_new); MAKE_FUNCPTR(SSL_free); @@ -191,6 +192,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_library_init); DYNSSL(SSL_load_error_strings); DYNSSL(SSLv23_method); + DYNSSL(SSL_CTX_free); DYNSSL(SSL_CTX_new); DYNSSL(SSL_new); DYNSSL(SSL_free); @@ -246,6 +248,20 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) return TRUE; } +void NETCON_unload(void) +{ +#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) + if (OpenSSL_crypto_handle) + wine_dlclose(OpenSSL_crypto_handle, NULL, 0); + if (OpenSSL_ssl_handle) + { + if (ctx) + pSSL_CTX_free(ctx); + wine_dlclose(OpenSSL_ssl_handle, NULL, 0); + } +#endif +} + BOOL NETCON_connected(WININET_NETCONNECTION *connection) { if (connection->socketFD == -1)

1 0

André Hentschel : libwine: Implemented the call_on_stack function for ARM.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 23842df37106d410fb778aec1a434b47c577daf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23842df37106d410fb778aec1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 2 14:56:50 2009 +0200 libwine: Implemented the call_on_stack function for ARM. --- libs/wine/port.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index 1e05e2b..ce32653 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -171,6 +171,20 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "lwz 0, 4(1)\n\t" /* fetch return address */ "mtlr 0\n\t" /* return address -> lr */ "blr") /* return */ +#elif defined(__arm__) +__ASM_GLOBAL_FUNC( wine_call_on_stack, + "str r14, [r13, #4]\n\t" /* save return address on stack */ + "sub r2, r2, #16\n\t" /* reserve space on new stack */ + "str r13, [r2, #12]\n\t" /* store old sp */ + "mov r3, r0\n\t" /* func */ + "mov r0, r1\n\t" /* arg */ + "mov r13, r2\n\t" /* stack */ + "mov r2, #0\n\t" /* zero */ + "str r2, [r13]\n\t" /* bottom of stack */ + "sub r13, r13, #16\n\t" /* create a frame for this function */ + "blx r3\n\t" /* call func */ + "ldr r13, [r13, #28]\n\t" /* fetch old sp */ + "ldr r15, [r13, #4]") /* fetch return address and return */ #else #error You must implement wine_switch_to_stack for your platform #endif

1 0

Alexandre Julliard : winex11: Use explicit prototypes for function pointers .
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 4c52a28e6b1dafa44067f335b7cd069cfda29963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c52a28e6b1dafa44067f335b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 14:56:37 2009 +0200 winex11: Use explicit prototypes for function pointers. --- dlls/winex11.drv/event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 542fce8..956e4f1 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -323,7 +323,7 @@ static inline void call_event_handler( Display *display, XEvent *event ) /*********************************************************************** * process_events */ -static int process_events( Display *display, Bool (*filter)(), ULONG_PTR arg ) +static int process_events( Display *display, Bool (*filter)(Display*, XEvent*,XPointer), ULONG_PTR arg ) { XEvent event, prev_event; int count = 0;

1 0

Juan Lang : wininet: Set callbacks needed by OpenSSL for multithreaded use.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 3c98992f5537dab767bff701de5a210d0ae32907 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c98992f5537dab767bff701d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 2 07:47:48 2009 -0700 wininet: Set callbacks needed by OpenSSL for multithreaded use. --- dlls/wininet/netconnection.c | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 1a9d7a2..97c764f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -138,11 +138,29 @@ MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); +MAKE_FUNCPTR(CRYPTO_num_locks); +MAKE_FUNCPTR(CRYPTO_set_id_callback); +MAKE_FUNCPTR(CRYPTO_set_locking_callback); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); MAKE_FUNCPTR(i2d_X509); #undef MAKE_FUNCPTR +static CRITICAL_SECTION *ssl_locks; + +static unsigned long ssl_thread_id(void) +{ + return GetCurrentThreadId(); +} + +static void ssl_lock_callback(int mode, int type, const char *file, int line) +{ + if (mode & CRYPTO_LOCK) + EnterCriticalSection(&ssl_locks[type]); + else + LeaveCriticalSection(&ssl_locks[type]); +} + #endif BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) @@ -152,6 +170,8 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) if (useSSL) { #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) + int i; + TRACE("using SSL connection\n"); EnterCriticalSection(&init_ssl_cs); if (OpenSSL_ssl_handle) /* already initialized everything */ @@ -219,6 +239,9 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) return FALSE; \ } DYNCRYPTO(BIO_new_fp); + DYNCRYPTO(CRYPTO_num_locks); + DYNCRYPTO(CRYPTO_set_id_callback); + DYNCRYPTO(CRYPTO_set_locking_callback); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); DYNCRYPTO(i2d_X509); @@ -238,6 +261,19 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) LeaveCriticalSection(&init_ssl_cs); return FALSE; } + + pCRYPTO_set_id_callback(ssl_thread_id); + ssl_locks = HeapAlloc(GetProcessHeap(), 0, + pCRYPTO_num_locks() * sizeof(CRITICAL_SECTION)); + if (!ssl_locks) + { + INTERNET_SetLastError(ERROR_OUTOFMEMORY); + LeaveCriticalSection(&init_ssl_cs); + return FALSE; + } + for (i = 0; i < pCRYPTO_num_locks(); i++) + InitializeCriticalSection(&ssl_locks[i]); + pCRYPTO_set_locking_callback(ssl_lock_callback); LeaveCriticalSection(&init_ssl_cs); #else FIXME("can't use SSL, not compiled in.\n"); @@ -252,7 +288,17 @@ void NETCON_unload(void) { #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (OpenSSL_crypto_handle) + { + if (ssl_locks) + { + int i; + + for (i = 0; i < pCRYPTO_num_locks(); i++) + DeleteCriticalSection(&ssl_locks[i]); + HeapFree(GetProcessHeap(), 0, ssl_locks); + } wine_dlclose(OpenSSL_crypto_handle, NULL, 0); + } if (OpenSSL_ssl_handle) { if (ctx)

1 0

Huw Davies : oledb32: Implement conversions to DBTYPE_BYREF | DBTYPE_WSTR.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: a94e8088c872f35e3b1561d7ecd886f5a5bcdc0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a94e8088c872f35e3b1561d7e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 2 12:36:05 2009 +0100 oledb32: Implement conversions to DBTYPE_BYREF | DBTYPE_WSTR. --- dlls/oledb32/convert.c | 21 ++++++++++ dlls/oledb32/tests/convert.c | 89 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index c1e99be..ad86398 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -129,6 +129,7 @@ static int get_length(DBTYPE type) case DBTYPE_BSTR: return sizeof(BSTR); case DBTYPE_WSTR: + case DBTYPE_BYREF | DBTYPE_WSTR: return 0; default: FIXME("Unhandled type %04x\n", type); @@ -312,6 +313,26 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return hr; } + case DBTYPE_BYREF | DBTYPE_WSTR: + { + BSTR b; + WCHAR **d = dst; + DBLENGTH bstr_len; + hr = IDataConvert_DataConvert(iface, src_type, DBTYPE_BSTR, src_len, &bstr_len, + src, &b, sizeof(BSTR), src_status, dst_status, + precision, scale, flags); + if(hr != S_OK) return hr; + + bstr_len = SysStringLen(b) * sizeof(WCHAR); + *dst_len = bstr_len; /* Doesn't include size for '\0' */ + + *d = CoTaskMemAlloc(bstr_len + sizeof(WCHAR)); + if(*d) memcpy(*d, b, bstr_len + sizeof(WCHAR)); + else hr = E_OUTOFMEMORY; + SysFreeString(b); + return hr; + } + default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); return E_NOTIMPL; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 376a8cc..a1378cf 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -1023,6 +1023,94 @@ static void test_converttowstr(void) IDataConvert_Release(convert); } +static void test_converttobyrefwstr(void) +{ + IDataConvert *convert; + HRESULT hr; + WCHAR *dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + static const WCHAR ten[] = {'1','0',0}; + static const WCHAR fourthreetwoone[] = {'4','3','2','1',0}; + BSTR b; + + hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); + if(FAILED(hr)) + { + win_skip("Unable to load oledb conversion library\n"); + return; + } + + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 0, "got %d\n", dst_len); + ok(dst[0] == 0, "got %04x\n", dst[0]); + CoTaskMemFree(dst); + + dst = (void*)0x12345678; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == 0, "got %d\n", dst_len); + ok(dst == (void*)0x12345678, "got %p\n", dst); + + *(short *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + CoTaskMemFree(dst); + + *(short *)src = 4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, src, &dst, 0, 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 8, "got %d\n", dst_len); + ok(!lstrcmpW(dst, fourthreetwoone), "got %s\n", wine_dbgstr_w(dst)); + CoTaskMemFree(dst); + + b = SysAllocString(ten); + *(BSTR *)src = b; + hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst)); + CoTaskMemFree(dst); + SysFreeString(b); + + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_BYREF | DBTYPE_WSTR, 2, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 2, "got %d\n", dst_len); + ok(dst[0] == '1', "got %02x\n", dst[0]); + ok(dst[1] == 0, "got %02x\n", dst[1]); + CoTaskMemFree(dst); + + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_BYREF | DBTYPE_WSTR, 4, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(!lstrcmpW(ten, dst), "got %s\n", wine_dbgstr_w(dst)); + CoTaskMemFree(dst); + + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_BYREF | DBTYPE_WSTR, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == 4, "got %d\n", dst_len); + ok(!lstrcmpW(ten, dst), "got %s\n", wine_dbgstr_w(dst)); + CoTaskMemFree(dst); + + IDataConvert_Release(convert); +} + + START_TEST(convert) { OleInitialize(NULL); @@ -1032,5 +1120,6 @@ START_TEST(convert) test_converttoi4(); test_converttobstr(); test_converttowstr(); + test_converttobyrefwstr(); OleUninitialize(); }

1 0

Alexandre Julliard : opengl32/tests: Use explicit prototypes for function pointers.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 8349b13453b932e9dfd30fae9c3f484218deba92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8349b13453b932e9dfd30fae9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 14:56:43 2009 +0200 opengl32/tests: Use explicit prototypes for function pointers. --- dlls/opengl32/tests/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 96df784..13e41fd 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -48,7 +48,7 @@ static int (WINAPI *pwglReleasePbufferDCARB)(HPBUFFERARB, HDC); /* WGL_ARB_make_current_read */ static BOOL (WINAPI *pwglMakeContextCurrentARB)(HDC hdraw, HDC hread, HGLRC hglrc); -static HDC (WINAPI *pwglGetCurrentReadDCARB)(); +static HDC (WINAPI *pwglGetCurrentReadDCARB)(void); /* WGL_ARB_pixel_format */ #define WGL_ACCELERATION_ARB 0x2003

1 0

Ge van Geldorp : shell32/tests: Fix shlexec on Vista and higher.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 1b5a373c0ec14b62d6caff6656a1aa369643d1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b5a373c0ec14b62d6caff665… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Fri Oct 2 15:47:28 2009 +0200 shell32/tests: Fix shlexec on Vista and higher. --- dlls/shell32/tests/shlexec.c | 370 ++++++++++++++++++++++++++++++------------ 1 files changed, 266 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b5a373c0ec14b62d6caf…

1 0

Jacek Caban : jscript: Added FIXME about IClassFactoryEx.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: 960d7f9fdb0b57a5e6a74a05039f1d1b93576263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960d7f9fdb0b57a5e6a74a050… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:54:51 2009 +0200 jscript: Added FIXME about IClassFactoryEx. --- dlls/jscript/activex.c | 15 +++++++++++++-- dlls/jscript/jscript_main.c | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 2029edf..e37abd2 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -21,6 +21,7 @@ #include "jscript.h" #include "objsafe.h" +#include "mshtmhst.h" #include "wine/debug.h" @@ -59,6 +60,8 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) { IInternetHostSecurityManager *secmgr; struct CONFIRMSAFETY cs; + IClassFactoryEx *cfex; + IClassFactory *cf; DWORD policy_size; BYTE *bpolicy; IUnknown *obj; @@ -82,9 +85,17 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) if(FAILED(hres) || policy != URLPOLICY_ALLOW) return NULL; - /* FIXME: Use IClassFactoryEx */ + hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, &IID_IClassFactory, (void**)&cf); + if(FAILED(hres)) + return NULL; + + hres = IClassFactory_QueryInterface(cf, &IID_IClassFactoryEx, (void**)&cfex); + if(SUCCEEDED(hres)) { + FIXME("Use IClassFactoryEx\n"); + IClassFactoryEx_Release(cfex); + } - hres = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&obj); + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); if(FAILED(hres)) return NULL; diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 4f59ecb..78f8f00 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -24,6 +24,7 @@ #include "advpub.h" #include "activaut.h" #include "objsafe.h" +#include "mshtmhst.h" #include "wine/debug.h"

1 0

Jacek Caban : mshtml: Use document.defaultView to get iframe contentWindow.
by Alexandre Julliard Oct. 2, 2009

Oct. 2, 2009

Module: wine Branch: master Commit: b1a9b4fd2d014f95a16922caa2b3a1a534404303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1a9b4fd2d014f95a16922caa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:53:52 2009 +0200 mshtml: Use document.defaultView to get iframe contentWindow. --- dlls/mshtml/htmliframe.c | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 5f3cafb..a482a5b 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -43,6 +43,40 @@ typedef struct { #define HTMLFRAMEBASE2(x) (&(x)->lpIHTMLFrameBase2Vtbl) +static HRESULT create_content_window(HTMLIFrame *This, nsIDOMHTMLDocument *nsdoc, HTMLWindow **ret) +{ + nsIDOMDocumentView *nsdocview; + nsIDOMAbstractView *nsview; + nsIDOMWindow *nswindow; + nsresult nsres; + HRESULT hres; + + nsres = nsIDOMHTMLDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentView, (void**)&nsdocview); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMDocumentView: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMDocumentView_GetDefaultView(nsdocview, &nsview); + nsIDOMDocumentView_Release(nsdocview); + if(NS_FAILED(nsres)) { + ERR("GetDefaultView failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMAbstractView_QueryInterface(nsview, &IID_nsIDOMWindow, (void**)&nswindow); + nsIDOMAbstractView_Release(nsview); + if(NS_FAILED(nsres)) { + ERR("Coult not get nsIDOMWindow iface: %08x\n", nsres); + return E_FAIL; + } + + hres = HTMLWindow_Create(This->element.node.doc->basedoc.doc_obj, nswindow, ret); + + nsIDOMWindow_Release(nswindow); + return hres; +} + #define HTMLFRAMEBASE2_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLFrameBase2, iface) static HRESULT WINAPI HTMLIFrameBase2_QueryInterface(IHTMLFrameBase2 *iface, REFIID riid, void **ppv) @@ -130,10 +164,10 @@ static HRESULT WINAPI HTMLIFrameBase2_get_contentWindow(IHTMLFrameBase2 *iface, return E_FAIL; } - hres = HTMLWindow_Create(This->element.node.doc->basedoc.doc_obj, NULL, &window); + hres = create_content_window(This, nshtmldoc, &window); if(FAILED(hres)) { - nsIDOMDocument_Release(nsdoc); - return hres; + nsIDOMHTMLDocument_Release(nshtmldoc); + return E_FAIL; } hres = create_doc_from_nsdoc(nshtmldoc, This->element.node.doc->basedoc.doc_obj, window, &content_doc);

1 0