Allocate the 0x1D1A0000 base adress for the _ctypes extension module.

Export the COM entry point functions.

Note that there are several conflicting base addresses defined for
other extensions, also not all are listed in dllbase_nt.txt.

diff --git a/PC/dllbase_nt.txt b/PC/dllbase_nt.txt
index 944ef958127bf646da74978f79f71bf5fd5db999..c06e497e7517651bea5f6697bbf42de92441b347 100644 (file)
--- a/PC/dllbase_nt.txt
+++ b/PC/dllbase_nt.txt
@@ -33,6 +33,7 @@ More standard extensions 1D100000 - 1e000000
  - bZ2                       1D170000 - 1D180000
  - datetime                  1D180000 - 1D190000    pyd removed in 2.4
  - _csv                      1D190000 - 1D1A0000    pyd removed in 2.4
+ - _ctypes                   1D1A0000 - 1D1B0000
 
 Other extension modules
  - win32api                  1e200000 - 1e220000

diff --git a/PCbuild/_ctypes.vcproj b/PCbuild/_ctypes.vcproj
index 76518e69530aa5ba5e3e89f7438947e1ef6b493a..4990c9eb02001cde10615c1aa5056dc0208f8482 100644 (file)
--- a/PCbuild/_ctypes.vcproj
+++ b/PCbuild/_ctypes.vcproj
@@ -33,12 +33,14 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
                                OutputFile="./_ctypes_d.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
                                GenerateDebugInformation="TRUE"
                                ProgramDatabaseFile=".\./_ctypes_d.pdb"
                                SubSystem="0"
+                               BaseAddress="0x1D1A0000"
                                ImportLibrary=".\./_ctypes_d.lib"
                                TargetMachine="1"/>
                        <Tool
@@ -85,6 +87,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
                                OutputFile="./_ctypes.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -93,6 +96,7 @@
                                SubSystem="0"
                                OptimizeReferences="0"
                                EnableCOMDATFolding="0"
+                               BaseAddress="0x1D1A0000"
                                ImportLibrary=".\./_ctypes.lib"
                                TargetMachine="1"/>
                        <Tool
@@ -142,7 +146,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
+                               AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
                                OutputFile="./_ctypes.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -151,6 +155,7 @@
                                SubSystem="0"
                                OptimizeReferences="0"
                                EnableCOMDATFolding="0"
+                               BaseAddress="0x1D1A0000"
                                ImportLibrary=".\./_ctypes.lib"
                                TargetMachine="0"/>
                        <Tool
@@ -200,7 +205,7 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
+                               AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
                                OutputFile="./_ctypes.pyd"
                                LinkIncremental="1"
                                SuppressStartupBanner="TRUE"
@@ -209,6 +214,7 @@
                                SubSystem="0"
                                OptimizeReferences="0"
                                EnableCOMDATFolding="0"
+                               BaseAddress="0x1D1A0000"
                                ImportLibrary=".\./_ctypes.lib"
                                TargetMachine="0"/>
                        <Tool