wine/ include/msi.h dlls/msi/registry.c dlls/m ...

[Alexandre Julliard]

ChangeSet ID:	21284
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/15 10:55:04

Modified files:
    include        : msi.h 
    dlls/msi       : registry.c msi.spec

Log message:
    Mike McCormack 
    Fix function prototype and spec file entry for
    MsiEnumComponentQualifiers.

Patch: http://cvs.winehq.org/patch.py?id=21284

Old revision  New revision  Changes     Path
 1.35          1.36          +2 -2       wine/include/msi.h
 1.13          1.14          +2 -2       wine/dlls/msi/registry.c
 1.50          1.51          +2 -2       wine/dlls/msi/msi.spec

Index: wine/include/msi.h
diff -u -p wine/include/msi.h:1.35 wine/include/msi.h:1.36
--- wine/include/msi.h:1.35	15 Nov 2005 16:55: 5 -0000
+++ wine/include/msi.h	15 Nov 2005 16:55: 5 -0000
@@ -476,8 +476,8 @@ UINT WINAPI MsiProvideAssemblyA(LPCSTR, 
 UINT WINAPI MsiProvideAssemblyW(LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD*);
 #define MsiProvideAssembly WINELIB_NAME_AW(MsiProvideAssembly)

-UINT WINAPI MsiEnumComponentQualifiersA(LPSTR, DWORD, LPSTR, DWORD*, LPSTR, DWORD*);
-UINT WINAPI MsiEnumComponentQualifiersW(LPWSTR, DWORD, LPWSTR, DWORD*, LPWSTR, DWORD*);
+UINT WINAPI MsiEnumComponentQualifiersA(LPCSTR, DWORD, LPSTR, DWORD*, LPSTR, DWORD*);
+UINT WINAPI MsiEnumComponentQualifiersW(LPCWSTR, DWORD, LPWSTR, DWORD*, LPWSTR, DWORD*);
 #define MsiEnumComponentQualifiers WINELIB_NAME_AW(MsiEnumComponentQualifiers)

UINT WINAPI MsiGetFileVersionA(LPCSTR, LPSTR, DWORD*, LPSTR, DWORD*);
Index: wine/dlls/msi/registry.c
diff -u -p wine/dlls/msi/registry.c:1.13 wine/dlls/msi/registry.c:1.14
--- wine/dlls/msi/registry.c:1.13	15 Nov 2005 16:55: 5 -0000
+++ wine/dlls/msi/registry.c	15 Nov 2005 16:55: 5 -0000
@@ -773,7 +773,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szCo
  *  MsiEnumComponentQualifiersA [MSI.@]
  *
  */
-UINT WINAPI MsiEnumComponentQualifiersA( LPSTR szComponent, DWORD iIndex,
+UINT WINAPI MsiEnumComponentQualifiersA( LPCSTR szComponent, DWORD iIndex,
                 LPSTR lpQualifierBuf, DWORD* pcchQualifierBuf,
                 LPSTR lpApplicationDataBuf, DWORD* pcchApplicationDataBuf)
 {
@@ -852,7 +852,7 @@ UINT WINAPI MsiEnumComponentQualifiersA(
  *  MsiEnumComponentQualifiersW [MSI.@]
  *
  */
-UINT WINAPI MsiEnumComponentQualifiersW( LPWSTR szComponent, DWORD iIndex,
+UINT WINAPI MsiEnumComponentQualifiersW( LPCWSTR szComponent, DWORD iIndex,
                 LPWSTR lpQualifierBuf, DWORD* pcchQualifierBuf,
                 LPWSTR lpApplicationDataBuf, DWORD* pcchApplicationDataBuf )
 {
Index: wine/dlls/msi/msi.spec
diff -u -p wine/dlls/msi/msi.spec:1.50 wine/dlls/msi/msi.spec:1.51
--- wine/dlls/msi/msi.spec:1.50	15 Nov 2005 16:55: 5 -0000
+++ wine/dlls/msi/msi.spec	15 Nov 2005 16:55: 5 -0000
@@ -31,8 +31,8 @@
 35 stdcall MsiEnableUIPreview(long ptr)
 36 stdcall MsiEnumClientsA(str long ptr)
 37 stdcall MsiEnumClientsW(wstr long ptr)
-38 stdcall MsiEnumComponentQualifiersA(str long str ptr str ptr)
-39 stdcall MsiEnumComponentQualifiersW(wstr long wstr ptr wstr ptr)
+38 stdcall MsiEnumComponentQualifiersA(str long ptr ptr ptr ptr)
+39 stdcall MsiEnumComponentQualifiersW(wstr long ptr ptr ptr ptr)
 40 stdcall MsiEnumComponentsA(long ptr)
 41 stdcall MsiEnumComponentsW(long ptr)
 42 stdcall MsiEnumFeaturesA(str long ptr ptr)