- Wine-Commits - list.winehq.org

Rémi Bernon : maintainers: Take ownership of joy.cpl.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: ed91d22fe4062a85b46ba48975e0836a710737fb URL: https://gitlab.winehq.org/wine/wine/-/commit/ed91d22fe4062a85b46ba48975e083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 27 12:57:03 2022 +0100 maintainers: Take ownership of joy.cpl. --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 721341266a9..276471287da 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -191,11 +191,12 @@ F: dlls/jscript/ Joystick input M: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/dinput*/ +F: dlls/joy.cpl/ F: dlls/windows.gaming.input/ F: dlls/winebus.sys/ F: dlls/winexinput.sys/ -F: dlls/xinput*/ F: dlls/winmm/joystick.c +F: dlls/xinput*/ Media format conversion P: Andrew Eikum <coldpie(a)fastmail.com>

1 0

Piotr Caban : localspl: Add FILE: port tests.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: 2aa9400897b65d26a46d9ac9d84a9d19f2e60db0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2aa9400897b65d26a46d9ac9d84a9d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 27 14:04:50 2022 +0100 localspl: Add FILE: port tests. --- dlls/localspl/tests/Makefile.in | 2 +- dlls/localspl/tests/localmon.c | 70 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/localspl/tests/Makefile.in b/dlls/localspl/tests/Makefile.in index 2c2785fae16..9638788307e 100644 --- a/dlls/localspl/tests/Makefile.in +++ b/dlls/localspl/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = localspl.dll -IMPORTS = advapi32 +IMPORTS = advapi32 winspool C_SRCS = \ localmon.c diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 9f10ed8e3bf..edc0b1f7cbb 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -874,6 +874,75 @@ static void test_OpenPort(void) } +static void test_file_port(void) +{ + WCHAR printer_name[256]; + DOC_INFO_1W doc_info; + HANDLE hport, hf; + BYTE buf[16]; + DWORD no; + BOOL res; + + if ((!pOpenPort && !pOpenPort2) || !pClosePort || !pStartDocPort || + !pWritePort || !pEndDocPort) + { + win_skip("FILE: port\n"); + return; + } + + no = ARRAY_SIZE(printer_name); + if (!GetDefaultPrinterW(printer_name, &no)) + { + skip("no default printer\n"); + return; + } + + SetLastError(0xdeadbeef); + res = call_OpenPort(tempfileW, &hport); + ok(!res, "OpenPort succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError() = %lu\n", GetLastError()); + + res = call_OpenPort((WCHAR *)L"FILE", &hport); + ok(!res, "OpenPort succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "GetLastError() = %lu\n", GetLastError()); + + res = call_OpenPort((WCHAR *)L"FILE:", &hport); + ok(res, "OpenPort failed (%lu)\n", GetLastError()); + + SetLastError(0xdeadbeef); + res = pWritePort(hport, (BYTE *)"test", 4, &no); + ok(!res, "WritePort succeeded\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "GetLastError() = %lu\n", GetLastError()); + + doc_info.pDocName = (WCHAR *)L"not used"; + doc_info.pOutputFile = tempfileW; + doc_info.pDatatype = (WCHAR *)L"not used"; + res = pStartDocPort(hport, printer_name, 1, 1, (BYTE *)&doc_info); + ok(res, "StartDocPort failed (%lu)\n", GetLastError()); + + res = pStartDocPort(hport, printer_name, 1, 1, (BYTE *)&doc_info); + ok(res, "StartDocPort failed (%lu)\n", GetLastError()); + + res = pWritePort(hport, (BYTE *)"test", 4, &no); + ok(res, "WritePort failed (%lu)\n", GetLastError()); + ok(no == 4, "no = %ld\n", no); + + res = pEndDocPort(hport); + ok(res, "EndDocPort failed (%lu)\n", GetLastError()); + res = pEndDocPort(hport); + ok(res, "EndDocPort failed (%lu)\n", GetLastError()); + + hf = CreateFileW(tempfileW, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(hf != INVALID_HANDLE_VALUE, "CreateFile failed (%lu)\n", GetLastError()); + res = ReadFile(hf, buf, sizeof(buf), &no, NULL); + ok(res, "ReadFile failed (%lu)\n", GetLastError()); + ok(no == 4, "no = %ld\n", no); + CloseHandle(hf); + + res = pClosePort(hport); + ok(res, "ClosePort failed (%lu)\n", GetLastError()); +} + /* ########################### */ static void test_XcvClosePort(void) @@ -1611,6 +1680,7 @@ START_TEST(localmon) test_DeletePort(); test_EnumPorts(); test_OpenPort(); + test_file_port(); if ( !hXcv ) { skip("Xcv not supported\n");

1 0

Piotr Caban : localspl: Add FILE: port monitor implementation.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: bdd561cfa352ce18197a2d9018d7d6819db485fd URL: https://gitlab.winehq.org/wine/wine/-/commit/bdd561cfa352ce18197a2d9018d7d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 27 14:36:12 2022 +0100 localspl: Add FILE: port monitor implementation. --- dlls/localspl/localmon.c | 111 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 83 insertions(+), 28 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 381b36dd2e2..a982d359058 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -65,6 +65,7 @@ static CRITICAL_SECTION xcv_handles_cs = { &xcv_handles_cs_debug, -1, 0, 0, 0, 0 typedef struct { struct list entry; DWORD type; + HANDLE hfile; WCHAR nameW[1]; } port_t; @@ -385,31 +386,6 @@ static BOOL WINAPI localmon_AddPortExW(LPWSTR pName, DWORD level, LPBYTE pBuffer return (res == ERROR_SUCCESS); } -/***************************************************** - * localmon_ClosePort [exported through MONITOREX] - * - * Close a - * - * PARAMS - * hPort [i] The Handle to close - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - */ -static BOOL WINAPI localmon_ClosePort(HANDLE hPort) -{ - port_t * port = hPort; - - TRACE("(%p)\n", port); - EnterCriticalSection(&port_handles_cs); - list_remove(&port->entry); - LeaveCriticalSection(&port_handles_cs); - free(port); - return TRUE; -} - /***************************************************** * localmon_EnumPortsW [exported through MONITOREX] * @@ -501,6 +477,7 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) if (!port) return FALSE; port->type = type; + port->hfile = INVALID_HANDLE_VALUE; lstrcpyW(port->nameW, pName); *phPort = port; @@ -512,6 +489,84 @@ static BOOL WINAPI localmon_OpenPortW(LPWSTR pName, PHANDLE phPort) return TRUE; } +static BOOL WINAPI localmon_StartDocPort(HANDLE hport, WCHAR *printer_name, + DWORD job_id, DWORD level, BYTE *info) +{ + DOC_INFO_1W *doc_info = (DOC_INFO_1W *)info; + port_t *port = hport; + + TRACE("(%p %s %ld %ld %p)\n", hport, debugstr_w(printer_name), + job_id, level, doc_info); + + if (port->type != PORT_IS_FILE) + { + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if (port->hfile != INVALID_HANDLE_VALUE) + return TRUE; + + if (!doc_info || !doc_info->pOutputFile) + { + FIXME("set error\n"); + return FALSE; + } + + port->hfile = CreateFileW(doc_info->pOutputFile, GENERIC_WRITE, + FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); + return port->hfile != INVALID_HANDLE_VALUE; +} + +static BOOL WINAPI localmon_WritePort(HANDLE hport, BYTE *buf, DWORD size, + DWORD *written) +{ + port_t *port = hport; + + TRACE("(%p %p %lu %p)\n", hport, buf, size, written); + + return WriteFile(port->hfile, buf, size, written, NULL); +} + +static BOOL WINAPI localmon_EndDocPort(HANDLE hport) +{ + port_t *port = hport; + + TRACE("(%p)\n", hport); + + CloseHandle(port->hfile); + port->hfile = INVALID_HANDLE_VALUE; + return TRUE; +} + +/***************************************************** + * localmon_ClosePort [exported through MONITOREX] + * + * Close a Port + * + * PARAMS + * hport [i] The Handle to close + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + */ +static BOOL WINAPI localmon_ClosePort(HANDLE hport) +{ + port_t *port = hport; + + TRACE("(%p)\n", port); + + localmon_EndDocPort(hport); + + EnterCriticalSection(&port_handles_cs); + list_remove(&port->entry); + LeaveCriticalSection(&port_handles_cs); + free(port); + return TRUE; +} + /***************************************************** * localmon_XcvClosePort [exported through MONITOREX] * @@ -755,10 +810,10 @@ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) localmon_EnumPortsW, localmon_OpenPortW, NULL, /* localmon_OpenPortExW */ - NULL, /* localmon_StartDocPortW */ - NULL, /* localmon_WritePortW */ + localmon_StartDocPort, + localmon_WritePort, NULL, /* localmon_ReadPortW */ - NULL, /* localmon_EndDocPortW */ + localmon_EndDocPort, localmon_ClosePort, NULL, /* Use AddPortUI in localui.dll */ localmon_AddPortExW,

1 0

Eric Pouech : wined3d: Set location types to uint32_t.
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: 3e5bdebbcea08721c784efe784dcbbb3289190b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e5bdebbcea08721c784efe784dcbb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 25 10:19:09 2022 +0100 wined3d: Set location types to uint32_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/texture.c | 16 ++++++++-------- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 30 +++++++++++++++--------------- 6 files changed, 32 insertions(+), 32 deletions(-)

1 0

Eric Pouech : wined3d: Set flag types to uint32_t (internal definitions).
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: 718118f3afc98446544d4040d0c976c9b411fa98 URL: https://gitlab.winehq.org/wine/wine/-/commit/718118f3afc98446544d4040d0c976… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 25 10:19:08 2022 +0100 wined3d: Set flag types to uint32_t (internal definitions). (no longer using long types) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 14 +++++++------- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/palette.c | 2 +- dlls/wined3d/query.c | 26 +++++++++++++------------- dlls/wined3d/shader.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 32 ++++++++++++++++---------------- 14 files changed, 56 insertions(+), 56 deletions(-)

1 0

Eric Pouech : wined3d: Set flag types to uint32_t (external definitions).
by Alexandre Julliard Nov. 28, 2022

Nov. 28, 2022

Module: wine Branch: master Commit: a71526bb07548ee0f45e03b12ab1048445000e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/a71526bb07548ee0f45e03b12ab104… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 25 10:19:06 2022 +0100 wined3d: Set flag types to uint32_t (external definitions). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/palette.c | 6 +++--- dlls/wined3d/query.c | 4 ++-- dlls/wined3d/resource.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/wined3d_main.c | 2 +- include/wine/wined3d.h | 46 +++++++++++++++++++++++---------------------- 9 files changed, 42 insertions(+), 40 deletions(-)

1 0

Alexandre Julliard : Wine release 7.22
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: website Branch: master Commit: a827f9fad7b3827c507d964c96ba3ccebdbbe5d4 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/a827f9fad7b3827c507d964c96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 26 00:29:47 2022 +0100 Wine release 7.22 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022112601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022112601.xml b/news/en/2022112601.xml new file mode 100644 index 00000000..58fe4e44 --- /dev/null +++ b/news/en/2022112601.xml @@ -0,0 +1,17 @@ +<news> +<date>November 26, 2022</date> +<title>Wine 7.22 Released</title> +<body> + The Wine development release 7.22 is now available. + <a href="{$root}/announce/7.22">What's new</a> in this release: +<ul> + <li>32-on-64 thunks for both Vulkan and OpenGL.</li> + <li>OpenLDAP library bundled and built as PE.</li> + <li>Support for the RAW print processor in WinPrint.</li> + <li>More progress on the long types printf format conversion.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.22.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.22 : Alexandre Julliard : Release 7.22
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: refs/tags/wine-7.22 Tag: 79a446ff96006002e96de4a0d1567fb5a4eae154 URL: https://gitlab.winehq.org/wine/wine/-/tags/79a446ff96006002e96de4a0d1567fb5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 26 00:27:16 2022 +0100 Release 7.22

1 0

Alexandre Julliard : Release 7.22.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: 20d86f34a066657048610803e7143232efa6c0d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/20d86f34a066657048610803e71432… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 26 00:22:31 2022 +0100 Release 7.22. --- ANNOUNCE | 1058 +++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 623 insertions(+), 457 deletions(-)

1 0

Eric Pouech : cmd: Use OEM code page when reading a file.
by Alexandre Julliard Nov. 25, 2022

Nov. 25, 2022

Module: wine Branch: master Commit: f2ca35bd806205b841d11b1079e44ec65c5b9076 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2ca35bd806205b841d11b1079e44e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 25 10:43:41 2022 +0100 cmd: Use OEM code page when reading a file. Calling GetConsoleCP() when ReadConsoleW() fails (potentially indicating that cmd.exe's instance isn't attached to a console) makes no sense. In details, since GetConsoleCP() returns 0 when not attached to a console to indicate error, we're in fact using CP_ACP. So fallback explicitely to OEM CP (which is the default for CUI programs). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/batch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 9a262c5fec5..beecccfe926 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -255,7 +255,7 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) UINT cp; const char *p; - cp = GetConsoleCP(); + cp = GetOEMCP(); bufA = heap_xalloc(noChars); /* Save current file position */

1 0