Jason Edmeades : advpack: Show fixme when advpack fails to prompt user for directory.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Aug 10 07:31:13 CDT 2007


Module: wine
Branch: master
Commit: ccaddb8a34eadd8c69d14fbf5e1f2265f2e531db
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ccaddb8a34eadd8c69d14fbf5e1f2265f2e531db

Author: Jason Edmeades <jason.edmeades at googlemail.com>
Date:   Thu Aug  9 23:56:17 2007 +0100

advpack: Show fixme when advpack fails to prompt user for directory.

---

 dlls/advpack/advpack.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c
index ee3a87e..157413f 100644
--- a/dlls/advpack/advpack.c
+++ b/dlls/advpack/advpack.c
@@ -116,6 +116,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir)
     do
     {
         LPWSTR value, ptr, key, key_copy = NULL;
+        DWORD flags = 0;
 
         SetupGetLineTextW(&context, NULL, NULL, NULL,
                           line, MAX_FIELD_LENGTH, &size);
@@ -141,10 +142,12 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir)
         while (*value == ' ')
             value++;
 
-        /* FIXME: need to check the query option */
+        /* Extract the flags */
         ptr = strchrW(value, ',');
-        if (ptr)
+        if (ptr) {
             *ptr = '\0';
+            flags = atolW(ptr+1);
+        }
 
         /* set dest to pszWorkingDir if key is SourceDir */
         if (pszWorkingDir && !lstrcmpiW(value, source_dir))
@@ -152,6 +155,10 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir)
         else
             get_dest_dir(hInf, value, dest, MAX_PATH);
 
+        /* If prompting required, provide dialog to request path */
+        if (flags & 0x04)
+            FIXME("Need to support changing paths - default will be used\n");
+
         /* set all ldids to dest */
         while ((ptr = get_parameter(&key, ',')))
         {




More information about the wine-cvs mailing list