wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Austin English : include: Add ASN1_* function prototypes.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 04baaa2bf30d0b018ad9f5a44784f1b0b0da8e45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04baaa2bf30d0b018ad9f5a44… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Feb 27 12:49:28 2015 -0600 include: Add ASN1_* function prototypes. --- dlls/msasn1/main.c | 1 + include/msasn1.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index fe4877e..81f246a 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "msasn1.h" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { diff --git a/include/msasn1.h b/include/msasn1.h index 32ace3e..6b7bdfb 100644 --- a/include/msasn1.h +++ b/include/msasn1.h @@ -70,6 +70,29 @@ typedef enum { ASN1_BER_RULE = ASN1_BER_RULE_BER | ASN1_BER_RULE_CER | ASN1_BER_RULE_DER } ASN1encodingrule_e; +typedef enum tagASN1error_e +{ + ASN1_SUCCESS = 0, + ASN1_ERR_INTERNAL = -1001, + ASN1_ERR_EOD = -1002, + ASN1_ERR_CORRUPT = -1003, + ASN1_ERR_LARGE = -1004, + ASN1_ERR_CONSTRAINT = -1005, + ASN1_ERR_MEMORY = -1006, + ASN1_ERR_OVERFLOW = -1007, + ASN1_ERR_BADPDU = -1008, + ASN1_ERR_BADARGS = -1009, + ASN1_ERR_BADREAL = -1010, + ASN1_ERR_BADTAG = -1011, + ASN1_ERR_CHOICE = -1012, + ASN1_ERR_RULE = -1013, + ASN1_ERR_UTF8 = -1014, + ASN1_ERR_PDU_TYPE = -1051, + ASN1_ERR_NYI = -1052, + ASN1_WRN_EXTENDED = 1001, + ASN1_WRN_NOEOD = 1002, +} ASN1error_e; + typedef struct tagASN1module_t { ASN1magic_t nModuleName; ASN1encodingrule_e eRule; @@ -83,6 +106,47 @@ typedef struct tagASN1module_t { }; } *ASN1module_t; +typedef enum tagASN1option_e +{ + ASN1OPT_CHANGE_RULE = 0x101, + ASN1OPT_GET_RULE = 0x201, + ASN1OPT_NOT_REUSE_BUFFER = 0x301, + ASN1OPT_REWIND_BUFFER = 0x302, + ASN1OPT_SET_DECODED_BUFFER = 0x501, + ASN1OPT_DEL_DECODED_BUFFER = 0x502, + ASN1OPT_GET_DECODED_BUFFER_SIZE = 0x601, +} ASN1option_e; + +typedef struct tagASN1optionparam_t { + ASN1option_e eOption; + union + { + ASN1encodingrule_e eRule; + ASN1uint32_t cbRequiredDecodedBufSize; + struct + { + ASN1octet_t* pbBuf; + ASN1uint32_t cbBufSize; + } Buffer; + }; +} ASN1optionparam_t, ASN1optionparam_s; + +void WINAPI ASN1_CloseDecoder(ASN1decoding_t); +void WINAPI ASN1_CloseEncoder(ASN1encoding_t); +void WINAPI ASN1_CloseEncoder2(ASN1encoding_t); +void WINAPI ASN1_CloseModule(ASN1module_t); +ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t, ASN1decoding_t*,ASN1octet_t*, ASN1uint32_t, ASN1decoding_t); +ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t, ASN1encoding_t*, ASN1octet_t*, ASN1uint32_t, ASN1encoding_t); +ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t,ASN1encodingrule_e,ASN1uint32_t,ASN1uint32_t,const ASN1GenericFun_t [],const ASN1GenericFun_t [],const ASN1FreeFun_t [],const ASN1uint32_t [],ASN1magic_t); +ASN1error_e WINAPI ASN1_Decode(ASN1decoding_t, void** , ASN1uint32_t, ASN1uint32_t, ASN1octet_t*, ASN1uint32_t); +ASN1error_e WINAPI ASN1_Encode(ASN1encoding_t, void*, ASN1uint32_t, ASN1uint32_t, ASN1octet_t*, ASN1uint32_t); +void WINAPI ASN1_FreeDecoded(ASN1decoding_t, void*, ASN1uint32_t); +void WINAPI ASN1_FreeEncoded(ASN1encoding_t, void*); +ASN1error_e WINAPI ASN1_GetDecoderOption(ASN1decoding_t, ASN1optionparam_t*); +ASN1error_e WINAPI ASN1_GetEncoderOption(ASN1encoding_t, ASN1optionparam_t*); +ASN1error_e WINAPI ASN1_SetDecoderOption(ASN1decoding_t, ASN1optionparam_t*); +ASN1error_e WINAPI ASN1_SetEncoderOption(ASN1encoding_t, ASN1optionparam_t*); + #ifdef __cplusplus } #endif

1 0

Alex Henrie : x3daudio1_2: Add stub dll.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 13a1b2cfd4e55c97b0b728d2673e3f35abc9cfad URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a1b2cfd4e55c97b0b728d26… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 26 23:15:29 2015 -0700 x3daudio1_2: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/x3daudio1_2/Makefile.in | 4 ++++ dlls/x3daudio1_2/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/x3daudio1_2/x3daudio1_2.spec | 2 ++ 5 files changed, 46 insertions(+) diff --git a/configure b/configure index 273f79e..726a247 100755 --- a/configure +++ b/configure @@ -1324,6 +1324,7 @@ enable_wtsapi32 enable_wuapi enable_wuaueng enable_x3daudio1_1 +enable_x3daudio1_2 enable_x3daudio1_3 enable_x3daudio1_4 enable_x3daudio1_5 @@ -17682,6 +17683,7 @@ wine_fn_config_test dlls/wtsapi32/tests wtsapi32_test wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_1 enable_x3daudio1_1 +wine_fn_config_dll x3daudio1_2 enable_x3daudio1_2 wine_fn_config_dll x3daudio1_3 enable_x3daudio1_3 wine_fn_config_dll x3daudio1_4 enable_x3daudio1_4 wine_fn_config_dll x3daudio1_5 enable_x3daudio1_5 diff --git a/configure.ac b/configure.ac index 465ea4d..f242181 100644 --- a/configure.ac +++ b/configure.ac @@ -3385,6 +3385,7 @@ WINE_CONFIG_TEST(dlls/wtsapi32/tests) WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_1) +WINE_CONFIG_DLL(x3daudio1_2) WINE_CONFIG_DLL(x3daudio1_3) WINE_CONFIG_DLL(x3daudio1_4) WINE_CONFIG_DLL(x3daudio1_5) diff --git a/dlls/x3daudio1_2/Makefile.in b/dlls/x3daudio1_2/Makefile.in new file mode 100644 index 0000000..6632115 --- /dev/null +++ b/dlls/x3daudio1_2/Makefile.in @@ -0,0 +1,4 @@ +MODULE = x3daudio1_2.dll + +C_SRCS = \ + main.c diff --git a/dlls/x3daudio1_2/main.c b/dlls/x3daudio1_2/main.c new file mode 100644 index 0000000..d71c54a --- /dev/null +++ b/dlls/x3daudio1_2/main.c @@ -0,0 +1,37 @@ +/* + * Copyright 2015 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/x3daudio1_2/x3daudio1_2.spec b/dlls/x3daudio1_2/x3daudio1_2.spec new file mode 100644 index 0000000..9a51f1b --- /dev/null +++ b/dlls/x3daudio1_2/x3daudio1_2.spec @@ -0,0 +1,2 @@ +@ stub X3DAudioCalculate +@ stub X3DAudioInitialize

1 0

Nikolay Sivov : comctl32/tests: Fix Monthcal tests failures on some VMs.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: f935a10add34fa1413df00047c0eebac26df823d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f935a10add34fa1413df00047… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 1 21:08:13 2015 +0300 comctl32/tests: Fix Monthcal tests failures on some VMs. --- dlls/comctl32/tests/monthcal.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 61f819e..b22db1c 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -612,7 +612,9 @@ static LRESULT WINAPI monthcal_subclass_proc(HWND hwnd, UINT message, WPARAM wPa static HWND create_monthcal_control(DWORD style) { WNDPROC oldproc; + RECT rect; HWND hwnd; + BOOL ret; hwnd = CreateWindowExA(0, MONTHCAL_CLASSA, "", WS_CHILD | WS_BORDER | WS_VISIBLE | style, 0, 0, 300, 400, parent_wnd, NULL, GetModuleHandleA(NULL), NULL); @@ -625,6 +627,13 @@ static HWND create_monthcal_control(DWORD style) SendMessageA(hwnd, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); + /* make sure calendar grid is 2x1 */ + ret = SendMessageA(hwnd, MCM_GETMINREQRECT, 0, (LPARAM)&rect); + ok(ret, "got %d\n", ret); + + ret = SetWindowPos(hwnd, NULL, 0, 0, rect.right * 5 / 2, rect.bottom * 3 / 2, SWP_NOMOVE); + ok(ret, "got %d\n", ret); + return hwnd; }

1 0

Nikolay Sivov : scrrun: Implement Exists() method for dictionary.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 9419e97c3e896c33987018cf65c59e8d211b4153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9419e97c3e896c33987018cf6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:18:13 2015 +0300 scrrun: Implement Exists() method for dictionary. --- dlls/scrrun/dictionary.c | 10 +++++++--- dlls/scrrun/tests/dictionary.c | 19 +++++++------------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 2306fad..7c776ee 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -368,13 +368,17 @@ static HRESULT WINAPI dictionary_get_Count(IDictionary *iface, LONG *count) return S_OK; } -static HRESULT WINAPI dictionary_Exists(IDictionary *iface, VARIANT *Key, VARIANT_BOOL *pExists) +static HRESULT WINAPI dictionary_Exists(IDictionary *iface, VARIANT *key, VARIANT_BOOL *exists) { dictionary *This = impl_from_IDictionary(iface); - FIXME("(%p)->(%p %p)\n", This, Key, pExists); + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(key), exists); - return E_NOTIMPL; + if (!exists) + return CTL_E_ILLEGALFUNCTIONCALL; + + *exists = get_keyitem_pair(This, key) != NULL ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI dictionary_Items(IDictionary *iface, VARIANT *pItemsArray) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index deeea50..74ab7b9 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -69,16 +69,16 @@ static void test_interfaces(void) exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); - todo_wine ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - todo_wine ok(exists == VARIANT_TRUE, "Expected TRUE but got FALSE.\n"); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(exists == VARIANT_TRUE, "Expected TRUE but got FALSE.\n"); VariantClear(&key); exists = VARIANT_TRUE; V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(key_non_exist); hr = IDictionary_Exists(dict, &key, &exists); - todo_wine ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - todo_wine ok(exists == VARIANT_FALSE, "Expected FALSE but got TRUE.\n"); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(exists == VARIANT_FALSE, "Expected FALSE but got TRUE.\n"); VariantClear(&key); hr = IDictionary_get_Count(dict, &count); @@ -442,17 +442,15 @@ if (0) /* crashes on native */ V_VT(&key) = VT_I2; V_I2(&key) = 0; hr = IDictionary_Exists(dict, &key, NULL); -todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 0; exists = VARIANT_TRUE; hr = IDictionary_Exists(dict, &key, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == VARIANT_FALSE, "got %x\n", exists); -} + VariantInit(&item); hr = IDictionary_Add(dict, &key, &item); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -465,26 +463,23 @@ todo_wine { V_VT(&key) = VT_I2; V_I2(&key) = 0; hr = IDictionary_Exists(dict, &key, NULL); -todo_wine ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); V_VT(&key) = VT_I2; V_I2(&key) = 0; exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == VARIANT_TRUE, "got %x\n", exists); -} + /* key of different type, but resolves to same hash value */ V_VT(&key) = VT_R4; V_R4(&key) = 0.0; exists = VARIANT_FALSE; hr = IDictionary_Exists(dict, &key, &exists); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(exists == VARIANT_TRUE, "got %x\n", exists); -} + IDictionary_Release(dict); }

1 0

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

02 Mar '15

Module: wine Branch: master Commit: acfde52f06eb9800faae0a1d537ff064da50758f URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfde52f06eb9800faae0a1d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:15:10 2015 +0300 scrrun: Implement Remove() for dictionary. --- dlls/scrrun/dictionary.c | 16 +++++++++++++--- dlls/scrrun/tests/dictionary.c | 2 -- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index a7c90db..2306fad 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -404,13 +404,23 @@ static HRESULT WINAPI dictionary_Keys(IDictionary *iface, VARIANT *pKeysArray) return E_NOTIMPL; } -static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *Key) +static HRESULT WINAPI dictionary_Remove(IDictionary *iface, VARIANT *key) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; - FIXME("(%p)->(%p)\n", This, Key); + TRACE("(%p)->(%p)\n", This, debugstr_variant(key)); - return E_NOTIMPL; + if (!(pair = get_keyitem_pair(This, key))) + return CTL_E_ELEMENT_NOT_FOUND; + + list_remove(&pair->entry); + if (This->buckets[pair->bucket] == pair) + This->buckets[pair->bucket] = NULL; + This->count--; + + free_keyitem_pair(pair); + return S_OK; } static HRESULT WINAPI dictionary_RemoveAll(IDictionary *iface) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index c9e71a5..deeea50 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -560,7 +560,6 @@ if (0) V_VT(&key) = VT_R4; V_R4(&key) = 0.0; hr = IDictionary_Remove(dict, &key); -todo_wine ok(hr == CTL_E_ELEMENT_NOT_FOUND, "got 0x%08x\n", hr); VariantInit(&item); @@ -568,7 +567,6 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDictionary_Remove(dict, &key); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); IDictionary_Release(dict);

1 0

Nikolay Sivov : scrrun: Implement Item() property for dictionary.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 1bc4c57e551e3d92ac2776d0e65d9a6d96a4acdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc4c57e551e3d92ac2776d0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 27 18:13:04 2015 +0300 scrrun: Implement Item() property for dictionary. --- dlls/scrrun/dictionary.c | 24 ++++++++++++++++++------ dlls/scrrun/tests/dictionary.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index 524485b..a7c90db 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -316,22 +316,34 @@ static HRESULT WINAPI dictionary_putref_Item(IDictionary *iface, VARIANT *Key, V return E_NOTIMPL; } -static HRESULT WINAPI dictionary_put_Item(IDictionary *iface, VARIANT *Key, VARIANT *pRetItem) +static HRESULT WINAPI dictionary_put_Item(IDictionary *iface, VARIANT *key, VARIANT *item) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; - FIXME("(%p)->(%p %p)\n", This, Key, pRetItem); + TRACE("(%p)->(%s %s)\n", This, debugstr_variant(key), debugstr_variant(item)); - return E_NOTIMPL; + if ((pair = get_keyitem_pair(This, key))) + return VariantCopyInd(&pair->item, item); + + return IDictionary_Add(iface, key, item); } -static HRESULT WINAPI dictionary_get_Item(IDictionary *iface, VARIANT *Key, VARIANT *pRetItem) +static HRESULT WINAPI dictionary_get_Item(IDictionary *iface, VARIANT *key, VARIANT *item) { dictionary *This = impl_from_IDictionary(iface); + struct keyitem_pair *pair; - FIXME("(%p)->(%p %p)\n", This, Key, pRetItem ); + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(key), item); - return E_NOTIMPL; + if ((pair = get_keyitem_pair(This, key))) + VariantCopy(item, &pair->item); + else { + VariantInit(item); + return IDictionary_Add(iface, key, item); + } + + return S_OK; } static HRESULT WINAPI dictionary_Add(IDictionary *iface, VARIANT *key, VARIANT *item) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 066a5ab..c9e71a5 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -574,6 +574,34 @@ todo_wine IDictionary_Release(dict); } +static void test_Item(void) +{ + VARIANT key, item; + IDictionary *dict; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 10; + V_VT(&item) = VT_I2; + V_I2(&item) = 123; + hr = IDictionary_get_Item(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&item) == VT_EMPTY, "got %d\n", V_VT(&item)); + + V_VT(&key) = VT_I2; + V_I2(&key) = 10; + V_VT(&item) = VT_I2; + hr = IDictionary_get_Item(dict, &key, &item); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&item) == VT_EMPTY, "got %d\n", V_VT(&item)); + + IDictionary_Release(dict); +} + START_TEST(dictionary) { IDispatch *disp; @@ -596,6 +624,7 @@ START_TEST(dictionary) test_Exists(); test_Keys(); test_Remove(); + test_Item(); CoUninitialize(); }

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

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

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015