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

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: 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 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 : 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

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

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

Alexandre Julliard : ntdll: Use the fileio structure and callback also for ioctl calls.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 4f43d743e07ab1b809de70d10972d6f97ba1f3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f43d743e07ab1b809de70d10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 16:56:47 2015 +0900 ntdll: Use the fileio structure and callback also for ioctl calls. --- dlls/ntdll/file.c | 44 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5232027..6e3825f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -336,22 +336,22 @@ struct async_fileio void *apc_arg; }; -typedef struct +struct async_fileio_read { struct async_fileio io; char* buffer; unsigned int already; unsigned int count; BOOL avail_mode; -} async_fileio_read; +}; -typedef struct +struct async_fileio_write { struct async_fileio io; const char *buffer; unsigned int already; unsigned int count; -} async_fileio_write; +}; /* callback for file I/O user APC */ @@ -416,7 +416,7 @@ NTSTATUS FILE_GetNtStatus(void) */ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATUS status, void **apc) { - async_fileio_read *fileio = user; + struct async_fileio_read *fileio = user; int fd, needs_close, result; switch (status) @@ -730,7 +730,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, if (async_read) { - async_fileio_read *fileio; + struct async_fileio_read *fileio; BOOL avail_mode; if ((status = get_io_avail_mode( hFile, type, &avail_mode ))) @@ -923,7 +923,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap */ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc) { - async_fileio_write *fileio = user; + struct async_fileio_write *fileio = user; int result, fd, needs_close; enum server_fd_type type; @@ -1140,7 +1140,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (async_write) { - async_fileio_write *fileio; + struct async_fileio_write *fileio; if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) { @@ -1327,22 +1327,12 @@ NTSTATUS WINAPI NtWriteFileGather( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap struct async_ioctl { - HANDLE handle; /* handle to the device */ - HANDLE event; /* async event */ - void *buffer; /* buffer for output */ - ULONG size; /* size of buffer */ - PIO_APC_ROUTINE apc; /* user apc params */ - void *apc_arg; + struct async_fileio io; + HANDLE event; /* async event */ + void *buffer; /* buffer for output */ + ULONG size; /* size of buffer */ }; -/* callback for ioctl user APC */ -static void WINAPI ioctl_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) -{ - struct async_ioctl *async = arg; - if (async->apc) async->apc( async->apc_arg, io, reserved ); - RtlFreeHeap( GetProcessHeap(), 0, async ); -} - /* callback for ioctl async I/O completion */ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc ) { @@ -1352,7 +1342,7 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu { SERVER_START_REQ( get_ioctl_result ) { - req->handle = wine_server_obj_handle( async->handle ); + req->handle = wine_server_obj_handle( async->io.handle ); req->user_arg = wine_server_client_ptr( async ); wine_server_set_reply( req, async->buffer, async->size ); status = wine_server_call( req ); @@ -1363,7 +1353,7 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu if (status != STATUS_PENDING) { io->u.Status = status; - if (async->apc || async->event) *apc = ioctl_apc; + if (async->io.apc || async->event) *apc = fileio_apc; } return status; } @@ -1383,12 +1373,12 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (!(async = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*async) ))) return STATUS_NO_MEMORY; - async->handle = handle; + async->io.handle = handle; + async->io.apc = apc; + async->io.apc_arg = apc_context; async->event = event; async->buffer = out_buffer; async->size = out_size; - async->apc = apc; - async->apc_arg = apc_context; SERVER_START_REQ( ioctl ) {

1 0

Alexandre Julliard : ntdll: Move NtNotifyChangeDirectoryFile to file.c and make it use the standard fileio structure.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: ff84bf8bdd118479b7aaabc393db66ff356bff92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff84bf8bdd118479b7aaabc39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 20:56:40 2015 +0900 ntdll: Move NtNotifyChangeDirectoryFile to file.c and make it use the standard fileio structure. --- dlls/ntdll/directory.c | 157 ------------------------------------------------- dlls/ntdll/file.c | 138 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 157 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff84bf8bdd118479b7aaa…

1 0

Alexandre Julliard : ntdll: Don' t queue a user APC when there is no callback function.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 577cb166d48e5c6f270237179cdbeb82a68b1ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=577cb166d48e5c6f270237179… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 17:53:40 2015 +0900 ntdll: Don't queue a user APC when there is no callback function. --- dlls/ntdll/file.c | 89 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 0323b23..43b6097 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -331,9 +331,10 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB struct async_fileio { - HANDLE handle; - PIO_APC_ROUTINE apc; - void *apc_arg; + struct async_fileio *next; + HANDLE handle; + PIO_APC_ROUTINE apc; + void *apc_arg; }; struct async_fileio_read @@ -353,13 +354,46 @@ struct async_fileio_write unsigned int count; }; +static struct async_fileio *fileio_freelist; + +static void release_fileio( struct async_fileio *io ) +{ + for (;;) + { + struct async_fileio *next = fileio_freelist; + io->next = next; + if (interlocked_cmpxchg_ptr( (void **)&fileio_freelist, io, next ) == next) return; + } +} + +static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROUTINE apc, void *arg ) +{ + /* first free remaining previous fileinfos */ + + struct async_fileio *io = interlocked_xchg_ptr( (void **)&fileio_freelist, NULL ); + + while (io) + { + struct async_fileio *next = io->next; + RtlFreeHeap( GetProcessHeap(), 0, io ); + io = next; + } + + if ((io = RtlAllocateHeap( GetProcessHeap(), 0, size ))) + { + io->handle = handle; + io->apc = apc; + io->apc_arg = arg; + } + return io; +} /* callback for file I/O user APC */ static void WINAPI fileio_apc( void *arg, IO_STATUS_BLOCK *io, ULONG reserved ) { struct async_fileio *async = arg; if (async->apc) async->apc( async->apc_arg, io, reserved ); - RtlFreeHeap( GetProcessHeap(), 0, async ); + release_fileio( async ); } /*********************************************************************** @@ -466,7 +500,10 @@ static NTSTATUS FILE_AsyncReadService(void *user, PIO_STATUS_BLOCK iosb, NTSTATU { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); } return status; } @@ -741,14 +778,12 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, goto done; } - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) + fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); + if (!fileio) { status = STATUS_NO_MEMORY; goto err; } - fileio->io.handle = hFile; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_user; fileio->already = total; fileio->count = length; fileio->buffer = buffer; @@ -963,7 +998,10 @@ static NTSTATUS FILE_AsyncWriteService(void *user, IO_STATUS_BLOCK *iosb, NTSTAT { iosb->u.Status = status; iosb->Information = fileio->already; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); } return status; } @@ -1142,14 +1180,12 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, { struct async_fileio_write *fileio; - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*fileio)))) + fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); + if (!fileio) { status = STATUS_NO_MEMORY; goto err; } - fileio->io.handle = hFile; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_user; fileio->already = total; fileio->count = length; fileio->buffer = buffer; @@ -1353,7 +1389,10 @@ static NTSTATUS ioctl_completion( void *arg, IO_STATUS_BLOCK *io, NTSTATUS statu if (status != STATUS_PENDING) { io->u.Status = status; - if (async->io.apc || async->event) *apc = fileio_apc; + if (async->io.apc) + *apc = fileio_apc; + else + release_fileio( &async->io ); } return status; } @@ -1371,11 +1410,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*async) ))) + if (!(async = (struct async_ioctl *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) return STATUS_NO_MEMORY; - async->io.handle = handle; - async->io.apc = apc; - async->io.apc_arg = apc_context; async->event = event; async->buffer = out_buffer; async->size = out_size; @@ -1410,7 +1446,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, NtWaitForSingleObject( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT), NULL ); status = io->u.Status; NtClose( wait_handle ); - RtlFreeHeap( GetProcessHeap(), 0, async ); } return status; @@ -1740,7 +1775,10 @@ static NTSTATUS read_changes_apc( void *user, PIO_STATUS_BLOCK iosb, NTSTATUS st iosb->u.Status = ret; iosb->Information = size; - *apc = fileio_apc; + if (fileio->io.apc) + *apc = fileio_apc; + else + release_fileio( &fileio->io ); return ret; } @@ -1772,13 +1810,10 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP if (!iosb) return STATUS_ACCESS_VIOLATION; if (filter == 0 || (filter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; - fileio = RtlAllocateHeap( GetProcessHeap(), 0, offsetof( struct read_changes_fileio, data[size] )); - if (!fileio) - return STATUS_NO_MEMORY; + fileio = (struct read_changes_fileio *)alloc_fileio( offsetof(struct read_changes_fileio, data[size]), + handle, apc, apc_context ); + if (!fileio) return STATUS_NO_MEMORY; - fileio->io.handle = handle; - fileio->io.apc = apc; - fileio->io.apc_arg = apc_context; fileio->buffer = buffer; fileio->buffer_size = buffer_size; fileio->data_size = size;

1 0

Mark Harmstone : comctl32: Call OpenThemeData on themed scrollbars.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 050bda2ece4f249d2973c3d4e1a1f5f3671de053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=050bda2ece4f249d2973c3d4e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Feb 28 16:37:08 2015 +0000 comctl32: Call OpenThemeData on themed scrollbars. --- dlls/comctl32/theme_scrollbar.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/theme_scrollbar.c b/dlls/comctl32/theme_scrollbar.c index 9978598..ed2c051 100644 --- a/dlls/comctl32/theme_scrollbar.c +++ b/dlls/comctl32/theme_scrollbar.c @@ -38,7 +38,39 @@ LRESULT CALLBACK THEMING_ScrollbarSubclassProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, ULONG_PTR dwRefData) { + const WCHAR* themeClass = WC_SCROLLBARW; + HTHEME theme; + LRESULT result; + TRACE("(%p, 0x%x, %lu, %lu, %lu)\n", hwnd, msg, wParam, lParam, dwRefData); - return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam); + switch (msg) { + case WM_CREATE: + result = THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + OpenThemeData(hwnd, themeClass); + return result; + + case WM_DESTROY: + theme = GetWindowTheme(hwnd); + CloseThemeData(theme); + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + + case WM_THEMECHANGED: + theme = GetWindowTheme(hwnd); + CloseThemeData(theme); + OpenThemeData(hwnd, themeClass); + break; + + case WM_SYSCOLORCHANGE: + theme = GetWindowTheme(hwnd); + if (!theme) return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + /* Do nothing. When themed, a WM_THEMECHANGED will be received, too, + * which will do the repaint. */ + break; + + default: + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + } + + return 0; }

1 0