wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Fabian Maurer : comctl32/tests: Add combo tests for WM_CTLCOLOR*.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: e95873997f09956f8ba49f26bc186803f8bed0ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e95873997f09956f8ba49f26… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Nov 4 10:30:26 2019 +0300 comctl32/tests: Add combo tests for WM_CTLCOLOR*. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..be4ee53c22 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -46,6 +46,8 @@ static HWND hComboExParentWnd, hMainWnd; static HINSTANCE hMainHinst; static const char ComboExTestClass[] = "ComboExTestClass"; +static HBRUSH brush_red; + static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); #define MAX_CHARS 100 @@ -507,6 +509,8 @@ static BOOL init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); + brush_red = CreateSolidBrush(RGB(255, 0, 0)); + hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); @@ -533,6 +537,7 @@ static void cleanup(void) UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); DestroyWindow(hMainWnd); + DeleteObject(brush_red); } static void test_comboex_subclass(void) @@ -717,6 +722,7 @@ static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, L static LPCSTR expected_edit_text; static LPCSTR expected_list_text; static BOOL selchange_fired; +static HWND lparam_for_WM_CTLCOLOR; static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -748,6 +754,20 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; } break; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lparam_for_WM_CTLCOLOR) + { + ok(lparam_for_WM_CTLCOLOR == (HWND)lparam, "Expected %p, got %p\n", lparam_for_WM_CTLCOLOR, (HWND)lparam); + return (LRESULT) brush_red; + } + break; } return CallWindowProcA(old_parent_proc, hwnd, msg, wparam, lparam); @@ -1254,6 +1274,83 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo_ctlcolor(void) +{ + static const int messages[] = + { + WM_CTLCOLOR, + WM_CTLCOLORMSGBOX, + WM_CTLCOLOREDIT, + WM_CTLCOLORLISTBOX, + WM_CTLCOLORBTN, + WM_CTLCOLORDLG, + WM_CTLCOLORSCROLLBAR, + WM_CTLCOLORSTATIC, + }; + + HBRUSH brush, global_brush; + COMBOBOXINFO info; + unsigned int i; + HWND combo; + + combo = create_combobox(CBS_DROPDOWN); + ok(!!combo, "Failed to create combo window.\n"); + + old_parent_proc = (void *)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + get_combobox_info(combo, &info); + + lparam_for_WM_CTLCOLOR = info.hwndItem; + + /* Parent returns valid brush handle. */ + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "%u: unexpected brush %p, expected got %p.\n", i, brush, brush_red); + } + + /* Parent returns NULL brush. */ + global_brush = brush_red; + brush_red = NULL; + + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(!brush, "%u: unexpected brush %p.\n", i, brush); + } + + brush_red = global_brush; + + lparam_for_WM_CTLCOLOR = 0; + + /* Parent does default processing. */ + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + ok(!!brush && brush != brush_red, "%u: unexpected brush %p.\n", i, brush); + } + + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); + DestroyWindow(combo); + + /* Combo without a parent. */ + combo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN, 5, 5, 100, 100, NULL, NULL, NULL, 0); + ok(!!combo, "Failed to create combo window.\n"); + + get_combobox_info(combo, &info); + + for (i = 0; i < ARRAY_SIZE(messages); ++i) + { + brush = (HBRUSH)SendMessageA(combo, messages[i], 0, (LPARAM)info.hwndItem); + todo_wine + ok(!brush, "%u: unexpected brush %p.\n", i, brush); + } + + DestroyWindow(combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1297,6 +1394,7 @@ START_TEST(combo) test_combo_listbox_styles(CBS_DROPDOWNLIST); test_combo_dropdown_size(0); test_combo_dropdown_size(CBS_NOINTEGRALHEIGHT); + test_combo_ctlcolor(); cleanup(); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : ole32: Support BIND_OPTS3 in bind context.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 89ef98ab8ad17f72fc2d4fd473fa5cf19b6305f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ef98ab8ad17f72fc2d4fd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 23:58:58 2019 +0300 ole32: Support BIND_OPTS3 in bind context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/bindctx.c | 38 +++++++++++++++----------------------- dlls/ole32/tests/moniker.c | 13 ++++++++----- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 1951100b0b..24229568f1 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -57,7 +57,7 @@ typedef struct BindCtxImpl{ DWORD bindCtxTableLastIndex; /* first free index in the table */ DWORD bindCtxTableSize; /* size table */ - BIND_OPTS2 bindOption2; /* a structure which contains the bind options*/ + BIND_OPTS3 options; } BindCtxImpl; @@ -246,17 +246,17 @@ BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = impl_from_IBindCtx(iface); - TRACE("(%p,%p)\n",This,pbindopts); + TRACE("(%p,%p)\n",This, pbindopts); if (pbindopts==NULL) return E_POINTER; - if (pbindopts->cbStruct > sizeof(BIND_OPTS2)) + if (pbindopts->cbStruct > sizeof(This->options)) { - WARN("invalid size\n"); - return E_INVALIDARG; /* FIXME : not verified */ + WARN("invalid size %u.\n", pbindopts->cbStruct); + return E_INVALIDARG; } - memcpy(&This->bindOption2, pbindopts, pbindopts->cbStruct); + memcpy(&This->options, pbindopts, pbindopts->cbStruct); return S_OK; } @@ -267,19 +267,16 @@ static HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { BindCtxImpl *This = impl_from_IBindCtx(iface); - ULONG cbStruct; + DWORD size; TRACE("(%p,%p)\n",This,pbindopts); if (pbindopts==NULL) return E_POINTER; - cbStruct = pbindopts->cbStruct; - if (cbStruct > sizeof(BIND_OPTS2)) - cbStruct = sizeof(BIND_OPTS2); - - memcpy(pbindopts, &This->bindOption2, cbStruct); - pbindopts->cbStruct = cbStruct; + size = min(pbindopts->cbStruct, sizeof(This->options)); + memcpy(pbindopts, &This->options, size); + pbindopts->cbStruct = size; return S_OK; } @@ -520,16 +517,11 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) This->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl; This->ref = 0; - /* Initialize the BIND_OPTS2 structure */ - This->bindOption2.cbStruct = sizeof(BIND_OPTS2); - This->bindOption2.grfFlags = 0; - This->bindOption2.grfMode = STGM_READWRITE; - This->bindOption2.dwTickCountDeadline = 0; - - This->bindOption2.dwTrackFlags = 0; - This->bindOption2.dwClassContext = CLSCTX_SERVER; - This->bindOption2.locale = GetThreadLocale(); - This->bindOption2.pServerInfo = 0; + memset(&This->options, 0, sizeof(This->options)); + This->options.cbStruct = sizeof(This->options); + This->options.grfMode = STGM_READWRITE; + This->options.dwClassContext = CLSCTX_SERVER; + This->options.locale = GetThreadLocale(); /* Initialize the bindctx table */ This->bindCtxTableSize=0; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 5bcc136a36..18ea4d465b 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1888,7 +1888,7 @@ static void test_bind_context(void) HRESULT hr; IBindCtx *pBindCtx; IEnumString *pEnumString; - BIND_OPTS2 bind_opts; + BIND_OPTS3 bind_opts; HeapUnknown *unknown; HeapUnknown *unknown2; IUnknown *param_obj; @@ -1908,19 +1908,20 @@ static void test_bind_context(void) bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts) || - bind_opts.cbStruct == sizeof(bind_opts) + sizeof(void*), /* Vista */ - "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(BIND_OPTS3) || broken(bind_opts.cbStruct == sizeof(BIND_OPTS2)) /* XP */, + "Unexpected bind_opts.cbStruct %d.\n", bind_opts.cbStruct); bind_opts.cbStruct = sizeof(BIND_OPTS); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(BIND_OPTS), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + memset(&bind_opts, 0xfe, sizeof(bind_opts)); bind_opts.cbStruct = sizeof(bind_opts); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); ok_ole_success(hr, "IBindCtx_GetBindOptions"); - ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); + ok(bind_opts.cbStruct == sizeof(bind_opts) || bind_opts.cbStruct == sizeof(BIND_OPTS2) /* XP */, + "Unexpected bind_opts.cbStruct %d.\n", bind_opts.cbStruct); ok(bind_opts.grfFlags == 0, "bind_opts.grfFlags was 0x%x instead of 0\n", bind_opts.grfFlags); ok(bind_opts.grfMode == STGM_READWRITE, "bind_opts.grfMode was 0x%x instead of STGM_READWRITE\n", bind_opts.grfMode); ok(bind_opts.dwTickCountDeadline == 0, "bind_opts.dwTickCountDeadline was %d instead of 0\n", bind_opts.dwTickCountDeadline); @@ -1929,6 +1930,8 @@ static void test_bind_context(void) "bind_opts.dwClassContext should have been 0x15 instead of 0x%x\n", bind_opts.dwClassContext); ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); ok(bind_opts.pServerInfo == NULL, "bind_opts.pServerInfo should have been NULL instead of %p\n", bind_opts.pServerInfo); + if (bind_opts.cbStruct >= sizeof(BIND_OPTS3)) + ok(bind_opts.hwnd == NULL, "Unexpected bind_opts.hwnd %p.\n", bind_opts.hwnd); bind_opts.cbStruct = -1; hr = IBindCtx_SetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts);

1 0

Nikolay Sivov : comsvcs: Implement Inverse() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ab6274180b0823f2babdc4737b4b510ec15bea8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6274180b0823f2babdc473… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:31:00 2019 +0300 comsvcs: Implement Inverse() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 4 ++-- dlls/comsvcs/tests/comsvcs.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index d772365dda..6b292844d9 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -584,9 +584,9 @@ static HRESULT WINAPI new_moniker_GetTimeOfLastChange(IMoniker *iface, IBindCtx static HRESULT WINAPI new_moniker_Inverse(IMoniker *iface, IMoniker **inverse) { - FIXME("%p, %p.\n", iface, inverse); + TRACE("%p, %p.\n", iface, inverse); - return E_NOTIMPL; + return CreateAntiMoniker(inverse); } static HRESULT WINAPI new_moniker_CommonPrefixWith(IMoniker *iface, IMoniker *other, IMoniker **ret) diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 5fb73d29ca..37fce3dab4 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -358,16 +358,13 @@ todo_wine ok(hr == MK_E_NOSTORAGE, "Unexpected hr %#x.\n", hr); hr = IMoniker_Inverse(moniker, &inverse); -todo_wine ok(hr == S_OK, "Failed to create inverse moniker, hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ moniker_type = MKSYS_NONE; hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); -} + IMoniker_Release(moniker); IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : comsvcs: Implement IsSystemMoniker() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 96b5670ac74df6a470018f56b527ffca923b70c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b5670ac74df6a470018f56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:59 2019 +0300 comsvcs: Implement IsSystemMoniker() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 6 ++++-- dlls/comsvcs/tests/comsvcs.c | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 7addd1ee80..d772365dda 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -621,9 +621,11 @@ static HRESULT WINAPI new_moniker_ParseDisplayName(IMoniker *iface, IBindCtx *pb static HRESULT WINAPI new_moniker_IsSystemMoniker(IMoniker *iface, DWORD *moniker_type) { - FIXME("%p, %p.\n", iface, moniker_type); + TRACE("%p, %p.\n", iface, moniker_type); - return E_NOTIMPL; + *moniker_type = MKSYS_NONE; + + return S_FALSE; } static const IMonikerVtbl new_moniker_vtbl = diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index cbe338872a..5fb73d29ca 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -332,10 +332,9 @@ static void test_new_moniker(void) moniker_type = MKSYS_CLASSMONIKER; hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); -todo_wine { ok(hr == S_FALSE || broken(hr == S_OK) /* XP */, "Unexpected hr %#x.\n", hr); ok(moniker_type == MKSYS_NONE, "Unexpected moniker type %d.\n", moniker_type); -} + hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL); todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : comsvcs: Implement Hash() for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: ee9447162518be0a91f1e580f8f246f1785eeee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9447162518be0a91f1e580… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:58 2019 +0300 comsvcs: Implement Hash() for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 10 ++++++++-- dlls/comsvcs/tests/comsvcs.c | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 101af6f071..7addd1ee80 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -55,6 +55,7 @@ struct new_moniker { IMoniker IMoniker_iface; LONG refcount; + CLSID clsid; }; static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret); @@ -556,9 +557,13 @@ static HRESULT WINAPI new_moniker_IsEqual(IMoniker *iface, IMoniker *other_monik static HRESULT WINAPI new_moniker_Hash(IMoniker *iface, DWORD *hash) { - FIXME("%p, %p.\n", iface, hash); + struct new_moniker *moniker = impl_from_IMoniker(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, hash); + + *hash = moniker->clsid.Data1; + + return S_OK; } static HRESULT WINAPI new_moniker_IsRunning(IMoniker* iface, IBindCtx *pbc, IMoniker *pmkToLeft, @@ -748,6 +753,7 @@ static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; moniker->refcount = 1; + moniker->clsid = guid; *ret = &moniker->IMoniker_iface; diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index b377a9a515..cbe338872a 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -327,10 +327,9 @@ static void test_new_moniker(void) /* Hashing */ hash = 0; hr = IMoniker_Hash(moniker, &hash); -todo_wine { ok(hr == S_OK, "Failed to get a hash, hr %#x.\n", hr); ok(hash == 0x20d04fe0, "Unexpected hash value %#x.\n", hash); -} + moniker_type = MKSYS_CLASSMONIKER; hr = IMoniker_IsSystemMoniker(moniker, &moniker_type); todo_wine {

1 0

Nikolay Sivov : comsvcs: Implement display name parsing for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: 51d90cb843266d4efbbb5337c58445b0d7cbb3a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51d90cb843266d4efbbb5337… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:57 2019 +0300 comsvcs: Implement display name parsing for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/main.c | 132 +++++++++++++++++++++++++++++++++++++------ dlls/comsvcs/tests/comsvcs.c | 9 ++- 2 files changed, 123 insertions(+), 18 deletions(-) diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index ae09094d30..101af6f071 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -57,6 +57,8 @@ struct new_moniker LONG refcount; }; +static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret); + static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) { return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); @@ -607,9 +609,9 @@ static HRESULT WINAPI new_moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI new_moniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - FIXME("%p, %p, %p, %s, %p, %p.\n", iface, pbc, pmkToLeft, debugstr_w(name), eaten, ret); + TRACE("%p, %p, %p, %s, %p, %p.\n", iface, pbc, pmkToLeft, debugstr_w(name), eaten, ret); - return E_NOTIMPL; + return new_moniker_parse_displayname(pbc, name, eaten, ret); } static HRESULT WINAPI new_moniker_IsSystemMoniker(IMoniker *iface, DWORD *moniker_type) @@ -646,6 +648,115 @@ static const IMonikerVtbl new_moniker_vtbl = new_moniker_IsSystemMoniker }; +static const BYTE guid_conv_table[256] = +{ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ + 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ +}; + +static BOOL is_valid_hex(WCHAR c) +{ + return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || + (c >= 'A' && c <= 'F'); +} + +static HRESULT guid_from_string(const WCHAR *s, GUID *ret) +{ + BOOL has_brackets; + GUID guid = { 0 }; + int i; + + memset(ret, 0, sizeof(*ret)); + + /* Curly brackets are optional. */ + has_brackets = s[0] == '{'; + + if (has_brackets) + s++; + + for (i = 0; i < 8; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + guid.Data1 = (guid.Data1 << 4) | guid_conv_table[s[i]]; + } + s += 8; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 4; i++) + { + if (!is_valid_hex(s[0])) return FALSE; + guid.Data2 = (guid.Data2 << 4) | guid_conv_table[s[i]]; + } + s += 4; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 4; i++) + { + if (!is_valid_hex(s[i])) return FALSE; + guid.Data3 = (guid.Data3 << 4) | guid_conv_table[s[i]]; + } + s += 4; + + if (s[0] != '-') return FALSE; + s++; + + for (i = 0; i < 17; i += 2) + { + if (i == 4) + { + if (s[i] != '-') return FALSE; + i++; + } + if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; + guid.Data4[i / 2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; + } + s += 17; + + if (has_brackets && s[0] != '}') + return FALSE; + + *ret = guid; + + return TRUE; +} + +static HRESULT new_moniker_parse_displayname(IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) +{ + struct new_moniker *moniker; + GUID guid; + + *ret = NULL; + + if (wcsnicmp(name, L"new:", 4)) + return MK_E_SYNTAX; + + if (!guid_from_string(name + 4, &guid)) + return MK_E_SYNTAX; + + moniker = heap_alloc_zero(sizeof(*moniker)); + if (!moniker) + return E_OUTOFMEMORY; + + moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; + moniker->refcount = 1; + + *ret = &moniker->IMoniker_iface; + + if (eaten) + *eaten = lstrlenW(name); + + return S_OK; +} + static HRESULT WINAPI new_moniker_parse_QueryInterface(IParseDisplayName *iface, REFIID riid, void **obj) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); @@ -676,22 +787,9 @@ static ULONG WINAPI new_moniker_parse_Release(IParseDisplayName *iface) static HRESULT WINAPI new_moniker_parse_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - struct new_moniker *moniker; - - FIXME("%p, %p, %s, %p, %p.\n", iface, pbc, debugstr_w(name), eaten, ret); - - moniker = heap_alloc_zero(sizeof(*moniker)); - if (!moniker) - return E_OUTOFMEMORY; - - moniker->IMoniker_iface.lpVtbl = &new_moniker_vtbl; - moniker->refcount = 1; + TRACE("%p, %p, %s, %p, %p.\n", iface, pbc, debugstr_w(name), eaten, ret); - *ret = &moniker->IMoniker_iface; - - *eaten = lstrlenW(name); - - return S_OK; + return new_moniker_parse_displayname(pbc, name, eaten, ret); } static const IParseDisplayNameVtbl new_moniker_parse_vtbl = diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c index 68760afd91..b377a9a515 100644 --- a/dlls/comsvcs/tests/comsvcs.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -269,7 +269,7 @@ static void create_dispenser(void) static void test_new_moniker(void) { - IMoniker *moniker, *inverse, *class_moniker; + IMoniker *moniker, *moniker2, *inverse, *class_moniker; DWORD moniker_type; IBindCtx *bindctx; FILETIME filetime; @@ -286,6 +286,13 @@ static void test_new_moniker(void) ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); ok(eaten == 40, "Unexpected eaten length %u.\n", eaten); + eaten = 0; + hr = IMoniker_ParseDisplayName(moniker, bindctx, NULL, (WCHAR *)L"new:20d04fe0-3aea-1069-a2d8-08002b30309d", + &eaten, &moniker2); + ok(hr == S_OK, "Failed to parse display name, hr %#x.\n", hr); + ok(eaten == 40, "Unexpected eaten length %u.\n", eaten); + IMoniker_Release(moniker2); + hr = IMoniker_QueryInterface(moniker, &IID_IParseDisplayName, (void **)&obj); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr);

1 0

Nikolay Sivov : comsvcs: Add a stub for "new" moniker.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: d36b8350d9b04de2b50a76085e47bef059f8f09f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36b8350d9b04de2b50a7608… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:56 2019 +0300 comsvcs: Add a stub for "new" moniker. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 1 + dlls/comsvcs/comsvcs_classes.idl | 29 ++++ dlls/comsvcs/main.c | 354 ++++++++++++++++++++++++++++++++++++++- dlls/comsvcs/tests/comsvcs.c | 100 +++++++++++ 4 files changed, 480 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d36b8350d9b04de2b50a…

1 0

Nikolay Sivov : comsvcs/tests: Rename test file.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: a3bf974aeeac21f205f99555a08d98ad3770479e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3bf974aeeac21f205f99555… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 22:30:55 2019 +0300 comsvcs/tests: Rename test file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/Makefile.in | 2 +- dlls/comsvcs/tests/{dispenser.c => comsvcs.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comsvcs/tests/Makefile.in b/dlls/comsvcs/tests/Makefile.in index 9a7047ebaf..86da9fda66 100644 --- a/dlls/comsvcs/tests/Makefile.in +++ b/dlls/comsvcs/tests/Makefile.in @@ -2,4 +2,4 @@ TESTDLL = comsvcs.dll IMPORTS = uuid oleaut32 ole32 C_SRCS = \ - dispenser.c + comsvcs.c diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/comsvcs.c similarity index 99% rename from dlls/comsvcs/tests/dispenser.c rename to dlls/comsvcs/tests/comsvcs.c index 10bce8e849..77d3224366 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/comsvcs.c @@ -268,7 +268,7 @@ static void create_dispenser(void) } -START_TEST(dispenser) +START_TEST(comsvcs) { HRESULT hr;

1 0

Zebediah Figura : strmbase/transform: Reimplement IQualityControl for the source pin.
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: cdeb55a8f94f1cfe3af01a6349d70c905b06583a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdeb55a8f94f1cfe3af01a63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 2 22:33:14 2019 -0500 strmbase/transform: Reimplement IQualityControl for the source pin. There is not enough common code between renderers and transforms to be worth duplicating. This fixes a regression introduced by db7eb3327. The wrong impl_from_*() helper was used in IQualityControl::Notify(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 105 +++++++++++++++++++++++++++++++++------------- include/wine/strmbase.h | 5 ++- 2 files changed, 80 insertions(+), 30 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 266232f57a..f4c2c4be72 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -28,7 +28,6 @@ static const WCHAR wcsOutputPinName[] = {'O','u','t',0}; static const IPinVtbl TransformFilter_InputPin_Vtbl; static const IPinVtbl TransformFilter_OutputPin_Vtbl; -static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl; static inline TransformFilter *impl_from_IBaseFilter( IBaseFilter *iface ) { @@ -149,7 +148,6 @@ static void transform_destroy(struct strmbase_filter *iface) filter->csReceive.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csReceive); FreeMediaType(&filter->pmt); - QualityControlImpl_Destroy(filter->qcimpl); IUnknown_Release(filter->seekthru_unk); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); @@ -225,7 +223,7 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo TransformFilter *filter = impl_from_source_IPin(&iface->IPin_iface); if (IsEqualGUID(iid, &IID_IQualityControl)) - *out = &filter->qcimpl->IQualityControl_iface; + *out = &filter->source_IQualityControl_iface; else if (IsEqualGUID(iid, &IID_IMediaSeeking)) return IUnknown_QueryInterface(filter->seekthru_unk, iid, out); else @@ -265,6 +263,80 @@ static const IBaseFilterVtbl transform_vtbl = BaseFilterImpl_QueryVendorInfo }; +static TransformFilter *impl_from_source_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, TransformFilter, source_IQualityControl_iface); +} + +static HRESULT WINAPI transform_source_qc_QueryInterface(IQualityControl *iface, + REFIID iid, void **out) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI transform_source_qc_AddRef(IQualityControl *iface) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI transform_source_qc_Release(IQualityControl *iface) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality q) +{ + IQualityControl *peer; + HRESULT hr = S_FALSE; + + if (filter->source_qc_sink) + return IQualityControl_Notify(filter->source_qc_sink, &filter->filter.IBaseFilter_iface, q); + + if (filter->sink.pin.peer + && SUCCEEDED(IPin_QueryInterface(filter->sink.pin.peer, &IID_IQualityControl, (void **)&peer))) + { + hr = IQualityControl_Notify(peer, &filter->filter.IBaseFilter_iface, q); + IQualityControl_Release(peer); + } + return hr; +} + +static HRESULT WINAPI transform_source_qc_Notify(IQualityControl *iface, + IBaseFilter *sender, Quality q) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + if (filter->pFuncsTable->pfnNotify) + return filter->pFuncsTable->pfnNotify(filter, sender, q); + return TransformFilterImpl_Notify(filter, sender, q); +} + +static HRESULT WINAPI transform_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + TransformFilter *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sink %p.\n", filter, sink); + + filter->source_qc_sink = sink; + + return S_OK; +} + +static const IQualityControlVtbl source_qc_vtbl = +{ + transform_source_qc_QueryInterface, + transform_source_qc_AddRef, + transform_source_qc_Release, + transform_source_qc_Notify, + transform_source_qc_SetSink, +}; + static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, const TransformFilterFuncTable *func_table, TransformFilter *filter) { @@ -285,9 +357,7 @@ static HRESULT strmbase_transform_init(IUnknown *outer, const CLSID *clsid, strmbase_source_init(&filter->source, &TransformFilter_OutputPin_Vtbl, &filter->filter, wcsOutputPinName, &source_ops); - - QualityControlImpl_Create(&filter->sink.pin, &filter->qcimpl); - filter->qcimpl->IQualityControl_iface.lpVtbl = &TransformFilter_QualityControl_Vtbl; + filter->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; filter->seekthru_unk = NULL; hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&filter->filter.IBaseFilter_iface, @@ -335,11 +405,6 @@ HRESULT strmbase_transform_create(LONG filter_size, IUnknown *outer, const CLSID return E_FAIL; } -HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *filter, IBaseFilter *sender, Quality qm) -{ - return QualityControlImpl_Notify(&filter->qcimpl->IQualityControl_iface, sender, qm); -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { TransformFilter *filter = impl_from_sink_IPin(iface); @@ -479,21 +544,3 @@ static const IPinVtbl TransformFilter_OutputPin_Vtbl = BaseOutputPinImpl_EndFlush, BasePinImpl_NewSegment }; - -static HRESULT WINAPI TransformFilter_QualityControlImpl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { - QualityControlImpl *qc = (QualityControlImpl*)iface; - TransformFilter *This = impl_from_source_IPin(&qc->pin->IPin_iface); - - if (This->pFuncsTable->pfnNotify) - return This->pFuncsTable->pfnNotify(This, sender, qm); - else - return TransformFilterImpl_Notify(This, sender, qm); -} - -static const IQualityControlVtbl TransformFilter_QualityControl_Vtbl = { - QualityControlImpl_QueryInterface, - QualityControlImpl_AddRef, - QualityControlImpl_Release, - TransformFilter_QualityControlImpl_Notify, - QualityControlImpl_SetSink -}; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index a4920054e6..f92a375a56 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -204,14 +204,17 @@ void strmbase_filter_cleanup(struct strmbase_filter *filter); typedef struct TransformFilter { struct strmbase_filter filter; + struct strmbase_source source; + IQualityControl source_IQualityControl_iface; + IQualityControl *source_qc_sink; + BaseInputPin sink; AM_MEDIA_TYPE pmt; CRITICAL_SECTION csReceive; const struct TransformFilterFuncTable * pFuncsTable; - struct QualityControlImpl *qcimpl; /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ IUnknown *seekthru_unk; } TransformFilter;

1 0

Nikolay Sivov : propsys: Add a semi-stub for PSCreatePropertyStoreFromObject().
by Alexandre Julliard 04 Nov '19

04 Nov '19

Module: wine Branch: master Commit: acb2e4fc7a4242c74ac91657edb97bf1e402656a URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb2e4fc7a4242c74ac91657… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 3 00:13:37 2019 +0300 propsys: Add a semi-stub for PSCreatePropertyStoreFromObject(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47958 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propstore.c | 16 ++++++++++++++++ dlls/propsys/propsys.spec | 2 +- dlls/propsys/tests/propsys.c | 35 ++++++++++++++++++++++++++++++++++- include/propsys.idl | 1 + 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 6212f29312..6e0d49057d 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -473,3 +473,19 @@ HRESULT PropertyStore_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv return ret; } + +HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown *obj, DWORD access, REFIID riid, void **ret) +{ + HRESULT hr; + + TRACE("(%p, %d, %s, %p)\n", obj, access, debugstr_guid(riid), ret); + + if (!obj || !ret) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IPropertyStore) && SUCCEEDED(hr = IUnknown_QueryInterface(obj, riid, ret))) + return hr; + + FIXME("Unimplemented for %s.\n", debugstr_guid(riid)); + return E_NOTIMPL; +} diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 8416b6dc74..3582805726 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -68,7 +68,7 @@ @ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray -@ stub PSCreatePropertyStoreFromObject +@ stdcall PSCreatePropertyStoreFromObject(ptr long ptr ptr) @ stub PSCreatePropertyStoreFromPropertySetStorage @ stub PSCreateSimplePropertyChange @ stub PSEnumeratePropertyDescriptions diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 419a0a080b..191a154744 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -29,8 +29,8 @@ #include "windef.h" #include "winbase.h" -#include "objbase.h" #include "initguid.h" +#include "objbase.h" #include "propsys.h" #include "propvarutil.h" #include "strsafe.h" @@ -1919,6 +1919,38 @@ static void test_propertystore(void) IPropertyStore_Release(propstore); } +static void test_PSCreatePropertyStoreFromObject(void) +{ + IPropertyStore *propstore; + IUnknown *unk; + HRESULT hr; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "Failed to create property store, hr %#x.\n", hr); + + hr = PSCreatePropertyStoreFromObject(NULL, STGM_READWRITE, &IID_IUnknown, (void **)&unk); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IUnknown, (void **)&unk); +todo_wine + ok(hr == S_OK, "Failed to create wrapper, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + ok(unk != (IUnknown *)propstore, "Unexpected object returned.\n"); + IUnknown_Release(unk); + } + + hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IPropertyStore, (void **)&unk); + ok(hr == S_OK, "Failed to create wrapper, hr %#x.\n", hr); + ok(unk == (IUnknown *)propstore, "Unexpected object returned.\n"); + IUnknown_Release(unk); + + IPropertyStore_Release(propstore); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -1941,4 +1973,5 @@ START_TEST(propsys) test_persistserialized(); test_PSCreateMemoryPropertyStore(); test_propertystore(); + test_PSCreatePropertyStoreFromObject(); } diff --git a/include/propsys.idl b/include/propsys.idl index bdd67fa6a5..fa6902831e 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -800,6 +800,7 @@ cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") +cpp_quote("HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown*,DWORD,REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);")

1 0

← Newer
1
...
82
83
84
85
86
87
88
89
90
Older →

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 November 2019