November 2018 - Wine-devel - list.winehq.org

[PATCH 2/3] user32/tests: Add a test for navigating a group of buttons using keyboard events.
by Dmitry Timoshkov 27 Nov '18

27 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 316 ++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 11 ++ 2 files changed, 327 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index baa8fe5286..6e62873023 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6726,6 +6726,132 @@ static const struct message auto_radio_button_BM_CLICK[] = { 0 } }; +static const struct message auto_radio_button_VK_UP_child[] = +{ + { WM_KEYDOWN, sent|wparam|lparam, VK_UP, 0 }, + { WM_KEYUP, sent|wparam|lparam, VK_UP, 0 }, + { 0 } +}; + +static const struct message auto_radio_button_VK_UP_parent[] = +{ + { WM_KEYDOWN, sent|wparam|lparam|parent, VK_UP, 0 }, + { WM_KEYUP, sent|wparam|lparam|parent, VK_UP, 0 }, + { 0 } +}; + +static const struct message auto_radio_button_VK_UP_dialog[] = +{ + { WM_GETDLGCODE, sent|parent, 0, 0 }, + + /* optional trailer seen on some windows setups */ + { WM_CHANGEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_CTLCOLORBTN, sent|parent|optional }, + { WM_CTLCOLORBTN, sent|parent|optional }, + { WM_UPDATEUISTATE, sent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { WM_CTLCOLORSTATIC, sent|parent|optional }, + { 0 } +}; + +static const struct message auto_radio_button_VK_DOWN_dialog[] = +{ + { WM_GETDLGCODE, sent|parent, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, MAKELPARAM(WM_KEYDOWN, VK_DOWN) }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, 0 }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent, 0, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO3, BN_KILLFOCUS) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_SETFOCUS, sent, 0, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_SETFOCUS) }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_CLICKED) }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, 0 }, + { WM_GETDLGCODE, sent|parent, 0, 0 }, + { DM_GETDEFID, sent|parent, 0, 0 }, + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO1 }, + { BM_CLICK, sent|wparam|lparam, 1, 0 }, + { WM_LBUTTONDOWN, sent|wparam|lparam|defwinproc, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO1 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO1 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO1, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO1 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO3, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO3 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_TEXT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO2, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO2 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO1, BN_CLICKED) }, + { WM_NCHITTEST, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_SETCURSOR, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_MOUSEMOVE, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_PAINT, sent }, + { WM_CTLCOLORSTATIC, sent|parent }, + { 0 } +}; + +static const struct message auto_radio_button_VK_DOWN_radio3[] = +{ + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO1 }, + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO2 }, + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO3 }, + { WM_GETDLGCODE, sent|parent, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, MAKELPARAM(WM_KEYDOWN, VK_DOWN) }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam, ID_RADIO1, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|parent, 0, 0 }, + { WM_USER, sent|parent, 0, 0 }, + { BM_GETCHECK, sent|wparam|lparam, 0, ID_RADIO1 }, + { 0 } +}; + +static const struct message auto_radio_button_VK_UP_radio1[] = +{ + { WM_GETDLGCODE, sent|parent, 0, 0 }, + { 0 } +}; + static INT_PTR WINAPI radio_test_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { ParentMsgCheckProcA(hwnd, msg, wp, lp); @@ -6812,6 +6938,195 @@ static void test_autoradio_BM_CLICK(void) DestroyWindow(parent); } +#define test_radio(r1, s1, r2, s2, r3, s3) test_radio_dbg(r1, s1, r2, s2, r3, s3, __LINE__) +static void test_radio_dbg(HWND radio1, int state1, HWND radio2, int state2, HWND radio3, int state3, int line) +{ + DWORD ret; + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok_(__FILE__,line)(ret == state1 ? BST_CHECKED : BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok_(__FILE__,line)(ret == state2 ? BST_CHECKED : BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok_(__FILE__,line)(ret == state3 ? BST_CHECKED : BST_UNCHECKED, "got %08x\n", ret); +} + +static void set_radio(HWND radio1, int state1, HWND radio2, int state2, HWND radio3, int state3) +{ + SendMessageA(radio1, BM_SETCHECK, state1 ? BST_CHECKED : BST_UNCHECKED, 0); + SendMessageA(radio2, BM_SETCHECK, state2 ? BST_CHECKED : BST_UNCHECKED, 0); + SendMessageA(radio3, BM_SETCHECK, state3 ? BST_CHECKED : BST_UNCHECKED, 0); +} + +static void test_autoradio_kbd_move(void) +{ + HWND parent, radio1, radio2, radio3, hwnd; + RECT rc; + MSG msg; + DWORD ret; + + subclass_button(); + + parent = CreateDialogParamA(0, "AUTORADIO_TEST_DIALOG_2", 0, radio_test_dlg_proc, 0); + ok(parent != 0, "failed to create parent window\n"); + + radio1 = GetDlgItem(parent, ID_RADIO1); + radio2 = GetDlgItem(parent, ID_RADIO2); + radio3 = GetDlgItem(parent, ID_RADIO3); + + flush_events(); + flush_sequence(); + + test_radio(radio1, 0, radio2, 0, radio3, 0); + set_radio(radio1, 1, radio2, 1, radio3, 1); + test_radio(radio1, 1, radio2, 1, radio3, 1); + + SetFocus(radio3); + + flush_events(); + flush_sequence(); + + log_all_parent_messages++; + + SendMessageA(radio3, WM_KEYDOWN, VK_UP, 0); + SendMessageA(radio3, WM_KEYUP, VK_UP, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_UP_child, "press/release VK_UP on auto-radio button", FALSE); + + test_radio(radio1, 1, radio2, 1, radio3, 1); + + flush_events(); + flush_sequence(); + + DefDlgProcA(parent, WM_KEYDOWN, VK_UP, 0); + DefDlgProcA(parent, WM_KEYUP, VK_UP, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_UP_parent, "press/release VK_UP on dialog", FALSE); + + test_radio(radio1, 1, radio2, 1, radio3, 1); + + SetFocus(radio3); + GetWindowRect(radio3, &rc); + + flush_events(); + flush_sequence(); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_UP; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); +if (0) /* actual message sequence is different on every run in some Windows setups */ + ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #1", FALSE); + /* what really matters is that nothing has changed */ + test_radio(radio1, 1, radio2, 1, radio3, 1); + + set_radio(radio1, 0, radio2, 1, radio3, 1); + test_radio(radio1, 0, radio2, 1, radio3, 1); + + flush_events(); + flush_sequence(); + + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); +if (0) /* actual message sequence is different on every run in some Windows setups */ + ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #2", FALSE); + /* what really matters is that nothing has changed */ + test_radio(radio1, 0, radio2, 1, radio3, 1); + + /* switch from radio3 ro radio1 */ + SetFocus(radio3); + GetWindowRect(radio3, &rc); + + flush_events(); + flush_sequence(); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_DOWN; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_DOWN_dialog, "IsDialogMessage(VK_DOWN)", TRUE); + +todo_wine + test_radio(radio1, 1, radio2, 0, radio3, 0); + + hwnd = GetFocus(); +todo_wine + ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); + GetWindowRect(radio1, &rc); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_DOWN; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_DOWN_radio3, "down to radio3", TRUE); + +todo_wine + test_radio(radio1, 1, radio2, 0, radio3, 0); + + hwnd = GetFocus(); +todo_wine + ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); + + flush_events(); + flush_sequence(); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_UP; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_VK_UP_radio1, "up to radio1", TRUE); + +todo_wine + test_radio(radio1, 1, radio2, 0, radio3, 0); + + hwnd = GetFocus(); +todo_wine + ok(hwnd == radio1, "focus should be on radio1, not on %p\n", hwnd); + + flush_events(); + flush_sequence(); + + msg.hwnd = parent; + msg.message = WM_KEYDOWN; + msg.wParam = VK_UP; + msg.lParam = 0; + msg.pt.x = rc.left + 1; + msg.pt.y = rc.top + 1; + ret = IsDialogMessageA(parent, &msg); + ok(ret, "IsDialogMessage should return TRUE\n"); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); +if (0) /* actual message sequence is different on every run in some Windows setups */ + ok_sequence(auto_radio_button_VK_UP_dialog, "IsDialogMessage(VK_UP) #3", FALSE); + /* what really matters is that nothing has changed */ +todo_wine + test_radio(radio1, 1, radio2, 0, radio3, 0); + + log_all_parent_messages--; + + DestroyWindow(parent); +} + /****************** static message test *************************/ static const struct message WmSetFontStaticSeq2[] = { @@ -17273,6 +17588,7 @@ START_TEST(msg) test_button_messages(); test_button_bm_get_set_image(); test_autoradio_BM_CLICK(); + test_autoradio_kbd_move(); test_static_messages(); test_listbox_messages(); test_combobox_messages(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 1557291c14..3823ed39e4 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -86,6 +86,17 @@ FONT 8, "MS Shell Dlg" CONTROL "Radio2",502,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,85,70,18 } +AUTORADIO_TEST_DIALOG_2 DIALOGEX 0, 0, 200, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Radio Button Test Dialog" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Radio1",501,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,10,70,18 + CONTROL "Radio3",503,"my_button_class",WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY,10,35,70,18 + CONTROL "Text",504,"my_button_class",WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY,10,60,70,18 + CONTROL "Radio2",502,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY,10,85,70,18 +} + CLASS_TEST_DIALOG DIALOG 0, 0, 91, 28 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CreateDialogParams Test" -- 2.17.1

2 1

[PATCH v3 1/4] dbghelp: Avoid using inline assembly in do_x86cpuid().
by Zebediah Figura 27 Nov '18

27 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: fix stack offsets dlls/dbghelp/minidump.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 975bb45c9a..eedce8138d 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -542,20 +542,27 @@ static unsigned dump_modules(struct dump_context* dc, BOOL dump_elf) return sz; } -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_x86cpuid(unsigned int ax, unsigned int *p) +extern void do_x86cpuid(unsigned int ax, unsigned int *p); + +#ifdef __i386__ +__ASM_GLOBAL_FUNC( do_x86cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ); +#else +void do_x86cpuid(unsigned int ax, unsigned int *p) { -#if defined(__GNUC__) && defined(__i386__) - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#endif } +#endif /* From xf86info havecpuid.c 1.11 */ static inline int have_x86cpuid(void) -- 2.14.1

3 10

[PATCH] dbghelp: Fix build failure on macOS.
by Huw Davies 27 Nov '18

27 Nov '18

This was caused by commit 8d096fb5e262e5e87866d1a4a397da144a09b635. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index a3f838f88f..a0623352a7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1096,7 +1096,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt if (ste->is_public && !(dbghelp_options & SYMOPT_NO_PUBLICS)) { - symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->addr, 0); + symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->is_code, ste->addr, 0); } } } -- 2.18.0

1 0

[PATCH 1/5] shcore: Implement SHCreateMemStream().
by Nikolay Sivov 27 Nov '18

27 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 308 ++++++++++++++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 309 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 8f674a2edc..792f7c85b7 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -28,7 +28,9 @@ #include "initguid.h" #include "ocidl.h" #include "shellscalingapi.h" + #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(shcore); @@ -492,3 +494,309 @@ WCHAR** WINAPI CommandLineToArgvW(const WCHAR *cmdline, int *numargs) return argv; } + +struct shstream +{ + IStream IStream_iface; + LONG refcount; + + union + { + struct + { + BYTE *buffer; + DWORD length; + DWORD position; + } mem; + } u; +}; + +static inline struct shstream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, struct shstream, IStream_iface); +} + +static HRESULT WINAPI shstream_QueryInterface(IStream *iface, REFIID riid, void **out) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)->(%s, %p)\n", stream, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + { + *out = iface; + IStream_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI shstream_AddRef(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + ULONG refcount = InterlockedIncrement(&stream->refcount); + + TRACE("(%p)->(%u)\n", stream, refcount); + + return refcount; +} + +static ULONG WINAPI memstream_Release(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + ULONG refcount = InterlockedDecrement(&stream->refcount); + + TRACE("(%p)->(%u)\n", stream, refcount); + + if (!refcount) + { + heap_free(stream->u.mem.buffer); + heap_free(stream); + } + + return refcount; +} + +static HRESULT WINAPI memstream_Read(IStream *iface, void *buff, ULONG buff_size, ULONG *read_len) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length; + + TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, read_len); + + if (stream->u.mem.position >= stream->u.mem.length) + length = 0; + else + length = stream->u.mem.length - stream->u.mem.position; + + length = buff_size > length ? length : buff_size; + if (length != 0) /* not at end of buffer and we want to read something */ + { + memmove(buff, stream->u.mem.buffer + stream->u.mem.position, length); + stream->u.mem.position += length; /* adjust pointer */ + } + + if (read_len) + *read_len = length; + + return S_OK; +} + +static HRESULT WINAPI memstream_Write(IStream *iface, const void *buff, ULONG buff_size, ULONG *written) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length = stream->u.mem.position + buff_size; + + TRACE("(%p)->(%p, %u, %p)\n", stream, buff, buff_size, written); + + if (length < stream->u.mem.position) /* overflow */ + return STG_E_INSUFFICIENTMEMORY; + + if (length > stream->u.mem.length) + { + BYTE *buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stream->u.mem.buffer, length); + if (!buffer) + return STG_E_INSUFFICIENTMEMORY; + + stream->u.mem.length = length; + stream->u.mem.buffer = buffer; + } + memmove(stream->u.mem.buffer + stream->u.mem.position, buff, buff_size); + stream->u.mem.position += buff_size; /* adjust pointer */ + + if (written) + *written = buff_size; + + return S_OK; +} + +static HRESULT WINAPI memstream_Seek(IStream *iface, LARGE_INTEGER move, DWORD origin, ULARGE_INTEGER*new_pos) +{ + struct shstream *stream = impl_from_IStream(iface); + LARGE_INTEGER tmp; + + TRACE("(%p)->(%s, %d, %p)\n", stream, wine_dbgstr_longlong(move.QuadPart), origin, new_pos); + + if (origin == STREAM_SEEK_SET) + tmp = move; + else if (origin == STREAM_SEEK_CUR) + tmp.QuadPart = stream->u.mem.position + move.QuadPart; + else if (origin == STREAM_SEEK_END) + tmp.QuadPart = stream->u.mem.length + move.QuadPart; + else + return STG_E_INVALIDPARAMETER; + + if (tmp.QuadPart < 0) + return STG_E_INVALIDFUNCTION; + + /* we cut off the high part here */ + stream->u.mem.position = tmp.u.LowPart; + + if (new_pos) + new_pos->QuadPart = stream->u.mem.position; + return S_OK; +} + +static HRESULT WINAPI memstream_SetSize(IStream *iface, ULARGE_INTEGER new_size) +{ + struct shstream *stream = impl_from_IStream(iface); + DWORD length; + BYTE *buffer; + + TRACE("(%p, %s)\n", stream, wine_dbgstr_longlong(new_size.QuadPart)); + + /* we cut off the high part here */ + length = new_size.u.LowPart; + buffer = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, stream->u.mem.buffer, length); + if (!buffer) + return STG_E_INSUFFICIENTMEMORY; + + stream->u.mem.buffer = buffer; + stream->u.mem.length = length; + + return S_OK; +} + +static HRESULT WINAPI shstream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER size, ULARGE_INTEGER *read_len, ULARGE_INTEGER *written) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + if (read_len) + read_len->QuadPart = 0; + + if (written) + written->QuadPart = 0; + + /* TODO implement */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_Commit(IStream *iface, DWORD flags) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %#x)\n", stream, flags); + + /* Commit is not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_Revert(IStream *iface) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* revert not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_LockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* lock/unlock not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI shstream_UnlockRegion(IStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER size, DWORD lock_type) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p)\n", stream); + + /* lock/unlock not supported by this stream */ + return E_NOTIMPL; +} + +static HRESULT WINAPI memstream_Stat(IStream *iface, STATSTG *statstg, DWORD flags) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %p, %#x)\n", stream, statstg, flags); + + memset(statstg, 0, sizeof(*statstg)); + statstg->type = STGTY_STREAM; + statstg->cbSize.QuadPart = stream->u.mem.length; + statstg->grfMode = STGM_READWRITE; + + return S_OK; +} + +static HRESULT WINAPI shstream_Clone(IStream *iface, IStream **dest) +{ + struct shstream *stream = impl_from_IStream(iface); + + TRACE("(%p, %p)\n", stream, dest); + + *dest = NULL; + + /* clone not supported by this stream */ + return E_NOTIMPL; +} + +static const IStreamVtbl shstreamvtbl = +{ + shstream_QueryInterface, + shstream_AddRef, + memstream_Release, + memstream_Read, + memstream_Write, + memstream_Seek, + memstream_SetSize, + shstream_CopyTo, + shstream_Commit, + shstream_Revert, + shstream_LockRegion, + shstream_UnlockRegion, + memstream_Stat, + shstream_Clone, +}; + +/************************************************************************* + * SHCreateMemStream [SHCORE.@] + * + * Create an IStream object on a block of memory. + * + * PARAMS + * data [I] Memory block to create the IStream object on + * data_len [I] Length of data block + * + * RETURNS + * Success: A pointer to the IStream object. + * Failure: NULL, if any parameters are invalid or an error occurs. + * + * NOTES + * A copy of the memory block is made, it's freed when the stream is released. + */ +IStream * WINAPI SHCreateMemStream(const BYTE *data, UINT data_len) +{ + struct shstream *stream; + + TRACE("(%p, %u)\n", data, data_len); + + if (!data) + data_len = 0; + + stream = heap_alloc(sizeof(*stream)); + stream->IStream_iface.lpVtbl = &shstreamvtbl; + stream->refcount = 1; + stream->u.mem.buffer = heap_alloc(data_len); + if (!stream->u.mem.buffer) + { + heap_free(stream); + return NULL; + } + memcpy(stream->u.mem.buffer, data, data_len); + stream->u.mem.length = data_len; + stream->u.mem.position = 0; + + return &stream->IStream_iface; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 1266a02f69..e8643d8691 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -33,7 +33,7 @@ @ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode @ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA @ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW -@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream +@ stdcall SHCreateMemStream(ptr long) @ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA @ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx @ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW -- 2.19.2

1 4

[PATCH 1/3] user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog.
by Dmitry Timoshkov 27 Nov '18

27 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 78 +++++++++++++++++++++-------------- dlls/user32/tests/resource.rc | 11 +++++ 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b39d0b251b..baa8fe5286 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -123,6 +123,8 @@ static DWORD cbt_hook_thread_id; static const WCHAR testWindowClassW[] = { 'T','e','s','t','W','i','n','d','o','w','C','l','a','s','s','W',0 }; +static LRESULT WINAPI ParentMsgCheckProcA(HWND, UINT, WPARAM, LPARAM); + /* FIXME: add tests for these Window Edge Styles (Win31/Win95/98 look), in order of precedence: @@ -6188,7 +6190,24 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, case BM_SETSTATE: if (GetCapture()) ok(GetCapture() == hwnd, "GetCapture() = %p\n", GetCapture()); + + lParam = (ULONG_PTR)GetMenu(hwnd); + goto log_it; + + case WM_GETDLGCODE: + if (lParam) + { + MSG *msg = (MSG *)lParam; + lParam = MAKELPARAM(msg->message, msg->wParam); + } + wParam = (ULONG_PTR)GetMenu(hwnd); + goto log_it; + + case BM_SETCHECK: + case BM_GETCHECK: + lParam = (ULONG_PTR)GetMenu(hwnd); /* fall through */ +log_it: default: msg.hwnd = hwnd; msg.message = message; @@ -6670,32 +6689,34 @@ static void test_button_bm_get_set_image(void) ReleaseDC(0, hdc); } -#define ID_RADIO1 0x00e1 -#define ID_RADIO2 0x00e2 +#define ID_RADIO1 501 +#define ID_RADIO2 502 +#define ID_RADIO3 503 +#define ID_TEXT 504 -static const struct message auto_radio_button_WM_CLICK[] = +static const struct message auto_radio_button_BM_CLICK[] = { { BM_CLICK, sent|wparam|lparam, 0, 0 }, { WM_LBUTTONDOWN, sent|wparam|lparam|defwinproc, 0, 0 }, { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, - { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO2 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, ID_RADIO2 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO2, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, ID_RADIO2 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO1, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, ID_RADIO1 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, - { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_RADIO3, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, ID_RADIO3 }, { WM_CTLCOLORSTATIC, sent|parent }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, ID_TEXT, 0 }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO2, BN_CLICKED) }, @@ -6705,30 +6726,27 @@ static const struct message auto_radio_button_WM_CLICK[] = { 0 } }; -static void test_autoradio_messages(void) +static INT_PTR WINAPI radio_test_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - HWND parent, radio1, radio2, radio3, child; + ParentMsgCheckProcA(hwnd, msg, wp, lp); + return 1; +} + +static void test_autoradio_BM_CLICK(void) +{ + HWND parent, radio1, radio2, radio3; RECT rc; MSG msg; DWORD ret; subclass_button(); - parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 100, 100, 200, 200, 0, 0, 0, NULL); + parent = CreateDialogParamA(0, "AUTORADIO_TEST_DIALOG_1", 0, radio_test_dlg_proc, 0); ok(parent != 0, "failed to create parent window\n"); - radio1 = CreateWindowExA(0, "my_button_class", "radio1", WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY, - 0, 0, 70, 18, parent, (HMENU)ID_RADIO1, 0, NULL); - ok(radio1 != 0, "failed to create child window\n"); - radio3 = CreateWindowExA(0, "my_button_class", "radio3", WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY, - 0, 25, 70, 18, parent, (HMENU)-1, 0, NULL); - ok(radio3 != 0, "failed to create child window\n"); - child = CreateWindowExA(0, "my_button_class", "text", WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY, - 0, 50, 70, 18, parent, (HMENU)-1, 0, NULL); - ok(child != 0, "failed to create child window\n"); - radio2 = CreateWindowExA(0, "my_button_class", "radio2", WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY, - 0, 75, 70, 18, parent, (HMENU)ID_RADIO2, 0, NULL); - ok(radio2 != 0, "failed to create child window\n"); + + radio1 = GetDlgItem(parent, ID_RADIO1); + radio2 = GetDlgItem(parent, ID_RADIO2); + radio3 = GetDlgItem(parent, ID_RADIO3); /* this avoids focus messages in the generated sequence */ SetFocus(radio2); @@ -6780,7 +6798,7 @@ static void test_autoradio_messages(void) SendMessageA(radio2, BM_CLICK, 0, 0); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(auto_radio_button_WM_CLICK, "BM_CLICK on auto-radio button", FALSE); + ok_sequence(auto_radio_button_BM_CLICK, "BM_CLICK on auto-radio button", FALSE); log_all_parent_messages--; @@ -17254,7 +17272,7 @@ START_TEST(msg) test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image(); - test_autoradio_messages(); + test_autoradio_BM_CLICK(); test_static_messages(); test_listbox_messages(); test_combobox_messages(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index a9e45e90ce..1557291c14 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -75,6 +75,17 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL,109,20,50,14, WS_TABSTOP | WS_GROUP } +AUTORADIO_TEST_DIALOG_1 DIALOGEX 0, 0, 200, 200 +STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Radio Button Test Dialog" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Radio1",501,"my_button_class",WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,10,70,18 + CONTROL "Radio3",503,"my_button_class",WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,35,70,18 + CONTROL "Text",504,"my_button_class",WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY | WS_TABSTOP,10,60,70,18 + CONTROL "Radio2",502,"my_button_class",WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,10,85,70,18 +} + CLASS_TEST_DIALOG DIALOG 0, 0, 91, 28 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "CreateDialogParams Test" -- 2.17.1

2 1

[PATCH] wininet: Free security context in failure case.
by Daniel Lehman 26 Nov '18

26 Nov '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/wininet/netconnection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4ad22177ee..e3531da17b 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -573,6 +573,8 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode WARN("Failed to establish SSL connection: %08x (%u)\n", status, res); heap_free(connection->ssl_buf); connection->ssl_buf = NULL; + if(SecIsValidHandle(&connection->ssl_ctx)) + DeleteSecurityContext(&connection->ssl_ctx); return res ? res : ERROR_INTERNET_SECURITY_CHANNEL_ERROR; } -- 2.17.1

2 1

[v2 PATCH 2/3] comsvcs: Implement IHolder Alloc/Free Resource
by Alistair Leslie-Hughes 26 Nov '18

26 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/main.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 21bdd67..d7831cf 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -107,19 +107,29 @@ static ULONG WINAPI holder_Release(IHolder *iface) static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; + TIMEINSECS secs; - FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + TRACE("(%p)->(%08lx, %p) stub\n", This, typeid, resid); - return E_NOTIMPL; + hr = IDispenserDriver_CreateResource(This->driver, typeid, resid, &secs); + + TRACE("<- 0x%08x\n", hr); + return hr; } static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) { holder *This = impl_from_IHolder(iface); + HRESULT hr; - FIXME("(%p)->(%08lx) stub\n", This, resid); + TRACE("(%p)->(%08lx) stub\n", This, resid); - return E_NOTIMPL; + hr = IDispenserDriver_DestroyResource(This->driver, resid); + + TRACE("<- 0x%08x\n", hr); + + return hr; } static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) -- 1.9.1

1 0

[v2 PATCH 1/3] comsvcs: Implement IDispenserManager RegisterDispenser
by Alistair Leslie-Hughes 26 Nov '18

26 Nov '18

The Document states the caller of RegisterDispenser is responsible for calling AddRef on the driver to keep it alive and that Release will called on Close of the Holder. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/main.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 179 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 6b7ec14..21bdd67 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -43,11 +43,180 @@ typedef struct dispensermanager } dispensermanager; +typedef struct holder +{ + IHolder IHolder_iface; + LONG ref; + + IDispenserDriver *driver; +} holder; + static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) { return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); } +static inline holder *impl_from_IHolder(IHolder *iface) +{ + return CONTAINING_RECORD(iface, holder, IHolder_iface); +} + +static HRESULT WINAPI holder_QueryInterface(IHolder *iface, REFIID riid, void **object) +{ + holder *This = impl_from_IHolder(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IHolder)) + { + *object = &This->IHolder_iface; + IUnknown_AddRef( (IUnknown*)*object); + + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),object); + return E_NOINTERFACE; +} + +static ULONG WINAPI holder_AddRef(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI holder_Release(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI holder_AllocResource(IHolder *iface, const RESTYPID typeid, RESID *resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %p) stub\n", This, typeid, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_FreeResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_TrackResourceS(IHolder *iface, const SRESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s) stub\n", This, debugstr_w(resid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResource(IHolder *iface, const RESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx, %d) stub\n", This, resid, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_UntrackResourceS(IHolder *iface, const SRESID resid, const BOOL value) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%s, %d) stub\n", This, debugstr_w(resid), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI holder_Close(IHolder *iface) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p) stub\n", This); + + IDispenserDriver_Release(This->driver); + + return S_OK; +} + +static HRESULT WINAPI holder_RequestDestroyResource(IHolder *iface, const RESID resid) +{ + holder *This = impl_from_IHolder(iface); + + FIXME("(%p)->(%08lx) stub\n", This, resid); + + return E_NOTIMPL; +} + +struct IHolderVtbl holder_vtbl = +{ + holder_QueryInterface, + holder_AddRef, + holder_Release, + holder_AllocResource, + holder_FreeResource, + holder_TrackResource, + holder_TrackResourceS, + holder_UntrackResource, + holder_UntrackResourceS, + holder_Close, + holder_RequestDestroyResource +}; + +static HRESULT create_holder(IDispenserDriver *driver, IHolder **object) +{ + holder *hold; + HRESULT ret; + + TRACE("(%p)\n", object); + + hold = heap_alloc(sizeof(*hold)); + if (!hold) + { + *object = NULL; + return E_OUTOFMEMORY; + } + + hold->IHolder_iface.lpVtbl = &holder_vtbl; + hold->ref = 1; + hold->driver = driver; + + ret = holder_QueryInterface(&hold->IHolder_iface, &IID_IHolder, (void**)object); + holder_Release(&hold->IHolder_iface); + + return ret; +} + static HRESULT WINAPI dismanager_QueryInterface(IDispenserManager *iface, REFIID riid, void **object) { dispensermanager *This = impl_from_IDispenserManager(iface); @@ -95,10 +264,18 @@ static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDi LPCOLESTR name, IHolder **dispenser) { dispensermanager *This = impl_from_IDispenserManager(iface); + HRESULT hr; - FIXME("(%p)->(%p, %s, %p) stub\n", This, driver, debugstr_w(name), dispenser); + TRACE("(%p)->(%p, %s, %p)\n", This, driver, debugstr_w(name), dispenser); - return E_NOTIMPL; + if(!dispenser) + return E_INVALIDARG; + + hr = create_holder(driver, dispenser); + + TRACE("<-- 0x%08x, %p\n", hr, *dispenser); + + return hr; } static HRESULT WINAPI dismanager_GetContext(IDispenserManager *iface, INSTID *id, TRANSID *transid) -- 1.9.1

1 0

[PATCH] testbot/web: Remove OnPrev() and OnNext() from Submit.
by Francois Gouget 26 Nov '18

26 Nov '18

These one-liners add an unnecessary layer of indirection. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 85a12a0f09..67c1f9b600 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -709,13 +709,6 @@ sub OnPage2Next($) return 1; } -sub OnNext($) -{ - my ($self) = @_; - - return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); -} - sub OnPage2Prev($) { my ($self) = @_; @@ -741,12 +734,6 @@ sub OnPage3Prev($) return 1; } -sub OnPrev($) -{ - my ($self) = @_; - - return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); -} sub SubmitJob($$$) { @@ -1018,11 +1005,11 @@ sub OnAction($$) if ($Action eq "Next >") { - return $self->OnNext(); + return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); } elsif ($Action eq "< Prev") { - return $self->OnPrev(); + return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); } elsif ($Action eq "Submit") { -- 2.19.1

1 0

[PATCH] testbot/web: Fix deleting old files when Submit goes back to page 1.
by Francois Gouget 26 Nov '18

26 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 67c1f9b600..3b7da0636f 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -713,7 +713,7 @@ sub OnPage2Prev($) { my ($self) = @_; - my $FileName = $self->GetParam("File"); + my $FileName = $self->GetParam("FileName"); if ($FileName) { my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); -- 2.19.1

1 0