Fixed duplication of definitions between shlwapi.h and

include/Makefile.in

@@ -168,7 +168,6 @@ INSTALLED_INCLUDES = \
 	wine/obj_picture.h \
 	wine/obj_property.h \
 	wine/obj_propertystorage.h \
-	wine/obj_queryassociations.h \
 	wine/obj_serviceprovider.h \
 	wine/obj_shellbrowser.h \
 	wine/obj_shellextinit.h \

include/shlguid.h

@@ -96,4 +96,7 @@ DEFINE_GUID(CLSID_RecycleBin, 0x645FF040, 0x5081, 0x101B, 0x9F, 0x08, 0x00, 0xAA
 DEFINE_GUID(CLSID_ControlPanel, 0x21EC2020, 0x3AEA, 0x1069, 0xA2, 0xDD, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_MyDocuments, 0x450d8fba, 0xad25, 0x11d0, 0x98, 0xa8, 0x08, 0x00, 0x36, 0x1b, 0x11, 0x03);
+
+DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57);
+
 #endif /* __WINE_SHLGUID_H */

include/shlwapi.h

@@ -21,6 +21,8 @@
 #ifndef __WINE_SHLWAPI_H
 #define __WINE_SHLWAPI_H
 
+#include "objbase.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* defined(__cplusplus) */
@@ -235,6 +237,30 @@ typedef enum
     ASSOCENUM_NONE
 } ASSOCENUM;
 
+typedef struct IQueryAssociations IQueryAssociations,*LPQUERYASSOCIATIONS;
+
+#define ICOM_INTERFACE IQueryAssociations
+#define IQueryAssociations_METHODS \
+    ICOM_METHOD4 (HRESULT, Init, ASSOCF, flags, LPCWSTR, pszAssoc, HKEY, hkProgid, HWND, hwnd) \
+    ICOM_METHOD5 (HRESULT, GetString, ASSOCF, flags, ASSOCSTR, str, LPCWSTR, pszExtra, LPWSTR, pszOut, DWORD*, pcchOut) \
+    ICOM_METHOD4 (HRESULT, GetKey, ASSOCF, flags, ASSOCKEY, key, LPCWSTR, pszExtra, HKEY*, phkeyOut) \
+    ICOM_METHOD5 (HRESULT, GetData, ASSOCF, flags, ASSOCDATA, data, LPCWSTR, pszExtra, LPVOID, pvOut, DWORD*, pcbOut) \
+    ICOM_METHOD5 (HRESULT, GetEnum, ASSOCF, flags, ASSOCENUM, assocenum, LPCWSTR, pszExtra, REFIID, riid, LPVOID*, ppvOut)
+#define IQueryAssociations_IMETHODS \
+        IUnknown_IMETHODS \
+        IQueryAssociations_METHODS
+ICOM_DEFINE(IQueryAssociations,IUnknown)
+#undef ICOM_INTERFACE
+
+#define IQueryAssociations_QueryInterface(p,a,b)   ICOM_CALL2(QueryInterface,p,a,b)
+#define IQueryAssociations_AddRef(p)               ICOM_CALL(AddRef,p)
+#define IQueryAssociations_Release(p)              ICOM_CALL(Release,p)
+#define IQueryAssociations_Init(p,a,b,c,d)         ICOM_CALL4(Init,p,a,b,c,d)
+#define IQueryAssociations_GetString(p,a,b,c,d,e)  ICOM_CALL5(GetString,p,a,b,c,d,e)
+#define IQueryAssociations_GetKey(p,a,b,c,d)       ICOM_CALL4(GetKey,p,a,b,c,d)
+#define IQueryAssociations_GetData(p,a,b,c,d,e)    ICOM_CALL5(GetData,p,a,b,c,d,e)
+#define IQueryAssociations_GetEnum(p,a,b,c,d,e)    ICOM_CALL5(GetEnum,p,a,b,c,d,e)
+
 HRESULT WINAPI AssocCreate(CLSID,REFIID,LPVOID*);
 
 HRESULT WINAPI AssocQueryStringA(ASSOCF,ASSOCSTR,LPCSTR,LPCSTR,LPSTR,LPDWORD);

include/wine/obj_queryassociations.h

-/*
- *    IQueryAssociations
- *
- * Copyright (C) 2000 Juergen Schmied
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __WINE_WINE_OBJ_QUERYASSOCIATIONS_H
-#define __WINE_WINE_OBJ_QUERYASSOCIATIONS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* defined(__cplusplus) */
-
-DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57);
-
-typedef struct IQueryAssociations IQueryAssociations,*LPQUERYASSOCIATIONS;
-
-#define ASSOCF_INIT_BYEXENAME		0x00000002
-#define ASSOCF_OPEN_BYEXENAME		0x00000002
-#define ASSOCF_INIT_DEFAULTTOSTAR	0x00000004
-#define ASSOCF_INIT_DEFAULTTOFOLDER	0x00000008
-#define ASSOCF_NOUSERSETTINGS		0x00000010
-#define ASSOCF_NOTRUNCATE		0x00000020
-#define ASSOCF_VERIFY			0x00000040
-#define ASSOCF_REMAPRUNDLL		0x00000080
-#define ASSOCF_NOFIXUPS			0x00000100
-#define ASSOCF_IGNOREBASECLASS		0x00000200
-
-typedef DWORD ASSOCF;
-
-typedef enum
-{
-	ASSOCSTR_COMMAND      = 1,
-	ASSOCSTR_EXECUTABLE,
-	ASSOCSTR_FRIENDLYDOCNAME,
-	ASSOCSTR_FRIENDLYAPPNAME,
-	ASSOCSTR_NOOPEN,
-	ASSOCSTR_SHELLNEWVALUE,
-	ASSOCSTR_DDECOMMAND,
-	ASSOCSTR_DDEIFEXEC,
-	ASSOCSTR_DDEAPPLICATION,
-	ASSOCSTR_DDETOPIC,
-	ASSOCSTR_MAX
-} ASSOCSTR;
-
-typedef enum
-{
-	ASSOCKEY_SHELLEXECCLASS = 1,
-	ASSOCKEY_APP,
-	ASSOCKEY_CLASS,
-	ASSOCKEY_BASECLASS,
-	ASSOCKEY_MAX
-} ASSOCKEY;
-
-typedef enum
-{
-	ASSOCDATA_MSIDESCRIPTOR = 1,
-	ASSOCDATA_NOACTIVATEHANDLER,
-	ASSOCDATA_QUERYCLASSSTORE,
-	ASSOCDATA_HASPERUSERASSOC,
-	ASSOCDATA_MAX
-} ASSOCDATA;
-
-typedef enum
-{
-	ASSOCENUM_NONE
-} ASSOCENUM;
-
-#define ICOM_INTERFACE IQueryAssociations
-#define IQueryAssociations_METHODS \
-    ICOM_METHOD4 (HRESULT, Init, ASSOCF, flags, LPCWSTR, pszAssoc, HKEY, hkProgid, HWND, hwnd) \
-    ICOM_METHOD5 (HRESULT, GetString, ASSOCF, flags, ASSOCSTR, str, LPCWSTR, pszExtra, LPWSTR, pszOut, DWORD*, pcchOut) \
-    ICOM_METHOD4 (HRESULT, GetKey, ASSOCF, flags, ASSOCKEY, key, LPCWSTR, pszExtra, HKEY*, phkeyOut) \
-    ICOM_METHOD5 (HRESULT, GetData, ASSOCF, flags, ASSOCDATA, data, LPCWSTR, pszExtra, LPVOID, pvOut, DWORD*, pcbOut) \
-    ICOM_METHOD5 (HRESULT, GetEnum, ASSOCF, flags, ASSOCENUM, assocenum, LPCWSTR, pszExtra, REFIID, riid, LPVOID*, ppvOut)
-#define IQueryAssociations_IMETHODS \
-	IUnknown_IMETHODS \
-	IQueryAssociations_METHODS
-ICOM_DEFINE(IQueryAssociations,IUnknown)
-#undef ICOM_INTERFACE
-
-#define IQueryAssociations_QueryInterface(p,a,b)	ICOM_CALL2(QueryInterface,p,a,b)
-#define IQueryAssociations_AddRef(p)			ICOM_CALL(AddRef,p)
-#define IQueryAssociations_Release(p)			ICOM_CALL(Release,p)
-#define IQueryAssociations_Init(p,a,b,c,d)		ICOM_CALL4(Init,p,a,b,c,d)
-#define IQueryAssociations_GetString(p,a,b,c,d,e)	ICOM_CALL5(GetString,p,a,b,c,d,e)
-#define IQueryAssociations_GetKey(p,a,b,c,d)		ICOM_CALL4(GetKey,p,a,b,c,d)
-#define IQueryAssociations_GetData(p,a,b,c,d,e)		ICOM_CALL5(GetData,p,a,b,c,d,e)
-#define IQueryAssociations_GetEnum(p,a,b,c,d,e)		ICOM_CALL5(GetEnum,p,a,b,c,d,e)
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* defined(__cplusplus) */
-
-#endif /* __WINE_WINE_OBJ_QUERYASSOCIATIONS_H */
-

ole/uuid.c

@@ -44,7 +44,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 #include "shlguid.h"
 #include "shlobj.h"
-#include "wine/obj_queryassociations.h"
 #include "wine/obj_channel.h"
 
 #include "comcat.h"