September 2023 - Wine-Commits

Zebediah Figura : include: Do not import strmif.idl in mediaobj.idl.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: b6d3e2ba0e89f56854bbbb593c73725f002d0b9f URL: https://gitlab.winehq.org/wine/wine/-/commit/b6d3e2ba0e89f56854bbbb593c7372… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 12:40:53 2023 -0500 include: Do not import strmif.idl in mediaobj.idl. This means that mfobjects.idl no longer pulls in mediaobj.idl. Since it still needs AM_MEDIA_TYPE to be declared (though not defined), add a typedef. Reorder includes in a couple files to avoid multiple-definition errors. strmiids and mfplat were getting strmif.h through mfobjects.h, and dsdmo was getting it through dmo.h. --- dlls/dsdmo/main.c | 1 + dlls/mfplat/mediatype.c | 1 + include/mediaobj.idl | 7 ++++++- include/mfapi.h | 1 + libs/strmiids/evr.c | 5 ++++- 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 2393b92185e..0879c4e0516 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -21,6 +21,7 @@ #include "mmreg.h" #include "mmsystem.h" #include "uuids.h" +#include "strmif.h" #include "initguid.h" #include "medparam.h" #include "dsound.h" diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 16854c7a5a4..eed06ef02ef 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -22,6 +22,7 @@ #include "dxva2api.h" #include "uuids.h" +#include "strmif.h" #include "initguid.h" #include "ks.h" #include "ksmedia.h" diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 4c2e4963174..127b95e7fc3 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -19,8 +19,10 @@ import "unknwn.idl"; import "objidl.idl"; -import "strmif.idl"; +cpp_quote("#ifdef __strmif_h__") +cpp_quote("typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE;") +cpp_quote("#else") typedef struct _DMOMediaType { GUID majortype; @@ -34,6 +36,9 @@ typedef struct _DMOMediaType BYTE *pbFormat; } DMO_MEDIA_TYPE; +typedef LONGLONG REFERENCE_TIME; +cpp_quote("#endif") + /***************************************************************************** * IEnumDMO interface */ diff --git a/include/mfapi.h b/include/mfapi.h index 3185fc6944f..105b093893f 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -507,6 +507,7 @@ typedef enum struct tagVIDEOINFOHEADER; typedef struct tagVIDEOINFOHEADER VIDEOINFOHEADER; +typedef struct _AMMediaType AM_MEDIA_TYPE; HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue); diff --git a/libs/strmiids/evr.c b/libs/strmiids/evr.c index 74ec145e4d4..3213b054a46 100644 --- a/libs/strmiids/evr.c +++ b/libs/strmiids/evr.c @@ -16,9 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Don't define those GUIDs here */ +/* strmiids needs guids from evr.idl, but not the rest of the MF guids. + * We also need to avoid redefining the rest of the DirectShow guids from + * strmif.h. */ #include "propidl.h" #include "mfidl.h" +#include "strmif.h" #include "initguid.h"

1 0

Zebediah Figura : dsound: Do not include strmif.h.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: d63acb3b913aac16fd2dba8c0665a26f326c0227 URL: https://gitlab.winehq.org/wine/wine/-/commit/d63acb3b913aac16fd2dba8c0665a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 12:54:14 2023 -0500 dsound: Do not include strmif.h. dsound_private.h pulls in mediaobj.h, which previously pulled in strmif.h. We were including that under the initguid.h, which meant that strmif.h GUIDs were being defined in both dsound_main.o and uuid. Now that mediaobj.h does not pull in strmif.h anymore, we don't need this include. --- dlls/dsound/dsound_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 08c08d841b4..f0ceb2ce0b8 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -52,7 +52,6 @@ #include "unknwn.h" #include "oleidl.h" #include "shobjidl.h" -#include "strmif.h" #include "propkey.h" #include "initguid.h"

1 0

Nikolay Sivov : ntdll/actctx: Accept empty assembly elements.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: a81535d8c995d7c29a084f669842d667ea549c25 URL: https://gitlab.winehq.org/wine/wine/-/commit/a81535d8c995d7c29a084f669842d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 13 14:27:28 2023 +0200 ntdll/actctx: Accept empty assembly elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 770c3751a1c..d468777ac2f 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2521,7 +2521,6 @@ static void test_actctx(void) /* Empty <assembly/> element. */ create_manifest_file("empty_assembly.manifest", empty_assembly_manifest, -1, NULL, NULL); handle = test_create("empty_assembly.manifest"); - todo_wine ok(handle != INVALID_HANDLE_VALUE, "Failed to create activation context.\n"); DeleteFileA("empty_assembly.manifest"); if (handle != INVALID_HANDLE_VALUE) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 853ac34d12e..9f2c1d54720 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2708,12 +2708,15 @@ static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly, } } - if (end || !version) + if (!version) { set_error( xmlbuf ); return; } + if (end) + return; + while (next_xml_elem(xmlbuf, &elem, parent)) { if (assembly->type == APPLICATION_MANIFEST && xml_elem_cmp(&elem, L"noInherit", asmv1W))

1 0

Nikolay Sivov : kernel32/tests: Add activation context test with empty assembly manifest.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: a14c6b737a43c2220cebeb9e2abfeb2be969d220 URL: https://gitlab.winehq.org/wine/wine/-/commit/a14c6b737a43c2220cebeb9e2abfeb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 22 09:35:44 2023 +0200 kernel32/tests: Add activation context test with empty assembly manifest. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/actctx.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index c6796a1ac64..770c3751a1c 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -542,6 +542,8 @@ static const char builtin_dll_manifest[] = " </dependency>" "</assembly>"; +static const char empty_assembly_manifest[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\" />"; DEFINE_GUID(VISTA_COMPAT_GUID, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); DEFINE_GUID(WIN7_COMPAT_GUID, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); @@ -2516,6 +2518,18 @@ static void test_actctx(void) ReleaseActCtx(handle); } + /* Empty <assembly/> element. */ + create_manifest_file("empty_assembly.manifest", empty_assembly_manifest, -1, NULL, NULL); + handle = test_create("empty_assembly.manifest"); + todo_wine + ok(handle != INVALID_HANDLE_VALUE, "Failed to create activation context.\n"); + DeleteFileA("empty_assembly.manifest"); + if (handle != INVALID_HANDLE_VALUE) + { + test_basic_info(handle, __LINE__); + ReleaseActCtx(handle); + } + test_wndclass_section(); test_dllredirect_section(); test_typelib_section();

1 0

Alistair Leslie-Hughes : user32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: fbbcd2b34cb08a114401a738326f975dfb9ea840 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbbcd2b34cb08a114401a738326f97… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 13 18:04:17 2023 +1000 user32: Remove DECLSPEC_HIDDEN usage. --- dlls/user32/controls.h | 48 ++++++++++++++-------------- dlls/user32/dde_private.h | 72 +++++++++++++++++++++--------------------- dlls/user32/user_private.h | 78 +++++++++++++++++++++++----------------------- 3 files changed, 99 insertions(+), 99 deletions(-)

1 0

Alistair Leslie-Hughes : diasymreader: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: 55971cbee7c2ab5dbf1ee1eb74d64be7f5087c99 URL: https://gitlab.winehq.org/wine/wine/-/commit/55971cbee7c2ab5dbf1ee1eb74d64b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 13 18:04:17 2023 +1000 diasymreader: Remove DECLSPEC_HIDDEN usage. --- dlls/diasymreader/diasymreader_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/diasymreader/diasymreader_private.h b/dlls/diasymreader/diasymreader_private.h index 2d05859d447..02a0c35c418 100644 --- a/dlls/diasymreader/diasymreader_private.h +++ b/dlls/diasymreader/diasymreader_private.h @@ -21,4 +21,4 @@ #include "corsym.h" #include "diasymreader.h" -HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; +HRESULT SymWriter_CreateInstance(REFIID iid, void **ppv);

1 0

Alistair Leslie-Hughes : kernel32: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: 016c29ad6e4ddb63902fad0886ab39dad82e170d URL: https://gitlab.winehq.org/wine/wine/-/commit/016c29ad6e4ddb63902fad0886ab39… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 13 18:04:17 2023 +1000 kernel32: Remove DECLSPEC_HIDDEN usage. --- dlls/kernel32/kernel_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 980a12b25a6..3c35a4b1bba 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -40,9 +40,9 @@ static inline BOOL set_ntstatus( NTSTATUS status ) return !status; } -extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; +extern SYSTEM_BASIC_INFORMATION system_info; -extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; -extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; +extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ); +extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ); #endif

1 0

Alistair Leslie-Hughes : wshom.ocx: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: 55ba9b17a42c624c9b3dd57b0a69cbe463841d56 URL: https://gitlab.winehq.org/wine/wine/-/commit/55ba9b17a42c624c9b3dd57b0a69cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 13 18:04:17 2023 +1000 wshom.ocx: Remove DECLSPEC_HIDDEN usage. --- dlls/wshom.ocx/wshom_private.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index 709b8817342..8e7792c871c 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -37,7 +37,7 @@ typedef enum tid_t { LAST_tid } tid_t; -HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo); struct provideclassinfo { IProvideClassInfo IProvideClassInfo_iface; @@ -45,7 +45,7 @@ struct provideclassinfo { const GUID *guid; }; -extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; +extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo); -HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; +HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); +HRESULT WINAPI WshNetworkFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**);

1 0

Alistair Leslie-Hughes : qmgr: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: 47526fbf1342b69eb5344a292f3fc8d441b324e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/47526fbf1342b69eb5344a292f3fc8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 13 18:04:17 2023 +1000 qmgr: Remove DECLSPEC_HIDDEN usage. --- dlls/qmgr/qmgr.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 8d9ccae73ff..cadcad1386f 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -96,23 +96,23 @@ typedef struct IClassFactory IClassFactory_iface; } ClassFactoryImpl; -extern HANDLE stop_event DECLSPEC_HIDDEN; -extern ClassFactoryImpl BITS_ClassFactory DECLSPEC_HIDDEN; -extern BackgroundCopyManagerImpl globalMgr DECLSPEC_HIDDEN; +extern HANDLE stop_event; +extern ClassFactoryImpl BITS_ClassFactory; +extern BackgroundCopyManagerImpl globalMgr; -HRESULT BackgroundCopyManagerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT BackgroundCopyManagerConstructor(LPVOID *ppObj); HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, - GUID *pJobId, BackgroundCopyJobImpl **job) DECLSPEC_HIDDEN; + GUID *pJobId, BackgroundCopyJobImpl **job); HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, - IEnumBackgroundCopyJobs **enumjob) DECLSPEC_HIDDEN; + IEnumBackgroundCopyJobs **enumjob); HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, - BackgroundCopyFileImpl **file) DECLSPEC_HIDDEN; -HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl*, IEnumBackgroundCopyFiles**) DECLSPEC_HIDDEN; -DWORD WINAPI fileTransfer(void *param) DECLSPEC_HIDDEN; -void processJob(BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN; -BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) DECLSPEC_HIDDEN; -BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_STATE to) DECLSPEC_HIDDEN; + BackgroundCopyFileImpl **file); +HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl*, IEnumBackgroundCopyFiles**); +DWORD WINAPI fileTransfer(void *param); +void processJob(BackgroundCopyJobImpl *job); +BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job); +BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_STATE to); /* Little helper functions */ static inline WCHAR *co_strdupW(const WCHAR *src)

1 0

Zebediah Figura : d3dxof: Remove unnecessary includes.
by Alexandre Julliard Sept. 13, 2023

Sept. 13, 2023

Module: wine Branch: master Commit: f0e6bc3521cc7cbb041dbab4a3da40ff8d0767af URL: https://gitlab.winehq.org/wine/wine/-/commit/f0e6bc3521cc7cbb041dbab4a3da40… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 6 12:52:55 2023 -0500 d3dxof: Remove unnecessary includes. And move the remaining common ones to d3dxof_private.h, as is usual practice with d3d dlls. --- dlls/d3dxof/d3dxof.c | 10 ---------- dlls/d3dxof/d3dxof_private.h | 6 +++--- dlls/d3dxof/main.c | 18 ------------------ dlls/d3dxof/parsing.c | 11 ----------- 4 files changed, 3 insertions(+), 42 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 41614d117fe..9ed02e1bdf9 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#define COBJMACROS - -#include "winbase.h" -#include "wingdi.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); WINE_DECLARE_DEBUG_CHANNEL(d3dxof_dump); diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index ff29261b608..babc37085e8 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -21,15 +21,15 @@ #ifndef __D3DXOF_PRIVATE_INCLUDED__ #define __D3DXOF_PRIVATE_INCLUDED__ +#define COBJMACROS #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" #include "dxfile.h" +#include "wine/debug.h" + #define MAX_NAME_LEN 40 #define MAX_ARRAY_DIM 4 #define MAX_MEMBERS 50 diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 080545c4387..a3a3358dbd4 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <string.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "winerror.h" - -#include "ole2.h" -#include "rpcproxy.h" -#include "uuids.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index c853060dea1..c87517c0f15 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -18,18 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/debug.h" - -#define COBJMACROS - -#include "winbase.h" -#include "wingdi.h" -#include "winternl.h" - #include "d3dxof_private.h" -#include "dxfile.h" - -#include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(d3dxof_parsing);

1 0