Commit aabb5d04 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

advpack: Set the ldids of the install section in install_init.

parent 704e70ff
...@@ -92,7 +92,7 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw ...@@ -92,7 +92,7 @@ static void get_dest_dir(HINF hInf, PCWSTR pszSection, PWSTR pszBuffer, DWORD dw
} }
/* loads the LDIDs specified in the install section of an INF */ /* 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 field[MAX_FIELD_LENGTH];
WCHAR line[MAX_FIELD_LENGTH]; WCHAR line[MAX_FIELD_LENGTH];
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#define __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H
LPWSTR get_parameter(LPWSTR *params, WCHAR separator); 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 launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE);
HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg); HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg);
......
...@@ -259,7 +259,8 @@ HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, ...@@ -259,7 +259,8 @@ HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec,
if (info->hinf == INVALID_HANDLE_VALUE) if (info->hinf == INVALID_HANDLE_VALUE)
return ADV_HRESULT(GetLastError()); 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 */ /* FIXME: check that the INF is advanced */
info->flags = flags; info->flags = flags;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment