Puetz Kevin A : oleaut32: Cut off only non-empty \[0-9]+$ resource-id in RegisterTypeLib.
Alexandre Julliard
julliard at winehq.org
Thu Jul 16 19:01:20 CDT 2020
Module: wine
Branch: master
Commit: 380fbe006ad153078a8cf0cfe4ecf6d2f11c2291
URL: https://source.winehq.org/git/wine.git/?a=commit;h=380fbe006ad153078a8cf0cfe4ecf6d2f11c2291
Author: Puetz Kevin A <PuetzKevinA at JohnDeere.com>
Date: Thu Jul 16 21:06:17 2020 +0200
oleaut32: Cut off only non-empty \[0-9]+$ resource-id in RegisterTypeLib.
Check if szFullPath ended with '\\' (was explicitly a directory).
Signed-off-by: Kevin Puetz <PuetzKevinA at JohnDeere.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/oleaut32/typelib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index 01bb16efbc..06667850a3 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -730,7 +730,7 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W
if ((disposition == REG_CREATED_NEW_KEY) && (szHelpDir == NULL)) {
szHelpDir = freeHelpDir = SysAllocString(szFullPath);
file_name = wcsrchr(szHelpDir, '\\');
- if (file_name && file_name[0]) {
+ if (file_name && file_name[1]) {
/* possible remove a numeric \index (resource-id) */
WCHAR *end_ptr = file_name + 1;
while ('0' <= *end_ptr && *end_ptr <= '9') end_ptr++;
More information about the wine-cvs
mailing list