February 2021 - Wine-Commits

Rémi Bernon : widl: Support WinRT flags attribute parsing.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 1a62712e259bad8033d9625a06fbd7750ac56a6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a62712e259bad8033d9625a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 29 09:50:05 2021 +0100 widl: Support WinRT flags attribute parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6bbfed5e80b..450d92f5926 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -362,6 +362,7 @@ static const struct keyword attr_keywords[] = {"exclusiveto", tEXCLUSIVETO, 1}, {"explicit_handle", tEXPLICITHANDLE, 0}, {"fault_status", tFAULTSTATUS, 0}, + {"flags", tFLAGS, 1}, {"force_allocate", tFORCEALLOCATE, 0}, {"free", tFREE, 0}, {"handle", tHANDLE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d12caa06b63..ef54bf13ded 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -201,6 +201,7 @@ static typelib_t *current_typelib; %token tEXPLICITHANDLE tEXTERN %token tFALSE %token tFASTCALL tFAULTSTATUS +%token tFLAGS %token tFLOAT tFORCEALLOCATE %token tHANDLE %token tHANDLET @@ -576,6 +577,7 @@ attribute: { $$ = NULL; } $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tFAULTSTATUS { $$ = make_attr(ATTR_FAULTSTATUS); } + | tFLAGS { $$ = make_attr(ATTR_FLAGS); } | tFORCEALLOCATE { $$ = make_attr(ATTR_FORCEALLOCATE); } | tHANDLE { $$ = make_attr(ATTR_HANDLE); } | tHELPCONTEXT '(' expr_int_const ')' { $$ = make_attrp(ATTR_HELPCONTEXT, $3); } @@ -2259,6 +2261,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, + /* ATTR_FLAGS */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "flags" }, /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "handle" }, /* ATTR_HELPCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpcontext" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 46a44dac039..7b634c82242 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -106,6 +106,7 @@ enum attr_type ATTR_EXCLUSIVETO, ATTR_EXPLICIT_HANDLE, ATTR_FAULTSTATUS, + ATTR_FLAGS, ATTR_FORCEALLOCATE, ATTR_HANDLE, ATTR_HELPCONTEXT,

1 0

Haoyang Chen : gdiplus: Avoid negative integer overflow due to implicit type conversion.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 4c4a5cb799f54326941f5d38eafef908867271dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4a5cb799f54326941f5d38… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Fri Jan 29 18:08:20 2021 +0800 gdiplus: Avoid negative integer overflow due to implicit type conversion. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2e6c0d7c9c8..7b4794e3620 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -972,9 +972,9 @@ static ARGB sample_bitmap_pixel(GDIPCONST GpRect *src_rect, LPBYTE bits, UINT wi { /* Tiling. Make sure co-ordinates are positive as it simplifies the math. */ if (x < 0) - x = width*2 + x % (width * 2); + x = width*2 + x % (INT)(width * 2); if (y < 0) - y = height*2 + y % (height * 2); + y = height*2 + y % (INT)(height * 2); if (attributes->wrap & WrapModeTileFlipX) {

1 0

Zebediah Figura : winemac: Send systray messages with SendNotifyMessage().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 46c4facab73558af8e9d1c96093656ce06cdf51b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46c4facab73558af8e9d1c96… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 30 13:54:32 2021 -0600 winemac: Send systray messages with SendNotifyMessage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 90d2430869d..dbddbddff9a 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -290,7 +290,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) } TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); - if (!PostMessageW(icon->owner, icon->callback_message, wp, lp) && + if (!SendNotifyMessageW(icon->owner, icon->callback_message, wp, lp) && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id);

1 0

Floris Renaud : po: Fix Dutch spelling errors.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: b36f626e4c34a1f2ef47a9967f59ab27fbfc0e25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b36f626e4c34a1f2ef47a996… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Sat Jan 30 22:51:57 2021 +0100 po: Fix Dutch spelling errors. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/po/nl.po b/po/nl.po index c4012a6cb0b..27ef0b5aaba 100644 --- a/po/nl.po +++ b/po/nl.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: 2021-01-26 12:00+0100\n" +"PO-Revision-Date: 2021-01-30 22:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "De volgende software kan automatisch verwijderd worden. Om een programma te " "verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de " -"lijst en druk op Wijzigen/Verwijderen." +"lijst en druk op Wijzigen of Verwijderen." #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -7018,7 +7018,7 @@ msgstr "De sink is niet voltooid.\n" #: dlls/mferror/mferror.mc:732 msgid "Clock was stopped\n" -msgstr "Klok is gestopt.\n" +msgstr "Klok is gestopt\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7844,7 +7844,7 @@ msgstr "Dienst: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Bestand: [1], Map: [9], Grootte: [6]" +msgstr "Bestand: [1], Map: [9], Grootte: [6]" #: dlls/msi/msi.rc:168 msgid "Found application: [1]" @@ -7860,7 +7860,7 @@ msgstr "Dienst: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "Bestand: [1], Afhankelijkheden: [2]" +msgstr "Bestand: [1], Afhankelijkheden: [2]" #: dlls/msi/msi.rc:173 msgid "Application: [1]" @@ -7872,7 +7872,7 @@ msgstr "Toepassingscontext:[1], Assemblynaam:[2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "Bestand: [1], Map: [2], Grootte: [3]" +msgstr "Bestand: [1], Map: [2], Grootte: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" @@ -7924,7 +7924,7 @@ msgstr "Programma: [1], Opdrachtregel: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "Bestand: [1], Selectie: [2], Sleutel: [3], Waarde; [4]" +msgstr "Bestand: [1], Selectie: [2], Sleutel: [3], Waarde; [4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" @@ -9336,7 +9336,7 @@ msgstr "Ja op &alles" #: dlls/shell32/shell32.rc:319 msgid "About %s" -msgstr "Info %s" +msgstr "Over %s" #: dlls/shell32/shell32.rc:323 msgid "Wine &license" @@ -9794,6 +9794,7 @@ msgstr "" "binnen de voorwaarden van de GNU Lesser General Public License zoals " "gepubliceerd door de Free Software Foundation; versie 2.1 van de licentie, " "of (naar keuze) een latere versie.\n" +"\n" "Wine is gemaakt in de hoop dat het nuttig is, maar komt met GEEN ENKELE " "GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID of " "GESCHIKTHEID VOOR EEN BEPAALD DOEL. Lees de GNU Lesser General Public " @@ -12307,8 +12308,7 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE toont een bericht op het scherm waarin de gebruiker word gevraagd een\n" -"toets in te drukken.\n" +"PAUSE toont een bericht waarin wordt gevraagd een toets in te drukken.\n" "\n" "Dit is vooral handig in batchbestanden om de gebruiker in staat te stellen\n" "om de uitvoer van een voorafgaande opdracht te bekijken, voordat het van\n" @@ -15040,7 +15040,8 @@ msgid "" msgstr "" "Wine DLL Registratie Hulpprogramma\n" "\n" -"Biedt DLL-registratiediensten\n" +"Biedt DLL-registratiediensten.\n" +"\n" #: programs/regsvr32/regsvr32.rc:40 msgid "" @@ -16778,7 +16779,7 @@ msgstr "&Naam wijzigen..." #: programs/winefile/winefile.rc:34 msgid "Propert&ies\tAlt+Enter" -msgstr "&Eigenschappent\tAlt+Enter" +msgstr "&Eigenschappen\tAlt+Enter" #: programs/winefile/winefile.rc:38 msgid "Cr&eate Directory..."

1 0

Zebediah Figura : explorer: Send systray messages with SendNotifyMessage().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 7eca09d7e06ec9961c81140e717b261c07080159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eca09d7e06ec9961c81140e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 30 13:54:31 2021 -0600 explorer: Send systray messages with SendNotifyMessage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 5f4fc60dbf3..161b4b57e58 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -731,7 +731,7 @@ static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt ) } TRACE( "relaying 0x%x\n", msg ); - if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) && + if (!SendNotifyMessageW( icon->owner, icon->callback_message, wp, lp ) && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN( "application window was destroyed, removing icon %u\n", icon->id );

1 0

Zebediah Figura : winegstreamer: Duplicate the file size into struct wg_parser.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: cde11289bf71120d7b7458c4679a401ab8276815 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cde11289bf71120d7b7458c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 23:58:07 2021 -0600 winegstreamer: Duplicate the file size into struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f8ff0bcdf4f..734984d7fed 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -52,7 +52,7 @@ struct wg_parser GstBus *bus; GstPad *my_src, *their_sink; - guint64 start_offset, next_offset, stop_offset; + guint64 file_size, start_offset, next_offset, stop_offset; }; struct parser @@ -67,7 +67,7 @@ struct parser unsigned int source_count; BOOL enum_sink_first; - LONGLONG filesize; + LONGLONG file_size; struct wg_parser *wg_parser; @@ -847,7 +847,7 @@ static void *push_data(void *iface) return NULL; } - maxlen = parser->stop_offset ? parser->stop_offset : This->filesize; + maxlen = parser->stop_offset ? parser->stop_offset : parser->file_size; for (;;) { ULONG len; @@ -1151,12 +1151,13 @@ static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, Gs if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->next_pull_offset; - if (ofs >= This->filesize) { + if (ofs >= This->file_size) + { WARN("Reading past eof: %s, %u\n", wine_dbgstr_longlong(ofs), len); return GST_FLOW_EOS; } - if (len + ofs > This->filesize) - len = This->filesize - ofs; + if (len + ofs > This->file_size) + len = This->file_size - ofs; This->next_pull_offset = ofs + len; gst_buffer_map(buffer, &info, GST_MAP_WRITE); @@ -1390,6 +1391,7 @@ static void existing_new_pad(GstElement *bin, GstPad *pad, gpointer user) static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) { struct parser *This = gst_pad_get_element_private(pad); + struct wg_parser *parser = This->wg_parser; GstFormat format; GST_LOG("filter %p, type %s.", This, GST_QUERY_TYPE_NAME(query)); @@ -1404,7 +1406,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) } else if (format == GST_FORMAT_BYTES) { - gst_query_set_duration(query, GST_FORMAT_BYTES, This->filesize); + gst_query_set_duration(query, GST_FORMAT_BYTES, parser->file_size); return TRUE; } return FALSE; @@ -1415,7 +1417,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) GST_WARNING("Cannot seek using format \"%s\".", gst_format_get_name(format)); return FALSE; } - gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, This->filesize); + gst_query_set_seeking(query, GST_FORMAT_BYTES, 1, 0, parser->file_size); return TRUE; case GST_QUERY_SCHEDULING: gst_query_set_scheduling(query, GST_SCHEDULING_FLAG_SEEKABLE, 1, -1, 0); @@ -1577,7 +1579,8 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); - IAsyncReader_Length(This->reader, &This->filesize, &avail); + IAsyncReader_Length(This->reader, &This->file_size, &avail); + parser->file_size = This->file_size; This->sink_connected = true;

1 0

Zebediah Figura : winegstreamer: Move the push offset tracking fields to struct wg_parser.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: c45d4bcec398baf9b53ed96ae9d2a3f6218eff26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c45d4bcec398baf9b53ed96a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 23:58:06 2021 -0600 winegstreamer: Move the push offset tracking fields to struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 377f548d806..f8ff0bcdf4f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -51,6 +51,8 @@ struct wg_parser GstElement *container; GstBus *bus; GstPad *my_src, *their_sink; + + guint64 start_offset, next_offset, stop_offset; }; struct parser @@ -74,7 +76,7 @@ struct parser * separate lock. */ bool streaming, flushing, sink_connected; - guint64 start, nextofs, nextpullofs, stop; + uint64_t next_pull_offset; pthread_mutex_t mutex; pthread_cond_t init_cond; @@ -656,7 +658,7 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) gst_pad_set_active(parser->my_src, 1); } - This->nextofs = This->start = cur; + parser->next_offset = parser->start_offset = cur; /* and prepare to continue streaming */ if (flush) { @@ -845,23 +847,23 @@ static void *push_data(void *iface) return NULL; } - maxlen = This->stop ? This->stop : This->filesize; + maxlen = parser->stop_offset ? parser->stop_offset : This->filesize; for (;;) { ULONG len; int ret; - if (This->nextofs >= maxlen) + if (parser->next_offset >= maxlen) break; - len = min(16384, maxlen - This->nextofs); + len = min(16384, maxlen - parser->next_offset); - if ((ret = request_buffer_src(parser->my_src, NULL, This->nextofs, len, &buffer)) < 0) + if ((ret = request_buffer_src(parser->my_src, NULL, parser->next_offset, len, &buffer)) < 0) { GST_ERROR("Failed to read data, ret %s.", gst_flow_get_name(ret)); break; } - This->nextofs += len; + parser->next_offset += len; buffer->duration = buffer->pts = -1; if ((ret = gst_pad_push(parser->my_src, buffer)) < 0) @@ -1148,14 +1150,14 @@ static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, Gs TRACE("filter %p, offset %s, length %u, buffer %p.\n", This, wine_dbgstr_longlong(ofs), len, buffer); if (ofs == GST_BUFFER_OFFSET_NONE) - ofs = This->nextpullofs; + ofs = This->next_pull_offset; if (ofs >= This->filesize) { WARN("Reading past eof: %s, %u\n", wine_dbgstr_longlong(ofs), len); return GST_FLOW_EOS; } if (len + ofs > This->filesize) len = This->filesize - ofs; - This->nextpullofs = ofs + len; + This->next_pull_offset = ofs + len; gst_buffer_map(buffer, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); @@ -1429,6 +1431,7 @@ static gboolean query_function(GstPad *pad, GstObject *parent, GstQuery *query) static gboolean activate_push(GstPad *pad, gboolean activate) { struct parser *This = gst_pad_get_element_private(pad); + struct wg_parser *parser = This->wg_parser; if (!activate) { if (This->push_thread) { @@ -1436,7 +1439,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) This->push_thread = 0; } if (This->filter.state == State_Stopped) - This->nextofs = This->start; + parser->next_offset = parser->start_offset; } else if (!This->push_thread) { int ret; @@ -1596,7 +1599,8 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) gst_pad_set_event_function(parser->my_src, event_src); gst_pad_set_element_private (parser->my_src, This); - This->start = This->nextofs = This->nextpullofs = This->stop = 0; + parser->start_offset = parser->next_offset = parser->stop_offset = 0; + This->next_pull_offset = 0; if (!This->init_gst(This)) return E_FAIL; @@ -1620,7 +1624,8 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) pthread_mutex_unlock(&This->mutex); - This->nextofs = This->nextpullofs = 0; + parser->next_offset = 0; + This->next_pull_offset = 0; return S_OK; }

1 0

Zebediah Figura : winegstreamer: Move the "my_src" and "their_sink" fields to struct wg_parser.
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 69bd54a53da358e734ad945e7b3c6a43a4debb5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=69bd54a53da358e734ad945e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 29 23:58:05 2021 -0600 winegstreamer: Move the "my_src" and "their_sink" fields to struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 54 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2bd6622b889..377f548d806 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -50,6 +50,7 @@ struct wg_parser { GstElement *container; GstBus *bus; + GstPad *my_src, *their_sink; }; struct parser @@ -73,7 +74,6 @@ struct parser * separate lock. */ bool streaming, flushing, sink_connected; - GstPad *my_src, *their_sink; guint64 start, nextofs, nextpullofs, stop; pthread_mutex_t mutex; @@ -623,6 +623,7 @@ static gboolean query_sink(GstPad *pad, GstObject *parent, GstQuery *query) static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) { + struct wg_parser *parser = This->wg_parser; gboolean res = TRUE; gdouble rate; GstFormat seek_format; @@ -650,9 +651,9 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) if (flush) { tevent = gst_event_new_flush_start(); gst_event_set_seqnum(tevent, seqnum); - gst_pad_push_event(This->my_src, tevent); + gst_pad_push_event(parser->my_src, tevent); if (thread) - gst_pad_set_active(This->my_src, 1); + gst_pad_set_active(parser->my_src, 1); } This->nextofs = This->start = cur; @@ -661,9 +662,9 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) if (flush) { tevent = gst_event_new_flush_stop(TRUE); gst_event_set_seqnum(tevent, seqnum); - gst_pad_push_event(This->my_src, tevent); + gst_pad_push_event(parser->my_src, tevent); if (thread) - gst_pad_set_active(This->my_src, 1); + gst_pad_set_active(parser->my_src, 1); } return res; @@ -832,6 +833,7 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 static void *push_data(void *iface) { struct parser *This = iface; + struct wg_parser *parser = This->wg_parser; GstBuffer *buffer; LONGLONG maxlen; @@ -853,7 +855,7 @@ static void *push_data(void *iface) break; len = min(16384, maxlen - This->nextofs); - if ((ret = request_buffer_src(This->my_src, NULL, This->nextofs, len, &buffer)) < 0) + if ((ret = request_buffer_src(parser->my_src, NULL, This->nextofs, len, &buffer)) < 0) { GST_ERROR("Failed to read data, ret %s.", gst_flow_get_name(ret)); break; @@ -862,7 +864,7 @@ static void *push_data(void *iface) This->nextofs += len; buffer->duration = buffer->pts = -1; - if ((ret = gst_pad_push(This->my_src, buffer)) < 0) + if ((ret = gst_pad_push(parser->my_src, buffer)) < 0) { GST_ERROR("Failed to push data, ret %s.", gst_flow_get_name(ret)); break; @@ -871,7 +873,7 @@ static void *push_data(void *iface) gst_buffer_unref(buffer); - gst_pad_push_event(This->my_src, gst_event_new_eos()); + gst_pad_push_event(parser->my_src, gst_event_new_eos()); GST_DEBUG("Stopping push thread."); @@ -1587,12 +1589,12 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) parser->container = gst_bin_new(NULL); gst_element_set_bus(parser->container, parser->bus); - This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); - gst_pad_set_getrange_function(This->my_src, request_buffer_src); - gst_pad_set_query_function(This->my_src, query_function); - gst_pad_set_activatemode_function(This->my_src, activate_mode); - gst_pad_set_event_function(This->my_src, event_src); - gst_pad_set_element_private (This->my_src, This); + parser->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); + gst_pad_set_getrange_function(parser->my_src, request_buffer_src); + gst_pad_set_query_function(parser->my_src, query_function); + gst_pad_set_activatemode_function(parser->my_src, activate_mode); + gst_pad_set_event_function(parser->my_src, event_src); + gst_pad_set_element_private (parser->my_src, This); This->start = This->nextofs = This->nextpullofs = This->stop = 0; @@ -1854,13 +1856,13 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); - filter->their_sink = gst_element_get_static_pad(element, "sink"); + parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&filter->mutex); filter->no_more_pads = filter->error = false; pthread_mutex_unlock(&filter->mutex); - if ((ret = gst_pad_link(filter->my_src, filter->their_sink)) < 0) + if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { ERR("Failed to link pads, error %d.\n", ret); return FALSE; @@ -2511,10 +2513,10 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) pthread_mutex_unlock(&This->mutex); gst_element_set_state(parser->container, GST_STATE_NULL); - gst_pad_unlink(This->my_src, This->their_sink); - gst_object_unref(This->my_src); - gst_object_unref(This->their_sink); - This->my_src = This->their_sink = NULL; + gst_pad_unlink(parser->my_src, parser->their_sink); + gst_object_unref(parser->my_src); + gst_object_unref(parser->their_sink); + parser->my_src = parser->their_sink = NULL; /* read_thread() needs to stay alive to service any read requests GStreamer * sends, so we can only shut it down after GStreamer stops. */ @@ -2606,8 +2608,8 @@ static BOOL wave_parser_init_gst(struct parser *filter) gst_bin_add(GST_BIN(parser->container), element); - filter->their_sink = gst_element_get_static_pad(element, "sink"); - if ((ret = gst_pad_link(filter->my_src, filter->their_sink)) < 0) + parser->their_sink = gst_element_get_static_pad(element, "sink"); + if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { ERR("Failed to link sink pads, error %d.\n", ret); return FALSE; @@ -2723,13 +2725,13 @@ static BOOL avi_splitter_init_gst(struct parser *filter) g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad), filter); g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); - filter->their_sink = gst_element_get_static_pad(element, "sink"); + parser->their_sink = gst_element_get_static_pad(element, "sink"); pthread_mutex_lock(&filter->mutex); filter->no_more_pads = filter->error = false; pthread_mutex_unlock(&filter->mutex); - if ((ret = gst_pad_link(filter->my_src, filter->their_sink)) < 0) + if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { ERR("Failed to link pads, error %d.\n", ret); return FALSE; @@ -2846,8 +2848,8 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) gst_bin_add(GST_BIN(parser->container), element); - filter->their_sink = gst_element_get_static_pad(element, "sink"); - if ((ret = gst_pad_link(filter->my_src, filter->their_sink)) < 0) + parser->their_sink = gst_element_get_static_pad(element, "sink"); + if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { ERR("Failed to link sink pads, error %d.\n", ret); return FALSE;

1 0

Zebediah Figura : winex11: Send systray messages with SendNotifyMessage().
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: 5c09d815f838ec349816840f6992187acd4f72bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c09d815f838ec349816840f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 30 13:54:33 2021 -0600 winex11: Send systray messages with SendNotifyMessage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 952bc1ef266..5522b229836 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -451,7 +451,7 @@ static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam ) } TRACE( "relaying 0x%x\n", msg ); - if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) && + if (!SendNotifyMessageW( icon->owner, icon->callback_message, wp, lp ) && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN( "application window was destroyed, removing icon %u\n", icon->id );

1 0

Zebediah Figura : include: Fix the definition of NOTIFYICON_VERSION[_4].
by Alexandre Julliard Feb. 1, 2021

Feb. 1, 2021

Module: wine Branch: master Commit: d91a87cea22293ea6ca4586fc4f832329b141524 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d91a87cea22293ea6ca4586f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 30 13:54:30 2021 -0600 include: Fix the definition of NOTIFYICON_VERSION[_4]. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/systray.c | 2 +- dlls/winex11.drv/systray.c | 2 +- include/shellapi.h | 4 ++-- programs/explorer/systray.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 75bca5e3d51..90d2430869d 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -283,7 +283,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { wp = MAKEWPARAM(x, y); lp = MAKELPARAM(msg, icon->id); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 3be4bd65347..952bc1ef266 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -441,7 +441,7 @@ static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam ) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { POINT pt = { (short)LOWORD(lparam), (short)HIWORD(lparam) }; diff --git a/include/shellapi.h b/include/shellapi.h index 0f10690f7e0..e02869f14e8 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -378,8 +378,8 @@ void WINAPI WinExecErrorW(HWND hwnd,INT error, LPCWSTR lpstrFileName, LPCWSTR lp #define NIM_SETFOCUS 0x00000003 #define NIM_SETVERSION 0x00000004 -#define NOTIFY_VERSION 3 /* supported by Windows 2000 and later */ -#define NOTIFY_VERSION_4 4 /* supported by Windows Vista */ +#define NOTIFYICON_VERSION 3 +#define NOTIFYICON_VERSION_4 4 /* callback message lParam values */ #define NIN_SELECT (WM_USER+0) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index dcd75f4e763..5f4fc60dbf3 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -723,7 +723,7 @@ static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt ) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { ClientToScreen( tray_window, &pt ); wp = MAKEWPARAM( pt.x, pt.y );

1 0