February 2021 - Wine-commits

Alexandre Julliard : esent: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: b3bb24ef31df51cb1597f2ed80591b1685ed11a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3bb24ef31df51cb1597f2ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:43:45 2021 +0100 esent: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/esent/Makefile.in | 5 +---- dlls/esent/esent_main.c | 37 ------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/esent/Makefile.in b/dlls/esent/Makefile.in index b789ee2a65c..c06056b22af 100644 --- a/dlls/esent/Makefile.in +++ b/dlls/esent/Makefile.in @@ -1,6 +1,3 @@ MODULE = esent.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - esent_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/esent/esent_main.c b/dlls/esent/esent_main.c deleted file mode 100644 index f555676f422..00000000000 --- a/dlls/esent/esent_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2015 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "windows.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(esent); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : feclient: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 0708c658f6a742aef9a373c8007c9c5d34d3a0ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=0708c658f6a742aef9a373c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:43:59 2021 +0100 feclient: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/feclient/Makefile.in | 5 +---- dlls/feclient/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in index 0ca446d3620..ce3fb7e491e 100644 --- a/dlls/feclient/Makefile.in +++ b/dlls/feclient/Makefile.in @@ -1,6 +1,3 @@ MODULE = feclient.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c deleted file mode 100644 index ef49494da7c..00000000000 --- a/dlls/feclient/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * feclient API - * - * Copyright 2016 Michael Müller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(feclient); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : hid: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 30e7c49a7f1ce3a979bd34e7ff0911cccaff6ef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e7c49a7f1ce3a979bd34e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:44:18 2021 +0100 hid: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/Makefile.in | 5 ++--- dlls/hid/hidd.c | 1 + dlls/hid/main.c | 44 -------------------------------------------- 3 files changed, 3 insertions(+), 47 deletions(-) diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in index c9ae5f0e567..0146ebd8102 100644 --- a/dlls/hid/Makefile.in +++ b/dlls/hid/Makefile.in @@ -1,11 +1,10 @@ MODULE = hid.dll IMPORTLIB = hid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ hidd.c \ - hidp.c \ - main.c + hidp.c RC_SRCS = version.rc diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 4bb4deb48b3..684ad5b5df8 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -32,6 +32,7 @@ #include "ddk/wdm.h" #include "hidusage.h" +#include "initguid.h" #include "ddk/hidclass.h" #include "ddk/hidsdi.h" diff --git a/dlls/hid/main.c b/dlls/hid/main.c deleted file mode 100644 index 6c53f118582..00000000000 --- a/dlls/hid/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Human Input Devices - * - * Copyright (C) 2006 Kevin Koltzau - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -#include "wine/debug.h" -#include "initguid.h" -#include "ddk/hidclass.h" - -/***********************************************************************/ - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : ksuser: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 52c4a49a73fca980f24f8826be6f88e422195041 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52c4a49a73fca980f24f8826… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:44:32 2021 +0100 ksuser: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ksuser/Makefile.in | 5 +---- dlls/ksuser/main.c | 37 ------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/ksuser/Makefile.in b/dlls/ksuser/Makefile.in index c5e8251fb23..c83a9556073 100644 --- a/dlls/ksuser/Makefile.in +++ b/dlls/ksuser/Makefile.in @@ -1,8 +1,5 @@ MODULE = ksuser.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/ksuser/main.c b/dlls/ksuser/main.c deleted file mode 100644 index df8e1a19325..00000000000 --- a/dlls/ksuser/main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2014 Stefan Leichter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" - -static HINSTANCE instance; - -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance = hinst; - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : mapistub: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 2b5151f751ce3566816ec254eddacc02a4c055fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5151f751ce3566816ec254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:44:44 2021 +0100 mapistub: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapistub/Makefile.in | 5 +---- dlls/mapistub/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/mapistub/Makefile.in b/dlls/mapistub/Makefile.in index 63e06a4984a..20d740b1be6 100644 --- a/dlls/mapistub/Makefile.in +++ b/dlls/mapistub/Makefile.in @@ -1,6 +1,3 @@ MODULE = mapistub.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mapistub/main.c b/dlls/mapistub/main.c deleted file mode 100644 index d1d81170f06..00000000000 --- a/dlls/mapistub/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2009 Louis Lenders - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mapistub); - -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %p)\n", hinst, reason, reserved); - - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : mscat32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 1ea7ddf8c6587b8baf6c4ff7cc4595d2f0a58fd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ea7ddf8c6587b8baf6c4ff7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:45:01 2021 +0100 mscat32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscat32/Makefile.in | 5 +---- dlls/mscat32/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/mscat32/Makefile.in b/dlls/mscat32/Makefile.in index 4ccaf8c42c8..cc53ef65cc1 100644 --- a/dlls/mscat32/Makefile.in +++ b/dlls/mscat32/Makefile.in @@ -1,7 +1,4 @@ MODULE = mscat32.dll IMPORTS = wintrust -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mscat32/main.c b/dlls/mscat32/main.c deleted file mode 100644 index 8408070282c..00000000000 --- a/dlls/mscat32/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* mscat32.dll - Backend for Microsoft's MakeCat command-line tool - * - * Copyright (C) 2007 Alexander N. Sørnes <alex(a)thehandofagony.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mscat); - - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ - - if (fdwReason == DLL_PROCESS_ATTACH) - { - DisableThreadLibraryCalls( hinstDLL ); - } - - return TRUE; -}

1 0

Alexandre Julliard : mscorwks: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 9d1f13438f523a7799631c0324b5ecbaf83eeea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1f13438f523a7799631c03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:45:17 2021 +0100 mscorwks: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscorwks/Makefile.in | 5 +---- dlls/mscorwks/mscorwks_main.c | 36 ------------------------------------ 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in index 42a6238a9a9..91d8823d971 100644 --- a/dlls/mscorwks/Makefile.in +++ b/dlls/mscorwks/Makefile.in @@ -1,6 +1,3 @@ MODULE = mscorwks.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - mscorwks_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/mscorwks/mscorwks_main.c b/dlls/mscorwks/mscorwks_main.c deleted file mode 100644 index ac7708087f6..00000000000 --- a/dlls/mscorwks/mscorwks_main.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * .NET workstation runtime - * - * Copyright 2019 Zebediah Figura for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - } - - return TRUE; -}

1 0

Alexandre Julliard : msdelta: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 5984b855b937c3378f23ac44e84f1c6e0e1c1c71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5984b855b937c3378f23ac44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:45:30 2021 +0100 msdelta: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdelta/Makefile.in | 5 +---- dlls/msdelta/msdelta_main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/msdelta/Makefile.in b/dlls/msdelta/Makefile.in index 84dae3d114e..5f26bb04dde 100644 --- a/dlls/msdelta/Makefile.in +++ b/dlls/msdelta/Makefile.in @@ -1,6 +1,3 @@ MODULE = msdelta.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - msdelta_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdelta/msdelta_main.c b/dlls/msdelta/msdelta_main.c deleted file mode 100644 index 5ae82061bd6..00000000000 --- a/dlls/msdelta/msdelta_main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2015 Andrew Eikum for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msdelta); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Esme Povirk : mscoree: Remove individual vtable fixup traces.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 09d573cee83eea2e1a34fbd0cee7b2800613c962 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09d573cee83eea2e1a34fbd0… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed Feb 17 16:02:17 2021 -0600 mscoree: Remove individual vtable fixup traces. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index cf8acae09e0..51522c57d83 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1319,7 +1319,6 @@ static void CDECL ReallyFixupVTable(struct dll_fixup *fixup) ULONG_PTR *tokens = fixup->tokens; for (i=0; i<fixup->fixup->count; i++) { - TRACE("%#lx\n", tokens[i]); vtable[i] = mono_marshal_get_vtfixup_ftnptr( image, tokens[i], fixup->fixup->type); } @@ -1363,7 +1362,6 @@ static void FixupVTableEntry(HMODULE hmodule, VTableFixup *vtable_fixup) fixup->vtable = (BYTE*)hmodule + vtable_fixup->rva; fixup->done = FALSE; - TRACE("vtable_fixup->type=0x%x\n",vtable_fixup->type); #if __x86_64__ if (vtable_fixup->type & COR_VTABLE_64BIT) #else

1 0

Zebediah Figura : winegstreamer: Move GST_BUFFER_OFFSET_NONE handling to the Unix library.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: e9800b1cbca5dd44759f540673012a3b0b72f921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9800b1cbca5dd44759f5406… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 17 17:30:32 2021 -0600 winegstreamer: Move GST_BUFFER_OFFSET_NONE handling to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 6 ------ dlls/winegstreamer/wg_parser.c | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 33c87f2c1ec..2ac10ee37d3 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -145,6 +145,7 @@ struct wg_parser GstPad *my_src, *their_sink; guint64 file_size, start_offset, next_offset, stop_offset; + guint64 next_pull_offset; pthread_t push_thread; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4e476c78e9e..a4164ab643b 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -66,8 +66,6 @@ struct parser * separate lock. */ bool streaming, sink_connected; - uint64_t next_pull_offset; - HANDLE read_thread; BOOL (*init_gst)(struct parser *filter); @@ -796,8 +794,6 @@ 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->next_pull_offset; if (ofs >= This->file_size) { WARN("Reading past eof: %s, %u\n", wine_dbgstr_longlong(ofs), len); @@ -805,7 +801,6 @@ static GstFlowReturn read_buffer(struct parser *This, guint64 ofs, guint len, Gs } 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); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); @@ -998,7 +993,6 @@ static HRESULT parser_sink_connect(struct strmbase_sink *iface, IPin *peer, cons filter->sink_connected = true; filter->read_thread = CreateThread(NULL, 0, read_thread, filter, 0, NULL); - filter->next_pull_offset = 0; if (FAILED(hr = unix_funcs->wg_parser_connect(filter->wg_parser, filter->file_size))) goto err; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 96c6fc1e715..f2f878ffabc 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -989,6 +989,10 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + if (offset == GST_BUFFER_OFFSET_NONE) + offset = parser->next_pull_offset; + parser->next_pull_offset = offset + size; + if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); @@ -1325,6 +1329,7 @@ static HRESULT CDECL wg_parser_connect(struct wg_parser *parser, uint64_t file_s gst_pad_set_element_private(parser->my_src, parser); parser->start_offset = parser->next_offset = parser->stop_offset = 0; + parser->next_pull_offset = 0; if (!parser->init_gst(parser)) return E_FAIL;

1 0