gss.c: initialize/shutdown winsock library

gss.rc: more descriptive window, with an example

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9853 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog
index 4fd2a74fb6ecb558d406db4c181f44b4660a0507..a4fee92a2d25f07c60e3652697eada331d2312c9 100644 (file)
--- a/src/windows/gss/ChangeLog
+++ b/src/windows/gss/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 11 14:07:28 1997  Richard Basch  <basch@lehman.com>
+
+       * gss.c: Initialize/shutdown Winsock library
+       * gss.rc: More descriptive dialog box with an example
+
 Mon Feb 10 23:18:46 1997  Richard Basch  <basch@lehman.com>
 
        * Makefile.in: Use WLIB definition in config/windows.in

diff --git a/src/windows/gss/gss.c b/src/windows/gss/gss.c
index f57b76319ad964770c6b575be2d785df61a3ad67..f2942f6fd3cfc7e267925e7a477e795a8ab4c5fd 100644 (file)
--- a/src/windows/gss/gss.c
+++ b/src/windows/gss/gss.c
@@ -47,11 +47,29 @@ LPSTR lpszCmdLine;
 int nCmdShow;
 {
        FARPROC lpfnDlgProc;
+       WSADATA wsadata;
+       WORD versionrequested;
+       int rc;
 
+       versionrequested = 0x0101;              /* Version 1.1 */
+       rc = WSAStartup(versionrequested, &wsadata);
+       if (rc) {
+           MessageBox(NULL, "Couldn't initialize Winsock library", "",
+                      MB_OK | MB_ICONSTOP);
+           return FALSE;
+       }
+       if (versionrequested != wsadata.wVersion) {
+           WSACleanup();
+           MessageBox(NULL, "Winsock version 1.1 not available", "",
+                      MB_OK | MB_ICONSTOP);
+           return FALSE;
+       }
+       
        lpfnDlgProc = MakeProcInstance(OpenGssapiDlg, hInstance);
        DialogBox (hInstance, "OPENGSSAPIDLG", NULL, lpfnDlgProc);
        FreeProcInstance(lpfnDlgProc);
 
+       WSACleanup();
        return 0;
 }
 /*+*************************************************************************

diff --git a/src/windows/gss/gss.rc b/src/windows/gss/gss.rc
index 9fdffefad612bf47b3139bb2481a62d1bd5f74be..ac8cb2b82575d98ffbf7604b29209b0e0b99d68a 100644 (file)
--- a/src/windows/gss/gss.rc
+++ b/src/windows/gss/gss.rc
@@ -14,15 +14,16 @@
 
 gss ICON gss.ico
 
-OPENGSSAPIDLG DIALOG 63, 65, 303, 51
+OPENGSSAPIDLG DIALOG 63, 65, 330, 71
 STYLE DS_ABSALIGN | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Open GSSAPI Connection"
 FONT 8, "MS Sans Serif"
 BEGIN
-       CONTROL "To Host:", -1, "STATIC", NOT WS_GROUP, 3, 10, 33, 10
-       CONTROL "", GSS_CONNECT_NAME, "COMBOBOX", CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP, 42, 9, 256, 60
-       CONTROL "Test", GSS_OK, "BUTTON", WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON, 27, 30, 51, 14
-       CONTROL "Exit", GSS_CANCEL, "BUTTON", WS_TABSTOP, 97, 30, 51, 14
+       CONTROL "Host Port Service:", -1, "STATIC", NOT WS_GROUP, 5, 10, 60, 10
+       CONTROL "Example: foo 34000 sample@foo.bar.com", -1, "STATIC", NOT WS_GROUP, 70, 25, 256, 10
+       CONTROL "", GSS_CONNECT_NAME, "COMBOBOX", CBS_DROPDOWN | WS_VSCROLL | WS_GROUP | WS_TABSTOP, 70, 9, 256, 60
+       CONTROL "Test", GSS_OK, "BUTTON", WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON, 70, 50, 51, 14
+       CONTROL "Exit", GSS_CANCEL, "BUTTON", WS_TABSTOP, 150, 50, 51, 14
 END