Alex Henrie : dmloader: Don't force a calling convention on internal functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: be666ef4228b156dec8946d4f5f3211783dcc153
URL:    https://gitlab.winehq.org/wine/wine/-/commit/be666ef4228b156dec8946d4f5f3211...

Author: Alex Henrie 
Date:   Mon Nov 21 20:54:30 2022 -0700

dmloader: Don't force a calling convention on internal functions.

---

dlls/dmloader/container.c        |  2 +-
 dlls/dmloader/dmloader_main.c    |  2 +-
 dlls/dmloader/dmloader_private.h | 10 +++++-----
 dlls/dmloader/loader.c           |  2 +-
 dlls/dmloader/loaderstream.c     |  6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index 111c0db4760..f2b284e1cb3 100644
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -647,7 +647,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
 };

/* for ClassFactory */
-HRESULT WINAPI create_dmcontainer(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmcontainer(REFIID lpcGUID, void **ppobj)
 {
    IDirectMusicContainerImpl* obj;
         HRESULT hr;
diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c
index 61aa092b5f8..512e6102d86 100644
--- a/dlls/dmloader/dmloader_main.c
+++ b/dlls/dmloader/dmloader_main.c
@@ -40,7 +40,7 @@ LONG module_ref = 0;

typedef struct {
     IClassFactory IClassFactory_iface;
-    HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv);
+    HRESULT (*fnCreateInstance)(REFIID riid, void **ppv);
 } IClassFactoryImpl;

/******************************************************************
diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h
index 94bb9ddf1bd..47994a48c4e 100644
--- a/dlls/dmloader/dmloader_private.h
+++ b/dlls/dmloader/dmloader_private.h
@@ -62,11 +62,11 @@ typedef struct IDirectMusicLoaderGenericStream  IDirectMusicLoaderGenericStream;
 /*****************************************************************************
  * Creation helpers
  */
-extern HRESULT WINAPI create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN;
+extern HRESULT create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN;
+extern HRESULT DMUSIC_CreateDirectMusicLoaderFileStream(void **ppobj) DECLSPEC_HIDDEN;
+extern HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream(void **ppobj) DECLSPEC_HIDDEN;
+extern HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream(void **ppobj) DECLSPEC_HIDDEN;

/*****************************************************************************
  * IDirectMusicLoaderFileStream implementation structure
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 0bb22a406ab..6c4b29ab5ea 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -903,7 +903,7 @@ static HRESULT DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) {
 }

/* for ClassFactory */
-HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj)
+HRESULT create_dmloader(REFIID lpcGUID, void **ppobj)
 {
    IDirectMusicLoaderImpl *obj;
    DMUS_OBJECTDESC Desc;
diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c
index 864c222e118..38862c0fec7 100644
--- a/dlls/dmloader/loaderstream.c
+++ b/dlls/dmloader/loaderstream.c
@@ -288,7 +288,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtb
    IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoader
 };

-HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID* ppobj) {
+HRESULT DMUSIC_CreateDirectMusicLoaderFileStream (void** ppobj) {
    IDirectMusicLoaderFileStream *obj;

TRACE("(%p)\n", ppobj);
@@ -545,7 +545,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader
    IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_GetLoader
 };

-HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID* ppobj) {
+HRESULT DMUSIC_CreateDirectMusicLoaderResourceStream (void** ppobj) {
    IDirectMusicLoaderResourceStream *obj;

TRACE("(%p)\n", ppobj);
@@ -797,7 +797,7 @@ static const IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_
    IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_GetLoader
 };

-HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID* ppobj) {
+HRESULT DMUSIC_CreateDirectMusicLoaderGenericStream (void** ppobj) {
    IDirectMusicLoaderGenericStream *obj;

TRACE("(%p)\n", ppobj);