Removed C++ style comments

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



ChangeLog: dlls/advapi32/crypt.h         dlls/richedit/charlist.h
           dlls/twain/twain.h            dlls/wsock32/wscontrol.h
           include/wnaspi32.h            programs/notepad/language.c
           programs/notepad/language.h   programs/notepad/main.c
           programs/winefile/splitpath.c programs/winefile/winefile.c
           programs/winefile/winefile.h
 - Removed C++ style comments

I have been trying to get wine to compile with Sun's Forte C compiler.  If I 
succeed, then there will be several more patches.

Gregg Mattinson
Co-op Developer
Sun Microsystems of Canada

Index: dlls/advapi32/crypt.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/advapi32/crypt.h,v
retrieving revision 1.1
diff -u -r1.1 crypt.h
--- /tmp/T0ffa4wv	Wed Jun 26 12:01:28 2002
+++ crypt.h	Mon Jun 24 14:42:22 2002
@@ -56,20 +56,20 @@
 {
 	HMODULE hModule;
 	PPROVFUNCS pFuncs;
-	HCRYPTPROV hPrivate;  //CSP's handle - Should not be given to application under any circumstances!
+        HCRYPTPROV hPrivate;  /*CSP's handle - Should not be given to application under any circumstances!*/
 	PVTableProvStruc pVTable;
 } CRYPTPROV, *PCRYPTPROV;
 
 typedef struct tagCRYPTKEY
 {
 	PCRYPTPROV pProvider;
-	HCRYPTKEY hPrivate;    //CSP's handle - Should not be given to application under any circumstances!
+        HCRYPTKEY hPrivate;    /*CSP's handle - Should not be given to application under any circumstances!*/
 } CRYPTKEY, *PCRYPTKEY;
 
 typedef struct tagCRYPTHASH
 {
 	PCRYPTPROV pProvider;
-	HCRYPTHASH hPrivate;    //CSP's handle - Should not be given to application under any circumstances!
+        HCRYPTHASH hPrivate;    /*CSP's handle - Should not be given to application under any circumstances!*/
 } CRYPTHASH, *PCRYPTHASH;
 
 #define MAXPROVTYPES 999
Index: dlls/richedit/charlist.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/richedit/charlist.h,v
retrieving revision 1.1
diff -u -r1.1 charlist.h
--- /tmp/T0Xga4Fv	Wed Jun 26 12:02:09 2002
+++ charlist.h	Tue Jun 25 08:29:05 2002
@@ -29,7 +29,7 @@
 
 typedef struct _tagCHARLIST
 {
-    unsigned int nCount; // Entries Count;
+    unsigned int nCount; /* Entries Count; */
     CHARLISTENTRY *pHead;
     CHARLISTENTRY *pTail;
 } CHARLIST;
Index: dlls/twain/twain.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/twain/twain.h,v
retrieving revision 1.1
diff -u -r1.1 twain.h
--- /tmp/T0pGaaHv	Wed Jun 26 12:02:19 2002
+++ twain.h	Mon Jun 24 14:33:17 2002
@@ -383,7 +383,7 @@
     TW_INT16    dataArgType;    /* DSM_Entry dataArgType parameter          */
     TW_INT16    message;        /* DSM_Entry message parameter              */
     TW_INT32    pDataSize;      /* Size of pData (0 if NULL)                */
-    //  TW_MEMREF   pData;      /* Based on implementation specifics, a     */
+    /*  TW_MEMREF   pData; */   /* Based on implementation specifics, a     */
                                 /* pData parameter makes no sense in this   */
                                 /* structure, but data (if provided) will be*/
                                 /* appended in the data block.              */
@@ -396,7 +396,7 @@
     TW_UINT16   returnCode;     /* Thunker DsEntry return code.             */
     TW_UINT16   conditionCode;  /* Thunker DsEntry condition code.          */
     TW_INT32    pDataSize;      /* Size of pData (0 if NULL)                */
-    //  TW_MEMREF   pData;      /* Based on implementation specifics, a     */
+    /*  TW_MEMREF   pData; */   /* Based on implementation specifics, a     */
                                 /* pData parameter makes no sense in this   */
                                 /* structure, but data (if provided) will be*/
                                 /* appended in the data block.              */
@@ -660,7 +660,7 @@
 #define TWSS_A5          5
 #define TWSS_B4          6
 #define TWSS_B6          7
-//#define TWSS_B          8
+/*#define TWSS_B          8 */
 /* Added 1.7 */
 #define TWSS_USLEDGER    9
 #define TWSS_USEXECUTIVE 10
Index: dlls/wsock32/wscontrol.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/dlls/wsock32/wscontrol.h,v
retrieving revision 1.1
diff -u -r1.1 wscontrol.h
--- /tmp/T0zza4Iv	Wed Jun 26 12:02:47 2002
+++ wscontrol.h	Tue Jun 25 09:22:51 2002
@@ -159,7 +159,7 @@
  * an IP route table entry is unknown */
 typedef struct IPRouteEntry {
    unsigned long ire_addr;
-   unsigned long ire_index;  //matches if_index in IFEntry and iae_index in IPAddrEntry
+   unsigned long ire_index;  /*matches if_index in IFEntry and iae_index in IPAddrEntry */
    unsigned long ire_metric;
    unsigned long ire_option4;
    unsigned long ire_option5;
Index: include/wnaspi32.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/include/wnaspi32.h,v
retrieving revision 1.1
diff -u -r1.1 wnaspi32.h
--- /tmp/T03CaiOv	Wed Jun 26 12:03:20 2002
+++ wnaspi32.h	Tue Jun 25 08:38:34 2002
@@ -56,13 +56,13 @@
 
 #define SS_INVALID_SRB			0xE0
 #define SS_OLD_MANAGER			0xE1
-#define SS_BUFFER_ALIGN			0xE1 // Win32
+#define SS_BUFFER_ALIGN			0xE1 /* Win32 */
 #define SS_ILLEGAL_MODE			0xE2
 #define SS_NO_ASPI			0xE3
 #define SS_FAILED_INIT			0xE4
 #define SS_ASPI_IS_BUSY			0xE5
 #define SS_BUFFER_TO_BIG		0xE6
-#define SS_MISMATCHED_COMPONENTS	0xE7 // DLLs/EXE version mismatch
+#define SS_MISMATCHED_COMPONENTS	0xE7 /* DLLs/EXE version mismatch */
 #define SS_NO_ADAPTERS			0xE8
 #define SS_INSUFFICIENT_RESOURCES	0xE9
 #define SS_ASPI_IS_SHUTDOWN		0xEA
@@ -101,7 +101,7 @@
 #define SC_GETSET_TIMEOUTS		0x08
 
 /* SRB Status.. MS defined */
-#define SS_SECURITY_VIOLATION		0xE2 // Replaces SS_INVALID_MODE
+#define SS_SECURITY_VIOLATION		0xE2 /* Replaces SS_INVALID_MODE */
 /*** END DEFS */
 
 #include "pshpack1.h"
Index: programs/notepad/language.c
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/programs/notepad/language.c,v
retrieving revision 1.1
diff -u -r1.1 language.c
--- /tmp/T0gnayTv	Wed Jun 26 12:03:52 2002
+++ language.c	Tue Jun 25 08:11:47 2002
@@ -77,8 +77,8 @@
   LANGUAGE_UpdateWindowCaption();
 
   /* Change Resource names */
-//  lstrcpyn(STRING_MENU_Xx      + sizeof(STRING_MENU_Xx)      - 3, lang, 3);
-//  lstrcpyn(STRING_PAGESETUP_Xx + sizeof(STRING_PAGESETUP_Xx) - 3, lang, 3);
+  /*lstrcpyn(STRING_MENU_Xx      + sizeof(STRING_MENU_Xx)      - 3, lang, 3);*/
+  /*lstrcpyn(STRING_PAGESETUP_Xx + sizeof(STRING_PAGESETUP_Xx) - 3, lang, 3);*/
 
   /* Create menu */
   hMainMenu = LoadMenu(Globals.hInstance, MAIN_MENU);
@@ -95,9 +95,10 @@
   Globals.hMainMenu = hMainMenu;
 }
 
-//VOID LANGUAGE_DefaultHandle(WPARAM wParam)
-//{
-//  if ((wParam >=NP_FIRST_LANGUAGE) && (wParam<=NP_LAST_LANGUAGE))
-//          LANGUAGE_SelectByNumber(wParam - NP_FIRST_LANGUAGE);
-//     else printf("Unimplemented menu command %i\n", wParam);
-//}
+/*VOID LANGUAGE_DefaultHandle(WPARAM wParam)
+{
+  if ((wParam >=NP_FIRST_LANGUAGE) && (wParam<=NP_LAST_LANGUAGE))
+          LANGUAGE_SelectByNumber(wParam - NP_FIRST_LANGUAGE);
+     else printf("Unimplemented menu command %i\n", wParam);
+}
+*/
Index: programs/notepad/language.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/programs/notepad/language.h,v
retrieving revision 1.1
diff -u -r1.1 language.h
--- /tmp/T0ntaWTv	Wed Jun 26 12:03:52 2002
+++ language.h	Tue Jun 25 08:10:28 2002
@@ -22,4 +22,4 @@
 
 VOID LANGUAGE_UpdateWindowCaption(VOID);
 VOID LANGUAGE_LoadMenus(VOID);
-//VOID LANGUAGE_DefaultHandle(WPARAM wParam);
+/*VOID LANGUAGE_DefaultHandle(WPARAM wParam);*/
Index: programs/notepad/main.c
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/programs/notepad/main.c,v
retrieving revision 1.1
diff -u -r1.1 main.c
--- /tmp/T0LCaiUv	Wed Jun 26 12:03:53 2002
+++ main.c	Tue Jun 25 08:12:51 2002
@@ -745,8 +745,8 @@
      case 0x136:  DIALOG_HelpNoWarranty(); break;
      case 0x137:   DIALOG_HelpAboutWine(); break;
 
-//     default:
-//      LANGUAGE_DefaultHandle(wParam);
+       /*     default: */
+       /*      LANGUAGE_DefaultHandle(wParam); */
    }
    return 0;
 }
Index: programs/winefile/splitpath.c
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/programs/winefile/splitpath.c,v
retrieving revision 1.1
diff -u -r1.1 splitpath.c
--- /tmp/T06baaWv	Wed Jun 26 12:04:03 2002
+++ splitpath.c	Tue Jun 25 08:27:39 2002
@@ -22,11 +22,11 @@
 
 void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext)
 {
-	const WCHAR* end; // end of processed string
-	const WCHAR* p;	  // search pointer
-	const WCHAR* s;	  // copy pointer
+        const WCHAR* end; /* end of processed string */
+	const WCHAR* p;	  /* search pointer */
+	const WCHAR* s;	  /* copy pointer */
 
-	 // extract drive name
+	/* extract drive name */
 	if (path[0] && path[1]==':') {
 		if (drv) {
 			*drv++ = *path++;
@@ -36,11 +36,11 @@
 	} else if (drv)
 		*drv = L'\0';
 
-	 // search for end of string or stream separator
+	/* search for end of string or stream separator */
 	for(end=path; *end && *end!=L':'; )
 		end++;
 
-	 // search for begin of file extension
+	/* search for begin of file extension */
 	for(p=end; p>path && *--p!=L'\\' && *p!=L'/'; )
 		if (*p == L'.') {
 			end = p;
@@ -51,7 +51,7 @@
 		for(s=end; *ext=*s++; )
 			ext++;
 
-	 // search for end of directory name
+	/* search for end of directory name */
 	for(p=end; p>path; )
 		if (*--p=='\\' || *p=='/') {
 			p++;
@@ -77,11 +77,11 @@
 
 void _splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ext)
 {
-	const CHAR* end; // end of processed string
-	const CHAR* p;	 // search pointer
-	const CHAR* s;	 // copy pointer
+        const CHAR* end; /* end of processed string */
+	const CHAR* p;	 /* search pointer */
+	const CHAR* s;	 /* copy pointer */
 
-	 // extract drive name
+	/* extract drive name */
 	if (path[0] && path[1]==':') {
 		if (drv) {
 			*drv++ = *path++;
@@ -91,11 +91,11 @@
 	} else if (drv)
 		*drv = '\0';
 
-	 // search for end of string or stream separator
+	/* search for end of string or stream separator */
 	for(end=path; *end && *end!=':'; )
 		end++;
 
-	 // search for begin of file extension
+	/* search for begin of file extension */
 	for(p=end; p>path && *--p!='\\' && *p!='/'; )
 		if (*p == '.') {
 			end = p;
@@ -106,7 +106,7 @@
 		for(s=end; (*ext=*s++); )
 			ext++;
 
-	 // search for end of directory name
+	/* search for end of directory name */
 	for(p=end; p>path; )
 		if (*--p=='\\' || *p=='/') {
 			p++;
Index: programs/winefile/winefile.c
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/programs/winefile/winefile.c,v
retrieving revision 1.1
diff -u -r1.1 winefile.c
--- /tmp/T05kayWv	Wed Jun 26 12:04:04 2002
+++ winefile.c	Tue Jun 25 09:05:55 2002
@@ -25,7 +25,7 @@
 #include "resource.h"
 
 
- // for read_directory_unix()
+/* for read_directory_unix() */
 #if !defined(_NO_EXTENSIONS)
 #include <dirent.h>
 #include <sys/stat.h>
@@ -123,7 +123,7 @@
 	HWND	hwnd;
 	Pane	left;
 	Pane	right;
-	int		focus_pane;		// 0: left  1: right
+        int		focus_pane;		/* 0: left  1: right */
 	WINDOWPLACEMENT pos;
 	int		split_pos;
 	BOOL	header_wdths_ok;
@@ -186,7 +186,7 @@
 			entry->level = level;
 
 #ifdef _NO_EXTENSIONS
-			 // hide directory entry "."
+			/* hide directory entry "." */
 			if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
 				LPCTSTR name = entry->data.cFileName;
 
@@ -304,7 +304,7 @@
 
 	stime.wYear = tm->tm_year+1900;
 	stime.wMonth = tm->tm_mon+1;
-//	stime.wDayOfWeek
+	/*	stime.wDayOfWeek */
 	stime.wDay = tm->tm_mday;
 	stime.wHour = tm->tm_hour;
 	stime.wMinute = tm->tm_min;
@@ -442,7 +442,7 @@
 #endif
 
 
- // directories first...
+/* directories first... */
 static int compareType(const WIN32_FIND_DATA* fd1, const WIN32_FIND_DATA* fd2)
 {
 	int dir1 = fd1->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
@@ -532,10 +532,10 @@
 
 
 static int (*sortFunctions[])(const void* arg1, const void* arg2) = {
-	compareName,	// SORT_NAME
-	compareExt,		// SORT_EXT
-	compareSize,	// SORT_SIZE
-	compareDate		// SORT_DATE
+        compareName,	/* SORT_NAME */
+	compareExt,		/* SORT_EXT */
+	compareSize,	/* SORT_SIZE */
+	compareDate		/* SORT_DATE */
 };
 
 
@@ -556,7 +556,7 @@
 		for(entry=parent->down; entry; entry=entry->next)
 			*p++ = entry;
 
-		 // call qsort with the appropriate compare function
+		/* call qsort with the appropriate compare function */
 		qsort(array, len, sizeof(array[0]), sortFunctions[sortOrder]);
 
 		parent->down = array[0];
@@ -686,7 +686,7 @@
 		entry = read_tree_win(root, path, child->sortOrder);
 	}
 
-//@@lstrcpy(root->entry.data.cFileName, drv);
+	/*@@lstrcpy(root->entry.data.cFileName, drv); */
 	wsprintf(root->entry.data.cFileName, _T("%s - %s"), drv, root->fs);
 
 	root->entry.data.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY;
@@ -699,7 +699,7 @@
 }
 
 
- // recursively free all child entries
+/* recursively free all child entries */
 static void free_entries(Entry* parent)
 {
 	Entry *entry, *next=parent->down;
@@ -717,7 +717,7 @@
 	}
 }
 
- // free all memory associated with a child window
+/* free all memory associated with a child window */
 static void free_child_window(ChildWnd* child)
 {
 	free_entries(&child->root.entry);
@@ -725,7 +725,7 @@
 }
 
 
- // get full path of specified directory entry
+/* get full path of specified directory entry */
 static void get_path(Entry* dir, PTSTR path)
 {
 	Entry* entry;
@@ -907,7 +907,7 @@
 	RECT	orgPos;
 	BOOL	wasZoomed;
 } g_fullscreen = {
-	FALSE	// mode
+        FALSE	/* mode */
 };
 
 void frame_get_clientspace(HWND hwnd, PRECT prect)
@@ -1018,7 +1018,7 @@
 
 	_tsplitpath(path, drv1, 0, 0, 0);
 
-	 // search for a already open window for the same drive
+	/* search for a already open window for the same drive */
 	for(child_wnd=GetNextWindow(Globals.hmdiclient,GW_CHILD); child_wnd; child_wnd=GetNextWindow(child_wnd, GW_HWNDNEXT)) {
 		ChildWnd* child = (ChildWnd*) GetWindowLong(child_wnd, GWL_USERDATA);
 
@@ -1077,7 +1077,7 @@
 					return 0;
 				}
 
-				GetCurrentDirectory(MAX_PATH, path); //@@ letztes Verzeichnis pro Laufwerk speichern
+				GetCurrentDirectory(MAX_PATH, path); /*@@ letztes Verzeichnis pro Laufwerk speichern */
 				child = alloc_child_window(path);
 
 				if (!create_child_window(child))
@@ -1158,7 +1158,7 @@
 #endif
 #endif
 
-					//TODO: There are even more menu items!
+				/*TODO: There are even more menu items! */
 
 #ifndef _NO_EXTENSIONS
 				case ID_LICENSE:
@@ -1187,14 +1187,14 @@
 
 		case WM_SIZE:
 			resize_frame(hwnd, LOWORD(lparam), HIWORD(lparam));
-			break;	// do not pass message to DefFrameProc
+			break;	/* do not pass message to DefFrameProc */
 
 #ifndef _NO_EXTENSIONS
 		case WM_GETMINMAXINFO: {
 			LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam;
 
-			lpmmi->ptMaxTrackSize.x <<= 1;//2*GetSystemMetrics(SM_CXSCREEN) / SM_CXVIRTUALSCREEN
-			lpmmi->ptMaxTrackSize.y <<= 1;//2*GetSystemMetrics(SM_CYSCREEN) / SM_CYVIRTUALSCREEN
+			lpmmi->ptMaxTrackSize.x <<= 1;/*2*GetSystemMetrics(SM_CXSCREEN) / SM_CXVIRTUALSCREEN */
+			lpmmi->ptMaxTrackSize.y <<= 1;/*2*GetSystemMetrics(SM_CYSCREEN) / SM_CYVIRTUALSCREEN */
 			break;}
 
 		case FRM_CALC_CLIENT:
@@ -1211,7 +1211,7 @@
 
 
 const static LPTSTR g_pos_names[COLUMNS] = {
-	_T(""),			// symbol
+        _T(""),			/* symbol */
 	_T("Name"),
 	_T("Size"),
 	_T("CDate"),
@@ -1229,18 +1229,18 @@
 
 const static int g_pos_align[] = {
 	0,
-	HDF_LEFT,	// Name
-	HDF_RIGHT,	// Size
-	HDF_LEFT,	// CDate
-#ifndef _NO_EXTENSIONS
-	HDF_LEFT,	// ADate
-	HDF_LEFT,	// MDate
-	HDF_LEFT,	// Index
-	HDF_CENTER,	// Links
+	HDF_LEFT,	/* Name */
+	HDF_RIGHT,	/* Size */
+	HDF_LEFT,	/* CDate */
+#ifndef _NO_EXTENSIONS
+	HDF_LEFT,	/* ADate */
+	HDF_LEFT,	/* MDate */
+	HDF_LEFT,	/* Index */
+	HDF_CENTER,	/* Links */
 #endif
-	HDF_CENTER,	// Attributes
+	HDF_CENTER,	/* Attributes */
 #ifndef _NO_EXTENSIONS
-	HDF_LEFT	// Security
+	HDF_LEFT	/* Security */
 #endif
 };
 
@@ -1319,7 +1319,7 @@
 static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWidthCol);
 
 
- // calculate prefered width for all visible columns
+/* calculate prefered width for all visible columns */
 
 static BOOL calc_widths(Pane* pane, BOOL anyway)
 {
@@ -1376,11 +1376,11 @@
 
 	ListBox_SetHorizontalExtent(pane->hwnd, x);
 
-	 // no change?
+	/* no change? */
 	if (!memcmp(orgWidths, pane->widths, sizeof(orgWidths)))
 		return FALSE;
 
-	 // don't move, if only collapsing an entry
+	/* don't move, if only collapsing an entry */
 	if (!anyway && pane->widths[0]<orgWidths[0] &&
 		!memcmp(orgWidths+1, pane->widths+1, sizeof(orgWidths)-sizeof(int))) {
 		pane->widths[0] = orgWidths[0];
@@ -1395,7 +1418,7 @@
 }
 
 
- // calculate one prefered column width
+/* calculate one prefered column width */
 
 static void calc_single_width(Pane* pane, int col)
 {
@@ -1442,7 +1442,7 @@
 }
 
 
- // insert listbox entries after index idx
+/* insert listbox entries after index idx */
 
 static void insert_entries(Pane* pane, Entry* parent, int idx)
 {
@@ -1459,7 +1459,7 @@
 			continue;
 #endif
 
-		 // don't display entries "." and ".." in the left pane
+		/* don't display entries "." and ".." in the left pane */
 		if (pane->treePane && (entry->data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
 				&& entry->data.cFileName[0]==_T('.'))
 			if (
@@ -1498,11 +1498,11 @@
 
 	SendMessage(pane->hwnd, WM_SETFONT, (WPARAM)Globals.hfont, FALSE);
 
-	 // insert entries into listbox
+	/* insert entries into listbox */
 	if (entry)
 		insert_entries(pane, entry, -1);
 
-	 // calculate column widths
+	/* calculate column widths */
 	if (!s_init) {
 		s_init = 1;
 		init_output(pane->hwnd);
@@ -1576,7 +1576,7 @@
 	DrawTextEx(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/
 
 	DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8));
-//@@ rt (0,0) ???
+	/*@@ rt (0,0) ??? */
 
 	if (rt.right > pane->widths[col])
 		pane->widths[col] = rt.right;
@@ -1614,7 +1614,7 @@
 	if (*s)
 		*d++ = *s++;
 
-	 // insert number separator characters
+	/* insert number separator characters */
 	pos = lstrlen(s) % 3;
 
 	while(*s)
@@ -1661,7 +1661,7 @@
 
 static int is_registered_type(LPCTSTR ext)
 {
-	//TODO
+        /* TODO */
 
 	return 1;
 }
@@ -1735,7 +1735,7 @@
 					hrgn_org = 0;
 				}
 
-//				HGDIOBJ holdPen = SelectObject(dis->hDC, GetStockObject(BLACK_PEN));
+				/*				HGDIOBJ holdPen = SelectObject(dis->hDC, GetStockObject(BLACK_PEN)); */
 				ExtSelectClipRgn(dis->hDC, hrgn, RGN_AND);
 				DeleteObject(hrgn);
 
@@ -1779,7 +1779,7 @@
 
 				SelectClipRgn(dis->hDC, hrgn_org);
 				if (hrgn_org) DeleteObject(hrgn_org);
-//				SelectObject(dis->hDC, holdPen);
+				/*				SelectObject(dis->hDC, holdPen); */
 			} else if (calcWidthCol==col || calcWidthCol==COLUMNS) {
 				int right = img_pos + IMAGE_WIDTH - Globals.spaceSize.cx;
 
@@ -1851,7 +1851,7 @@
 
 	col++;
 
-	 // ouput file name
+	/* ouput file name */
 	if (calcWidthCol == -1)
 		output_text(pane, dis, col, entry->data.cFileName, 0);
 	else if (calcWidthCol==col || calcWidthCol==COLUMNS)
@@ -1863,7 +1863,7 @@
   if (!pane->treePane) {
 #endif
 
-	 // display file size
+        /* display file size */
 	if (visible_cols & COL_SIZE) {
 #ifdef _NO_EXTENSIONS
 		if (!(attrs&FILE_ATTRIBUTE_DIRECTORY))
@@ -1871,7 +1871,7 @@
 		{
 			QWORD size;
 
-			*(DWORD*)(&size) = entry->data.nFileSizeLow;	//TODO: platform spefific
+			*(DWORD*)(&size) = entry->data.nFileSizeLow;	/*TODO: platform spefific */
 			*(((DWORD*)&size)+1) = entry->data.nFileSizeHigh;
 
 			_stprintf(buffer, _T("%") LONGLONGARG _T("d"), size);
@@ -1879,13 +1879,13 @@
 			if (calcWidthCol == -1)
 				output_number(pane, dis, col, buffer);
 			else if (calcWidthCol==col || calcWidthCol==COLUMNS)
-				calc_width(pane, dis, col, buffer);//TODO: not ever time enough
+				calc_width(pane, dis, col, buffer);/*TODO: not ever time enough */
 		}
 
 		col++;
 	}
 
-	 // display file date
+	/* display file date */
 	if (visible_cols & (COL_DATE|COL_TIME)) {
 #ifndef _NO_EXTENSIONS
 		format_date(&entry->data.ftCreationTime, buffer, visible_cols);
@@ -1913,7 +1913,7 @@
 
 #ifndef _NO_EXTENSIONS
 	if (entry->bhfi_valid) {
-		((DWORD*)&index)[0] = entry->bhfi.nFileIndexLow;	//TODO: platform spefific
+	  ((DWORD*)&index)[0] = entry->bhfi.nFileIndexLow;	/*TODO: platform spefific */
 		((DWORD*)&index)[1] = entry->bhfi.nFileIndexHigh;
 
 		if (visible_cols & COL_INDEX) {
@@ -1937,7 +1937,7 @@
 		col += 2;
 #endif
 
-	 // show file attributes
+	/* show file attributes */
 	if (visible_cols & COL_ATTRIBUTES) {
 #ifdef _NO_EXTENSIONS
 		_tcscpy(buffer, _T(" \t \t \t \t "));
@@ -2002,15 +2002,15 @@
 #ifdef _NO_EXTENSIONS
   }
 
-	 // draw focus frame
+        /* draw focus frame */
 	if ((dis->itemState&ODS_FOCUS) && calcWidthCol==-1) {
-		 // Currently [04/2000] Wine neither behaves exactly the same
-		 // way as WIN 95 nor like Windows NT...
+	        /* Currently [04/2000] Wine neither behaves exactly the same */
+	        /* way as WIN 95 nor like Windows NT... */
 		HGDIOBJ lastBrush;
 		HPEN lastPen;
 		HPEN hpen;
 
-		if (!(GetVersion() & 0x80000000)) {	// Windows NT?
+		if (!(GetVersion() & 0x80000000)) {	/* Windows NT? */
 			LOGBRUSH lb = {PS_SOLID, RGB(255,255,255)};
 			hpen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, 0);
 		} else
@@ -2090,7 +2093,7 @@
 			RECT clnt;
 			GetClientRect(pane->hwnd, &clnt);
 
-			 // move immediate to simulate HDS_FULLDRAG (for now [04/2000] not realy needed with WINELIB)
+			/* move immediate to simulate HDS_FULLDRAG (for now [04/2000] not realy needed with WINELIB) */
 			Header_SetItem(pane->hwndHeader, idx, phdn->pitem);
 
 			pane->widths[idx] += dx;
@@ -2147,7 +2147,7 @@
 	int idx = ListBox_GetCurSel(child->left.hwnd);
 	HCURSOR crsrOld = SetCursor(LoadCursor(0, IDC_WAIT));
 
-	 // delete sub entries in left pane
+	/* delete sub entries in left pane */
 	for(;;) {
 		LRESULT res = ListBox_GetItemData(child->left.hwnd, idx+1);
 		Entry* sub = (Entry*) res;
@@ -2158,17 +2158,17 @@
 		ListBox_DeleteString(child->left.hwnd, idx+1);
 	}
 
-	 // empty right pane
+	/* empty right pane */
 	ListBox_ResetContent(child->right.hwnd);
 
-	 // release memory
+	/* release memory */
 	free_entries(entry);
 
-	 // read contents from disk
+	/* read contents from disk */
 	get_path(entry, path);
 	read_directory(entry, path, child->sortOrder);
 
-	 // insert found entries in right pane
+	/* insert found entries in right pane */
 	insert_entries(&child->right, entry->down, -1);
 	calc_widths(&child->right, FALSE);
 #ifndef _NO_EXTENSIONS
@@ -2181,7 +2181,7 @@
 }
 
 
- // expand a directory entry
+/* expand a directory entry */
 
 static BOOL expand_entry(ChildWnd* child, Entry* dir)
 {
@@ -2201,7 +2201,7 @@
 			p = p->next;
 	}
 
-	 // no subdirectories ?
+	/* no subdirectories ? */
 	if (!(p->data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY))
 		return FALSE;
 
@@ -2209,7 +2209,7 @@
 
 	dir->expanded = TRUE;
 
-	 // insert entries in left pane
+	/* insert entries in left pane */
 	insert_entries(&child->left, p, idx);
 
 	if (!child->header_wdths_ok) {
@@ -2232,7 +2232,7 @@
 
 	ShowWindow(pane->hwnd, SW_HIDE);
 
-	 // hide sub entries
+	/* hide sub entries */
 	for(;;) {
 		LRESULT res = ListBox_GetItemData(pane->hwnd, idx+1);
 		Entry* sub = (Entry*) res;
@@ -2318,7 +2318,7 @@
 		}
 	} else {
 
-		//TODO: start program, open document...
+	        /*TODO: start program, open document... */
 
 	}
 }
@@ -2363,7 +2363,7 @@
 			break;}
 #endif
 
-			// TODO: more command ids...
+		        /* TODO: more command ids... */
 
 		default:
 			return FALSE;
@@ -2529,8 +2529,8 @@
 
 			{LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam;
 
-			lpmmi->ptMaxTrackSize.x <<= 1;//2*GetSystemMetrics(SM_CXSCREEN) / SM_CXVIRTUALSCREEN
-			lpmmi->ptMaxTrackSize.y <<= 1;//2*GetSystemMetrics(SM_CYSCREEN) / SM_CYVIRTUALSCREEN
+			lpmmi->ptMaxTrackSize.x <<= 1;/*2*GetSystemMetrics(SM_CXSCREEN) / SM_CXVIRTUALSCREEN */
+			lpmmi->ptMaxTrackSize.y <<= 1;/*2*GetSystemMetrics(SM_CYSCREEN) / SM_CYVIRTUALSCREEN */
 			break;}
 #endif
 
@@ -2594,7 +2594,7 @@
 		case WM_SIZE:
 			if (wparam != SIZE_MINIMIZED)
 				resize_tree(child, LOWORD(lparam), HIWORD(lparam));
-			 // fall through
+			/* fall through */
 
 		default: def:
 			return DefMDIChildProc(hwnd, nmsg, wparam, lparam);
@@ -2620,12 +2620,12 @@
 		case WM_SETFOCUS:
 			child->focus_pane = pane==&child->right? 1: 0;
 			ListBox_SetSel(hwnd, TRUE, 1);
-			//TODO: check menu items
+			/*TODO: check menu items */
 			break;
 
 		case WM_KEYDOWN:
 			if (wparam == VK_TAB) {
-				//TODO: SetFocus(Globals.hdrivebar)
+				/*TODO: SetFocus(Globals.hdrivebar) */
 				SetFocus(child->focus_pane? child->left.hwnd: child->right.hwnd);
 			}
 	}
@@ -2702,7 +2702,7 @@
 
 	Globals.hInstance = hinstance;
 
-	 // create main window
+	/* create main window */
 	Globals.hMainWnd = CreateWindowEx(0, (LPCTSTR)(int)hframeClass, _T("Wine File"), WS_OVERLAPPEDWINDOW,
 					CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
 					0/*hWndParent*/, Globals.hMenuFrame, hinstance, 0/*lpParam*/);
@@ -2732,7 +2732,7 @@
 
 #ifndef _NO_EXTENSIONS
 #ifdef __linux__
-		 // insert unix file system button
+		/* insert unix file system button */
 		SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)_T("/\0"));
 
 		drivebarBtn.idCommand = ID_DRIVE_UNIX_FS;
@@ -2740,7 +2740,7 @@
 		drivebarBtn.iString++;
 #endif
 
-		 // register windows drive root strings
+		/* register windows drive root strings */
 		SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)Globals.drives);
 #endif
 
@@ -2748,7 +2748,7 @@
 
 		for(p=Globals.drives; *p; ) {
 #ifdef _NO_EXTENSIONS
-			 // insert drive letter
+		  /* insert drive letter */
 			TCHAR b[3] = {tolower(*p)};
 			SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)b);
 #endif
@@ -2793,7 +2793,7 @@
 					WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_BORDER|CCS_NODIVIDER, 0,0,0,0,
 					Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/
 
-	 //TODO: read paths and window placements from registry
+	/*TODO: read paths and window placements from registry */
 	GetCurrentDirectory(MAX_PATH, path);
 	child = alloc_child_window(path);
 
@@ -2821,7 +2821,7 @@
 
 #ifdef _NO_EXTENSIONS
 
- // search for already running win[e]files
+/* search for already running win[e]files */
 
 static int g_foundPrevInstance = 0;
 
@@ -2850,7 +2850,7 @@
 	MSG msg;
 
 #ifdef _NO_EXTENSIONS
-	// allow only one running instance
+	/* allow only one running instance */
 	EnumWindows(EnumWndProc, (LPARAM)WINEFILEFRAME);
 
 	if (g_foundPrevInstance)
@@ -2860,7 +2860,7 @@
 	InitInstance(hinstance);
 
 	if (cmdshow == SW_SHOWNORMAL) {
-	 	//TODO: read window placement from registry
+	        /*TODO: read window placement from registry */
 		cmdshow = SW_MAXIMIZE;
 	}
 
Index: programs/winefile/winefile.h
===================================================================
RCS file: /opcom/comp/ws/wine/CVSROOT/wine/programs/winefile/winefile.h,v
retrieving revision 1.1
diff -u -r1.1 winefile.h
--- /tmp/T0htaWWv	Wed Jun 26 12:04:04 2002
+++ winefile.h	Tue Jun 25 08:23:56 2002
@@ -80,7 +80,7 @@
 #define IDW_STATUSBAR		0x100
 #define IDW_TOOLBAR			0x101
 #define IDW_DRIVEBAR		0x102
-#define	IDW_FIRST_CHILD		0xC000	//0x200
+#define	IDW_FIRST_CHILD		0xC000	/*0x200*/
 
 #define IDW_TREE_LEFT		3
 #define IDW_TREE_RIGHT		6
@@ -128,7 +128,7 @@
   HIMAGELIST himl;
 
   TCHAR		drives[BUFFER_LEN];
-  BOOL		prescan_node;	//TODO
+  BOOL		prescan_node;	/*TODO*/
 
   UINT		wStringTableOffset;
 } WINEFILE_GLOBALS;

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux