June 2020 - Wine-devel - list.winehq.org

[PATCH v2 1/9] user32/tests: Add basic rawinput message tests.
by Rémi Bernon 15 Jun '20

15 Jun '20

This tests basic functionality by injecting mouse event and checking the number of each messages received. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Various test tweaks, use BOOL test variables, simplify wndproc by removing early returns, add some comments on the window creation calls. * Add some more cross-process tests, checking behavior when multiple processes register for rawinput messages, add RIDEV_EXINPUTSINK flag tests (but not implemented). * Avoid introducing dead code in patch #7. dlls/user32/tests/input.c | 135 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 913fabfbd85..172bcc3c8dd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1819,6 +1819,140 @@ static void test_RegisterRawInputDevices(void) DestroyWindow(hwnd); } +static BOOL rawinput_test_received_legacy; +static BOOL rawinput_test_received_raw; +static BOOL rawinput_test_received_rawfg; + +static LRESULT CALLBACK rawinput_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + UINT ret, raw_size; + RAWINPUT raw; + + if (msg == WM_INPUT) + { + todo_wine_if(rawinput_test_received_raw) + ok(!rawinput_test_received_raw, "Unexpected spurious WM_INPUT message.\n"); + ok(wparam == RIM_INPUT || wparam == RIM_INPUTSINK, "Unexpected wparam: %lu\n", wparam); + + rawinput_test_received_raw = TRUE; + if (wparam == RIM_INPUT) rawinput_test_received_rawfg = TRUE; + + ret = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, NULL, &raw_size, sizeof(RAWINPUTHEADER)); + ok(ret == 0, "GetRawInputData failed\n"); + ok(raw_size <= sizeof(raw), "Unexpected rawinput data size: %u", raw_size); + + raw_size = sizeof(raw); + ret = GetRawInputData((HRAWINPUT)lparam, RID_INPUT, &raw, &raw_size, sizeof(RAWINPUTHEADER)); + ok(ret > 0 && ret != (UINT)-1, "GetRawInputData failed\n"); + ok(raw.header.dwType == RIM_TYPEMOUSE, "Unexpected rawinput type: %u\n", raw.header.dwType); + + ok(!(raw.data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE), "Unexpected absolute rawinput motion\n"); + ok(!(raw.data.mouse.usFlags & MOUSE_VIRTUAL_DESKTOP), "Unexpected virtual desktop rawinput motion\n"); + } + + if (msg == WM_MOUSEMOVE) rawinput_test_received_legacy = TRUE; + + return DefWindowProcA(hwnd, msg, wparam, lparam); +} + +struct rawinput_test +{ + BOOL register_device; + BOOL register_window; + DWORD register_flags; + BOOL expect_legacy; + BOOL expect_raw; + BOOL expect_rawfg; + BOOL todo_legacy; + BOOL todo_raw; + BOOL todo_rawfg; +}; + +struct rawinput_test rawinput_tests[] = +{ + { FALSE, FALSE, 0, TRUE, FALSE, FALSE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, FALSE, 0, TRUE, TRUE, TRUE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, 0, TRUE, TRUE, TRUE, /* todos: */ FALSE, FALSE, FALSE }, + { TRUE, TRUE, RIDEV_NOLEGACY, FALSE, TRUE, TRUE, /* todos: */ TRUE, FALSE, FALSE }, +}; + +static void test_rawinput(void) +{ + RAWINPUTDEVICE raw_devices[1]; + DWORD ret; + POINT pt, newpt; + HWND hwnd; + int i; + + SetCursorPos(100, 100); + empty_message_queue(); + + for (i = 0; i < ARRAY_SIZE(rawinput_tests); ++i) + { + GetCursorPos(&pt); + + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinput_wndproc); + empty_message_queue(); + + /* FIXME: Try to workaround X11/Win32 focus inconsistencies and + * make the window visible and foreground as hard as possible. */ + ShowWindow(hwnd, SW_SHOW); + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hwnd); + UpdateWindow(hwnd); + empty_message_queue(); + + rawinput_test_received_legacy = FALSE; + rawinput_test_received_raw = FALSE; + rawinput_test_received_rawfg = FALSE; + + raw_devices[0].usUsagePage = 0x01; + raw_devices[0].usUsage = 0x02; + raw_devices[0].dwFlags = rawinput_tests[i].register_flags; + raw_devices[0].hwndTarget = rawinput_tests[i].register_window ? hwnd : 0; + + if (rawinput_tests[i].register_device) + { + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + } + + mouse_event(MOUSEEVENTF_MOVE, 5, 0, 0, 0); + empty_message_queue(); + + todo_wine_if(rawinput_tests[i].todo_legacy) + ok(rawinput_test_received_legacy == rawinput_tests[i].expect_legacy, + "%d: %sexpected WM_MOUSEMOVE message\n", i, rawinput_tests[i].expect_legacy ? "" : "un"); + todo_wine_if(rawinput_tests[i].todo_raw) + ok(rawinput_test_received_raw == rawinput_tests[i].expect_raw, + "%d: %sexpected WM_INPUT message\n", i, rawinput_tests[i].expect_raw ? "" : "un"); + todo_wine_if(rawinput_tests[i].todo_rawfg) + ok(rawinput_test_received_rawfg == rawinput_tests[i].expect_rawfg, + "%d: %sexpected RIM_INPUT message\n", i, rawinput_tests[i].expect_rawfg ? "" : "un"); + + GetCursorPos(&newpt); + ok((newpt.x - pt.x) == 5 || (newpt.x - pt.x) == 4, "%d: Unexpected cursor movement\n", i); + + if (rawinput_tests[i].register_device) + { + raw_devices[0].dwFlags = RIDEV_REMOVE; + raw_devices[0].hwndTarget = 0; + + SetLastError(0xdeadbeef); + ret = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); + ok(ret, "%d: RegisterRawInputDevices failed\n", i); + ok(GetLastError() == 0xdeadbeef, "%d: RegisterRawInputDevices returned %08x\n", i, GetLastError()); + } + + DestroyWindow(hwnd); + } +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -3034,6 +3168,7 @@ START_TEST(input) test_OemKeyScan(); test_GetRawInputData(); test_RegisterRawInputDevices(); + test_rawinput(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(); -- 2.27.0

2 15

[PATCH 4/4] prntvpt: Implement PTMergeAndValidatePrintTicket.
by Dmitry Timoshkov 15 Jun '20

15 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/ticket.c | 28 ++++++++++++++++++++++++++++ include/prntvpt.h | 5 ++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index bae26fab9d..9563d9ae37 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -4,7 +4,7 @@ @ stdcall PTCloseProvider(ptr) @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities -@ stub PTMergeAndValidatePrintTicket +@ stdcall PTMergeAndValidatePrintTicket(ptr ptr ptr long ptr ptr) @ stdcall PTConvertPrintTicketToDevMode(ptr ptr long long ptr ptr ptr) @ stdcall PTConvertDevModeToPrintTicket(ptr long ptr long ptr) @ stdcall PTReleaseMemory(ptr) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index e9745233c9..42cdec6ec0 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -1227,3 +1227,31 @@ HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, P return write_ticket(stream, &ticket, scope); } + +HRESULT WINAPI PTMergeAndValidatePrintTicket(HPTPROVIDER provider, IStream *base, IStream *delta, + EPrintTicketScope scope, IStream *result, BSTR *error) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + struct ticket ticket; + HRESULT hr; + + TRACE("%p,%p,%p,%d,%p,%p\n", provider, base, delta, scope, result, error); + + if (!is_valid_provider(provider) || !base || !result) + return E_INVALIDARG; + + hr = initialize_ticket(prov, &ticket); + if (hr != S_OK) return hr; + + hr = parse_ticket(base, scope, &ticket); + if (hr != S_OK) return hr; + + if (delta) + { + hr = parse_ticket(delta, scope, &ticket); + if (hr != S_OK) return hr; + } + + hr = write_ticket(result, &ticket, scope); + return hr ? hr : S_PT_NO_CONFLICT; +} diff --git a/include/prntvpt.h b/include/prntvpt.h index f1d7edc350..94b047d8c7 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -25,7 +25,9 @@ extern "C" { DECLARE_HANDLE(HPTPROVIDER); -#define E_PRINTTICKET_FORMAT 0x80040003 +#define S_PT_NO_CONFLICT 0x00040001 +#define S_PT_CONFLICT_RESOLVED 0x00040002 +#define E_PRINTTICKET_FORMAT 0x80040003 typedef enum { @@ -45,6 +47,7 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p HRESULT WINAPI PTCloseProvider(HPTPROVIDER); HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER, ULONG, PDEVMODEW, EPrintTicketScope, IStream *); HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER, IStream *, EDefaultDevmodeType, EPrintTicketScope, ULONG *, PDEVMODEW *, BSTR *); +HRESULT WINAPI PTMergeAndValidatePrintTicket(HPTPROVIDER, IStream *, IStream *, EPrintTicketScope, IStream *, BSTR *); HRESULT WINAPI PTReleaseMemory(PVOID); #ifdef __cplusplus -- 2.26.2

2 1

[PATCH 3/4] prntvpt: Initialize ticket from printer defaults.
by Dmitry Timoshkov 15 Jun '20

15 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/main.c | 15 ++---- dlls/prntvpt/prntvpt_private.h | 29 ++++++++++ dlls/prntvpt/ticket.c | 99 +++++++++++++++++++--------------- 3 files changed, 88 insertions(+), 55 deletions(-) create mode 100644 dlls/prntvpt/prntvpt_private.h diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index ac44cdc1ee..2c27dc6689 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -29,13 +29,9 @@ #include "wine/heap.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); +#include "prntvpt_private.h" -struct prn_provider -{ - DWORD owner; - HANDLE hprn; -}; +WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) { @@ -64,18 +60,13 @@ HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) return E_NOTIMPL; } -static BOOL is_valid_provider(struct prn_provider *prov) -{ - return prov && prov->owner == GetCurrentThreadId(); -} - HRESULT WINAPI PTCloseProvider(HPTPROVIDER provider) { struct prn_provider *prov = (struct prn_provider *)provider; TRACE("%p\n", provider); - if (!is_valid_provider(prov)) + if (!is_valid_provider(provider)) return E_HANDLE; prov->owner = 0; diff --git a/dlls/prntvpt/prntvpt_private.h b/dlls/prntvpt/prntvpt_private.h new file mode 100644 index 0000000000..c8d1c5ef34 --- /dev/null +++ b/dlls/prntvpt/prntvpt_private.h @@ -0,0 +1,29 @@ +/* + * Copyright 2019 Dmitry Timoshkov + * + * 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 + */ + +struct prn_provider +{ + DWORD owner; + HANDLE hprn; +}; + +static inline BOOL is_valid_provider(HPTPROVIDER provider) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + return prov && prov->owner == GetCurrentThreadId(); +} diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 8f1da24af8..e9745233c9 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -33,6 +33,8 @@ #include "wine/heap.h" #include "wine/debug.h" +#include "prntvpt_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); struct size @@ -665,47 +667,6 @@ static void ticket_to_devmode(const struct ticket *ticket, DEVMODEW *dm) dm->dmCollate = ticket->document.collate; } -static void initialize_ticket(struct ticket *ticket) -{ - ticket->job.nup = 0; - ticket->job.copies = 1; - ticket->job.input_bin = DMBIN_AUTO; - ticket->document.collate = DMCOLLATE_FALSE; - ticket->page.media.paper = DMPAPER_A4; - ticket->page.media.size.width = 210000; - ticket->page.media.size.height = 297000; - ticket->page.resolution.x = 600; - ticket->page.resolution.y = 600; - ticket->page.orientation = DMORIENT_PORTRAIT; - ticket->page.scaling = 100; - ticket->page.color = DMCOLOR_MONOCHROME; -} - -HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stream, EDefaultDevmodeType type, - EPrintTicketScope scope, ULONG *size, PDEVMODEW *dm, BSTR *error) -{ - HRESULT hr; - struct ticket ticket; - - TRACE("%p,%p,%d,%d,%p,%p,%p\n", provider, stream, type, scope, size, dm, error); - - if (!provider || !stream || !size || !dm) - return E_INVALIDARG; - - initialize_ticket(&ticket); - - hr = parse_ticket(stream, scope, &ticket); - if (hr != S_OK) return hr; - - *dm = heap_alloc(sizeof(**dm)); - if (!dm) return E_OUTOFMEMORY; - - ticket_to_devmode(&ticket, *dm); - *size = sizeof(**dm); - - return S_OK; -} - static void devmode_to_ticket(const DEVMODEW *dm, struct ticket *ticket) { if (dm->dmFields & DM_ORIENTATION) @@ -738,6 +699,55 @@ static void devmode_to_ticket(const DEVMODEW *dm, struct ticket *ticket) ticket->document.collate = dm->dmCollate; } +static HRESULT initialize_ticket(struct prn_provider *prov, struct ticket *ticket) +{ + PRINTER_INFO_2W *pi2; + DWORD size; + HRESULT hr = S_OK; + + GetPrinterW(prov->hprn, 2, NULL, 0, &size); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return HRESULT_FROM_WIN32(GetLastError()); + + pi2 = heap_alloc(size); + if (!pi2) return E_OUTOFMEMORY; + + if (!GetPrinterW(prov->hprn, 2, (LPBYTE)pi2, size, NULL)) + hr = HRESULT_FROM_WIN32(GetLastError()); + else + devmode_to_ticket(pi2->pDevMode, ticket); + + heap_free(pi2); + return hr; +} + +HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stream, EDefaultDevmodeType type, + EPrintTicketScope scope, ULONG *size, PDEVMODEW *dm, BSTR *error) +{ + struct prn_provider *prov = (struct prn_provider *)provider; + HRESULT hr; + struct ticket ticket; + + TRACE("%p,%p,%d,%d,%p,%p,%p\n", provider, stream, type, scope, size, dm, error); + + if (!is_valid_provider(provider) || !stream || !size || !dm) + return E_INVALIDARG; + + hr = initialize_ticket(prov, &ticket); + if (hr != S_OK) return hr; + + hr = parse_ticket(stream, scope, &ticket); + if (hr != S_OK) return hr; + + *dm = heap_alloc(sizeof(**dm)); + if (!dm) return E_OUTOFMEMORY; + + ticket_to_devmode(&ticket, *dm); + *size = sizeof(**dm); + + return S_OK; +} + static HRESULT add_attribute(IXMLDOMElement *element, const WCHAR *attr, const WCHAR *value) { VARIANT var; @@ -1197,11 +1207,13 @@ static void dump_devmode(const DEVMODEW *dm) HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, PDEVMODEW dm, EPrintTicketScope scope, IStream *stream) { + struct prn_provider *prov = (struct prn_provider *)provider; struct ticket ticket; + HRESULT hr; TRACE("%p,%u,%p,%d,%p\n", provider, size, dm, scope, stream); - if (!provider || !dm || !stream) + if (!is_valid_provider(provider) || !dm || !stream) return E_INVALIDARG; dump_devmode(dm); @@ -1209,7 +1221,8 @@ HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, P if (!IsValidDevmodeW(dm, size)) return E_INVALIDARG; - initialize_ticket(&ticket); + hr = initialize_ticket(prov, &ticket); + if (hr != S_OK) return hr; devmode_to_ticket(dm, &ticket); return write_ticket(stream, &ticket, scope); -- 2.26.2

2 1

[PATCH 2/4] prntvpt: Add support for custom scaling to ticket XML writer.
by Dmitry Timoshkov 15 Jun '20

15 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/ticket.c | 47 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index f012a16f7a..8f1da24af8 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -825,6 +825,16 @@ static HRESULT create_ParameterInit(IXMLDOMElement *root, const WCHAR *name, IXM return add_attribute(*child, L"name", name); } +static HRESULT create_ParameterRef(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:ParameterRef", child); + if (hr != S_OK) return hr; + + return add_attribute(*child, L"name", name); +} + static HRESULT create_ScoredProperty(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) { HRESULT hr; @@ -889,12 +899,41 @@ static HRESULT write_PageScaling(IXMLDOMElement *root, const struct ticket *tick hr = create_Feature(root, L"psk:PageScaling", &feature); if (hr != S_OK) return hr; - if (ticket->page.scaling != 100) - FIXME("page.scaling: %d\n", ticket->page.scaling); + if (ticket->page.scaling == 100) + { + hr = create_Option(feature, L"psk:None", &option); + if (hr == S_OK) IXMLDOMElement_Release(option); + } + else + { + hr = create_Option(feature, L"psk:CustomSquare", &option); + if (hr == S_OK) + { + IXMLDOMElement *property, *parameter; + + hr = create_ScoredProperty(option, L"psk:Scale", &property); + if (hr == S_OK) + { + hr = create_ParameterRef(property, L"psk:PageScalingScale", &parameter); + if (hr == S_OK) + { + IXMLDOMElement_Release(parameter); + + hr = create_ParameterInit(root, L"psk:PageScalingScale", &parameter); + if (hr == S_OK) + { + hr = write_int_value(parameter, ticket->page.scaling); + IXMLDOMElement_Release(parameter); + } + } + + IXMLDOMElement_Release(property); + } - hr = create_Option(feature, L"psk:None", &option); + IXMLDOMElement_Release(option); + } + } - if (option) IXMLDOMElement_Release(option); IXMLDOMElement_Release(feature); return hr; } -- 2.26.2

2 1

[PATCH 1/4] prntvpt: Implement PTConvertDevModeToPrintTicket.
by Dmitry Timoshkov 15 Jun '20

15 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/prntvpt/prntvpt.spec | 2 +- dlls/prntvpt/ticket.c | 482 ++++++++++++++++++++++++++++++++++++++ include/prntvpt.h | 1 + 3 files changed, 484 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index ce8a0e591c..bae26fab9d 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -6,7 +6,7 @@ @ stub PTGetPrintCapabilities @ stub PTMergeAndValidatePrintTicket @ stdcall PTConvertPrintTicketToDevMode(ptr ptr long long ptr ptr ptr) -@ stub PTConvertDevModeToPrintTicket +@ stdcall PTConvertDevModeToPrintTicket(ptr long ptr long ptr) @ stdcall PTReleaseMemory(ptr) @ stub ConvertDevModeToPrintTicketThunk2 @ stub ConvertDevModeToPrintTicketThunk diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 36e343bbf2..f012a16f7a 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -102,6 +102,18 @@ static int media_to_paper(const WCHAR *name) return DMPAPER_A4; } +static const WCHAR *paper_to_media(int paper) +{ + int i; + + for (i = 0 ; i < ARRAY_SIZE(psk_media); i++) + if (psk_media[i].paper == paper) + return psk_media[i].name; + + FIXME("%d\n", paper); + return psk_media[0].name; +} + static BOOL is_valid_node_name(const WCHAR *name) { static const WCHAR * const psf_names[] = { L"psf:ParameterInit", L"psf:Feature" }; @@ -693,3 +705,473 @@ HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER provider, IStream *stre return S_OK; } + +static void devmode_to_ticket(const DEVMODEW *dm, struct ticket *ticket) +{ + if (dm->dmFields & DM_ORIENTATION) + ticket->page.orientation = dm->u1.s1.dmOrientation; + if (dm->dmFields & DM_PAPERSIZE) + ticket->page.media.paper = dm->u1.s1.dmPaperSize; + if (dm->dmFields & DM_PAPERLENGTH) + ticket->page.media.size.width = dm->u1.s1.dmPaperWidth * 100; + if (dm->dmFields & DM_PAPERWIDTH) + ticket->page.media.size.height = dm->u1.s1.dmPaperLength * 100; + if (dm->dmFields & DM_SCALE) + ticket->page.scaling = dm->u1.s1.dmScale; + if (dm->dmFields & DM_COPIES) + ticket->job.copies = dm->u1.s1.dmCopies; + if (dm->dmFields & DM_COLOR) + ticket->page.color = dm->dmColor; + if (dm->dmFields & DM_PRINTQUALITY) + { + ticket->page.resolution.x = dm->u1.s1.dmPrintQuality; + ticket->page.resolution.y = dm->u1.s1.dmPrintQuality; + } + if (dm->dmFields & DM_YRESOLUTION) + ticket->page.resolution.y = dm->dmYResolution; + if (dm->dmFields & DM_LOGPIXELS) + { + ticket->page.resolution.x = dm->dmLogPixels; + ticket->page.resolution.y = dm->dmLogPixels; + } + if (dm->dmFields & DM_COLLATE) + ticket->document.collate = dm->dmCollate; +} + +static HRESULT add_attribute(IXMLDOMElement *element, const WCHAR *attr, const WCHAR *value) +{ + VARIANT var; + BSTR name; + HRESULT hr; + + name = SysAllocString(attr); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(value); + + hr = IXMLDOMElement_setAttribute(element, name, var); + + SysFreeString(name); + SysFreeString(V_BSTR(&var)); + + return hr; +} + +static HRESULT create_element(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + IXMLDOMDocument *doc; + HRESULT hr; + + hr = IXMLDOMElement_get_ownerDocument(root, &doc); + if (hr != S_OK) return hr; + + hr = IXMLDOMDocument_createElement(doc, (BSTR)name, child); + if (hr == S_OK) + hr = IXMLDOMElement_appendChild(root, (IXMLDOMNode *)*child, NULL); + + IXMLDOMDocument_Release(doc); + return hr; +} + +static HRESULT write_int_value(IXMLDOMElement *root, int value) +{ + HRESULT hr; + IXMLDOMElement *child; + VARIANT var; + + hr = create_element(root, L"psf:Value", &child); + if (hr != S_OK) return hr; + + hr = add_attribute(child, L"xsi:type", L"xsd:integer"); + if (hr != S_OK) return hr; + + V_VT(&var) = VT_I4; + V_I4(&var) = value; + hr = IXMLDOMElement_put_nodeTypedValue(child, var); + + IXMLDOMElement_Release(child); + return hr; +} + +static HRESULT create_Feature(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:Feature", child); + if (hr != S_OK) return hr; + + return add_attribute(*child, L"name", name); +} + +static HRESULT create_Option(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:Option", child); + if (hr != S_OK) return hr; + + if (name) + hr = add_attribute(*child, L"name", name); + + return hr; +} + +static HRESULT create_ParameterInit(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:ParameterInit", child); + if (hr != S_OK) return hr; + + return add_attribute(*child, L"name", name); +} + +static HRESULT create_ScoredProperty(IXMLDOMElement *root, const WCHAR *name, IXMLDOMElement **child) +{ + HRESULT hr; + + hr = create_element(root, L"psf:ScoredProperty", child); + if (hr != S_OK) return hr; + + return add_attribute(*child, L"name", name); +} + +static HRESULT write_PageMediaSize(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL, *property; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageMediaSize", &feature); + if (hr != S_OK) return hr; + + hr = create_Option(feature, paper_to_media(ticket->page.media.paper), &option); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:MediaSizeWidth", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.media.size.width); + IXMLDOMElement_Release(property); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:MediaSizeHeight", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.media.size.height); + IXMLDOMElement_Release(property); + +fail: + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageOutputColor(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageOutputColor", &feature); + if (hr != S_OK) return hr; + + if (ticket->page.color == DMCOLOR_COLOR) + hr = create_Option(feature, L"psk:Color", &option); + else /* DMCOLOR_MONOCHROME */ + hr = create_Option(feature, L"psk:Monochrome", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageScaling(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageScaling", &feature); + if (hr != S_OK) return hr; + + if (ticket->page.scaling != 100) + FIXME("page.scaling: %d\n", ticket->page.scaling); + + hr = create_Option(feature, L"psk:None", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageResolution(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL, *property; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageResolution", &feature); + if (hr != S_OK) return hr; + + hr = create_Option(feature, NULL, &option); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:ResolutionX", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.resolution.x); + IXMLDOMElement_Release(property); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:ResolutionY", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.resolution.y); + IXMLDOMElement_Release(property); + +fail: + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_PageOrientation(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageOrientation", &feature); + if (hr != S_OK) return hr; + + if (ticket->page.orientation == DMORIENT_PORTRAIT) + hr = create_Option(feature, L"psk:Portrait", &option); + else /* DMORIENT_LANDSCAPE */ + hr = create_Option(feature, L"psk:Landscape", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_DocumentCollate(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:DocumentCollate", &feature); + if (hr != S_OK) return hr; + + if (ticket->document.collate == DMCOLLATE_TRUE) + hr = create_Option(feature, L"psk:Collated", &option); + else /* DMCOLLATE_FALSE */ + hr = create_Option(feature, L"psk:Uncollated", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_JobInputBin(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL; + HRESULT hr; + + hr = create_Feature(root, L"psk:JobInputBin", &feature); + if (hr != S_OK) return hr; + + if (ticket->job.input_bin != DMBIN_AUTO) + FIXME("job.input_bin: %d\n", ticket->job.input_bin); + + hr = create_Option(feature, L"psk:AutoSelect", &option); + + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + +static HRESULT write_JobCopies(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *parameter; + HRESULT hr; + + hr = create_ParameterInit(root, L"psk:JobCopiesAllDocuments", &parameter); + if (hr != S_OK) return hr; + + hr = write_int_value(parameter, ticket->job.copies); + + IXMLDOMElement_Release(parameter); + return hr; +} + +static HRESULT write_attributes(IXMLDOMElement *element) +{ + HRESULT hr; + + hr = add_attribute(element, L"xmlns:psf", L"http://schemas.microsoft.com/windows/2003/08/printing/printschemaframework"); + if (hr != S_OK) return hr; + hr = add_attribute(element, L"xmlns:psk", L"http://schemas.microsoft.com/windows/2003/08/printing/printschemakeywords"); + if (hr != S_OK) return hr; + hr = add_attribute(element, L"xmlns:xsi", L"http://www.w3.org/2001/XMLSchema-instance"); + if (hr != S_OK) return hr; + hr = add_attribute(element, L"xmlns:xsd", L"http://www.w3.org/2001/XMLSchema"); + if (hr != S_OK) return hr; + + return add_attribute(element, L"version", L"1"); +} + +static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrintTicketScope scope) +{ + static const char xmldecl[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"; + HRESULT hr; + IXMLDOMDocument *doc; + IXMLDOMElement *root = NULL; + VARIANT var; + + hr = CoCreateInstance(&CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void **)&doc); + if (hr != S_OK) return hr; + + hr = IXMLDOMDocument_createElement(doc, (BSTR)L"psf:PrintTicket", &root); + if (hr != S_OK) goto fail; + + hr = IXMLDOMDocument_appendChild(doc, (IXMLDOMNode *)root, NULL); + if (hr != S_OK) goto fail; + + hr = write_attributes(root); + if (hr != S_OK) goto fail; + + hr = write_PageMediaSize(root, ticket); + if (hr != S_OK) goto fail; + hr = write_PageOutputColor(root, ticket); + if (hr != S_OK) goto fail; + hr = write_PageScaling(root, ticket); + if (hr != S_OK) goto fail; + hr = write_PageResolution(root, ticket); + if (hr != S_OK) goto fail; + hr = write_PageOrientation(root, ticket); + if (hr != S_OK) goto fail; + + if (scope >= kPTDocumentScope) + { + hr = write_DocumentCollate(root, ticket); + if (hr != S_OK) goto fail; + } + + if (scope >= kPTJobScope) + { + hr = write_JobInputBin(root, ticket); + if (hr != S_OK) goto fail; + hr = write_JobCopies(root, ticket); + if (hr != S_OK) goto fail; + } + + hr = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); + if (hr != S_OK) goto fail; + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown *)stream; + hr = IXMLDOMDocument_save(doc, var); + +fail: + if (root) IXMLDOMElement_Release(root); + IXMLDOMDocument_Release(doc); + return hr; +} + +static void dump_fields(DWORD fields) +{ + int add_space = 0; + +#define CHECK_FIELD(flag) \ +do \ +{ \ + if (fields & flag) \ + { \ + if (add_space++) TRACE(" "); \ + TRACE(#flag); \ + fields &= ~flag; \ + } \ +} \ +while (0) + + CHECK_FIELD(DM_ORIENTATION); + CHECK_FIELD(DM_PAPERSIZE); + CHECK_FIELD(DM_PAPERLENGTH); + CHECK_FIELD(DM_PAPERWIDTH); + CHECK_FIELD(DM_SCALE); + CHECK_FIELD(DM_POSITION); + CHECK_FIELD(DM_NUP); + CHECK_FIELD(DM_DISPLAYORIENTATION); + CHECK_FIELD(DM_COPIES); + CHECK_FIELD(DM_DEFAULTSOURCE); + CHECK_FIELD(DM_PRINTQUALITY); + CHECK_FIELD(DM_COLOR); + CHECK_FIELD(DM_DUPLEX); + CHECK_FIELD(DM_YRESOLUTION); + CHECK_FIELD(DM_TTOPTION); + CHECK_FIELD(DM_COLLATE); + CHECK_FIELD(DM_FORMNAME); + CHECK_FIELD(DM_LOGPIXELS); + CHECK_FIELD(DM_BITSPERPEL); + CHECK_FIELD(DM_PELSWIDTH); + CHECK_FIELD(DM_PELSHEIGHT); + CHECK_FIELD(DM_DISPLAYFLAGS); + CHECK_FIELD(DM_DISPLAYFREQUENCY); + CHECK_FIELD(DM_ICMMETHOD); + CHECK_FIELD(DM_ICMINTENT); + CHECK_FIELD(DM_MEDIATYPE); + CHECK_FIELD(DM_DITHERTYPE); + CHECK_FIELD(DM_PANNINGWIDTH); + CHECK_FIELD(DM_PANNINGHEIGHT); + if (fields) TRACE(" %#x", fields); + TRACE("\n"); +#undef CHECK_FIELD +} + +/* Dump DEVMODE structure without a device specific part. + * Some applications and drivers fail to specify correct field + * flags (like DM_FORMNAME), so dump everything. + */ +static void dump_devmode(const DEVMODEW *dm) +{ + if (!TRACE_ON(prntvpt)) return; + + TRACE("dmDeviceName: %s\n", debugstr_w(dm->dmDeviceName)); + TRACE("dmSpecVersion: 0x%04x\n", dm->dmSpecVersion); + TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion); + TRACE("dmSize: 0x%04x\n", dm->dmSize); + TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); + TRACE("dmFields: 0x%04x\n", dm->dmFields); + dump_fields(dm->dmFields); + TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation); + TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize); + TRACE("dmPaperLength: %d\n", dm->u1.s1.dmPaperLength); + TRACE("dmPaperWidth: %d\n", dm->u1.s1.dmPaperWidth); + TRACE("dmScale: %d\n", dm->u1.s1.dmScale); + TRACE("dmCopies: %d\n", dm->u1.s1.dmCopies); + TRACE("dmDefaultSource: %d\n", dm->u1.s1.dmDefaultSource); + TRACE("dmPrintQuality: %d\n", dm->u1.s1.dmPrintQuality); + TRACE("dmColor: %d\n", dm->dmColor); + TRACE("dmDuplex: %d\n", dm->dmDuplex); + TRACE("dmYResolution: %d\n", dm->dmYResolution); + TRACE("dmTTOption: %d\n", dm->dmTTOption); + TRACE("dmCollate: %d\n", dm->dmCollate); + TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName)); + TRACE("dmLogPixels %u\n", dm->dmLogPixels); + TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel); + TRACE("dmPelsWidth %u\n", dm->dmPelsWidth); + TRACE("dmPelsHeight %u\n", dm->dmPelsHeight); +} + +HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, PDEVMODEW dm, + EPrintTicketScope scope, IStream *stream) +{ + struct ticket ticket; + + TRACE("%p,%u,%p,%d,%p\n", provider, size, dm, scope, stream); + + if (!provider || !dm || !stream) + return E_INVALIDARG; + + dump_devmode(dm); + + if (!IsValidDevmodeW(dm, size)) + return E_INVALIDARG; + + initialize_ticket(&ticket); + devmode_to_ticket(dm, &ticket); + + return write_ticket(stream, &ticket, scope); +} diff --git a/include/prntvpt.h b/include/prntvpt.h index e1855badd1..f1d7edc350 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -43,6 +43,7 @@ typedef enum HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); HRESULT WINAPI PTCloseProvider(HPTPROVIDER); +HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER, ULONG, PDEVMODEW, EPrintTicketScope, IStream *); HRESULT WINAPI PTConvertPrintTicketToDevMode(HPTPROVIDER, IStream *, EDefaultDevmodeType, EPrintTicketScope, ULONG *, PDEVMODEW *, BSTR *); HRESULT WINAPI PTReleaseMemory(PVOID); -- 2.26.2

2 1

[PATCH] d3dx10_43/tests: Add tests for D3DX10GetImageInfoFromMemory().
by Ziqing Hui 15 Jun '20

15 Jun '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 138 ++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+)

1 0

[PATCH 1/8] netio.sys: Implement wsk_get_address_info() function.
by Paul Gofman 15 Jun '20

15 Jun '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/netio.sys/Makefile.in | 2 +- dlls/netio.sys/netio.c | 120 ++++++++++++++++++++++++++++++++++++- 2 files changed, 118 insertions(+), 4 deletions(-) diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in index 76e541021a6..2db691540df 100644 --- a/dlls/netio.sys/Makefile.in +++ b/dlls/netio.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = netio.sys IMPORTLIB = netio -IMPORTS = ntoskrnl +IMPORTS = ntoskrnl ws2_32 EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index fac91736ab1..cbbf8c06118 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -31,6 +31,8 @@ #include "ddk/wdm.h" #include "ddk/wsk.h" #include "wine/debug.h" +#include "winsock2.h" +#include "ws2tcpip.h" #include "wine/heap.h" @@ -42,6 +44,54 @@ struct _WSK_CLIENT WSK_CLIENT_NPI *client_npi; }; +static NTSTATUS sock_error_to_ntstatus(DWORD err) +{ + switch (err) + { + case 0: return STATUS_SUCCESS; + case WSAEBADF: return STATUS_INVALID_HANDLE; + case WSAEACCES: return STATUS_ACCESS_DENIED; + case WSAEFAULT: return STATUS_NO_MEMORY; + case WSAEINVAL: return STATUS_INVALID_PARAMETER; + case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case WSAEWOULDBLOCK: return STATUS_CANT_WAIT; + case WSAEINPROGRESS: return STATUS_PENDING; + case WSAEALREADY: return STATUS_NETWORK_BUSY; + case WSAENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; + case WSAEDESTADDRREQ: return STATUS_INVALID_PARAMETER; + case WSAEMSGSIZE: return STATUS_BUFFER_OVERFLOW; + case WSAEPROTONOSUPPORT: + case WSAESOCKTNOSUPPORT: + case WSAEPFNOSUPPORT: + case WSAEAFNOSUPPORT: + case WSAEPROTOTYPE: return STATUS_NOT_SUPPORTED; + case WSAENOPROTOOPT: return STATUS_INVALID_PARAMETER; + case WSAEOPNOTSUPP: return STATUS_NOT_SUPPORTED; + case WSAEADDRINUSE: return STATUS_ADDRESS_ALREADY_ASSOCIATED; + case WSAEADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; + case WSAECONNREFUSED: return STATUS_CONNECTION_REFUSED; + case WSAESHUTDOWN: return STATUS_PIPE_DISCONNECTED; + case WSAENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case WSAETIMEDOUT: return STATUS_IO_TIMEOUT; + case WSAENETUNREACH: return STATUS_NETWORK_UNREACHABLE; + case WSAENETDOWN: return STATUS_NETWORK_BUSY; + case WSAECONNRESET: return STATUS_CONNECTION_RESET; + case WSAECONNABORTED: return STATUS_CONNECTION_ABORTED; + case WSAHOST_NOT_FOUND: return STATUS_NOT_FOUND; + default: + FIXME("Unmapped error %u.\n", err); + return STATUS_UNSUCCESSFUL; + } +} + +static void dispatch_irp(IRP *irp, NTSTATUS status) +{ + irp->IoStatus.u.Status = status; + --irp->CurrentLocation; + --irp->Tail.Overlay.s.u2.CurrentStackLocation; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_family, USHORT socket_type, ULONG protocol, ULONG Flags, void *socket_context, const void *dispatch, PEPROCESS owning_process, PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) @@ -81,16 +131,74 @@ static NTSTATUS WINAPI wsk_control_client(WSK_CLIENT *client, ULONG control_code return STATUS_NOT_IMPLEMENTED; } +struct wsk_get_address_info_context +{ + UNICODE_STRING *node_name; + UNICODE_STRING *service_name; + ULONG namespace; + GUID *provider; + ADDRINFOEXW *hints; + ADDRINFOEXW **result; + IRP *irp; +}; + +static void WINAPI get_address_info_callback(TP_CALLBACK_INSTANCE *instance, void *context_) +{ + struct wsk_get_address_info_context *context = context_; + INT ret; + + TRACE("instance %p, context %p.\n", instance, context); + + ret = GetAddrInfoExW( context->node_name ? context->node_name->Buffer : NULL, + context->service_name ? context->service_name->Buffer : NULL, context->namespace, + context->provider, context->hints, context->result, NULL, NULL, NULL, NULL); + + context->irp->IoStatus.Information = 0; + dispatch_irp(context->irp, sock_error_to_ntstatus(ret)); + heap_free(context); +} + static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING *node_name, UNICODE_STRING *service_name, ULONG name_space, GUID *provider, ADDRINFOEXW *hints, ADDRINFOEXW **result, PEPROCESS owning_process, PETHREAD owning_thread, IRP *irp) { - FIXME("client %p, node_name %p, service_name %p, name_space %#x, provider %p, hints %p, " - "result %p, owning_process %p, owning_thread %p, irp %p stub.\n", + struct wsk_get_address_info_context *context; + NTSTATUS status; + + TRACE("client %p, node_name %p, service_name %p, name_space %#x, provider %p, hints %p, " + "result %p, owning_process %p, owning_thread %p, irp %p.\n", client, node_name, service_name, name_space, provider, hints, result, owning_process, owning_thread, irp); - return STATUS_NOT_IMPLEMENTED; + if (!irp) + return STATUS_INVALID_PARAMETER; + + if (!(context = heap_alloc(sizeof(*context)))) + { + ERR("No memory.\n"); + status = STATUS_NO_MEMORY; + dispatch_irp(irp, status); + return status; + } + + context->node_name = node_name; + context->service_name = service_name; + context->namespace = name_space; + context->provider = provider; + context->hints = hints; + context->result = result; + context->irp = irp; + + if (!TrySubmitThreadpoolCallback(get_address_info_callback, context, NULL)) + { + ERR("Could not submit thread pool callback.\n"); + status = STATUS_UNSUCCESSFUL; + dispatch_irp(irp, status); + heap_free(context); + return status; + } + TRACE("Submitted threadpool callback, context %p.\n", context); + return STATUS_PENDING; } static void WINAPI wsk_free_address_info(WSK_CLIENT *client, ADDRINFOEXW *addr_info) @@ -142,6 +250,9 @@ void WINAPI WskReleaseProviderNPI(WSK_REGISTRATION *wsk_registration) NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *wsk_registration) { + static const WORD version = MAKEWORD( 2, 2 ); + WSADATA data; + WSK_CLIENT *client; TRACE("wsk_client_npi %p, wsk_registration %p.\n", wsk_client_npi, wsk_registration); @@ -156,6 +267,9 @@ NTSTATUS WINAPI WskRegister(WSK_CLIENT_NPI *wsk_client_npi, WSK_REGISTRATION *ws client->client_npi = wsk_client_npi; wsk_registration->ReservedRegistrationContext = client; + if (WSAStartup(version, &data)) + return STATUS_INTERNAL_ERROR; + return STATUS_SUCCESS; } -- 2.26.2

4 18

[PATCH] ntdll: Include <signal.h> where needed in the Unix library.
by Gerald Pfeifer 14 Jun '20

14 Jun '20

After Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 09:26:50 2020 +0200 ntdll: Move fork and exec support to the Unix library. the build fails when declarations/definitions for signal(), SIGPIPE, and SIG_DFL are not pulled in implicitly. Make sure we always declare/define those by including <signal.h>. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/ntdll/unix/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 9f38f042de..58ba031421 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -28,6 +28,7 @@ #include <errno.h> #include <fcntl.h> +#include <signal.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> -- 2.27.0

2 1

[PATCH V5] include: Add xact3.h
by Vijay Kiran Kamuju 14 Jun '20

14 Jun '20

Based on work by Ethan Lee and Alistair Leslie-Hughes Use the header file directly instead of idl file just like other directx headers like dsound.h Implementing idl file involves a lot of hacks. V2: Fix overflow warnings and typos V3: Correct IXACT3SoundBank interface V4: Correct IXACT3WaveBank, IXACT3Engine interface V5: use INT_MAX, INT_MIN instead of LONG_MAX, LONG_MIN constants Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH V4] include: Add xact3.h
by Vijay Kiran Kamuju 14 Jun '20

14 Jun '20

Based on work by Ethan Lee and Alistair Leslie-Hughes Use the header file directly instead of idl file just like other directx headers like dsound.h Implementing idl file involves a lot of hacks. V2: Fix overflow warnings and typos V3: Correct IXACT3SoundBank interface V4: Correct IXACT3WaveBank, IXACT3Engine interface Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0