wine/ dlls/advpack/advpack.c dlls/advpack/advp ...

[Alexandre Julliard]

ChangeSet ID:	21590
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/12/01 06:00:26

Modified files:
    dlls/advpack   : advpack.c advpack.spec 
    include        : advpub.h

Log message:
    James Hawkins 
    Add a stub for AdvInstallFile.

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

Old revision  New revision  Changes     Path
 1.16          1.17          +34 -0      wine/dlls/advpack/advpack.c
 1.11          1.12          +1 -1       wine/dlls/advpack/advpack.spec
 1.7           1.8           +14 -0      wine/include/advpub.h

Index: wine/dlls/advpack/advpack.c
diff -u -p wine/dlls/advpack/advpack.c:1.16 wine/dlls/advpack/advpack.c:1.17
--- wine/dlls/advpack/advpack.c:1.16	1 Dec 2005 12: 0:26 -0000
+++ wine/dlls/advpack/advpack.c	1 Dec 2005 12: 0:26 -0000
@@ -36,6 +36,40 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack);

typedef HRESULT (WINAPI *DLLREGISTER) (void);

+/***********************************************************************
+ *      AdvInstallFile (ADVPACK.@)
+ *
+ * Copies a file from the source to a destination.
+ *
+ * PARAMS
+ *   hwnd           [I] Handle to the window used for messages.
+ *   lpszSourceDir  [I] Source directory.
+ *   lpszSourceFile [I] Source filename.
+ *   lpszDestDir    [I] Destination directory.
+ *   lpszDestFile   [I] Optional destination filename.
+ *   dwFlags        [I] See advpub.h.
+ *   dwReserved     [I] Reserved.  Must be 0.
+ *
+ * RETURNS
+ *   Success: S_OK.
+ *   Failure: E_FAIL.
+ *
+ * NOTES
+ *   If lpszDestFile is NULL, the destination filename is the same as
+ *   lpszSourceFIle.
+ *
+ * BUGS
+ *   Unimplemented.
+ */
+HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourceFile,
+                              LPCSTR lpszDestDir, LPCSTR lpszDestFile,
+                              DWORD dwFlags, DWORD dwReserved)
+{
+    FIXME("(%p,%p,%p,%p,%p,%ld,%ld) stub\n", hwnd, debugstr_a(lpszSourceDir),
+          debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir),
+          debugstr_a(lpszDestFile), dwFlags, dwReserved);
+    return E_FAIL;
+}

/***********************************************************************
  *           DllMain (ADVPACK.@)
Index: wine/dlls/advpack/advpack.spec
diff -u -p wine/dlls/advpack/advpack.spec:1.11 wine/dlls/advpack/advpack.spec:1.12
--- wine/dlls/advpack/advpack.spec:1.11	1 Dec 2005 12: 0:26 -0000
+++ wine/dlls/advpack/advpack.spec	1 Dec 2005 12: 0:26 -0000
@@ -1,5 +1,5 @@
 @ stub AddDelBackupEntry
-@ stub AdvInstallFile
+@ stdcall AdvInstallFile(long str str str str long long)
 @ stub CloseINFEngine
 @ stdcall DelNode(str long)
 @ stdcall DelNodeRunDLL32(ptr ptr str long)
Index: wine/include/advpub.h
diff -u -p wine/include/advpub.h:1.7 wine/include/advpub.h:1.8
--- wine/include/advpub.h:1.7	1 Dec 2005 12: 0:26 -0000
+++ wine/include/advpub.h	1 Dec 2005 12: 0:26 -0000
@@ -46,6 +46,17 @@ typedef struct _StrTable {
 typedef const STRTABLE CSTRTABLE;
 typedef CSTRTABLE *LPCSTRTABLE;

+/* Flags for AdvInstallFile */
+#define AIF_WARNIFSKIP              0x00000001
+#define AIF_NOSKIP                  0x00000002
+#define AIF_NOVERSIONCHECK          0x00000004
+#define AIF_FORCE_FILE_IN_USE       0x00000008
+#define AIF_NOOVERWRITE             0x00000010
+#define AIF_NO_VERSION_DIALOG       0x00000020
+#define AIF_REPLACEONLY             0x00000400
+#define AIF_NOLANGUAGECHECK         0x10000000
+#define AIF_QUIET                   0x20000000
+
 /* Flags for RunSetupCommand */
 #define RSC_FLAG_INF                0x00000001
 #define RSC_FLAG_SKIPDISKSPACECHECK 0x00000002
@@ -61,6 +72,9 @@ typedef CSTRTABLE *LPCSTRTABLE;
 #define ADN_DONT_DEL_DIR            0x00000004
 #define ADN_DEL_UNC_PATHS           0x00000008

+HRESULT WINAPI AdvInstallFile(HWND hwnd, LPCSTR lpszSourceDir,
+     LPCSTR lpszSourceFile, LPCSTR lpszDestDir, LPCSTR lpszDestFile,
+     DWORD dwFlags, DWORD dwReserved);
 HRESULT WINAPI DelNode(LPCSTR pszFileOrDirName, DWORD dwFlags);
 HRESULT WINAPI DelNodeRunDLL32(HWND,HINSTANCE,LPSTR,INT);
 HRESULT WINAPI ExecuteCab( HWND hwnd, PCABINFO pCab, LPVOID pReserved );