March 2015 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Allow specifying the user APC argument in the system APC callback.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: wine Branch: master Commit: 0a241b0fcc550cc60d8a59dfec0bdcd99bd0f1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a241b0fcc550cc60d8a59dfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 3 16:06:51 2015 +0900 ntdll: Allow specifying the user APC argument in the system APC callback. --- dlls/ntdll/file.c | 26 +++++++++++++++++++++----- dlls/ntdll/server.c | 8 ++++---- dlls/ws2_32/socket.c | 27 +++++++++++++++++++-------- server/protocol.def | 2 +- 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 43b6097..1cd6546 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -448,7 +448,8 @@ NTSTATUS FILE_GetNtStatus(void) /*********************************************************************** * FILE_AsyncReadService (INTERNAL) */ -static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc) +static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct async_fileio_read *fileio = user; int fd, needs_close, result; @@ -501,7 +502,10 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU iosb->u.Status = status; iosb->Information = fileio->already; if (fileio->io.apc) + { *apc = fileio_apc; + *arg = &fileio->io; + } else release_fileio( &fileio->io ); } @@ -956,7 +960,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap /*********************************************************************** * FILE_AsyncWriteService (INTERNAL) */ -static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc) +static NTSTATUS FILE_AsyncWriteService( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct async_fileio_write *fileio = user; int result, fd, needs_close; @@ -999,7 +1004,10 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT iosb->u.Status = status; iosb->Information = fileio->already; if (fileio->io.apc) + { *apc = fileio_apc; + *arg = &fileio->io; + } else release_fileio( &fileio->io ); } @@ -1370,9 +1378,10 @@ struct async_ioctl }; /* callback for ioctl async I/O completion */ -static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc ) +static NTSTATUS ioctl_completion( void *user, IO_STATUS_BLOCK *io, + NTSTATUS status, void **apc, void **arg ) { - struct async_ioctl *async = arg; + struct async_ioctl *async = user; if (status == STATUS_ALERTED) { @@ -1390,7 +1399,10 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu { io->u.Status = status; if (async->io.apc) + { *apc = fileio_apc; + *arg = &async->io; + } else release_fileio( &async->io ); } @@ -1709,7 +1721,8 @@ struct read_changes_fileio char data[1]; }; -static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) +static NTSTATUS read_changes_apc( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct read_changes_fileio *fileio = user; NTSTATUS ret; @@ -1776,7 +1789,10 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st iosb->u.Status = ret; iosb->Information = size; if (fileio->io.apc) + { *apc = fileio_apc; + *arg = &fileio->io; + } else release_fileio( &fileio->io ); return ret; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index e3f1694..2c99cbe 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -391,17 +391,17 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) } case APC_ASYNC_IO: { - void *apc = NULL; + void *apc = NULL, *arg = NULL; IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); - NTSTATUS (*func)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **) = wine_server_get_ptr( call->async_io.func ); + NTSTATUS (*func)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **, void **) = wine_server_get_ptr( call->async_io.func ); result->type = call->type; result->async_io.status = func( wine_server_get_ptr( call->async_io.user ), - iosb, call->async_io.status, &apc ); + iosb, call->async_io.status, &apc, &arg ); if (result->async_io.status != STATUS_PENDING) { result->async_io.total = iosb->Information; result->async_io.apc = wine_server_client_ptr( apc ); - result->async_io.arg = call->async_io.user; + result->async_io.arg = wine_server_client_ptr( arg ); } break; } diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f1f00eb..5bfdecf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2013,7 +2013,8 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) * * Handler for overlapped recv() operations. */ -static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status, void **apc) +static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct ws2_async *wsa = user; int result = 0, fd; @@ -2051,7 +2052,10 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat iosb->u.Status = status; iosb->Information = result; if (wsa->completion_func) + { *apc = ws2_async_apc; + *arg = wsa; + } else release_async_io( &wsa->io ); } @@ -2064,12 +2068,13 @@ static NTSTATUS WS2_async_recv( void* user, IO_STATUS_BLOCK* iosb, NTSTATUS stat * This function is used to finish the read part of an accept request. It is * needed to place the completion on the correct socket (listener). */ -static NTSTATUS WS2_async_accept_recv( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc ) +static NTSTATUS WS2_async_accept_recv( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { void *junk; - struct ws2_accept_async *wsa = arg; + struct ws2_accept_async *wsa = user; - status = WS2_async_recv( wsa->read, iosb, status, &junk ); + status = WS2_async_recv( wsa->read, iosb, status, &junk, &junk ); if (status == STATUS_PENDING) return status; @@ -2087,9 +2092,10 @@ static NTSTATUS WS2_async_accept_recv( void *arg, IO_STATUS_BLOCK *iosb, NTSTATU * * This is the function called to satisfy the AcceptEx callback */ -static NTSTATUS WS2_async_accept( void *arg, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc ) +static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { - struct ws2_accept_async *wsa = arg; + struct ws2_accept_async *wsa = user; int len; char *addr; @@ -2241,7 +2247,8 @@ static int WS2_send( int fd, struct ws2_async *wsa ) * * Handler for overlapped send() operations. */ -static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS status, void **apc) +static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct ws2_async *wsa = user; int result = 0, fd; @@ -2285,7 +2292,10 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu { iosb->u.Status = status; if (wsa->completion_func) + { *apc = ws2_async_apc; + *arg = wsa; + } else release_async_io( &wsa->io ); } @@ -2297,7 +2307,8 @@ static NTSTATUS WS2_async_send(void* user, IO_STATUS_BLOCK* iosb, NTSTATUS statu * * Handler for shutdown() operations on overlapped sockets. */ -static NTSTATUS WS2_async_shutdown( void* user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc ) +static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, + NTSTATUS status, void **apc, void **arg ) { struct ws2_async_shutdown *wsa = user; int fd, err = 1; diff --git a/server/protocol.def b/server/protocol.def index f2a5a9a..7ec380b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -480,7 +480,7 @@ typedef union { enum apc_type type; /* APC_ASYNC_IO */ unsigned int status; /* I/O status */ - client_ptr_t func; /* unsigned int (*func)(void*, void*, unsigned int, void **); */ + client_ptr_t func; /* unsigned int (*func)(void*, void*, unsigned int, void**, void**); */ client_ptr_t user; /* user pointer */ client_ptr_t sb; /* status block */ } async_io;

1 0

Vincent Povirk : winemono.php: Added 4.5.6 release.
by Alexandre Julliard 03 Mar '15

03 Mar '15

Module: tools Branch: master Commit: bd2235d27b9e1c769251ab0363d8946cb87d7374 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bd2235d27b9e1c769251ab03… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 2 13:24:42 2015 -0600 winemono.php: Added 4.5.6 release. --- winemono.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/winemono.php b/winemono.php index 10bf13f..3758d0e 100644 --- a/winemono.php +++ b/winemono.php @@ -4,7 +4,7 @@ */ // Default version if none given -$sVersion = '4.5.4'; +$sVersion = '4.5.6'; // Suffix appended to base name of file $sFileSuffix = ''; @@ -30,7 +30,8 @@ $aFileSizes = array( '0.0.4'=>44408320, '0.0.8'=>46967296, '4.5.2'=>52502528, - '4.5.4'=>53706752 + '4.5.4'=>53706752, + '4.5.6'=>53705216 ); // Exact size of the file:

1 0

Sebastian Lackner : shell32: Fix incorrect size argument of FormatMessageW.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 7c48641100b6edc16116d68895f0b4bcf620a8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c48641100b6edc16116d6889… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 28 19:58:59 2015 +0100 shell32: Fix incorrect size argument of FormatMessageW. --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 62d7880..e7e24e0 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -292,7 +292,7 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (__ms_va_list*)args); + szText, 0, 0, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0]), (__ms_va_list*)args); hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems);

1 0

Sebastian Lackner : browseui: Always use interlocked functions when accessing variable BROWSEUI_refCount.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 890dc4d2600857cb691f65bd069d8a1d0e0f9b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890dc4d2600857cb691f65bd0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 03:46:06 2015 +0100 browseui: Always use interlocked functions when accessing variable BROWSEUI_refCount. --- dlls/browseui/browseui_main.c | 4 ++-- dlls/browseui/compcatcachedaemon.c | 4 ++-- dlls/browseui/progressdlg.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 78ce326..f509ee5 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -74,7 +74,7 @@ static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -154,7 +154,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 0acb4ec..a5addd2 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -60,7 +60,7 @@ static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI CompCatCacheDaemon_QueryInterface(IRunnableTask *iface, REFIID iid, LPVOID *ppvOut) @@ -159,6 +159,6 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 598197b..e61a4cc 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -268,7 +268,7 @@ static void ProgressDialog_Destructor(ProgressDialog *This) This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFIID iid, LPVOID *ppvOut) @@ -574,6 +574,6 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; }

1 0

Sebastian Lackner : amstream: Do not allow unloading while library is still in use.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 2edc31d6c028b9532c8e4059f585d330f532a2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2edc31d6c028b9532c8e4059f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 04:25:48 2015 +0100 amstream: Do not allow unloading while library is still in use. --- dlls/amstream/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 9479053..e80c491 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -39,7 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static HINSTANCE instance; -static DWORD dll_ref = 0; /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) @@ -205,7 +204,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return dll_ref != 0 ? S_FALSE : S_OK; + return S_FALSE; } /***********************************************************************

1 0

Sebastian Lackner : d3dxof: Do not allow unloading while library is still in use.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: fc2d81464d9cdeaca06a362416858ab0c5da36a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2d81464d9cdeaca06a36241… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 04:45:08 2015 +0100 d3dxof: Do not allow unloading while library is still in use. --- dlls/d3dxof/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index ddd4661..572f388 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -41,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); static HINSTANCE instance; -static LONG dll_ref = 0; /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) @@ -225,7 +224,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return dll_ref != 0 ? S_FALSE : S_OK; + return S_FALSE; } /***********************************************************************

1 0

Sebastian Lackner : quartz: Remove unused variable.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 9057a693d75bdc4554a2fd83e135666d97f142ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9057a693d75bdc4554a2fd83e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 04:55:02 2015 +0100 quartz: Remove unused variable. --- dlls/quartz/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index b45c55b..32865f3 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -29,8 +29,6 @@ extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLS extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; -static DWORD dll_ref = 0; - /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -206,7 +204,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - if (dll_ref) return S_FALSE; return QUARTZ_DllCanUnloadNow(); }

1 0

Sebastian Lackner : msctf: Always use interlocked functions when accessing MSCTF_refCount.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 3765e08ddce41dde80ccb8129338cdf1e4f8609a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3765e08ddce41dde80ccb8129… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 05:05:04 2015 +0100 msctf: Always use interlocked functions when accessing MSCTF_refCount. --- dlls/msctf/msctf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 78992f7..231246a 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -110,7 +110,7 @@ static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); HeapFree(GetProcessHeap(),0,This); - MSCTF_refCount--; + InterlockedDecrement(&MSCTF_refCount); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -190,7 +190,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - MSCTF_refCount++; + InterlockedIncrement(&MSCTF_refCount); return S_OK; }

1 0

Nikolay Sivov : scrrun: Implement Add() and RemoveAll() for dictionary.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 5f41a746e97be7f2a0fd7937bc4a1a0ab6b256b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f41a746e97be7f2a0fd7937b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:00:28 2015 +0300 scrrun: Implement Add() and RemoveAll() for dictionary. --- dlls/scrrun/dictionary.c | 170 +++++++++++++++++++++++++++++++++++++++-- dlls/scrrun/tests/dictionary.c | 10 +-- 2 files changed, 166 insertions(+), 14 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 958d7fc..5c1893a 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -32,9 +32,20 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(scrrun); +#define BUCKET_COUNT 509 + +struct keyitem_pair { + struct list entry; + DWORD bucket; + DWORD hash; + VARIANT key; + VARIANT item; +}; + typedef struct { IDictionary IDictionary_iface; @@ -42,6 +53,8 @@ typedef struct CompareMethod method; LONG count; + struct list pairs; + struct keyitem_pair *buckets[BUCKET_COUNT]; } dictionary; static inline dictionary *impl_from_IDictionary(IDictionary *iface) @@ -49,6 +62,133 @@ static inline dictionary *impl_from_IDictionary(IDictionary *iface) return CONTAINING_RECORD(iface, dictionary, IDictionary_iface); } +static inline struct keyitem_pair *get_bucket_head(const dictionary *dict, DWORD hash) +{ + return dict->buckets[hash % BUCKET_COUNT]; +} + +static inline BOOL is_string_key(const VARIANT *key) +{ + return V_VT(key) == VT_BSTR || V_VT(key) == (VT_BSTR|VT_BYREF); +} + +/* Only for VT_BSTR or VT_BSTR|VT_BYREF types */ +static inline WCHAR *get_key_strptr(const VARIANT *key) +{ + if (V_VT(key) == VT_BSTR) + return V_BSTR(key); + + if (V_BSTRREF(key)) + return *V_BSTRREF(key); + + return NULL; +} + +/* should be used only when both keys are of string type, it's not checked */ +static inline int strcmp_key(const dictionary *dict, const VARIANT *key1, const VARIANT *key2) +{ + const WCHAR *str1, *str2; + + str1 = get_key_strptr(key1); + str2 = get_key_strptr(key2); + return dict->method == BinaryCompare ? strcmpW(str1, str2) : strcmpiW(str1, str2); +} + +static BOOL is_matching_key(const dictionary *dict, const struct keyitem_pair *pair, const VARIANT *key, DWORD hash) +{ + if (is_string_key(key) && is_string_key(&pair->key)) { + if (hash != pair->hash) + return FALSE; + + return strcmp_key(dict, key, &pair->key) == 0; + } + + if ((is_string_key(key) && !is_string_key(&pair->key)) || + (!is_string_key(key) && is_string_key(&pair->key))) + return FALSE; + + /* for numeric keys only check hash */ + return hash == pair->hash; +} + +static struct keyitem_pair *get_keyitem_pair(dictionary *dict, VARIANT *key) +{ + struct keyitem_pair *pair; + DWORD bucket; + VARIANT hash; + HRESULT hr; + + hr = IDictionary_get_HashVal(&dict->IDictionary_iface, key, &hash); + if (FAILED(hr)) + return NULL; + + pair = get_bucket_head(dict, V_I4(&hash)); + if (!pair) + return NULL; + + bucket = pair->bucket; + + do { + if (is_matching_key(dict, pair, key, V_I4(&hash))) return pair; + pair = LIST_ENTRY(list_next(&dict->pairs, &pair->entry), struct keyitem_pair, entry); + if (pair && pair->bucket != bucket) break; + } while (pair != NULL); + + return NULL; +} + +static HRESULT add_keyitem_pair(dictionary *dict, VARIANT *key, VARIANT *item) +{ + struct keyitem_pair *pair, *head; + VARIANT hash; + HRESULT hr; + + hr = IDictionary_get_HashVal(&dict->IDictionary_iface, key, &hash); + if (FAILED(hr)) + return hr; + + pair = heap_alloc(sizeof(*pair)); + if (!pair) + return E_OUTOFMEMORY; + + pair->hash = V_I4(&hash); + pair->bucket = pair->hash % BUCKET_COUNT; + VariantInit(&pair->key); + VariantInit(&pair->item); + + hr = VariantCopyInd(&pair->key, key); + if (FAILED(hr)) + goto failed; + + hr = VariantCopyInd(&pair->item, item); + if (FAILED(hr)) + goto failed; + + head = get_bucket_head(dict, pair->hash); + if (head) + list_add_tail(&head->entry, &pair->entry); + else { + dict->buckets[pair->bucket] = pair; + list_add_tail(&dict->pairs, &pair->entry); + } + + dict->count++; + return S_OK; + +failed: + VariantClear(&pair->key); + VariantClear(&pair->item); + heap_free(pair); + return hr; +} + +static void free_keyitem_pair(struct keyitem_pair *pair) +{ + VariantClear(&pair->key); + VariantClear(&pair->item); + heap_free(pair); +} + static HRESULT WINAPI dictionary_QueryInterface(IDictionary *iface, REFIID riid, void **obj) { dictionary *This = impl_from_IDictionary(iface); @@ -100,8 +240,10 @@ static ULONG WINAPI dictionary_Release(IDictionary *iface) TRACE("(%p)\n", This); ref = InterlockedDecrement(&This->ref); - if(ref == 0) + if(ref == 0) { + IDictionary_RemoveAll(iface); heap_free(This); + } return ref; } @@ -192,13 +334,16 @@ static HRESULT WINAPI dictionary_get_Item(IDictionary *iface, VARIANT *Key, VARI return E_NOTIMPL; } -static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *Key, VARIANT *Item) +static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *key, VARIANT *item) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->(%p %p)\n", This, Key, Item); + TRACE("(%p)->(%s %s)\n", This, debugstr_variant(key), debugstr_variant(item)); - return E_NOTIMPL; + if (get_keyitem_pair(This, key)) + return CTL_E_KEY_ALREADY_EXISTS; + + return add_keyitem_pair(This, key, item); } static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *count) @@ -259,10 +404,21 @@ static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *Key) static HRESULT WINAPI dictionary_RemoveAll(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair, *pair2; - FIXME("(%p)->()\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + if (This->count == 0) + return S_OK; + + LIST_FOR_EACH_ENTRY_SAFE(pair, pair2, &This->pairs, struct keyitem_pair, entry) { + list_remove(&pair->entry); + free_keyitem_pair(pair); + } + memset(This->buckets, 0, sizeof(This->buckets)); + This->count = 0; + + return S_OK; } static HRESULT WINAPI dictionary_put_CompareMode(IDictionary *iface, CompareMethod method) @@ -415,6 +571,8 @@ HRESULT WINAPI Dictionary_CreateInstance(IClassFactory *factory,IUnknown *outer, This->ref = 1; This->method = BinaryCompare; This->count = 0; + list_init(&This->pairs); + memset(This->buckets, 0, sizeof(This->buckets)); *obj = &This->IDictionary_iface; diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 25cb0a6..066a5ab 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -64,7 +64,7 @@ static void test_interfaces(void) V_VT(&value) = VT_BSTR; V_BSTR(&value) = SysAllocString(key_add_value); hr = IDictionary_Add(dict, &key, &value); - todo_wine ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); VariantClear(&value); exists = VARIANT_FALSE; @@ -83,7 +83,7 @@ static void test_interfaces(void) hr = IDictionary_get_Count(dict, &count); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - todo_wine ok(count == 1, "got %d, expected 1\n", count); + ok(count == 1, "got %d, expected 1\n", count); IDictionary_Release(dict); IDispatch_Release(disp); @@ -128,11 +128,9 @@ if (0) /* crashes on native */ V_I2(&key) = 0; VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDictionary_put_CompareMode(dict, BinaryCompare); -todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); IDictionary_Release(dict); @@ -457,13 +455,11 @@ todo_wine { } VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); V_VT(&key) = VT_R4; V_R4(&key) = 0.0; hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == CTL_E_KEY_ALREADY_EXISTS, "got 0x%08x\n", hr); V_VT(&key) = VT_I2; @@ -519,7 +515,6 @@ todo_wine { V_R4(&key) = 0.0; VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); VariantInit(&keys); @@ -570,7 +565,6 @@ todo_wine VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDictionary_Remove(dict, &key);

1 0

Nikolay Sivov : scrrun: Support VT_BSTR|VT_BYREF keys.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 7727a4859500b524dff011c5326bb1c470e8d60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7727a4859500b524dff011c53… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:01:48 2015 +0300 scrrun: Support VT_BSTR|VT_BYREF keys. --- dlls/scrrun/dictionary.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 5c1893a..524485b 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -485,8 +485,9 @@ static HRESULT WINAPI dictionary_get_HashVal(IDictionary *iface, VARIANT *key, V V_VT(hash) = VT_I4; switch (V_VT(key)) { + case VT_BSTR|VT_BYREF: case VT_BSTR: - V_I4(hash) = get_str_hash(V_BSTR(key), This->method); + V_I4(hash) = get_str_hash(get_key_strptr(key), This->method); break; case VT_UI1: V_I4(hash) = get_num_hash(V_UI1(key));

1 0