[PATCH] shell32: autocomplete: we shouldn't pass NULL pceltFetched to IEnumString_Next

Mikołaj Zalewski mikolaj at zalewski.pl
Thu Jul 24 04:22:48 CDT 2008


---
 dlls/advapi32/registry.c    |    2 +-
 dlls/shell32/autocomplete.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
index adf1f67..0ddaff5 100644
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -45,7 +45,7 @@
 WINE_DEFAULT_DEBUG_CHANNEL(reg);
 
 /* allowed bits for access mask */
-#define KEY_ACCESS_MASK (KEY_ALL_ACCESS | KEY_WOW64_RES | MAXIMUM_ALLOWED | GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL)
+#define KEY_ACCESS_MASK (KEY_ALL_ACCESS /*| KEY_WOW64_RES*/ | MAXIMUM_ALLOWED | GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL)
 
 #define HKEY_SPECIAL_ROOT_FIRST   HKEY_CLASSES_ROOT
 #define HKEY_SPECIAL_ROOT_LAST    HKEY_DYN_DATA
diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index 4c32b3f..5eb76f7 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -574,7 +574,8 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 	    IEnumString_Reset(This->enumstr);
 	    filled = FALSE;
 	    for(cpt = 0;;) {
-		hr = IEnumString_Next(This->enumstr, 1, &strs, NULL);
+	        ULONG fetched;
+		hr = IEnumString_Next(This->enumstr, 1, &strs, &fetched);
 		if (hr != S_OK)
 		    break;
 
-- 
1.5.4


--------------020002070909050006010906--



More information about the wine-patches mailing list