December 2020 - Wine-commits

Huw Davies : qcap: Avoid unused variable warning if v4l is absent.
by Alexandre Julliard 22 Dec '20

22 Dec '20

Module: wine Branch: master Commit: 73281bf132e1dad9aebf3410b21616727438fb63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73281bf132e1dad9aebf3410… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 22 14:26:36 2020 +0000 qcap: Avoid unused variable warning if v4l is absent. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index da09b2b26d6..ccc06194b99 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -57,10 +57,9 @@ #include "qcap_private.h" #include "winternl.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); - #ifdef HAVE_LINUX_VIDEODEV2_H +WINE_DEFAULT_DEBUG_CHANNEL(qcap); WINE_DECLARE_DEBUG_CHANNEL(winediag); static typeof(open) *video_open = open;

1 0

Paul Gofman : ntdll: Always copy context in call_user_apc_dispatcher() on x86.
by Alexandre Julliard 22 Dec '20

22 Dec '20

Module: wine Branch: master Commit: 175a3649ba04daaad3f2b5b62d6bfe091d6a9e46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=175a3649ba04daaad3f2b5b6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 18 20:06:39 2020 +0300 ntdll: Always copy context in call_user_apc_dispatcher() on x86. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 48 +++++++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 84 +++++++++++++++++++++++++++---------------- 2 files changed, 101 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 3a0a5ac049c..44c03a6e52a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2001,6 +2001,53 @@ static void test_kiuserexceptiondispatcher(void) ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); } +static BOOL test_apc_called; + +static void CALLBACK test_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + test_apc_called = TRUE; +} + +static void test_user_apc(void) +{ + NTSTATUS status; + CONTEXT context; + int pass; + + if (!pNtQueueApcThread) + { + win_skip("NtQueueApcThread is not available.\n"); + return; + } + + pass = 0; + InterlockedIncrement(&pass); + RtlCaptureContext(&context); + InterlockedIncrement(&pass); + + if (pass == 2) + { + /* Try to make sure context data is far enough below context.Esp. */ + CONTEXT c[4]; + + c[0] = context; + + test_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + SleepEx(0, TRUE); + ok(test_apc_called, "Test user APC was not called.\n"); + test_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + status = NtContinue(&c[0], TRUE ); + + /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */ + ok(0, "Should not get here, status %#x.\n", status); + } + ok(pass == 3, "Got unexpected pass %d.\n", pass); + ok(test_apc_called, "Test user APC was not called.\n"); +} #elif defined(__x86_64__) #define UNW_FLAG_NHANDLER 0 @@ -8253,6 +8300,7 @@ START_TEST(exception) test_kiuserexceptiondispatcher(); test_extended_context(); test_copy_context(); + test_user_apc(); #elif defined(__x86_64__) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 11fa61232fa..c8690b51f2f 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1665,6 +1665,42 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) setup_raise_exception( sigcontext, stack, rec, &xcontext ); } +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + void *context_ptr; + void *ctx; + void *arg1; + void *arg2; + void *func; + CONTEXT context; +}; + +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, + void *ctx, void *arg1, void *arg2, void *func ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + stack->context_ptr = &stack->context; + stack->ctx = ctx; + stack->arg1 = arg1; + stack->arg2 = arg2; + stack->func = func; + stack->context.Eax = STATUS_USER_APC; + return stack; +} + +C_ASSERT( sizeof(struct apc_stack_layout) == 0x2e0 ); +C_ASSERT( offsetof(struct syscall_frame, ret_addr) == 0x14 ); +C_ASSERT( offsetof(struct apc_stack_layout, context) == 20 ); /*********************************************************************** * call_user_apc_dispatcher @@ -1672,41 +1708,27 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl 4(%esp),%esi\n\t" /* context_ptr */ "movl 24(%esp),%edi\n\t" /* dispatcher */ + "leal 4(%esp),%ebp\n\t" "test %esi,%esi\n\t" "jz 1f\n\t" - "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Rsp */ - "leal -0x2f8(%eax),%eax\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) + params */ - "movl 20(%esp),%ecx\n\t" /* func */ - "movl %ecx,20(%eax)\n\t" - "movl 8(%esp),%ebx\n\t" /* ctx */ - "movl 12(%esp),%edx\n\t" /* arg1 */ - "movl 16(%esp),%ecx\n\t" /* arg2 */ - "leal 4(%eax),%esp\n\t" - "jmp 2f\n" + "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Esp */ + "jmp 2f\n\t" "1:\tmovl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ - "leal -0x2cc(%eax),%esi\n\t" - "movl %esp,%ebx\n\t" - "cmpl %esp,%esi\n\t" - "cmovbl %esi,%esp\n\t" - "pushl 20(%ebx)\n\t" /* func */ - "pushl 16(%ebx)\n\t" /* arg2 */ - "pushl 12(%ebx)\n\t" /* arg1 */ - "movl 8(%ebx),%ebx\n\t" /* ctx */ - "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ - "pushl %esi\n\t" /* context */ - "pushl $0xfffffffe\n\t" - "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" - "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "popl %edx\n\t" - "popl %ecx\n\t" - "popl %eax\n\t" - "leal -20(%esi),%esp\n\t" - "movl %eax,16(%esp)\n" /* func */ - "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */ - "movl %edx,8(%esp)\n\t" /* arg1 */ - "movl %ebx,4(%esp)\n\t" /* ctx */ - "movl %esi,(%esp)\n\t" /* context */ + "leal 0x14(%eax),%eax\n\t" /* &x86_thread_data()->syscall_frame->ret_addr */ + "2:\tsubl $0x2e0,%eax\n\t" /* sizeof(struct apc_stack_layout) */ + "movl %ebp,%esp\n\t" /* pop return address */ + "cmpl %esp,%eax\n\t" + "cmovbl %eax,%esp\n\t" + "pushl 16(%ebp)\n\t" /* func */ + "pushl 12(%ebp)\n\t" /* arg2 */ + "pushl 8(%ebp)\n\t" /* arg1 */ + "pushl 4(%ebp)\n\t" /* ctx */ + "pushl %eax\n\t" + "pushl %esi\n\t" + "call " __ASM_STDCALL("setup_user_apc_dispatcher_stack",24) "\n\t" "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ + "movl %eax,%esp\n\t" + "leal 20(%eax),%esi\n\t" "movl 0xb4(%esi),%ebp\n\t" /* context.Ebp */ "pushl 0xb8(%esi)\n\t" /* context.Eip */ "jmp *%edi\n" )

1 0

Akihiro Sagawa : d3dx9: Avoid closing invalid handles.
by Alexandre Julliard 22 Dec '20

22 Dec '20

Module: wine Branch: master Commit: e27a95e92097a601baa9b0e9dd6fcc5013c863fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27a95e92097a601baa9b0e9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 21 22:44:00 2020 +0900 d3dx9: Avoid closing invalid handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50373 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/util.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 5be9083360a..39afe6740c0 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -134,8 +134,10 @@ HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) return S_OK; error: - CloseHandle(hmapping); - CloseHandle(hfile); + if (hmapping) + CloseHandle(hmapping); + if (hfile != INVALID_HANDLE_VALUE) + CloseHandle(hfile); return HRESULT_FROM_WIN32(GetLastError()); }

1 0

Biswapriyo Nath : include: Add IAMCameraControl definition in axextend.idl.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: baea948be14f1cdf4d2183fb93f3eb8679f633f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baea948be14f1cdf4d2183fb… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Dec 21 22:10:37 2020 +0530 include: Add IAMCameraControl definition in axextend.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/axextend.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/axextend.idl b/include/axextend.idl index 7630ea247c4..155dea5dd8a 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -1291,6 +1291,20 @@ interface IAMVfwCaptureDialogs : IUnknown [in] long data2); } +[ + local, + object, + uuid(c6e13370-30ac-11d0-a18c-00a0c9118956), + pointer_default(unique) +] +interface IAMCameraControl : IUnknown +{ + HRESULT GetRange([in] long property, [out] long *min, [out] long *max, + [out] long *stepping_delta, [out] long *default_value, [out] long *flags); + HRESULT Set([in] long property, [in] long property_value, [in] long flags); + HRESULT Get([in] long property, [out] long *property_value, [out] long *flags); +} + [ local, object,

1 0

Zebediah Figura : amstream/tests: Define NONAMELESSUNION.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 402532b3fd92176e9f6290a5f1a4737c1a17a5bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=402532b3fd92176e9f6290a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 21 11:04:58 2020 -0600 amstream/tests: Define NONAMELESSUNION. Old versions of gcc allow nameless unions, but can't parse them in designated initializers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50378 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 255 +++++++++++++++++++++-------------------- 1 file changed, 128 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=402532b3fd92176e9f62…

1 0

Jacek Caban : conhost: Fix copy-paste typos in selection coordinates.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 3d2b42332884fec35a7e79e919bd31fd4f6816a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d2b42332884fec35a7e79e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 21 18:38:22 2020 +0100 conhost: Fix copy-paste typos in selection coordinates. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50052 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index ed806c379d3..55690377a7e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -878,7 +878,7 @@ static COORD get_cell( struct console *console, LPARAM lparam ) { COORD c; c.X = console->active->win.left + (short)LOWORD(lparam) / console->active->font.width; - c.Y = console->active->win.left + (short)HIWORD(lparam) / console->active->font.height; + c.Y = console->active->win.top + (short)HIWORD(lparam) / console->active->font.height; return c; } @@ -906,11 +906,11 @@ static void get_selection_rect( struct console *console, RECT *r ) r->left = (min(console->window->selection_start.X, console->window->selection_end.X) - console->active->win.left) * console->active->font.width; r->top = (min(console->window->selection_start.Y, console->window->selection_end.Y) - - console->active->win.left) * console->active->font.height; + console->active->win.top) * console->active->font.height; r->right = (max(console->window->selection_start.X, console->window->selection_end.X) + 1 - console->active->win.left) * console->active->font.width; r->bottom = (max(console->window->selection_start.Y, console->window->selection_end.Y) + 1 - - console->active->win.left) * console->active->font.height; + console->active->win.top) * console->active->font.height; } static void update_selection( struct console *console, HDC ref_dc )

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 772e9e9e97602151fc7b505c797048cc5d565063 URL: https://source.winehq.org/git/wine.git/?a=commit;h=772e9e9e97602151fc7b505c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 21 22:43:58 2020 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index 30005ba56ad..056b7ccf066 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-12-15 21:26+0900\n" +"PO-Revision-Date: 2020-12-21 22:36+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -604,7 +604,7 @@ msgstr "縮小" #: dlls/comdlg32/comdlg32.rc:225 dlls/comdlg32/comdlg32.rc:397 msgid "Print Setup" -msgstr "プリンタの設定" +msgstr "印刷設定" #: dlls/comdlg32/comdlg32.rc:228 dlls/comdlg32/comdlg32.rc:361 #: dlls/comdlg32/comdlg32.rc:400 @@ -901,7 +901,7 @@ msgstr "下(&B):" #: dlls/comdlg32/comdlg32.rc:457 msgid "P&rinter..." -msgstr "プリンタ(&R)..." +msgstr "プリンター(&R)..." #: dlls/comdlg32/comdlg32.rc:465 dlls/comdlg32/comdlg32.rc:490 msgid "Look &in:" @@ -10966,7 +10966,7 @@ msgstr "両面印刷:" #: dlls/wineps.drv/wineps.rc:50 msgid "Setup" -msgstr "プリンタの設定" +msgstr "プリンターの設定" #: dlls/wininet/wininet.rc:53 dlls/wininet/wininet.rc:73 msgid "Realm" @@ -13425,7 +13425,7 @@ msgstr "ページ設定(&T)..." #: programs/notepad/notepad.rc:37 msgid "P&rinter Setup..." -msgstr "プリンタの設定(&R)..." +msgstr "プリンターの設定(&R)..." #: programs/notepad/notepad.rc:42 programs/wordpad/wordpad.rc:44 msgid "&Undo\tCtrl+Z"

1 0

Alexandre Julliard : gdi32: Don't fail font creation when we are out of handles.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 5e648e896731190270b399434c6332b18504ecdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e648e896731190270b39943… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 21:04:55 2020 +0100 gdi32: Don't fail font creation when we are out of handles. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50354 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 00bbeb0a11f..7f243192cc3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1717,11 +1717,7 @@ static struct gdi_font *alloc_gdi_font( const WCHAR *file, void *data_ptr, SIZE_ font->data_size = data_size; } - if (!(font->handle = alloc_font_handle( font ))) - { - HeapFree( GetProcessHeap(), 0, font ); - return NULL; - } + font->handle = alloc_font_handle( font ); return font; }

1 0

Biswapriyo Nath : include: Add more Media Foundation error codes.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 26b8efc70a631753a37bff000967fb2dc74073b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26b8efc70a631753a37bff00… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Dec 21 22:10:23 2020 +0530 include: Add more Media Foundation error codes. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mferror.h | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 168 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=26b8efc70a631753a37b…

1 0

Can Taşan : po: Update Turkish translation.
by Alexandre Julliard 21 Dec '20

21 Dec '20

Module: wine Branch: master Commit: 3cd5c35525db3537d2280d5b5d025c09c812e07e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cd5c35525db3537d2280d5b… Author: Can Taşan <betax34(a)hotmail.com> Date: Sat Dec 19 21:20:25 2020 +0100 po: Update Turkish translation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 298 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 147 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cd5c35525db3537d228…

1 0