From 4b600b337cde8c4045d4e4f467b163231b477205 Mon Sep 17 00:00:00 2001
From: cvs2svn <tools@python.org>
Date: Mon, 13 Dec 2004 13:11:42 +0000
Subject: [PATCH] This commit was manufactured by cvs2svn to create branch
 'release24-maint'.

---
 Doc/html/icons/pyfav.png | Bin 0 -> 240 bytes
 Tools/msi/msisupport.c   |  89 +++++++++++++++++++++++++++++++++++++++
 Tools/msi/msisupport.mak |  12 ++++++
 3 files changed, 101 insertions(+)
 create mode 100644 Doc/html/icons/pyfav.png
 create mode 100644 Tools/msi/msisupport.c
 create mode 100644 Tools/msi/msisupport.mak

diff --git a/Doc/html/icons/pyfav.png b/Doc/html/icons/pyfav.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2d8669d512e9cb5d66fe86fe2a53c78049dd339
GIT binary patch
literal 240
zc-rd>@N?(olHy`uVBq!ia0vp^d_c_4!VDzUtRA}qDbWC*5Z40-4lw)&LJ;`>pP``v
zL~r>uOA1IcmIV0)GdMiEkp|)<dAqwXbg;^L06Clm9+AZi4BWyX%*Zfnjs#GUy~NYk
zmHi4gH>a-7k4}G(-65VXjv*Y^ReLV-HW+ZYc+Oz(6~DmhwQfhd;+y?lF;AZtPN-Jm
zx+!dGK3{$3i>Qe<>0<VQUnk|2O|p<#yi(kTb<y_zD|rX9CdmrgZ$IEJ9kIde1bgc{
V{#&Zr&L=@m_H^}gS?83{1ON}QNGAXQ

literal 0
Hc-jL100001

diff --git a/Tools/msi/msisupport.c b/Tools/msi/msisupport.c
new file mode 100644
index 000000000000..a6feadfd14ec
--- /dev/null
+++ b/Tools/msi/msisupport.c
@@ -0,0 +1,89 @@
+#include "windows.h"
+#include "msiquery.h"
+
+/* Print a debug message to the installer log file.
+ * To see the debug messages, install with
+ * msiexec /i pythonxy.msi /l*v python.log
+ */
+static UINT debug(MSIHANDLE hInstall, LPCWSTR msg)
+{
+	MSIHANDLE hRec = MsiCreateRecord(1);
+	if (!hRec || MsiRecordSetStringW(hRec, 1, msg) != ERROR_SUCCESS) {
+		return ERROR_INSTALL_FAILURE;
+	}
+	MsiProcessMessage(hInstall, INSTALLMESSAGE_INFO, hRec);
+	MsiCloseHandle(hRec);
+	return ERROR_SUCCESS;
+}
+
+/* Check whether the TARGETDIR exists and is a directory.
+ * Set TargetExists appropriately.
+ */
+UINT __declspec(dllexport) __stdcall CheckDir(MSIHANDLE hInstall)
+{
+	WCHAR path[1024];
+	UINT result;
+	DWORD size = sizeof(path)/sizeof(WCHAR);
+	DWORD attributes;
+	
+	result = MsiGetPropertyW(hInstall, L"TARGETDIR", path, &size);
+	if (result != ERROR_SUCCESS)
+		return result;
+	path[size] = L'\0';
+
+	attributes = GetFileAttributesW(path);
+	if (attributes == INVALID_FILE_ATTRIBUTES ||
+		!(attributes & FILE_ATTRIBUTE_DIRECTORY)) 
+	{
+		return MsiSetPropertyW(hInstall, L"TargetExists", L"0");
+	} else {
+		return MsiSetPropertyW(hInstall, L"TargetExists", L"1");
+	}
+}
+
+/* Update the state of the REGISTRY.tcl component according to the
+ * Extension and TclTk features. REGISTRY.tcl must be installed
+ * if both features are installed, and must be absent otherwise.
+ */
+UINT __declspec(dllexport) __stdcall UpdateEditIDLE(MSIHANDLE hInstall)
+{
+	INSTALLSTATE ext_old, ext_new, tcl_old, tcl_new, reg_new;
+	UINT result;
+
+	result = MsiGetFeatureStateW(hInstall, L"Extensions", &ext_old, &ext_new);
+	if (result != ERROR_SUCCESS)
+		return result;
+	result = MsiGetFeatureStateW(hInstall, L"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;
+
+	// 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 = MsiSetComponentStateW(hInstall, L"REGISTRY.tcl", reg_new);
+	return result;
+}
+
+BOOL APIENTRY DllMain(HANDLE hModule, 
+                      DWORD  ul_reason_for_call, 
+                      LPVOID lpReserved)
+{
+    return TRUE;
+}
+
diff --git a/Tools/msi/msisupport.mak b/Tools/msi/msisupport.mak
new file mode 100644
index 000000000000..1047510cdd1c
--- /dev/null
+++ b/Tools/msi/msisupport.mak
@@ -0,0 +1,12 @@
+# /OPT: REF and ICF are added by VS.NET by default
+# NOWIN98 saves 7k of executable size, at the expense of some
+# slowdown on Win98
+msisupport.dll:	msisupport.obj
+	link.exe /OUT:msisupport.dll /INCREMENTAL:NO /NOLOGO /DLL /MACHINE:X86 /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /OPT:NOWIN98 msisupport.obj msi.lib kernel32.lib
+
+# We request a static CRT, so that there will be no CRT dependencies
+# for the target system. We cannot do without a CRT, since it provides
+# the DLL entry point.
+msisupport.obj:	msisupport.c
+	cl /O2 /D WIN32 /D NDEBUG /D _WINDOWS /MT /W3 /c msisupport.c
+
-- 
2.47.3