shell32: Do not cast NULL.

Michael Stefaniuc mstefani at redhat.de
Sat Nov 1 18:23:18 CDT 2008


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

diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index 5892b6d..6c02310 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -533,7 +533,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 				WCHAR *msg;
 				int len;
 				
-				len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL);
+				len = SendMessageW(This->hwndListBox, LB_GETTEXTLEN, sel, 0);
 				msg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len+1)*sizeof(WCHAR));
 				SendMessageW(This->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg);
 				SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg);
@@ -555,7 +555,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam,
 		    }
 		    if (This->options & ACO_AUTOAPPEND) {
 			DWORD b;
-			SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, (LPARAM)NULL);
+                        SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, 0);
 			if (b>1) {
 			    hwndText[b-1] = '\0';
 			} else {
diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c
index 2cc0f54..3b88309 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -319,7 +319,7 @@ SEGPTR WINAPI FindEnvironmentString16(LPCSTR str)
 
     if( lpString )		/*  offset should be small enough */
 	return spEnv + (lpString - lpEnv);
-    return (SEGPTR)NULL;
+    return 0;
 }
 
 /*************************************************************************
-- 
1.6.0.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20081102/2c1f0356/attachment.pgp 


More information about the wine-patches mailing list