James Hawkins : advpack:
Load the LDIDs of an install section in TranslateInfString.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Feb 21 05:04:11 CST 2006
Module: wine
Branch: refs/heads/master
Commit: dd5ae20dc10bb910b9c8427d1fcf5a10f798de3d
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd5ae20dc10bb910b9c8427d1fcf5a10f798de3d
Author: James Hawkins <truiken at gmail.com>
Date: Mon Feb 20 21:40:59 2006 -0600
advpack: Load the LDIDs of an install section in TranslateInfString.
---
dlls/advpack/advpack.c | 74 ++++++++++++++++++++++++++++++++++++++++++
dlls/advpack/tests/advpack.c | 8 +++--
2 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c
index ed370fa..f6cdaa1 100644
--- a/dlls/advpack/advpack.c
+++ b/dlls/advpack/advpack.c
@@ -36,6 +36,77 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack);
typedef HRESULT (WINAPI *DLLREGISTER) (void);
+#define MAX_FIELD_LENGTH 512
+#define PREFIX_LEN 5
+
+/* parses the destination directory parameters from pszSection
+ * the parameters are of the form: root,key,value,unknown,fallback
+ * we first read the reg value root\\key\\value and if that fails,
+ * use fallback as the destination directory
+ */
+static void get_dest_dir(HINF hInf, PCSTR pszSection, PSTR pszBuffer, DWORD dwSize)
+{
+ INFCONTEXT context;
+ CHAR key[MAX_PATH], value[MAX_PATH];
+ CHAR prefix[PREFIX_LEN];
+ HKEY root, subkey;
+ DWORD size;
+
+ /* load the destination parameters */
+ SetupFindFirstLineA(hInf, pszSection, NULL, &context);
+ SetupGetStringFieldA(&context, 1, prefix, PREFIX_LEN, &size);
+ SetupGetStringFieldA(&context, 2, key, MAX_PATH, &size);
+ SetupGetStringFieldA(&context, 3, value, MAX_PATH, &size);
+
+ if (!lstrcmpA(prefix, "HKLM"))
+ root = HKEY_LOCAL_MACHINE;
+ else if (!lstrcmpA(prefix, "HKCU"))
+ root = HKEY_CURRENT_USER;
+ else
+ root = NULL;
+
+ /* preserve the buffer size */
+ size = dwSize;
+
+ /* fallback to the default destination dir if reg fails */
+ if (RegOpenKeyA(root, key, &subkey) ||
+ RegQueryValueExA(subkey, value, NULL, NULL, (LPBYTE)pszBuffer, &size))
+ {
+ SetupGetStringFieldA(&context, 6, pszBuffer, dwSize, &size);
+ }
+
+ RegCloseKey(subkey);
+}
+
+/* loads the LDIDs specified in the install section of an INF */
+static void set_ldids(HINF hInf, PCSTR pszInstallSection)
+{
+ CHAR field[MAX_FIELD_LENGTH];
+ CHAR key[MAX_FIELD_LENGTH];
+ CHAR dest[MAX_PATH];
+ INFCONTEXT context;
+ DWORD size;
+ int ldid;
+
+ if (!SetupGetLineTextA(NULL, hInf, pszInstallSection, "CustomDestination",
+ field, MAX_FIELD_LENGTH, &size))
+ return;
+
+ if (!SetupFindFirstLineA(hInf, field, NULL, &context))
+ return;
+
+ do
+ {
+ SetupGetIntField(&context, 0, &ldid);
+ SetupGetLineTextA(&context, NULL, NULL, NULL,
+ key, MAX_FIELD_LENGTH, &size);
+
+ get_dest_dir(hInf, key, dest, MAX_PATH);
+
+ SetupSetDirectoryIdA(hInf, ldid, dest);
+ } while (SetupFindNextLine(&context, &context));
+}
+
/***********************************************************************
* CloseINFEngine (ADVPACK.@)
*
@@ -507,6 +578,8 @@ HRESULT WINAPI TranslateInfString(PCSTR
if (hInf == INVALID_HANDLE_VALUE)
return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
+ set_ldids(hInf, pszInstallSection);
+
if (!SetupGetLineTextA(NULL, hInf, pszTranslateSection, pszTranslateKey,
pszBuffer, dwBufferSize, pdwRequiredSize))
{
@@ -516,6 +589,7 @@ HRESULT WINAPI TranslateInfString(PCSTR
return SPAPI_E_LINE_NOT_FOUND;
}
+ SetupCloseInfFile(hInf);
return S_OK;
}
diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c
index 2d82964..b678797 100644
--- a/dlls/advpack/tests/advpack.c
+++ b/dlls/advpack/tests/advpack.c
@@ -222,7 +222,6 @@ static void translateinfstring_test()
"Expected ERROR_SUCCESS or E_FAIL, got 0x%08x\n", (UINT)hr);
if(hr == ERROR_SUCCESS)
- todo_wine
{
HKEY key;
DWORD len = MAX_PATH;
@@ -245,8 +244,11 @@ static void translateinfstring_test()
hr = pTranslateInfString("c:\\test.inf", NULL, "Options.NTx86",
"InstallDir", buffer, MAX_PATH, &dwSize, NULL);
ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", (UINT)hr);
- ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer);
- ok(dwSize == 25, "Expected size 25, got %ld\n", dwSize);
+ todo_wine
+ {
+ ok(!strcmp(buffer, TEST_STRING2), "Expected %s, got %s\n", TEST_STRING2, buffer);
+ ok(dwSize == 25, "Expected size 25, got %ld\n", dwSize);
+ }
DeleteFile("c:\\a.inf");
DeleteFile("c:\\test.inf");
More information about the wine-cvs
mailing list