Yet more global-removal. The static variables in logging.c are now

[PuTTY.git] / winstuff.h

diff --git a/winstuff.h b/winstuff.h
index 5ce7387e18e8b62b238c1bd1de92e7f8ef487221..90c03481d689af58dc5f2d3cd9ce8df26bd07d5e 100644 (file)
--- a/winstuff.h
+++ b/winstuff.h
@@ -18,6 +18,13 @@
 #endif
 #endif
 
+#ifndef DONE_TYPEDEFS
+#define DONE_TYPEDEFS
+typedef struct config_tag Config;
+typedef struct backend_tag Backend;
+typedef struct terminal_tag Terminal;
+#endif
+
 #define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
 #define PUTTY_REG_PARENT "Software\\SimonTatham"
 #define PUTTY_REG_PARENT_CHILD "PuTTY"
@@ -43,6 +50,20 @@ GLOBAL HWND logbox;
  */
 GLOBAL HINSTANCE hinst;
 
+/*
+ * Details of the help file.
+ */
+GLOBAL char *help_path;
+GLOBAL int help_has_contents;
+
+/*
+ * The terminal and logging context are notionally local to the
+ * Windows front end, but they must be shared between window.c and
+ * windlg.c.
+ */
+GLOBAL Terminal *term;
+GLOBAL void *logctx;
+
 /*
  * I've just looked in the windows standard headr files for WM_USER, there
  * are hundreds of flags defined using the form WM_USER+123 so I've 
@@ -167,13 +188,4 @@ void force_normal(HWND hwnd);
 void UpdateSizeTip(HWND src, int cx, int cy);
 void EnableSizeTip(int bEnable);
 
-/*
- * Unicode and multi-byte character handling stuff.
- */
-#define is_dbcs_leadbyte(cp, c) IsDBCSLeadByteEx(cp, c)
-#define mb_to_wc(cp, flags, mbstr, mblen, wcstr, wclen) \
-       MultiByteToWideChar(cp, flags, mbstr, mblen, wcstr, wclen)
-#define wc_to_mb(cp, flags, wcstr, wclen, mbstr, mblen, def, defused) \
-       WideCharToMultiByte(cp, flags, wcstr, wclen, mbstr, mblen, def,defused)
-
 #endif