Changeset 391 for python/trunk/Tools/msi/msisupport.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Tools/msi/msisupport.c (modified) (3 diffs)

python/trunk/Tools/msi/msisupport.c

@@ -8 +8 @@
 static UINT debug(MSIHANDLE hInstall, LPCSTR msg)
 {
-        MSIHANDLE hRec = MsiCreateRecord(1);
-        if (!hRec || MsiRecordSetStringA(hRec, 1, msg) != ERROR_SUCCESS) {
-                return ERROR_INSTALL_FAILURE;
-        }
-        MsiProcessMessage(hInstall, INSTALLMESSAGE_INFO, hRec);
-        MsiCloseHandle(hRec);
-        return ERROR_SUCCESS;
+    MSIHANDLE hRec = MsiCreateRecord(1);
+    if (!hRec || MsiRecordSetStringA(hRec, 1, msg) != ERROR_SUCCESS) {
+        return ERROR_INSTALL_FAILURE;
+    }
+    MsiProcessMessage(hInstall, INSTALLMESSAGE_INFO, hRec);
+    MsiCloseHandle(hRec);
+    return ERROR_SUCCESS;
 }
 
@@ -23 +23 @@
 {
 #define PSIZE 1024
-        WCHAR wpath[PSIZE];
-        char path[PSIZE];
-        UINT result;
-        DWORD size = PSIZE;
-        DWORD attributes;
+    WCHAR wpath[PSIZE];
+    char path[PSIZE];
+    UINT result;
+    DWORD size = PSIZE;
+    DWORD attributes;
 
-        
-        result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size);
-        if (result != ERROR_SUCCESS)
-                return result;
-        wpath[size] = L'\0';
-        path[size] = L'\0';
 
-        attributes = GetFileAttributesW(wpath);
-        if (attributes == INVALID_FILE_ATTRIBUTES ||
-                !(attributes & FILE_ATTRIBUTE_DIRECTORY)) 
-        {
-                return MsiSetPropertyA(hInstall, "TargetExists", "0");
-        } else {
-                return MsiSetPropertyA(hInstall, "TargetExists", "1");
-        }
+    result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size);
+    if (result != ERROR_SUCCESS)
+        return result;
+    wpath[size] = L'\0';
+    path[size] = L'\0';
+
+    attributes = GetFileAttributesW(wpath);
+    if (attributes == INVALID_FILE_ATTRIBUTES ||
+        !(attributes & FILE_ATTRIBUTE_DIRECTORY))
+    {
+        return MsiSetPropertyA(hInstall, "TargetExists", "0");
+    } else {
+        return MsiSetPropertyA(hInstall, "TargetExists", "1");
+    }
 }
 
@@ -52 +52 @@
 UINT __declspec(dllexport) __stdcall UpdateEditIDLE(MSIHANDLE hInstall)
 {
-        INSTALLSTATE ext_old, ext_new, tcl_old, tcl_new, reg_new;
-        UINT result;
+    INSTALLSTATE ext_old, ext_new, tcl_old, tcl_new, reg_new;
+    UINT result;
 
-        result = MsiGetFeatureStateA(hInstall, "Extensions", &ext_old, &ext_new);
-        if (result != ERROR_SUCCESS)
-                return result;
-        result = MsiGetFeatureStateA(hInstall, "TclTk", &tcl_old, &tcl_new);
-        if (result != ERROR_SUCCESS)
-                return result;
+    result = MsiGetFeatureStateA(hInstall, "Extensions", &ext_old, &ext_new);
+    if (result != ERROR_SUCCESS)
+        return result;
+    result = MsiGetFeatureStateA(hInstall, "TclTk", &tcl_old, &tcl_new);
+    if (result != ERROR_SUCCESS)
+        return result;
 
-        /* If the current state is Absent, and the user did not select
-           the feature in the UI, Installer apparently sets the "selected"
-           state to unknown. Update it to the current value, then. */
-        if (ext_new == INSTALLSTATE_UNKNOWN)
-                ext_new = ext_old;
-        if (tcl_new == INSTALLSTATE_UNKNOWN)
-                tcl_new = tcl_old;
+    /* If the current state is Absent, and the user did not select
+       the feature in the UI, Installer apparently sets the "selected"
+       state to unknown. Update it to the current value, then. */
+    if (ext_new == INSTALLSTATE_UNKNOWN)
+        ext_new = ext_old;
+    if (tcl_new == INSTALLSTATE_UNKNOWN)
+        tcl_new = tcl_old;
 
-        // XXX consider current state of REGISTRY.tcl?
-        if (((tcl_new == INSTALLSTATE_LOCAL) ||
-                 (tcl_new == INSTALLSTATE_SOURCE) ||
-                 (tcl_new == INSTALLSTATE_DEFAULT)) &&
-                ((ext_new == INSTALLSTATE_LOCAL) ||
-                 (ext_new == INSTALLSTATE_SOURCE) ||
-                 (ext_new == INSTALLSTATE_DEFAULT))) {
-                reg_new = INSTALLSTATE_SOURCE;
-        } else { 
-                reg_new = INSTALLSTATE_ABSENT;
-        }
-        result = MsiSetComponentStateA(hInstall, "REGISTRY.tcl", reg_new);
-        return result;
+    // XXX consider current state of REGISTRY.tcl?
+    if (((tcl_new == INSTALLSTATE_LOCAL) ||
+             (tcl_new == INSTALLSTATE_SOURCE) ||
+             (tcl_new == INSTALLSTATE_DEFAULT)) &&
+        ((ext_new == INSTALLSTATE_LOCAL) ||
+         (ext_new == INSTALLSTATE_SOURCE) ||
+         (ext_new == INSTALLSTATE_DEFAULT))) {
+        reg_new = INSTALLSTATE_SOURCE;
+    } else {
+        reg_new = INSTALLSTATE_ABSENT;
+    }
+    result = MsiSetComponentStateA(hInstall, "REGISTRY.tcl", reg_new);
+    return result;
 }
 
-BOOL APIENTRY DllMain(HANDLE hModule, 
-                      DWORD  ul_reason_for_call, 
+BOOL APIENTRY DllMain(HANDLE hModule,
+                      DWORD  ul_reason_for_call,
                       LPVOID lpReserved)
 {