advpack: Rename SETUPCOMMAND_PARAMS and move it to advpub.h
Markus Amsler
markus.amsler at oribi.org
Tue Dec 27 10:13:55 CST 2005
The name SETUPCOMMAND_PARAMS is misleading, since it contains the params
for DoInfInstall.
DoInfInstall is a public function, so I think advpub.h is the right place.
Changelog:
Rename SETUPCOMMAND_PARAMS, aplly Hungarian notation
and move it to advpub.h
-------------- next part --------------
Index: dlls/advpack/advpack.c
===================================================================
RCS file: /home/wine/wine/dlls/advpack/advpack.c,v
retrieving revision 1.18
diff -u -r1.18 advpack.c
--- dlls/advpack/advpack.c 2 Dec 2005 10:29:40 -0000 1.18
+++ dlls/advpack/advpack.c 27 Dec 2005 16:07:30 -0000
@@ -159,35 +159,25 @@
return E_FAIL;
}
-/* this structure very closely resembles parameters of RunSetupCommand() */
-typedef struct
-{
- HWND hwnd;
- LPCSTR title;
- LPCSTR inf_name;
- LPCSTR dir;
- LPCSTR section_name;
-} SETUPCOMMAND_PARAMS;
-
/***********************************************************************
* DoInfInstall (ADVPACK.@)
*/
-BOOL WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup)
+BOOL WINAPI DoInfInstall(LPCDOINFINSTALL setup)
{
BOOL ret;
HINF hinf;
void *callback_context;
- TRACE("%p %s %s %s %s\n", setup->hwnd, debugstr_a(setup->title),
- debugstr_a(setup->inf_name), debugstr_a(setup->dir),
- debugstr_a(setup->section_name));
+ TRACE("%p %s %s %s %s\n", setup->hWnd, debugstr_a(setup->lpszTitle),
+ debugstr_a(setup->lpszInf), debugstr_a(setup->lpszDir),
+ debugstr_a(setup->lpszSection));
- hinf = SetupOpenInfFileA(setup->inf_name, NULL, INF_STYLE_WIN4, NULL);
+ hinf = SetupOpenInfFileA(setup->lpszInf, NULL, INF_STYLE_WIN4, NULL);
if (hinf == INVALID_HANDLE_VALUE) return FALSE;
- callback_context = SetupInitDefaultQueueCallback(setup->hwnd);
+ callback_context = SetupInitDefaultQueueCallback(setup->hWnd);
- ret = SetupInstallFromInfSectionA(NULL, hinf, setup->section_name, SPINST_ALL,
+ ret = SetupInstallFromInfSectionA(NULL, hinf, setup->lpszSection, SPINST_ALL,
NULL, NULL, 0, SetupDefaultQueueCallbackA,
callback_context, NULL, NULL);
SetupTermDefaultQueueCallback(callback_context);
Index: include/advpub.h
===================================================================
RCS file: /home/wine/wine/include/advpub.h,v
retrieving revision 1.8
diff -u -r1.8 advpub.h
--- include/advpub.h 1 Dec 2005 12:00:26 -0000 1.8
+++ include/advpub.h 27 Dec 2005 16:07:32 -0000
@@ -46,6 +46,21 @@
typedef const STRTABLE CSTRTABLE;
typedef CSTRTABLE *LPCSTRTABLE;
+/*
+ * Structure for DoInfInstall (undocumented by Microsoft).
+ * Very closely resembles the parameters of RunSetupCommand().
+ */
+typedef struct _DoInfInstall{
+ HWND hWnd;
+ LPCSTR lpszTitle;
+ LPCSTR lpszInf;
+ LPCSTR lpszDir;
+ LPCSTR lpszSection;
+} DOINFINSTALL, *LPDOINFINSTALL;
+
+typedef const DOINFINSTALL CDOINFINSTALL;
+typedef CDOINFINSTALL *LPCDOINFINSTALL;
+
/* Flags for AdvInstallFile */
#define AIF_WARNIFSKIP 0x00000001
#define AIF_NOSKIP 0x00000002
More information about the wine-patches
mailing list