]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
crypto: windows: use LPCTSTR for the temp registry buffer
authorHugo Beauzée-Luyssen <hugo@beauzee.fr>
Mon, 27 Jan 2025 07:36:30 +0000 (08:36 +0100)
committerTomas Mraz <tomas@openssl.org>
Mon, 31 Mar 2025 11:58:06 +0000 (13:58 +0200)
mingw-w64 only defines LPCTCH when UNICODE isn't defined
crypto/defaults.c: In function 'get_windows_regdirs':
crypto/defaults.c:72:5: error: unknown type name 'LPCTCH'; did you mean 'LPTCH'?
   72 |     LPCTCH tempstr = NULL;
      |     ^~~~~~
      |     LPTCH

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26566)

crypto/defaults.c

index b507660d4214469d9e7231f6e2296111d36d0331..09ac5a879990dfc86d101ac2df08feea36c85101 100644 (file)
@@ -69,7 +69,7 @@ static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
     HKEY hkey;
     LSTATUS ret;
     DWORD index = 0;
-    LPCTCH tempstr = NULL;
+    LPCTSTR tempstr = NULL;
 
     ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
                        TEXT(REGISTRY_KEY), KEY_WOW64_32KEY,
@@ -93,7 +93,7 @@ static char *get_windows_regdirs(char *dst, LPCTSTR valuename)
         goto out;
 
     if (RegQueryValueEx(hkey, valuename,
-                        NULL, &ktype, tempstr, &keysize) != ERROR_SUCCESS)
+                        NULL, &ktype, (LPBYTE)tempstr, &keysize) != ERROR_SUCCESS)
         goto out;
 
     if (!WideCharToMultiByte(CP_UTF8, 0, tempstr, -1, dst, keysize,