X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/b73fd1b14f758cc52b47b1cec9c68ba52fee70ac..18790478b4e1bf5b005a2c85936558e0e659a80f:/sizetip.c

diff --git a/sizetip.c b/sizetip.c
index 90c05732..439d88ca 100644
--- a/sizetip.c
+++ b/sizetip.c
@@ -1,17 +1,27 @@
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <winreg.h>
 #include <tchar.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "putty.h"
+#include "winstuff.h"
 
-ATOM tip_class = 0;
+static ATOM tip_class = 0;
 
-HFONT tip_font;
-COLORREF tip_bg;
-COLORREF tip_text;
+static HFONT tip_font;
+static COLORREF tip_bg;
+static COLORREF tip_text;
 
-LRESULT CALLBACK SizeTipWndProc(HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam)
+static LRESULT CALLBACK SizeTipWndProc(HWND hWnd, UINT nMsg,
+                                       WPARAM wParam, LPARAM lParam)
 {
 
     switch (nMsg) {
@@ -85,12 +95,12 @@ LRESULT CALLBACK SizeTipWndProc(HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
     return DefWindowProc(hWnd, nMsg, wParam, lParam);
 }
 
-HWND tip_wnd = NULL;
-int tip_enabled = 0;
+static HWND tip_wnd = NULL;
+static int tip_enabled = 0;
 
 void UpdateSizeTip(HWND src, int cx, int cy)
 {
-    TCHAR str[16];
+    TCHAR str[32];
 
     if (!tip_enabled) return;
 
@@ -105,7 +115,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
             wc.lpfnWndProc = SizeTipWndProc;
             wc.cbClsExtra = 0;
             wc.cbWndExtra = 0;
-            wc.hInstance = putty_inst;
+            wc.hInstance = hinst;
             wc.hIcon = NULL;
             wc.hCursor = NULL;
             wc.hbrBackground = NULL;
@@ -136,8 +146,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
 
     /* Generate the tip text */
 
-    _sntprintf(str, 16, "%dx%d", cx, cy);
-
+    sprintf(str, "%dx%d", cx, cy);
 
     if (!tip_wnd) {
         HDC hdc;
@@ -163,7 +172,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
 
         tip_wnd = CreateWindowEx(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, MAKEINTRESOURCE(tip_class), str, WS_POPUP,
 				 ix, iy, sz.cx, sz.cy,
-				 NULL, NULL, putty_inst, NULL);
+				 NULL, NULL, hinst, NULL);
 
         ShowWindow(tip_wnd, SW_SHOWNOACTIVATE);