Eric Pouech : typelib.dll16: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ca4cc5723af03baae0c98b38dbcf4694dec2a27a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ca4cc5723af03baae0c98b38d...

Author: Eric Pouech <eric.pouech(a)gmail.com>
Date:   Fri Feb 18 09:17:46 2022 +0100

typelib.dll16: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/typelib.dll16/Makefile.in | 1 -
 dlls/typelib.dll16/typelib.c   | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in
index 06adb35b296..b4d39ee6601 100644
--- a/dlls/typelib.dll16/Makefile.in
+++ b/dlls/typelib.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = typelib.dll16
 IMPORTS   = oleaut32 advapi32
 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll
diff --git a/dlls/typelib.dll16/typelib.c b/dlls/typelib.dll16/typelib.c
index 4787010354c..41a4790a253 100644
--- a/dlls/typelib.dll16/typelib.c
+++ b/dlls/typelib.dll16/typelib.c
@@ -82,14 +82,14 @@ QueryPathOfRegTypeLib16(
 	TRACE("\n");
 
 	if (HIWORD(guid)) {
-            sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16",
+            sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%lx\\win16",
                      guid->Data1, guid->Data2, guid->Data3,
                      guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
                      guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7],
                      wMaj,wMin,lcid);
 	} else {
-		sprintf(xguid,"<guid 0x%08x>",(DWORD)guid);
-		FIXME("(%s,%d,%d,0x%04x,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path);
+		sprintf(xguid,"<guid 0x%08lx>",(DWORD)guid);
+		FIXME("(%s,%d,%d,0x%04lx,%p),can't handle non-string guids.\n",xguid,wMaj,wMin,lcid,path);
 		return E_FAIL;
 	}
 	plen = sizeof(pathname);