October 2009 - Wine-commits

Alexandre Julliard : wnaspi32: Use explicit prototypes for function pointers.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: a85b6fe2c4ff3b226b99bded919b9efc3d26c43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85b6fe2c4ff3b226b99bded9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 2 14:55:19 2009 +0200 wnaspi32: Use explicit prototypes for function pointers. --- dlls/wnaspi32/winaspi32.c | 2 +- include/wnaspi32.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 84b54f0..342fb82 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -270,7 +270,7 @@ ASPI_DebugPrintResult(SRB_ExecSCSICmd *prb) static DWORD WNASPI32_DoPosting( SRB_ExecSCSICmd *lpPRB, DWORD status ) { - void (*SRB_PostProc)() = lpPRB->SRB_PostProc; + void (*SRB_PostProc)(SRB_ExecSCSICmd *) = lpPRB->SRB_PostProc; BYTE SRB_Flags = lpPRB->SRB_Flags; if( status == SS_PENDING ) { diff --git a/include/wnaspi32.h b/include/wnaspi32.h index 09ada9c..6a20fb0 100644 --- a/include/wnaspi32.h +++ b/include/wnaspi32.h @@ -150,7 +150,7 @@ typedef struct tagSRB32_ExecSCSICmd { BYTE SRB_CDBLen; /* 15 CDB Length */ BYTE SRB_HaStat; /* 16 Host Adapter Status */ BYTE SRB_TargStat; /* 17 Target Status */ - void (*SRB_PostProc)(); /* 18 Post routine */ + void (*SRB_PostProc)( struct tagSRB32_ExecSCSICmd * ); /* 18 Post routine */ void *SRB_Rsvd2; /* 1C Reserved */ BYTE SRB_Rsvd3[16]; /* 20 Reserved for expansion */ BYTE CDBByte[16]; /* 30 SCSI CDB */ @@ -179,7 +179,7 @@ typedef struct tagSRB32_BusDeviceReset { BYTE SRB_Rsvd1[12]; /* 0A Reserved for Alignment */ BYTE SRB_HaStat; /* 16 Host Adapter Status */ BYTE SRB_TargStat; /* 17 Target Status */ - void (*SRB_PostProc)(); /* 18 Post routine */ + void (*SRB_PostProc)( struct tagSRB32_BusDeviceReset * ); /* 18 Post routine */ void *SRB_Rsvd2; /* 1c Reserved */ BYTE SRB_Rsvd3[32]; /* 20 Reserved */ } SRB_BusDeviceReset, *PSRB_BusDeviceReset;

1 0

Alexandre Julliard : winex11: Use explicit prototypes for function pointers .
by Alexandre Julliard 02 Oct '09

02 Oct '09

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

Alexandre Julliard : opengl32/tests: Use explicit prototypes for function pointers.
by Alexandre Julliard 02 Oct '09

02 Oct '09

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

Huw Davies : oledb32: Implement conversions to DBTYPE_BYREF | DBTYPE_WSTR.
by Alexandre Julliard 02 Oct '09

02 Oct '09

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

Ge van Geldorp : shell32/tests: Fix shlexec on Vista and higher.
by Alexandre Julliard 02 Oct '09

02 Oct '09

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

André Hentschel : libwine: Implemented the call_on_stack function for ARM.
by Alexandre Julliard 02 Oct '09

02 Oct '09

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

Juan Lang : wininet: Unload OpenSSL when unloading wininet.
by Alexandre Julliard 02 Oct '09

02 Oct '09

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

Juan Lang : wininet: Set callbacks needed by OpenSSL for multithreaded use.
by Alexandre Julliard 02 Oct '09

02 Oct '09

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

Jacek Caban : mshtml: Use dispinterface DISPID_VALUE implementation if available.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 1c60a21a53a00b6b395d9d61efd15100f9ebe689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c60a21a53a00b6b395d9d61e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:51:48 2009 +0200 mshtml: Use dispinterface DISPID_VALUE implementation if available. --- dlls/mshtml/dispex.c | 52 ++++++++++++++++++++++++++++++------------------- 1 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 3cfae67..4092374 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; + typedef struct { DISPID id; BSTR name; @@ -244,10 +246,12 @@ static dispex_data_t *preprocess_dispex_data(DispatchEx *This) TRACE("(%p)\n", This); - hres = get_typeinfo(This->data->disp_tid, &dti); - if(FAILED(hres)) { - ERR("Could not get disp type info: %08x\n", hres); - return NULL; + if(This->data->disp_tid) { + hres = get_typeinfo(This->data->disp_tid, &dti); + if(FAILED(hres)) { + ERR("Could not get disp type info: %08x\n", hres); + return NULL; + } } data = heap_alloc(sizeof(dispex_data_t)); @@ -421,8 +425,6 @@ HRESULT dispex_get_dprop_ref(DispatchEx *This, const WCHAR *name, BOOL alloc, VA static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { - static const WCHAR objectW[] = {'[','o','b','j','e','c','t',']',0}; - if(This->data->vtbl && This->data->vtbl->value) return This->data->vtbl->value(This->outer, lcid, flags, params, res, ei, caller); @@ -537,11 +539,13 @@ static const dispex_static_data_vtbl_t function_dispex_vtbl = { NULL }; +static const tid_t function_iface_tids[] = {0}; + static dispex_static_data_t function_dispex = { &function_dispex_vtbl, - LAST_tid, + NULL_tid, NULL, - NULL + function_iface_tids }; static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) @@ -572,6 +576,18 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, case DISPATCH_PROPERTYGET: { dispex_dynamic_data_t *dynamic_data; + if(func->id == DISPID_VALUE) { + BSTR ret; + + ret = SysAllocString(objectW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(res) = VT_BSTR; + V_BSTR(res) = ret; + return S_OK; + } + dynamic_data = get_dynamic_data(This, TRUE); if(!dynamic_data) return E_OUTOFMEMORY; @@ -613,8 +629,10 @@ static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **re while(min <= max) { n = (min+max)/2; - if(data->funcs[n].id == id) - break; + if(data->funcs[n].id == id) { + *ret = data->funcs+n; + return S_OK; + } if(data->funcs[n].id < id) min = n+1; @@ -622,13 +640,8 @@ static HRESULT get_builtin_func(dispex_data_t *data, DISPID id, func_info_t **re max = n-1; } - if(min > max) { - WARN("invalid id %x\n", id); - return DISP_E_UNKNOWNNAME; - } - - *ret = data->funcs+n; - return S_OK; + WARN("invalid id %x\n", id); + return DISP_E_UNKNOWNNAME; } #define DISPATCHEX_THIS(iface) DEFINE_THIS(DispatchEx, IDispatchEx, iface) @@ -777,9 +790,6 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(id == DISPID_VALUE) - return dispex_value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - if(is_custom_dispid(id) && This->data->vtbl && This->data->vtbl->invoke) return This->data->vtbl->invoke(This->outer, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); @@ -853,6 +863,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc return E_FAIL; hres = get_builtin_func(data, id, &func); + if(id == DISPID_VALUE && hres == DISP_E_UNKNOWNNAME) + return dispex_value(This, lcid, wFlags, pdp, pvarRes, pei, pspCaller); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Get rid of no longer needed HTMLLocation_value.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 8085b7085c700e09f483f851a846795f287b0042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8085b7085c700e09f483f851a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 13:52:05 2009 +0200 mshtml: Get rid of no longer needed HTMLLocation_value. --- dlls/mshtml/htmllocation.c | 36 +----------------------------------- 1 files changed, 1 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 67ebf99..45899b4 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -343,34 +343,6 @@ static HRESULT WINAPI HTMLLocation_toString(IHTMLLocation *iface, BSTR *String) return E_NOTIMPL; } -static HRESULT HTMLLocation_value(IUnknown *iface, LCID lcid, WORD flags, DISPPARAMS *params, - VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) -{ - HTMLLocation *This = HTMLLOCATION_THIS(iface); - HRESULT hres; - - TRACE("(%p)\n", This); - - switch(flags) { - case DISPATCH_PROPERTYGET: { - BSTR str; - - hres = IHTMLLocation_get_href(HTMLLOCATION(This), &str); - if(FAILED(hres)) - return hres; - - V_VT(res) = VT_BSTR; - V_BSTR(res) = str; - break; - } - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } - - return S_OK; -} - #undef HTMLLOCATION_THIS static const IHTMLLocationVtbl HTMLLocationVtbl = { @@ -403,18 +375,12 @@ static const IHTMLLocationVtbl HTMLLocationVtbl = { HTMLLocation_toString }; -static const dispex_static_data_vtbl_t HTMLLocation_dispex_vtbl = { - HTMLLocation_value, - NULL, - NULL -}; - static const tid_t HTMLLocation_iface_tids[] = { IHTMLLocation_tid, 0 }; static dispex_static_data_t HTMLLocation_dispex = { - &HTMLLocation_dispex_vtbl, + NULL, DispHTMLLocation_tid, NULL, HTMLLocation_iface_tids

1 0