October 2019 - Wine-commits

Joseph Kogut : iphlpapi: Report success in NotifyIpInterfaceChange.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 713f4568e6d0467e585775828bd725caa0f4faa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=713f4568e6d0467e58577582… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Mon Oct 14 19:25:39 2019 -0700 iphlpapi: Report success in NotifyIpInterfaceChange. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47935 Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1f823b401d..8c7c9018c4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2758,7 +2758,7 @@ DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_ FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", family, callback, context, init_notify, handle); if (handle) *handle = NULL; - return ERROR_NOT_SUPPORTED; + return NO_ERROR; }

1 0

Alistair Leslie-Hughes : include: Added sapiaut.idl.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: b2448805aec65ff309c2b4c76c4d70a0eb0faa48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2448805aec65ff309c2b4c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 16 23:37:19 2019 +0000 include: Added sapiaut.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/sapi.idl | 2 + include/sapiaut.idl | 2007 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 2010 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2448805aec65ff309c2…

1 0

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

16 Oct '19

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

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

16 Oct '19

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

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

16 Oct '19

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

Jacek Caban : server: Reselect read queue before write queue in pipe_end_write.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: add05569917152b45f3288f67f7e7a0ae62d0fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=add05569917152b45f3288f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 16 14:50:18 2019 +0200 server: Reselect read queue before write queue in pipe_end_write. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 6926712b8c..1e0c5898a1 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -787,11 +787,10 @@ static int ignore_reselect; static void reselect_write_queue( struct pipe_end *pipe_end ); -static void reselect_read_queue( struct pipe_end *pipe_end ) +static void reselect_read_queue( struct pipe_end *pipe_end, int reselect_write ) { struct async *async; struct iosb *iosb; - int read_done = 0; ignore_reselect = 1; while (!list_empty( &pipe_end->message_queue ) && (async = find_pending_async( &pipe_end->read_q ))) @@ -801,7 +800,7 @@ static void reselect_read_queue( struct pipe_end *pipe_end ) async_terminate( async, iosb->result ? STATUS_ALERTED : iosb->status ); release_object( async ); release_object( iosb ); - read_done = 1; + reselect_write = 1; } ignore_reselect = 0; @@ -809,7 +808,7 @@ static void reselect_read_queue( struct pipe_end *pipe_end ) { if (list_empty( &pipe_end->message_queue )) fd_async_wake_up( pipe_end->connection->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); - else if (read_done) + else if (reselect_write) reselect_write_queue( pipe_end->connection ); } } @@ -841,7 +840,7 @@ static void reselect_write_queue( struct pipe_end *pipe_end ) } ignore_reselect = 0; - reselect_read_queue( reader ); + reselect_read_queue( reader, 0 ); } static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) @@ -870,7 +869,7 @@ static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ) } queue_async( &pipe_end->read_q, async ); - reselect_read_queue( pipe_end ); + reselect_read_queue( pipe_end, 0 ); set_error( STATUS_PENDING ); return 1; } @@ -905,7 +904,7 @@ static int pipe_end_write( struct fd *fd, struct async *async, file_pos_t pos ) message->async = (struct async *)grab_object( async ); queue_async( &pipe_end->write_q, async ); - reselect_write_queue( pipe_end ); + reselect_read_queue( pipe_end->connection, 1 ); set_error( STATUS_PENDING ); return 1; } @@ -919,7 +918,7 @@ static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ) if (&pipe_end->write_q == queue) reselect_write_queue( pipe_end ); else if (&pipe_end->read_q == queue) - reselect_read_queue( pipe_end ); + reselect_read_queue( pipe_end, 0 ); } static enum server_fd_type pipe_end_get_fd_type( struct fd *fd ) @@ -1019,10 +1018,10 @@ static int pipe_end_transceive( struct pipe_end *pipe_end, struct async *async ) message = queue_message( pipe_end->connection, iosb ); release_object( iosb ); if (!message) return 0; - reselect_read_queue( pipe_end->connection ); + reselect_read_queue( pipe_end->connection, 0 ); queue_async( &pipe_end->read_q, async ); - reselect_read_queue( pipe_end ); + reselect_read_queue( pipe_end, 0 ); set_error( STATUS_PENDING ); return 1; }

1 0

Vijay Kiran Kamuju : msvcrt: Implement %n and %t formats for strftime.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: c583c4afaaac539359fb513c3e6e010d9cd6f99d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c583c4afaaac539359fb513c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Oct 11 22:35:23 2019 +0200 msvcrt: Implement %n and %t formats for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 10 ++++++++++ dlls/msvcrt/time.c | 8 ++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 7eea78367d..beba796317 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -633,11 +633,21 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%n", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%t", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%T", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 6108ad17cc..78f4602972 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1225,6 +1225,11 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) return 0; break; +#if _MSVCR_VER>=140 + case 'n': + str[ret++] = '\n'; + break; +#endif case 'p': if(mstm->tm_hour<0 || mstm->tm_hour>23) goto einval_error; @@ -1247,6 +1252,9 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; #if _MSVCR_VER>=140 + case 't': + str[ret++] = '\t'; + break; case 'T': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 0d865fdcb8..9747d8b21a 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -942,6 +942,14 @@ static void test_strftime(void) retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); ok(retA == 3, "expected 3, got %d\n", (int)retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%n", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "\n"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "\t"), "got %s\n", bufA); } static LONG* get_failures_counter(HANDLE *map)

1 0

Felix Hädicke : msvcrt: Use memmove() instead of memcpy() puts_clbk_str().
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: 90e520b418dcedae6fbfdd56b791ba50652f2ee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90e520b418dcedae6fbfdd56… Author: Felix Hädicke <felixhaedicke(a)web.de> Date: Thu Oct 10 23:39:35 2019 +0200 msvcrt: Use memmove() instead of memcpy() puts_clbk_str(). memcpy() must not be used here, because results are undefined if the memory areas overlap. This can cause problems, particularly if particular compiler optimisations are enabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47918 Signed-off-by: Felix Hädicke <felixhaedicke(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ++-- dlls/msvcrt/wcs.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index a0d75401c4..346fb5ac5d 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -52,13 +52,13 @@ static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len*sizeof(APICHAR)); + memmove(out->buf, str, out->len*sizeof(APICHAR)); out->buf += out->len; out->len = 0; return -1; } - memcpy(out->buf, str, len*sizeof(APICHAR)); + memmove(out->buf, str, len*sizeof(APICHAR)); out->buf += len; out->len -= len; return len; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index f84963ce2e..3e5bb512ff 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -781,13 +781,13 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) return len; if(out->len < len) { - memcpy(out->buf, str, out->len); + memmove(out->buf, str, out->len); out->buf += out->len; out->len = 0; return len; } - memcpy(out->buf, str, len); + memmove(out->buf, str, len); out->buf += len; out->len -= len; return len;

1 0

Alistair Leslie-Hughes : wshom.ocx: Correct out parameter for _NewEnum.
by Alexandre Julliard 16 Oct '19

16 Oct '19

Module: wine Branch: master Commit: 46dcaa5b93f264a75b0c924eb72d86574b6fdd64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46dcaa5b93f264a75b0c924e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 16 10:06:11 2019 +0000 wshom.ocx: Correct out parameter for _NewEnum. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d423856ce7..543d951ea0 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -698,7 +698,7 @@ static HRESULT WINAPI WshCollection_get_length(IWshCollection *iface, LONG *coun return E_NOTIMPL; } -static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown *Enum) +static HRESULT WINAPI WshCollection__NewEnum(IWshCollection *iface, IUnknown **Enum) { WshCollection *This = impl_from_IWshCollection(iface); FIXME("(%p)->(%p): stub\n", This, Enum); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index 039938c82b..00391d5283 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [ diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index d936721589..8d4a8f03e1 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -383,7 +383,7 @@ library IWshRuntimeLibrary HRESULT length([out, retval] long *out_Count); [id(DISPID_NEWENUM)] - HRESULT _NewEnum([out, retval] IUnknown *out_Enum); + HRESULT _NewEnum([out, retval] IUnknown **out_Enum); } [

1 0

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

16 Oct '19

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