James Hawkins : advpack:
Set the ldids of the install section in install_init.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Apr 20 08:46:13 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: aabb5d044361dec18dab8a300dbda22a0fd14d24
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aabb5d044361dec18dab8a300dbda22a0fd14d24
Author: James Hawkins <truiken at gmail.com>
Date: Thu Apr 20 01:36:39 2006 -0500
advpack: Set the ldids of the install section in install_init.
---
dlls/advpack/advpack.c | 2 +-
dlls/advpack/advpack_private.h | 1 +
dlls/advpack/install.c | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c
index 791cb88..cde1c52 100644
--- a/dlls/advpack/advpack.c
+++ b/dlls/advpack/advpack.c
@@ -92,7 +92,7 @@ static void get_dest_dir(HINF hInf, PCWS
}
/* loads the LDIDs specified in the install section of an INF */
-static void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir)
+void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir)
{
WCHAR field[MAX_FIELD_LENGTH];
WCHAR line[MAX_FIELD_LENGTH];
diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h
index a36b32b..8da353c 100644
--- a/dlls/advpack/advpack_private.h
+++ b/dlls/advpack/advpack_private.h
@@ -22,6 +22,7 @@ #ifndef __ADVPACK_PRIVATE_H
#define __ADVPACK_PRIVATE_H
LPWSTR get_parameter(LPWSTR *params, WCHAR separator);
+void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir);
HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE);
HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg);
diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c
index d280a42..252fd89 100644
--- a/dlls/advpack/install.c
+++ b/dlls/advpack/install.c
@@ -259,7 +259,8 @@ HRESULT install_init(LPCWSTR inf_filenam
if (info->hinf == INVALID_HANDLE_VALUE)
return ADV_HRESULT(GetLastError());
- /* FIXME: set the ldids of the install section */
+ set_ldids(info->hinf, info->install_sec, info->working_dir);
+
/* FIXME: check that the INF is advanced */
info->flags = flags;
More information about the wine-cvs
mailing list