Index: /trunk/tools/bin/gen-slickedit-workspace.sh
===================================================================
--- /trunk/tools/bin/gen-slickedit-workspace.sh	(revision 60586)
+++ /trunk/tools/bin/gen-slickedit-workspace.sh	(revision 60587)
@@ -635,6 +635,6 @@
 #define BS3_DECL(type)                  type
 #define BS3_DECL_CALLBACK(type)         type
-#define TMPL_NM(name)                   name
-#define TMPL_FAR_NM(name)               name##_far
+#define TMPL_NM(name)                   name##_mmm
+#define TMPL_FAR_NM(name)               name##_mmm_far
 #define BS3_CMN_NM(name)                name
 #define BS3_CMN_FAR_NM(name)            name
@@ -646,7 +646,49 @@
 #define BS3_NEAR
 #define BS3_NEAR_CODE
-#define BS3_CMN_PROTO(a_RetType, a_Name, a_Params, a_fAutoStub) a_RetType a_Name a_Params
-#define BS3_CMN_DEF(a_RetType, a_Name, a_Params)                a_RetType a_Name a_Params
-#define BS3_MODE_PROTO(a_RetType, a_Name, a_Params, a_fAutoStub) \
+#define BS3_CMN_PROTO_STUB(a_RetType, a_Name, a_Params) a_RetType a_Name a_Params
+#define BS3_CMN_PROTO_NOSB(a_RetType, a_Name, a_Params) a_RetType a_Name a_Params
+#define BS3_CMN_DEF(       a_RetType, a_Name, a_Params) a_RetType a_Name a_Params
+#define BS3_MODE_PROTO_STUB(a_RetType, a_Name, a_Params) \
+    a_RetType a_Name##_mmm           a_Params; \
+    a_RetType a_Name##_mmm_far       a_Params; \
+    a_RetType a_Name##_rm            a_Params; \
+    a_RetType a_Name##_pe16          a_Params; \
+    a_RetType a_Name##_pe16_32       a_Params; \
+    a_RetType a_Name##_pe16_v86      a_Params; \
+    a_RetType a_Name##_pe32          a_Params; \
+    a_RetType a_Name##_pe32_16       a_Params; \
+    a_RetType a_Name##_pev86         a_Params; \
+    a_RetType a_Name##_pp16          a_Params; \
+    a_RetType a_Name##_pp16_32       a_Params; \
+    a_RetType a_Name##_pp16_v86      a_Params; \
+    a_RetType a_Name##_pp32          a_Params; \
+    a_RetType a_Name##_pp32_16       a_Params; \
+    a_RetType a_Name##_ppv86         a_Params; \
+    a_RetType a_Name##_pae16         a_Params; \
+    a_RetType a_Name##_pae16_32      a_Params; \
+    a_RetType a_Name##_pae16_v86     a_Params; \
+    a_RetType a_Name##_pae32         a_Params; \
+    a_RetType a_Name##_pae32_16      a_Params; \
+    a_RetType a_Name##_paev86        a_Params; \
+    a_RetType a_Name##_lm16          a_Params; \
+    a_RetType a_Name##_lm32          a_Params; \
+    a_RetType a_Name##_lm64          a_Params; \
+    a_RetType a_Name##_rm_far        a_Params; \
+    a_RetType a_Name##_pe16_far      a_Params; \
+    a_RetType a_Name##_pe16_v86_far  a_Params; \
+    a_RetType a_Name##_pe32_16_far   a_Params; \
+    a_RetType a_Name##_pev86_far     a_Params; \
+    a_RetType a_Name##_pp16_far      a_Params; \
+    a_RetType a_Name##_pp16_v86_far  a_Params; \
+    a_RetType a_Name##_pp32_16_far   a_Params; \
+    a_RetType a_Name##_ppv86_far     a_Params; \
+    a_RetType a_Name##_pae16_far     a_Params; \
+    a_RetType a_Name##_pae16_v86_far a_Params; \
+    a_RetType a_Name##_pae32_16_far  a_Params; \
+    a_RetType a_Name##_paev86_far    a_Params; \
+    a_RetType a_Name##_lm16_far      a_Params
+#define BS3_MODE_PROTO_NOSB(a_RetType, a_Name, a_Params) \
+    a_RetType a_Name##_mmm           a_Params; \
+    a_RetType a_Name##_mmm_far       a_Params; \
     a_RetType a_Name##_rm            a_Params; \
     a_RetType a_Name##_pe16          a_Params; \