May 2018 - Wine-commits - list.winehq.org

Vladimir Bespalov : winedbg: Fix enum value compilation warning.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: d2ad933a28d665df1852aa1ad294f4628b9a11a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ad933a28d665df1852aa1a… Author: Vladimir Bespalov <vlad.botanic(a)gmail.com> Date: Fri Feb 2 04:11:26 2018 -0800 winedbg: Fix enum value compilation warning. Signed-off-by: Vlad Bespalov <vlad.botanic(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 57ccf8221fdabfb90c4117b34478919e21e72858) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/be_cpu.h | 2 +- programs/winedbg/gdbproxy.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h index 889f638..d62b517 100644 --- a/programs/winedbg/be_cpu.h +++ b/programs/winedbg/be_cpu.h @@ -20,7 +20,7 @@ enum be_cpu_addr {be_cpu_addr_pc, be_cpu_addr_stack, be_cpu_addr_frame}; enum be_xpoint_type {be_xpoint_break, be_xpoint_watch_exec, be_xpoint_watch_read, - be_xpoint_watch_write}; + be_xpoint_watch_write, be_xpoint_free=-1}; struct backend_cpu { const DWORD machine; diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index a87fe02..cfa9fe3 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -74,7 +74,7 @@ struct gdb_ctx_Xpoint { - enum be_xpoint_type type; /* -1 means free */ + enum be_xpoint_type type; /* (-1) == be_xpoint_free means free */ void* addr; unsigned long val; }; @@ -1514,7 +1514,7 @@ static BOOL read_memory(struct gdb_context *gdbctx, char *addr, char *buffer, SI { char *xpt_addr = xpt->addr; - if (xpt->type != -1 && xpt_addr >= addr && xpt_addr < addr + blk_len) + if (xpt->type != be_xpoint_free && xpt_addr >= addr && xpt_addr < addr + blk_len) buffer[xpt_addr - addr] = xpt->val; } } @@ -2123,7 +2123,7 @@ static enum packet_return packet_remove_breakpoint(struct gdb_context* gdbctx) gdbctx->process->process_io, &gdbctx->context, t, xpt->addr, xpt->val, len)) { - xpt->type = -1; + xpt->type = be_xpoint_free; return packet_ok; } break; @@ -2164,7 +2164,7 @@ static enum packet_return packet_set_breakpoint(struct gdb_context* gdbctx) /* really set the Xpoint */ for (xpt = &gdbctx->Xpoints[NUM_XPOINT - 1]; xpt >= gdbctx->Xpoints; xpt--) { - if (xpt->type == -1) + if (xpt->type == be_xpoint_free) { if (be_cpu->insert_Xpoint(gdbctx->process->handle, gdbctx->process->process_io, &gdbctx->context,

1 0

Nikolay Sivov : comctl32/toolbar: Fix a crash when tracing special button string identifier.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 75db90381b909966cbee50d26cd9302233c7b6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=75db90381b909966cbee50d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 5 23:32:14 2018 +0300 comctl32/toolbar: Fix a crash when tracing special button string identifier. Based on patch by Mark Jansen <mark.jansen(a)reactos.org>. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2e8dfbb1ad71f24c41e8485a39df01bb9304127f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/toolbar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 8a03597..d5cdd93 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -284,9 +284,9 @@ TOOLBAR_GetText(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *btnPtr) static void TOOLBAR_DumpTBButton(const TBBUTTON *tbb, BOOL fUnicode) { - TRACE("TBBUTTON: id %d, bitmap=%d, state=%02x, style=%02x, data=%08lx, stringid=0x%08lx (%s)\n", - tbb->idCommand,tbb->iBitmap, tbb->fsState, tbb->fsStyle, tbb->dwData, tbb->iString, - (fUnicode ? wine_dbgstr_w((LPWSTR)tbb->iString) : wine_dbgstr_a((LPSTR)tbb->iString))); + TRACE("TBBUTTON: id %d, bitmap=%d, state=%02x, style=%02x, data=%p, stringid=%p (%s)\n", tbb->idCommand, + tbb->iBitmap, tbb->fsState, tbb->fsStyle, (void *)tbb->dwData, (void *)tbb->iString, + tbb->iString != -1 ? (fUnicode ? debugstr_w((LPWSTR)tbb->iString) : debugstr_a((LPSTR)tbb->iString)) : ""); } static void

1 0

Nikolay Sivov : comctl32/treeview: Fix tooltip window leak.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: b7fc559cff9b4e3ec655f9d483c6872990fecae6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7fc559cff9b4e3ec655f9d4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 10:09:03 2018 +0300 comctl32/treeview: Fix tooltip window leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b413a937933027f3c87a3f2950762c2b44b41981) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 114 +++++++++++++++++++++++++++++++++++++---- dlls/comctl32/treeview.c | 3 +- 2 files changed, 106 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a014625..987584e 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1068,9 +1068,101 @@ static void test_get_set_textcolor(void) static void test_get_set_tooltips(void) { - HWND hwndLastToolTip = NULL; - HWND hPopupTreeView; - HWND hTree; + HWND hTree, tooltips, hwnd; + DWORD style; + int i; + + /* TVS_NOTOOLTIPS */ + hTree = create_treeview_control(TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected ret value %p.\n", tooltips); + + /* Toggle style */ + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style & ~TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips), "Unexpected tooltip window %p.\n", tooltips); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + + DestroyWindow(hTree); + + /* Set some valid window, does not have to be tooltips class. */ + hTree = create_treeview_control(TVS_NOTOOLTIPS); + + hwnd = CreateWindowA(WC_STATICA, "Test", WS_VISIBLE|WS_CHILD, 5, 5, 100, 100, hMainWnd, NULL, NULL, 0); + ok(hwnd != NULL, "Failed to create child window.\n"); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(tooltips == NULL, "Unexpected ret value %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == hwnd, "Unexpected tooltip window %p.\n", tooltips); + + /* Externally set tooltips window, disable style. */ + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style & ~TVS_NOTOOLTIPS); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips) && tooltips != hwnd, "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + ok(!IsWindow(tooltips), "Unexpected tooltip window %p.\n", tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == NULL, "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + DestroyWindow(hTree); + ok(IsWindow(hwnd), "Expected valid window.\n"); + + /* Set window, disable tooltips. */ + hTree = create_treeview_control(0); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + + style = GetWindowLongA(hTree, GWL_STYLE); + SetWindowLongA(hTree, GWL_STYLE, style | TVS_NOTOOLTIPS); + ok(!IsWindow(hwnd), "Unexpected tooltip window %p.\n", tooltips); + ok(IsWindow(tooltips), "Expected valid window %p.\n", tooltips); + + DestroyWindow(hTree); + ok(IsWindow(tooltips), "Expected valid window %p.\n", tooltips); + DestroyWindow(tooltips); + DestroyWindow(hwnd); + + for (i = 0; i < 2; i++) + { + DWORD style = i == 0 ? 0 : TVS_NOTOOLTIPS; + + hwnd = CreateWindowA(WC_STATICA, "Test", WS_VISIBLE|WS_CHILD, 5, 5, 100, 100, hMainWnd, NULL, NULL, 0); + ok(hwnd != NULL, "Failed to create child window.\n"); + + hTree = create_treeview_control(style); + + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, (WPARAM)hwnd, 0); + ok(style & TVS_NOTOOLTIPS ? tooltips == NULL : IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + DestroyWindow(tooltips); + + tooltips = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(tooltips == hwnd, "Unexpected tooltip window %p.\n", tooltips); + + /* TreeView is destroyed, check if set window is still around. */ + DestroyWindow(hTree); + ok(!IsWindow(hwnd), "Unexpected window.\n"); + } hTree = create_treeview_control(0); fill_tree(hTree); @@ -1078,20 +1170,23 @@ static void test_get_set_tooltips(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* show even WS_POPUP treeview don't send NM_TOOLTIPSCREATED */ - hPopupTreeView = CreateWindowA(WC_TREEVIEWA, NULL, WS_POPUP|WS_VISIBLE, 0, 0, 100, 100, + hwnd = CreateWindowA(WC_TREEVIEWA, NULL, WS_POPUP|WS_VISIBLE, 0, 0, 100, 100, hMainWnd, NULL, NULL, NULL); - DestroyWindow(hPopupTreeView); + DestroyWindow(hwnd); /* Testing setting a NULL ToolTip */ - SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); - hwndLastToolTip = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); - ok(hwndLastToolTip == NULL, "NULL tool tip, reported as 0x%p, expected 0.\n", hwndLastToolTip); + tooltips = (HWND)SendMessageA(hTree, TVM_SETTOOLTIPS, 0, 0); + ok(IsWindow(tooltips), "Unexpected ret value %p.\n", tooltips); + + hwnd = (HWND)SendMessageA(hTree, TVM_GETTOOLTIPS, 0, 0); + ok(hwnd == NULL, "Unexpected tooltip window %p.\n", hwnd); ok_sequence(sequences, TREEVIEW_SEQ_INDEX, test_get_set_tooltips_seq, "test get set tooltips", TRUE); - /* TODO: Add a test of an actual tooltip */ DestroyWindow(hTree); + ok(IsWindow(tooltips), "Expected valid window.\n"); + DestroyWindow(tooltips); } static void test_get_set_unicodeformat(void) @@ -2756,6 +2851,7 @@ START_TEST(treeview) test_expandedimage(); test_htreeitem_layout(); test_WM_GETDLGCODE(); + test_get_set_tooltips(); unload_v6_module(ctx_cookie, hCtx); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 5772196..71c25c7 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5188,8 +5188,6 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) TREEVIEW_FreeItem(infoPtr, infoPtr->root); DPA_Destroy(infoPtr->items); - /* tool tip is automatically destroyed: we are its owner */ - /* Restore original wndproc */ if (infoPtr->hwndEdit) SetWindowLongPtrW(infoPtr->hwndEdit, GWLP_WNDPROC, @@ -5204,6 +5202,7 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); DeleteObject(infoPtr->hBoldUnderlineFont); + DestroyWindow(infoPtr->hwndToolTip); Free(infoPtr); return 0;

1 0

Thomas Faber : ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity).
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 82eff682389623a986f01cd02179e4bfda9a92bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=82eff682389623a986f01cd0… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jan 16 19:19:34 2018 +0100 ntdll: Handle RtlReAllocateHeap failure in com_class_add_progid (Coverity). Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 42f742e1be8a4f3b26ed3d1a343f17fe55cbf322) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/actctx.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 323ee68..b978438 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1453,8 +1453,11 @@ static BOOL com_class_add_progid(const xmlstr_t *progid, struct entity *entity) if (progids->allocated == progids->num) { + WCHAR **new_progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, + 2 * progids->allocated * sizeof(WCHAR*)); + if (!new_progids) return FALSE; progids->allocated *= 2; - progids->progids = RtlReAllocateHeap(GetProcessHeap(), 0, progids->progids, progids->allocated * sizeof(WCHAR*)); + progids->progids = new_progids; } if (!(progids->progids[progids->num] = xmlstrdupW(progid))) return FALSE;

1 0

Martin Storsjo : configure: Check for -Wno-pragma-pack.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 3cee85f20f31eb4aea50aaf8ca2d94b009b71543 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cee85f20f31eb4aea50aaf8… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:05:35 2018 +0200 configure: Check for -Wno-pragma-pack. Recent clang versions warn if an include file changes the pragma pack level without restoring it before the end of the include file. This avoids warnings for each include of pshpack*.h/poppack.h. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51e2966b4b00cd128c44b413803d8e430a15d021) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index be6e012..d80dc55 100755 --- a/configure +++ b/configure @@ -14894,6 +14894,31 @@ $as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-pragma-pack" >&5 +$as_echo_n "checking whether the compiler supports -Wno-pragma-pack... " >&6; } +if ${ac_cv_cflags__Wno_pragma_pack+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-pragma-pack" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_pragma_pack=yes +else + ac_cv_cflags__Wno_pragma_pack=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_pragma_pack" >&5 +$as_echo "$ac_cv_cflags__Wno_pragma_pack" >&6; } +if test "x$ac_cv_cflags__Wno_pragma_pack" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 $as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : diff --git a/configure.ac b/configure.ac index 3b037f9..5b3a5c9 100644 --- a/configure.ac +++ b/configure.ac @@ -1842,6 +1842,7 @@ then WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) + WINE_TRY_CFLAGS([-Wno-pragma-pack]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Alexandre Julliard : configure: Check the positive form of the warning options.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: d2ede450905b41b22d4282c90c25013416c230ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ede450905b41b22d4282c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 23 13:37:15 2018 +0100 configure: Check the positive form of the warning options. Checking the -Wno- form doesn't fail and causes warnings on gcc. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8cf375de353dc16d834f6447b2765b2d9c2d9ddb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 36 ++++++++++++++++++------------------ configure.ac | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure b/configure index d80dc55..3cc342b 100755 --- a/configure +++ b/configure @@ -14869,54 +14869,54 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-packed-not-aligned" >&5 -$as_echo_n "checking whether the compiler supports -Wno-packed-not-aligned... " >&6; } -if ${ac_cv_cflags__Wno_packed_not_aligned+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpacked-not-aligned" >&5 +$as_echo_n "checking whether the compiler supports -Wpacked-not-aligned... " >&6; } +if ${ac_cv_cflags__Wpacked_not_aligned+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-packed-not-aligned" +CFLAGS="$CFLAGS -Wpacked-not-aligned" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_packed_not_aligned=yes + ac_cv_cflags__Wpacked_not_aligned=yes else - ac_cv_cflags__Wno_packed_not_aligned=no + ac_cv_cflags__Wpacked_not_aligned=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_packed_not_aligned" >&5 -$as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } -if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wpacked_not_aligned" >&5 +$as_echo "$ac_cv_cflags__Wpacked_not_aligned" >&6; } +if test "x$ac_cv_cflags__Wpacked_not_aligned" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-pragma-pack" >&5 -$as_echo_n "checking whether the compiler supports -Wno-pragma-pack... " >&6; } -if ${ac_cv_cflags__Wno_pragma_pack+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpragma-pack" >&5 +$as_echo_n "checking whether the compiler supports -Wpragma-pack... " >&6; } +if ${ac_cv_cflags__Wpragma_pack+:} false; then : $as_echo_n "(cached) " >&6 else ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wno-pragma-pack" +CFLAGS="$CFLAGS -Wpragma-pack" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main(int argc, char **argv) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Wno_pragma_pack=yes + ac_cv_cflags__Wpragma_pack=yes else - ac_cv_cflags__Wno_pragma_pack=no + ac_cv_cflags__Wpragma_pack=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$ac_wine_try_cflags_saved fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_pragma_pack" >&5 -$as_echo "$ac_cv_cflags__Wno_pragma_pack" >&6; } -if test "x$ac_cv_cflags__Wno_pragma_pack" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wpragma_pack" >&5 +$as_echo "$ac_cv_cflags__Wpragma_pack" >&6; } +if test "x$ac_cv_cflags__Wpragma_pack" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 diff --git a/configure.ac b/configure.ac index 5b3a5c9..ec2e16f 100644 --- a/configure.ac +++ b/configure.ac @@ -1841,8 +1841,8 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) - WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) - WINE_TRY_CFLAGS([-Wno-pragma-pack]) + WINE_TRY_CFLAGS([-Wpacked-not-aligned],[EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned"]) + WINE_TRY_CFLAGS([-Wpragma-pack],[EXTRACFLAGS="$EXTRACFLAGS -Wno-pragma-pack"]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Michael Stefaniuc : tools: Get the ANNOUNCE bug list from the stable-notes git notes.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: d979fc383563128122762687c0d032bde426f67f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d979fc383563128122762687… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 26 21:05:28 2017 +0200 tools: Get the ANNOUNCE bug list from the stable-notes git notes. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/make_announce | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index 83d869a..b38b7b0 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -24,7 +24,6 @@ use strict; use locale; use POSIX; -use Text::CSV::Encoded; use open ':encoding(utf8)'; sub unescape($) @@ -69,18 +68,14 @@ sub get_current_version() # retrieve a list of bugs with the specified filter sub get_bugs($) { - my $filter = shift; - my $csv = Text::CSV::Encoded->new({ encoding_in => "utf-8", encoding_out => "utf-8" }); my %bugs; - open QUERY, "-|" or exec "wget", "-qO-", "https://bugs.winehq.org/buglist.cgi?columnlist=short_desc&query_format=adva…" + open QUERY, "-|" or exec "git", "log", "--notes=stable-notes", "--format=%N", "wine-" . get_current_version() . ".." or die "cannot query bug list"; - <QUERY>; # skip header line while (<QUERY>) { - next unless $csv->parse($_); - my ($id, $descr) = $csv->fields(); - $bugs{$id} = $descr; + next unless /^Fixes: \[(\d+)\] (.*)/; + $bugs{$1} = $2; } close QUERY; return %bugs;

1 0

Alexandre Julliard : ntdll: Fix crash on nested thread exit.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 4c614dfe9efdcb92ba46e604966b137dd9689395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c614dfe9efdcb92ba46e604… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 16:06:42 2018 +0100 ntdll: Fix crash on nested thread exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7ccae68f6cf85388ef6eed98792127b7fbf01396) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 79d6e32..b411749 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2904,6 +2904,7 @@ __ASM_GLOBAL_FUNC( start_thread, extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) ); __ASM_GLOBAL_FUNC( call_thread_exit_func, + "movl 8(%esp),%ecx\n\t" /* fetch exit frame */ "movl %fs:0x1f4,%edx\n\t" /* x86_thread_data()->exit_frame */ "testl %edx,%edx\n\t" @@ -2911,7 +2912,6 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, "jmp *%ecx\n\t" /* switch to exit frame stack */ "1:\tmovl 4(%esp),%eax\n\t" - "movl 8(%esp),%ecx\n\t" "movl $0,%fs:0x1f4\n\t" "movl %edx,%ebp\n\t" __ASM_CFI(".cfi_def_cfa %ebp,4\n\t")

1 0

Zebediah Figura : winegstreamer: Stop creating the filter if gstreamer fails to render.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 037a7215968e2aac8fb171c27e63d5ba69bcdd9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=037a7215968e2aac8fb171c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 22 09:06:13 2018 -0600 winegstreamer: Stop creating the filter if gstreamer fails to render. Otherwise the push_data() thread will run and try to use resources we never allocated. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5374d5ca59d4a15053d10ba1c70eb01241acdac7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a19c64f..b48648c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1103,7 +1103,6 @@ static void unknown_type(GstElement *bin, GstPad *pad, GstCaps *caps, gpointer u static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTIES *props) { GSTImpl *This = (GSTImpl*)pPin->pin.pinInfo.pFilter; - HRESULT hr; int ret, i; LONGLONG avail, duration; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1163,19 +1162,20 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI WaitForSingleObject(This->event, -1); gst_element_get_state(This->container, NULL, NULL, -1); - if (!This->cStreams) { + if (!This->cStreams) + { FIXME("GStreamer could not find any streams\n"); - hr = E_FAIL; - } else { - gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); - for (i = 0; i < This->cStreams; ++i) { - This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; - This->ppPins[i]->seek.llCurrent = 0; - if (!This->ppPins[i]->seek.llDuration) - This->ppPins[i]->seek.dwCapabilities = 0; - WaitForSingleObject(This->ppPins[i]->caps_event, -1); - } - hr = S_OK; + return E_FAIL; + } + + gst_pad_query_duration(This->ppPins[0]->their_src, GST_FORMAT_TIME, &duration); + for (i = 0; i < This->cStreams; ++i) + { + This->ppPins[i]->seek.llDuration = This->ppPins[i]->seek.llStop = duration / 100; + This->ppPins[i]->seek.llCurrent = 0; + if (!This->ppPins[i]->seek.llDuration) + This->ppPins[i]->seek.dwCapabilities = 0; + WaitForSingleObject(This->ppPins[i]->caps_event, INFINITE); } *props = This->props; @@ -1191,7 +1191,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI gst_pad_set_active(This->my_src, 1); This->nextofs = This->nextpullofs = 0; - return hr; + return S_OK; } static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface )

1 0

Zebediah Figura : ieframe: Clean up InternetExplorerManager server process.
by Alexandre Julliard 14 May '18

14 May '18

Module: wine Branch: stable Commit: 134993c0262712b64ac01febd00cdd36de70f217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=134993c0262712b64ac01feb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 14 12:10:07 2018 -0500 ieframe: Clean up InternetExplorerManager server process. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b5b3146e4f701fe6273003fae609bec03d7d10e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/iexplore.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 23d61f9..aac1436 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -887,7 +887,10 @@ static ULONG WINAPI InternetExplorerManager_Release(IInternetExplorerManager *if TRACE("(%p) decreasing refcount to %u\n", iface, ref); if (ref == 0) + { HeapFree(GetProcessHeap(), 0, This); + released_obj(); + } return ref; } @@ -923,6 +926,7 @@ HRESULT WINAPI InternetExplorerManager_Create(IClassFactory *iface, IUnknown *pO hr = IInternetExplorerManager_QueryInterface(&ret->IInternetExplorerManager_iface, riid, ppv); IInternetExplorerManager_Release(&ret->IInternetExplorerManager_iface); + InterlockedIncrement(&obj_cnt); return hr; }

1 0