[xine-cvs] CVS: xine-lib/src/libw32dll/wine pe_image.c,1.5,1.6 registry.c,1.6,1.7 vfl.c,1.3,1.4 win32.c,1.13,1.14

[Rich J W. <ric...@us...>]

Update of /cvsroot/xine/xine-lib/src/libw32dll/wine
In directory usw-pr-cvs1:/tmp/cvs-serv5832/src/libw32dll/wine

Modified Files:
	pe_image.c registry.c vfl.c win32.c 
Log Message:
Commented out variable declarations leading to 'unused variable' warnings


Index: pe_image.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/wine/pe_image.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pe_image.c	2002/01/07 02:17:10	1.5
+++ pe_image.c	2002/02/01 14:23:14	1.6
@@ -281,7 +281,7 @@
      */
  
     for (i = 0, pe_imp = pem->pe_import; pe_imp->Name ; pe_imp++) {
-    	WINE_MODREF		*wmImp;
+    	/* WINE_MODREF		*wmImp; -- unused */
 	IMAGE_IMPORT_BY_NAME	*pe_name;
 	PIMAGE_THUNK_DATA	import_list,thunk_list;
  	char			*name = (char *) RVA(pe_imp->Name);
@@ -436,7 +436,7 @@
     IMAGE_NT_HEADERS *nt;
     IMAGE_SECTION_HEADER *pe_sec;
     IMAGE_DATA_DIRECTORY *dir;
-    BY_HANDLE_FILE_INFORMATION bhfi;
+    /* BY_HANDLE_FILE_INFORMATION bhfi; -- unused */
     int	i, rawsize, lowest_va, vma_size, file_size = 0;
     DWORD load_addr = 0, aoep, reloc = 0;
 //    struct get_read_fd_request *req = get_req_buffer();
@@ -696,7 +696,7 @@
     IMAGE_EXPORT_DIRECTORY *pe_export = NULL;
     IMAGE_RESOURCE_DIRECTORY *pe_resource = NULL;
     WINE_MODREF *wm;
-    int	result;
+    /* int	result; -- unused */
 
 
     

Index: registry.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/wine/registry.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- registry.c	2002/01/07 02:17:10	1.6
+++ registry.c	2002/02/01 14:23:14	1.7
@@ -255,7 +255,7 @@
 }
 static struct reg_value* insert_reg_value(int handle, const char* name, int type, const void* value, int len)
 {
-	reg_handle_t* t;
+	/* reg_handle_t* t; -- unused */
 	struct reg_value* v;
 	char* fullname;
 	if((fullname=build_keyname(handle, name))==NULL)
@@ -328,6 +328,8 @@
 	insert_handle(HKEY_CURRENT_USER, "HKCU");
 }
 
+#if 0
+/* UNUSED function */
 static reg_handle_t* find_handle_2(long key, const char* subkey)
 {
 	char* full_name;
@@ -347,6 +349,7 @@
 	free(full_name);
 	return t;
 }
+#endif
 
 long RegOpenKeyExA(long key, const char* subkey, long reserved, long access, int* newkey)
 {
@@ -502,7 +505,7 @@
 
 long RegSetValueExA(long key, const char* name, long v1, long v2, const void* data, long size)
 {
-    struct reg_value* t;
+    /* struct reg_value* t; -- unused */
     char* c;
     TRACE("Request to set value %s\n", name);
     if(!regs)

Index: vfl.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/wine/vfl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vfl.c	2002/01/07 02:17:10	1.3
+++ vfl.c	2002/02/01 14:23:14	1.4
@@ -349,7 +349,7 @@
 ICSendMessage(HIC hic,unsigned int msg,long lParam1,long lParam2) {
 	LRESULT		ret;
 	WINE_HIC	*whic = (WINE_HIC*)hic;
-	char qw[200];
+	/* char qw[200]; -- unused*/
 
 //    printf("ICSendMessage.whic=%p\n",whic);
 

Index: win32.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libw32dll/wine/win32.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- win32.c	2002/01/07 12:21:22	1.13
+++ win32.c	2002/02/01 14:23:14	1.14
@@ -811,7 +811,7 @@
     /* FIXME: better values for the two entries below... */
     static int cache = 0;
     static SYSTEM_INFO cachedsi;
-    unsigned int regs[4];
+    /* unsigned int regs[4]; -- Unused*/
     dbgprintf("GetSystemInfo(%p) =>\n", si);
 
     if (cache) {
@@ -1535,7 +1535,7 @@
 
 static long WINAPI expMultiByteToWideChar(long v1, long v2, char* s1, long siz1, short* s2, int siz2)
 {
-#warning FIXME
+// #warning FIXME
     int i;
     int result;
     if(s2==0)
@@ -1604,7 +1604,7 @@
 {
     pthread_mutex_t *pm;
     pthread_cond_t  *pc;
-    mutex_list* pp;
+    /* mutex_list* pp; -- unused */
     /*
      printf("CreateSemaphoreA(%p = %s)\n", name, (name ? name : "<null>"));
      pp=mlist;
@@ -2015,7 +2015,7 @@
 
 static int WINAPI expGetStartupInfoA(STARTUPINFOA *s)
 {
-    int i;
+    /* int i; -- unused */
     dbgprintf("GetStartupInfoA(0x%x) => 1\n");
     memset(s, 0, sizeof(*s));
     s->cb=sizeof(*s);
@@ -2104,7 +2104,7 @@
 {
     int result = 0;
     char* lastbc;
-    int i;
+    /* int i; */
     if (!name)
 	return -1;
     // we skip to the last backslash
@@ -2360,7 +2360,7 @@
 						const char* string,
 						const char* filename)
 {
-    int size=256;
+    /* int size=256; */
     char* fullname;
     dbgprintf("WritePrivateProfileStringA('%s', '%s', '%s', '%s')", appname, keyname, string, filename );
     if(!(appname && keyname && filename) )
@@ -2536,7 +2536,7 @@
 }
 static int WINAPI expGetCurrentThread(void)
 {
-#warning FIXME!
+/* #warning FIXME! -- Worry about it later :) */
     dbgprintf("GetCurrentThread() => %x\n", 0xcfcf9898);
     return 0xcfcf9898;
 }
@@ -2664,7 +2664,7 @@
 
 static int WINAPI expGetEnvironmentVariableA(const char* name, char* field, int size)
 {
-    char *p;
+    /* char *p; */
     //    printf("%s %x %x\n", name, field, size);
     if(field)field[0]=0;
     /*
@@ -3759,7 +3759,7 @@
     LL(msdmo)
 };
 
-static char* called_unk = "Called unk_%s\n";
+/* static char* called_unk = "Called unk_%s\n"; -- unused */
 static void ext_stubs(void)
 {
     // expects:
@@ -3834,7 +3834,7 @@
 
 void* LookupExternalByName(const char* library, const char* name)
 {
-    char* answ;
+    /* char* answ; -- unused */
     int i,j;
     //   return (void*)ext_unknown;
     if(library==0)