ADVAPI32: fix some warnings

[Mike McCormack]

ChangeLog:
* fix some warnings
-------------- next part --------------
Index: dlls/advapi32/tests/crypt.c
===================================================================
RCS file: /home/wine/wine/dlls/advapi32/tests/crypt.c,v
retrieving revision 1.23
diff -u -p -r1.23 crypt.c
--- dlls/advapi32/tests/crypt.c	23 Apr 2005 19:05:03 -0000	1.23
+++ dlls/advapi32/tests/crypt.c	9 Jun 2005 03:39:57 -0000
@@ -591,13 +591,13 @@ static BOOL FindDfltProvRegVals(DWORD dw
 	PSTR ptr;
 	DWORD user = dwFlags & CRYPT_USER_DEFAULT;
 	
-	LPSTR MACHINESTR = "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types\\Type XXX";
-	LPSTR USERSTR = "Software\\Microsoft\\Cryptography\\Provider Type XXX";
+	LPCSTR machinestr = "Software\\Microsoft\\Cryptography\\Defaults\\Provider Types\\Type XXX";
+	LPCSTR userstr = "Software\\Microsoft\\Cryptography\\Provider Type XXX";
 	
-	keyname = LocalAlloc(LMEM_ZEROINIT, (user ? strlen(USERSTR) : strlen(MACHINESTR)) + 1);
+	keyname = LocalAlloc(LMEM_ZEROINIT, (user ? strlen(userstr) : strlen(machinestr)) + 1);
 	if (keyname)
 	{
-		user ? strcpy(keyname, USERSTR) : strcpy(keyname, MACHINESTR);
+		user ? strcpy(keyname, userstr) : strcpy(keyname, machinestr);
 		ptr = keyname + strlen(keyname);
 		*(--ptr) = (dwProvType % 10) + '0';
 		*(--ptr) = ((dwProvType / 10) % 10) + '0';
Index: dlls/advapi32/tests/security.c
===================================================================
RCS file: /home/wine/wine/dlls/advapi32/tests/security.c,v
retrieving revision 1.16
diff -u -p -r1.16 security.c
--- dlls/advapi32/tests/security.c	31 Mar 2005 10:07:11 -0000	1.16
+++ dlls/advapi32/tests/security.c	9 Jun 2005 03:39:57 -0000
@@ -53,7 +53,7 @@ static void init(void)
     hmod = GetModuleHandle("advapi32.dll");
 }
 
-void test_sid()
+static void test_sid(void)
 {
     struct sidRef refs[] = {
      { { {0x00,0x00,0x33,0x44,0x55,0x66} }, "S-1-860116326-1" },
@@ -144,11 +144,11 @@ void test_sid()
     }
 }
 
-void test_trustee()
+static void test_trustee(void)
 {
     TRUSTEE trustee;
     PSID psid;
-    LPSTR str = "2jjj";
+    LPCSTR str = "2jjj";
 
     SID_IDENTIFIER_AUTHORITY auth = { {0x11,0x22,0,0,0, 0} };
 
@@ -253,7 +253,7 @@ static void test_allocateLuid(void)
 
 static void test_lookupPrivilegeName(void)
 {
-    BOOL (WINAPI *pLookupPrivilegeNameA)(LPSTR, PLUID, LPSTR, LPDWORD);
+    BOOL (WINAPI *pLookupPrivilegeNameA)(LPCSTR, PLUID, LPSTR, LPDWORD);
     char buf[MAX_PATH]; /* arbitrary, seems long enough */
     DWORD cchName = sizeof(buf);
     LUID luid = { 0, 0 };