October 2019 - Wine-Commits

Paul Gofman : gdi32: Collapse relative paths inside true type fonts file names in registry.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 81484b24f4c0832f88b7067017b338cbf01180a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81484b24f4c0832f88b70670… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Oct 16 14:49:24 2019 +0300 gdi32: Collapse relative paths inside true type fonts file names in registry. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e3cff25b76..f0e5514649 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3107,6 +3107,33 @@ static void load_system_fonts(void) } } +static WCHAR *get_full_path_name(const WCHAR *name) +{ + WCHAR *full_path; + DWORD len; + + if (!(len = GetFullPathNameW(name, 0, NULL, NULL))) + { + ERR("GetFullPathNameW() failed, name %s.\n", debugstr_w(name)); + return NULL; + } + + if (!(full_path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*full_path)))) + { + ERR("Could not get memory.\n"); + return NULL; + } + + if (GetFullPathNameW(name, len, full_path, NULL) != len - 1) + { + ERR("Unexpected GetFullPathNameW() result, name %s.\n", debugstr_w(name)); + HeapFree(GetProcessHeap(), 0, full_path); + return NULL; + } + + return full_path; +} + /************************************************************* * * This adds registry entries for any externally loaded fonts @@ -3121,7 +3148,7 @@ static void update_reg_entries(void) DWORD len; Family *family; Face *face; - WCHAR *file, *path; + WCHAR *file, *path, *full_path; static const WCHAR TrueType[] = {' ','(','T','r','u','e','T','y','p','e',')','\0'}; if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, @@ -3168,11 +3195,22 @@ static void update_reg_entries(void) HeapFree( GetProcessHeap(), 0, buffer ); if (path) + { + if ((full_path = get_full_path_name(path))) + { + HeapFree(GetProcessHeap(), 0, path); + path = full_path; + } file = path; + } else if ((file = strrchrW(face->file, '/'))) + { file++; + } else + { file = face->file; + } len = strlenW(file) + 1; RegSetValueExW(winnt_key, valueW, 0, REG_SZ, (BYTE*)file, len * sizeof(WCHAR));

1 0

Alexandre Julliard : libport: Add codepage 28601 (Latin/Thai).
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 4f6397116994a3ad93f4d155e42b8056fff10c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f6397116994a3ad93f4d155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 18:23:37 2019 +0200 libport: Add codepage 28601 (Latin/Thai). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/port/c_28601.c | 725 ++++++++++++++++++++++++++++++++++++++++++++++++++ libs/port/cptable.c | 4 +- loader/wine.inf.in | 1 + tools/make_unicode | 1 + 5 files changed, 731 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f6397116994a3ad93f4…

1 0

Alexandre Julliard : ntdll: Disallow changing DEP flags on 64-bit.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 98238aa8736022ec08205e66a4e92f690ddcc711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98238aa8736022ec08205e66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 16:29:04 2019 +0200 ntdll: Disallow changing DEP flags on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 6 ++++-- dlls/ntdll/tests/exception.c | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 02ae4404fd..c7e2cdb1b7 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -57,7 +57,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(process); -static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE; +static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE | (sizeof(void *) > sizeof(int) ? + MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION | + MEM_EXECUTE_OPTION_PERMANENT : 0); static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); @@ -679,7 +681,7 @@ NTSTATUS WINAPI NtSetInformationProcess( break; case ProcessExecuteFlags: - if (ProcessInformationLength != sizeof(ULONG)) + if (is_win64 || ProcessInformationLength != sizeof(ULONG)) return STATUS_INVALID_PARAMETER; else if (execute_flags & MEM_EXECUTE_OPTION_PERMANENT) return STATUS_ACCESS_DENIED; diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 0a9dae138c..fb58c0ee7a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -170,6 +170,7 @@ static char** my_argv; #define ProcessExecuteFlags 0x22 #define MEM_EXECUTE_OPTION_DISABLE 0x01 #define MEM_EXECUTE_OPTION_ENABLE 0x02 +#define MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION 0x04 #define MEM_EXECUTE_OPTION_PERMANENT 0x08 #endif @@ -2575,9 +2576,25 @@ static void test_dpe_exceptions(void) { static const BYTE ret[] = {0xc3}; DWORD (CDECL *func)(void) = code_mem; - DWORD old_prot; + DWORD old_prot, val = 0, len = 0xdeadbeef; + NTSTATUS status; void *handler; + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val, &len ); + ok( status == STATUS_SUCCESS || status == STATUS_INVALID_PARAMETER, "got status %08x\n", status ); + if (!status) + { + ok( len == sizeof(val), "wrong len %u\n", len ); + ok( val == (MEM_EXECUTE_OPTION_DISABLE | MEM_EXECUTE_OPTION_PERMANENT | + MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION), + "wrong val %08x\n", val ); + } + else ok( len == 0xdeadbeef, "wrong len %u\n", len ); + + val = MEM_EXECUTE_OPTION_DISABLE; + status = pNtSetInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &val, sizeof val ); + ok( status == STATUS_INVALID_PARAMETER, "got status %08x\n", status ); + memcpy(code_mem, ret, sizeof(ret)); handler = pRtlAddVectoredExceptionHandler(TRUE, &dpe_handler);

1 0

Brendan Shanks : server: Don't block ConnectNamedPipe for pipe in PIPE_NOWAIT mode.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 41374ef1967e2c0ec2a74c4d47a5d8fc8bb5b4b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41374ef1967e2c0ec2a74c4d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 16 14:50:45 2019 +0200 server: Don't block ConnectNamedPipe for pipe in PIPE_NOWAIT mode. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 4 ++-- server/named_pipe.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index de30e6a1c9..a192779e1d 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -4026,7 +4026,7 @@ static void test_nowait(void) ol.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); SetLastError(0xdeadbeef); ok(ConnectNamedPipe(pipewrite, &ol) == FALSE, "ConnectNamedPipe should fail\n"); - todo_wine ok(GetLastError() == ERROR_PIPE_LISTENING, "got %d should be ERROR_PIPE_LISTENING\n", GetLastError()); + ok(GetLastError() == ERROR_PIPE_LISTENING, "got %d should be ERROR_PIPE_LISTENING\n", GetLastError()); if (GetLastError() == ERROR_IO_PENDING) CancelIo(pipewrite); @@ -4044,7 +4044,7 @@ static void test_nowait(void) ok(DisconnectNamedPipe(pipewrite) == TRUE, "DisconnectNamedPipe should succeed\n"); SetLastError(0xdeadbeef); ok(ConnectNamedPipe(pipewrite,&ol) == FALSE, "ConnectNamedPipe should fail\n"); - todo_wine ok(GetLastError() == ERROR_PIPE_LISTENING, "got %d should be ERROR_PIPE_LISTENING\n", GetLastError()); + ok(GetLastError() == ERROR_PIPE_LISTENING, "got %d should be ERROR_PIPE_LISTENING\n", GetLastError()); if (GetLastError() == ERROR_IO_PENDING) CancelIo(pipewrite); ok(CloseHandle(ol.hEvent), "CloseHandle for the event failed\n"); diff --git a/server/named_pipe.c b/server/named_pipe.c index 9c5438b77a..f97b141641 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -1106,6 +1106,11 @@ static int pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *as return 0; } + if (server->pipe_end.flags & NAMED_PIPE_NONBLOCKING_MODE) + { + set_error( STATUS_PIPE_LISTENING ); + return 0; + } queue_async( &server->listen_q, async ); async_wake_up( &server->pipe_end.pipe->waiters, STATUS_SUCCESS ); set_error( STATUS_PENDING );

1 0

Alistair Leslie-Hughes : include: Add SpSharedRecognizer coclass and support interfaces.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 1692f90c2314304ec45a80e2ace5d64f34eb2d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1692f90c2314304ec45a80e2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 16 04:06:38 2019 +0000 include: Add SpSharedRecognizer coclass and support interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapi.idl | 835 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 835 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1692f90c2314304ec45a…

1 0

Brendan Shanks : server: Don't block when writing to named pipes in PIPE_NOWAIT mode.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 91c4e9bf9af5548320fbb38f533a53ff04494923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c4e9bf9af5548320fbb38f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 16 14:50:34 2019 +0200 server: Don't block when writing to named pipes in PIPE_NOWAIT mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 36 ++++++++++++++++++------------------ server/named_pipe.c | 17 ++++++++++++----- 2 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 02df7374c8..de30e6a1c9 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3941,7 +3941,7 @@ static void test_nowait(void) /* write one byte larger than the buffer size, should fail */ SetLastError(0xdeadbeef); - todo_wine ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); + ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); /* WriteFile only documents that 'write < sizeof(readbuf)' for this case, but Windows * doesn't seem to do partial writes ('write == 0' always) */ @@ -3952,32 +3952,32 @@ static void test_nowait(void) /* overlapped read of 32768, non-blocking write of 512 */ SetLastError(0xdeadbeef); - todo_wine ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2) == FALSE, "ReadFile should fail\n"); - todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2) == FALSE, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); ok(WriteFile(pipewrite, teststring, sizeof(teststring), &write, &ol), "WriteFile should succeed\n"); ok(write == sizeof(teststring), "got %d\n", write); ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); - todo_wine ok(read == sizeof(teststring), "got %d\n", read); + ok(read == sizeof(teststring), "got %d\n", read); if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) CancelIo(piperead); /* overlapped read of 32768, non-blocking write of 513 */ SetLastError(0xdeadbeef); - todo_wine ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2) == FALSE, "ReadFile should fail\n"); - todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); - todo_wine ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); - todo_wine ok(write == 513, "got %d, write should be %d\n", write, 513); + ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2) == FALSE, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); + ok(write == 513, "got %d, write should be %d\n", write, 513); ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); - todo_wine ok(read == 513, "got %d, read should be %d\n", read, 513); + ok(read == 513, "got %d, read should be %d\n", read, 513); if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) CancelIo(piperead); /* overlapped read of 1 byte, non-blocking write of 513 bytes */ SetLastError(0xdeadbeef); - todo_wine ok(ReadFile(piperead, readbuf, 1, &read, &ol2) == FALSE, "ReadFile should fail\n"); - todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); - todo_wine ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); - todo_wine ok(write == 513, "got %d, write should be %d\n", write, 513); + ok(ReadFile(piperead, readbuf, 1, &read, &ol2) == FALSE, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); + ok(write == 513, "got %d, write should be %d\n", write, 513); ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); ok(read == 1, "got %d, read should be %d\n", read, 1); if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) @@ -3985,7 +3985,7 @@ static void test_nowait(void) /* read the remaining 512 bytes */ SetLastError(0xdeadbeef); ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2), "ReadFile should succeed\n"); - todo_wine ok(read == 512, "got %d, write should be %d\n", write, 512); + ok(read == 512, "got %d, write should be %d\n", write, 512); if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) CancelIo(piperead); @@ -3993,8 +3993,8 @@ static void test_nowait(void) SetLastError(0xdeadbeef); ok(ReadFile(piperead, readbuf, 1, &read, &ol2) == FALSE, "ReadFile should fail\n"); ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); - todo_wine ok(WriteFile(pipewrite, readbuf, 514, &write, &ol), "WriteFile should succeed\n"); - todo_wine ok(write == 1, "got %d, write should be %d\n", write, 1); + ok(WriteFile(pipewrite, readbuf, 514, &write, &ol), "WriteFile should succeed\n"); + ok(write == 1, "got %d, write should be %d\n", write, 1); ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); ok(read == 1, "got %d, read should be %d\n", read, 1); if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) @@ -4002,8 +4002,8 @@ static void test_nowait(void) /* write the exact buffer size, should succeed */ SetLastError(0xdeadbeef); - todo_wine ok(WriteFile(pipewrite, readbuf, 512, &write, &ol), "WriteFile should succeed\n"); - todo_wine ok(write == 512, "WriteFile should write the whole buffer\n"); + ok(WriteFile(pipewrite, readbuf, 512, &write, &ol), "WriteFile should succeed\n"); + ok(write == 512, "WriteFile should write the whole buffer\n"); if (GetLastError() == ERROR_IO_PENDING) CancelIo(piperead); diff --git a/server/named_pipe.c b/server/named_pipe.c index 1e0c5898a1..9c5438b77a 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -363,7 +363,7 @@ static struct pipe_message *queue_message( struct pipe_end *pipe_end, struct ios return message; } -static void wake_message( struct pipe_message *message ) +static void wake_message( struct pipe_message *message, data_size_t result ) { struct async *async = message->async; @@ -371,7 +371,7 @@ static void wake_message( struct pipe_message *message ) if (!async) return; message->iosb->status = STATUS_SUCCESS; - message->iosb->result = message->iosb->in_size; + message->iosb->result = result; async_terminate( async, message->iosb->result ? STATUS_ALERTED : STATUS_SUCCESS ); release_object( async ); } @@ -749,7 +749,7 @@ static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb ) { iosb->out_data = message->iosb->in_data; message->iosb->in_data = NULL; - wake_message( message ); + wake_message( message, message->iosb->in_size ); free_message( message ); } else @@ -773,7 +773,7 @@ static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb ) message->read_pos += writing; if (message->read_pos == message->iosb->in_size) { - wake_message(message); + wake_message(message, message->iosb->in_size); free_message(message); } } while (write_pos < iosb->out_size); @@ -835,7 +835,14 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) { avail += message->iosb->in_size - message->read_pos; if (message->async && (avail <= reader->buffer_size || !message->iosb->in_size)) - wake_message( message ); + { + wake_message( message, message->iosb->in_size ); + } + else if (message->async && (pipe_end->flags & NAMED_PIPE_NONBLOCKING_MODE)) + { + wake_message( message, message->read_pos ); + free_message( message ); + } } }

1 0

Rafał Mużyło : x3daudio: Fix lib exports.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: a53a9a98f7b505ec9697c5fe59462e294dba1165 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a53a9a98f7b505ec9697c5fe… Author: Rafał Mużyło <galtgendo(a)o2.pl> Date: Fri Oct 4 13:18:17 2019 +0200 x3daudio: Fix lib exports. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/x3daudio1_0/x3daudio1_0.spec | 6 ++++-- dlls/x3daudio1_1/x3daudio1_1.spec | 6 ++++-- dlls/x3daudio1_2/x3daudio1_2.spec | 6 ++++-- dlls/xaudio2_7/x3daudio.c | 11 +++++++++++ 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/x3daudio1_0/x3daudio1_0.spec b/dlls/x3daudio1_0/x3daudio1_0.spec index 0d6caa0ccf..b9ba1c4fb4 100644 --- a/dlls/x3daudio1_0/x3daudio1_0.spec +++ b/dlls/x3daudio1_0/x3daudio1_0.spec @@ -1,2 +1,4 @@ -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize +@ stdcall -arch=i386 _X3DAudioCalculate(a)20(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate +@ stdcall -arch=i386 _X3DAudioInitialize(a)12(long float ptr) LEGACY_X3DAudioInitialize +@ stdcall -arch=!i386 X3DAudioCalculate(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate +@ stdcall -arch=!i386 X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize diff --git a/dlls/x3daudio1_1/x3daudio1_1.spec b/dlls/x3daudio1_1/x3daudio1_1.spec index 0d6caa0ccf..b9ba1c4fb4 100644 --- a/dlls/x3daudio1_1/x3daudio1_1.spec +++ b/dlls/x3daudio1_1/x3daudio1_1.spec @@ -1,2 +1,4 @@ -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize +@ stdcall -arch=i386 _X3DAudioCalculate(a)20(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate +@ stdcall -arch=i386 _X3DAudioInitialize(a)12(long float ptr) LEGACY_X3DAudioInitialize +@ stdcall -arch=!i386 X3DAudioCalculate(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate +@ stdcall -arch=!i386 X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize diff --git a/dlls/x3daudio1_2/x3daudio1_2.spec b/dlls/x3daudio1_2/x3daudio1_2.spec index 0d6caa0ccf..b9ba1c4fb4 100644 --- a/dlls/x3daudio1_2/x3daudio1_2.spec +++ b/dlls/x3daudio1_2/x3daudio1_2.spec @@ -1,2 +1,4 @@ -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize +@ stdcall -arch=i386 _X3DAudioCalculate(a)20(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate +@ stdcall -arch=i386 _X3DAudioInitialize(a)12(long float ptr) LEGACY_X3DAudioInitialize +@ stdcall -arch=!i386 X3DAudioCalculate(ptr ptr ptr long ptr) LEGACY_X3DAudioCalculate +@ stdcall -arch=!i386 X3DAudioInitialize(long float ptr) LEGACY_X3DAudioInitialize diff --git a/dlls/xaudio2_7/x3daudio.c b/dlls/xaudio2_7/x3daudio.c index 5bc7c8473c..240cd5c101 100644 --- a/dlls/xaudio2_7/x3daudio.c +++ b/dlls/xaudio2_7/x3daudio.c @@ -63,8 +63,13 @@ HRESULT CDECL X3DAudioInitialize(UINT32 chanmask, float speedofsound, #endif /* XAUDIO2_VER >= 8 */ #ifdef X3DAUDIO1_VER +#if X3DAUDIO1_VER <= 2 +void WINAPI LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound, + X3DAUDIO_HANDLE handle) +#else void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound, X3DAUDIO_HANDLE handle) +#endif { TRACE("0x%x, %f, %p\n", chanmask, speedofsound, handle); F3DAudioInitialize(chanmask, speedofsound, handle); @@ -72,9 +77,15 @@ void CDECL LEGACY_X3DAudioInitialize(UINT32 chanmask, float speedofsound, #endif /* X3DAUDIO1_VER */ #if XAUDIO2_VER >= 8 || defined X3DAUDIO1_VER +#if defined(X3DAUDIO1_VER) && X3DAUDIO1_VER <= 2 +void WINAPI LEGACY_X3DAudioCalculate(const X3DAUDIO_HANDLE handle, + const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter, + UINT32 flags, X3DAUDIO_DSP_SETTINGS *out) +#else void CDECL X3DAudioCalculate(const X3DAUDIO_HANDLE handle, const X3DAUDIO_LISTENER *listener, const X3DAUDIO_EMITTER *emitter, UINT32 flags, X3DAUDIO_DSP_SETTINGS *out) +#endif { TRACE("%p, %p, %p, 0x%x, %p\n", handle, listener, emitter, flags, out); F3DAudioCalculate(

1 0

Piotr Caban : msvcrt: Return time since CRT initialization in clock function.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: d3675fd611c6ccc224857c79e0c17a4374e63ba5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3675fd611c6ccc224857c79… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 13:20:58 2019 +0200 msvcrt: Return time since CRT initialization in clock function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/tests/time.c | 18 ------------------ dlls/msvcrt/time.c | 25 +++++++++++-------------- dlls/ucrtbase/tests/misc.c | 25 +++++++++++++++++++++++++ 5 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 0be8dd36b5..91496b86fb 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -124,6 +124,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) #elif _MSVCR_VER >= 80 MSVCRT__set_printf_count_output(0); #endif + msvcrt_init_clock(); TRACE("finished process init\n"); break; case DLL_THREAD_ATTACH: diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6e0e338a20..4bf26fbe9a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -369,6 +369,7 @@ extern void msvcrt_free_signals(void) DECLSPEC_HIDDEN; extern void msvcrt_free_popen_data(void) DECLSPEC_HIDDEN; extern BOOL msvcrt_init_heap(void) DECLSPEC_HIDDEN; extern void msvcrt_destroy_heap(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_clock(void) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 100 extern void msvcrt_init_scheduler(void*) DECLSPEC_HIDDEN; diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index beba796317..0eecfd6796 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -918,23 +918,6 @@ static void test__tzset(void) _putenv(TZ_env); } -static void test_clock(void) -{ - static const int THRESH = 100; - FILETIME start, cur; - int c, expect; - BOOL ret; - - ret = GetProcessTimes(GetCurrentProcess(), &start, &cur, &cur, &cur); - ok(ret, "GetProcessTimes failed with error: %d\n", GetLastError()); - GetSystemTimeAsFileTime(&cur); - expect = (((LONGLONG)cur.dwHighDateTime<<32)+cur.dwLowDateTime - - ((LONGLONG)start.dwHighDateTime<<32)-start.dwLowDateTime) / 10000; - - c = clock(); - ok(abs(c-expect) < THRESH, "clock() = %d, expected %d\n", c, expect); -} - START_TEST(time) { init(); @@ -953,5 +936,4 @@ START_TEST(time) test_localtime64_s(); test_daylight(); test_asctime(); - test_clock(); } diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 78f4602972..b299976d3f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -38,6 +38,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); BOOL WINAPI GetDaylightFlag(void); +static LONGLONG init_time; + +void msvcrt_init_clock(void) +{ + LARGE_INTEGER systime; + + NtQuerySystemTime(&systime); + init_time = systime.QuadPart; +} + static const int MonthLengths[2][12] = { { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, @@ -712,23 +722,10 @@ int CDECL _wstrtime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size) */ MSVCRT_clock_t CDECL MSVCRT_clock(void) { - static LONGLONG start_time; LARGE_INTEGER systime; - if(!start_time) { - KERNEL_USER_TIMES pti; - - /* while Linux's clock returns user time, Windows' clock - * returns wall-clock time from process start. cache the - * process start time since it won't change and to avoid - * wineserver round-trip overhead */ - if(NtQueryInformationProcess(GetCurrentProcess(), ProcessTimes, &pti, sizeof(pti), NULL)) - return -1; - start_time = pti.CreateTime.QuadPart; - } - NtQuerySystemTime(&systime); - return (systime.QuadPart - start_time) * MSVCRT_CLOCKS_PER_SEC / TICKSPERSEC; + return (systime.QuadPart - init_time) / (TICKSPERSEC / MSVCRT_CLOCKS_PER_SEC); } /********************************************************************* diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 9747d8b21a..fe59e30062 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -107,6 +107,7 @@ typedef struct MSVCRT__exception { typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); static HMODULE module; +static LONGLONG crt_init_start, crt_init_end; static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); @@ -146,6 +147,7 @@ static int (__cdecl *p__close)(int); static void* (__cdecl *p__o_malloc)(size_t); static size_t (__cdecl *p__msize)(void*); static void (__cdecl *p_free)(void*); +static clock_t (__cdecl *p_clock)(void); static void test__initialize_onexit_table(void) { @@ -465,7 +467,13 @@ static void test__get_narrow_winmain_command_line(char *path) static BOOL init(void) { + FILETIME cur; + + GetSystemTimeAsFileTime(&cur); + crt_init_start = ((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime; module = LoadLibraryA("ucrtbase.dll"); + GetSystemTimeAsFileTime(&cur); + crt_init_end = ((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime; if(!module) { win_skip("ucrtbase.dll not available\n"); @@ -510,6 +518,7 @@ static BOOL init(void) p__o_malloc = (void*)GetProcAddress(module, "_o_malloc"); p__msize = (void*)GetProcAddress(module, "_msize"); p_free = (void*)GetProcAddress(module, "free"); + p_clock = (void*)GetProcAddress(module, "clock"); return TRUE; } @@ -1166,6 +1175,21 @@ static void test__o_malloc(void) p_free(m); } +static void test_clock(void) +{ + static const int thresh = 100; + int c, expect_min, expect_max; + FILETIME cur; + + GetSystemTimeAsFileTime(&cur); + c = p_clock(); + + expect_min = (((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime - crt_init_end) / 10000; + expect_max = (((LONGLONG)cur.dwHighDateTime << 32) + cur.dwLowDateTime - crt_init_start) / 10000; + ok(c > expect_min-thresh && c < expect_max+thresh, "clock() = %d, expected range [%d, %d]\n", + c, expect_min, expect_max); +} + START_TEST(misc) { int arg_c; @@ -1202,4 +1226,5 @@ START_TEST(misc) test_quick_exit(arg_v[0]); test__stat32(); test__o_malloc(); + test_clock(); }

1 0

Brendan Shanks : kernel32/tests: Add tests for named pipes in PIPE_NOWAIT mode.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 11a554eecc43cc43e586e8d1fd070add37e397c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11a554eecc43cc43e586e8d1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Oct 16 14:49:48 2019 +0200 kernel32/tests: Add tests for named pipes in PIPE_NOWAIT mode. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 165 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index f61d441303..0980c4ef8c 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3887,6 +3887,170 @@ static void test_wait_pipe(void) CloseHandle(ov.hEvent); } +static void test_nowait(void) +{ + HANDLE piperead, pipewrite, file; + OVERLAPPED ol, ol2; + DWORD read, write; + char readbuf[32768]; + static const char teststring[] = "bits"; + + /* CreateNamedPipe with PIPE_NOWAIT, and read from empty pipe */ + piperead = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 512, + /* nInBufSize */ 512, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(piperead != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + pipewrite = CreateFileA(PIPENAME, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(pipewrite != INVALID_HANDLE_VALUE, "CreateFileA failed\n"); + memset(&ol, 0, sizeof(ol)); + ol.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol) == FALSE, "ReadFile should fail\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "got %d should be ERROR_NO_DATA\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(piperead); + + /* test a small write/read */ + ok(WriteFile(pipewrite, teststring, sizeof(teststring), &write, NULL), "WriteFile should succeed\n"); + ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol), "ReadFile should succeed\n"); + ok(read == write, "read/write bytes should match\n"); + ok(CloseHandle(ol.hEvent), "CloseHandle for the event failed\n"); + ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); + + + /* create write side with PIPE_NOWAIT, read side PIPE_WAIT, and test writes */ + pipewrite = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 512, + /* nInBufSize */ 512, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(pipewrite != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + piperead = CreateFileA(PIPENAME, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); + ok(piperead != INVALID_HANDLE_VALUE, "CreateFileA failed\n"); + memset(&ol, 0, sizeof(ol)); + ol.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + memset(&ol2, 0, sizeof(ol2)); + ol2.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + /* write one byte larger than the buffer size, should fail */ + SetLastError(0xdeadbeef); + todo_wine ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); + /* WriteFile only documents that 'write < sizeof(readbuf)' for this case, but Windows + * doesn't seem to do partial writes ('write == 0' always) + */ + ok(write < sizeof(readbuf), "WriteFile should fail to write the whole buffer\n"); + ok(write == 0, "WriteFile doesn't do partial writes here\n"); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(piperead); + + /* overlapped read of 32768, non-blocking write of 512 */ + SetLastError(0xdeadbeef); + todo_wine ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2) == FALSE, "ReadFile should fail\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + ok(WriteFile(pipewrite, teststring, sizeof(teststring), &write, &ol), "WriteFile should succeed\n"); + ok(write == sizeof(teststring), "got %d\n", write); + ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); + todo_wine ok(read == sizeof(teststring), "got %d\n", read); + if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) + CancelIo(piperead); + + /* overlapped read of 32768, non-blocking write of 513 */ + SetLastError(0xdeadbeef); + todo_wine ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2) == FALSE, "ReadFile should fail\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + todo_wine ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); + todo_wine ok(write == 513, "got %d, write should be %d\n", write, 513); + ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); + todo_wine ok(read == 513, "got %d, read should be %d\n", read, 513); + if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) + CancelIo(piperead); + + /* overlapped read of 1 byte, non-blocking write of 513 bytes */ + SetLastError(0xdeadbeef); + todo_wine ok(ReadFile(piperead, readbuf, 1, &read, &ol2) == FALSE, "ReadFile should fail\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + todo_wine ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); + todo_wine ok(write == 513, "got %d, write should be %d\n", write, 513); + ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); + ok(read == 1, "got %d, read should be %d\n", read, 1); + if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) + CancelIo(piperead); + /* read the remaining 512 bytes */ + SetLastError(0xdeadbeef); + ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2), "ReadFile should succeed\n"); + todo_wine ok(read == 512, "got %d, write should be %d\n", write, 512); + if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) + CancelIo(piperead); + + /* overlapped read of 1 byte, non-blocking write of 514 bytes */ + SetLastError(0xdeadbeef); + ok(ReadFile(piperead, readbuf, 1, &read, &ol2) == FALSE, "ReadFile should fail\n"); + ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + todo_wine ok(WriteFile(pipewrite, readbuf, 514, &write, &ol), "WriteFile should succeed\n"); + todo_wine ok(write == 1, "got %d, write should be %d\n", write, 1); + ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); + ok(read == 1, "got %d, read should be %d\n", read, 1); + if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) + CancelIo(piperead); + + /* write the exact buffer size, should succeed */ + SetLastError(0xdeadbeef); + todo_wine ok(WriteFile(pipewrite, readbuf, 512, &write, &ol), "WriteFile should succeed\n"); + todo_wine ok(write == 512, "WriteFile should write the whole buffer\n"); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(piperead); + + ok(CloseHandle(ol.hEvent), "CloseHandle for the event failed\n"); + ok(CloseHandle(ol2.hEvent), "CloseHandle for the event failed\n"); + ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); + + + /* CreateNamedPipe with PIPE_NOWAIT, test ConnectNamedPipe */ + pipewrite = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 512, + /* nInBufSize */ 512, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(pipewrite != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + memset(&ol, 0, sizeof(ol)); + ol.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + ok(ConnectNamedPipe(pipewrite, &ol) == FALSE, "ConnectNamedPipe should fail\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_LISTENING, "got %d should be ERROR_PIPE_LISTENING\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(pipewrite); + + /* connect and disconnect, then test ConnectNamedPipe again */ + file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed\n"); + ok(CloseHandle(file), "CloseHandle failed\n"); + SetLastError(0xdeadbeef); + ok(ConnectNamedPipe(pipewrite,&ol) == FALSE, "ConnectNamedPipe should fail\n"); + ok(GetLastError() == ERROR_NO_DATA, "got %d should be ERROR_NO_DATA\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(pipewrite); + + /* call DisconnectNamedPipe and test ConnectNamedPipe again */ + ok(DisconnectNamedPipe(pipewrite) == TRUE, "DisconnectNamedPipe should succeed\n"); + SetLastError(0xdeadbeef); + ok(ConnectNamedPipe(pipewrite,&ol) == FALSE, "ConnectNamedPipe should fail\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_LISTENING, "got %d should be ERROR_PIPE_LISTENING\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(pipewrite); + ok(CloseHandle(ol.hEvent), "CloseHandle for the event failed\n"); + ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); +} + START_TEST(pipe) { char **argv; @@ -3954,4 +4118,5 @@ START_TEST(pipe) test_namedpipe_session_id(); test_multiple_instances(); test_wait_pipe(); + test_nowait(); }

1 0

Dmitry Timoshkov : wineps.drv: Don't clear DM_PAPERWIDTH | DM_PAPERLENGTH flags.
by Alexandre Julliard Oct. 16, 2019

Oct. 16, 2019

Module: wine Branch: master Commit: 8d6183c832478d392ea5e9102539f76a05562cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d6183c832478d392ea5e910… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Oct 10 17:01:31 2019 +0800 wineps.drv: Don't clear DM_PAPERWIDTH | DM_PAPERLENGTH flags. dmFields should indicate that DEVMODE has dmPaperWidth and dmPaperLength set. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 173f6db7bd..c3d22cec1a 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -110,8 +110,7 @@ void PSDRV_MergeDevmodes( PSDRV_DEVMODE *dm1, const PSDRV_DEVMODE *dm2, PRINTERI dm1->dmPublic.u1.s1.dmPaperSize = dm2->dmPublic.u1.s1.dmPaperSize; dm1->dmPublic.u1.s1.dmPaperWidth = paper_size_from_points( page->PaperDimension->x ); dm1->dmPublic.u1.s1.dmPaperLength = paper_size_from_points( page->PaperDimension->y ); - dm1->dmPublic.dmFields &= ~(DM_PAPERLENGTH | DM_PAPERWIDTH); - dm1->dmPublic.dmFields |= DM_PAPERSIZE; + dm1->dmPublic.dmFields |= DM_PAPERSIZE | DM_PAPERWIDTH | DM_PAPERLENGTH; TRACE("Changing page to %s %d x %d\n", page->FullName, dm1->dmPublic.u1.s1.dmPaperWidth, dm1->dmPublic.u1.s1.dmPaperLength );

1 0