commit fafc6fbffe81b3e706cb649fcc7d1cd419b341a7
author Rein Klazes <rklazes@casema.net> Tue Mar 13 23:32:45 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 13 23:32:45 2001 +0000
tree 2f3b6cb216347899430eb1ddca6e920f0904611e
parent 916a1a6c726c18d335c2a8eac5302093bdd0f15a

Fix Unicode/Ansi message translation for some listbox/combobox
messages with a zero valued lparam. Output an error when the
translation fails.

windows/winproc.c

diff --git a/windows/winproc.c b/windows/winproc.c
index 225d42f..e82c350 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -577,6 +577,7 @@
     case LB_FINDSTRINGEXACT:
     case LB_SELECTSTRING:
     case EM_REPLACESEL:
+        if(!*plparam) return 0;
         *plparam = (LPARAM)HEAP_strdupAtoW( GetProcessHeap(), 0, (LPCSTR)*plparam );
         return (*plparam ? 1 : -1);
 
@@ -620,6 +621,7 @@
 /* Listbox */
     case LB_ADDSTRING:
     case LB_INSERTSTRING:
+        if(!*plparam) return 0;
 	if ( WINPROC_TestLBForStr( hwnd ))
           *plparam = (LPARAM)HEAP_strdupAtoW( GetProcessHeap(), 0, (LPCSTR)*plparam );
         return (*plparam ? 1 : -1);
@@ -637,6 +639,7 @@
 /* Combobox */
     case CB_ADDSTRING:
     case CB_INSERTSTRING:
+        if(!*plparam) return 0;
 	if ( WINPROC_TestCBForStr( hwnd ))
           *plparam = (LPARAM)HEAP_strdupAtoW( GetProcessHeap(), 0, (LPCSTR)*plparam );
         return (*plparam ? 1 : -1);
@@ -825,6 +828,7 @@
     case LB_FINDSTRINGEXACT:
     case LB_SELECTSTRING:
     case EM_REPLACESEL:
+        if(!*plparam) return 0;
         *plparam = (LPARAM)HEAP_strdupWtoA( GetProcessHeap(), 0, (LPCWSTR)*plparam );
         return (*plparam ? 1 : -1);
 
@@ -863,6 +867,7 @@
 /* Listbox */
     case LB_ADDSTRING:
     case LB_INSERTSTRING:
+        if(!*plparam) return 0;
 	if ( WINPROC_TestLBForStr( hwnd ))
           *plparam = (LPARAM)HEAP_strdupWtoA( GetProcessHeap(), 0, (LPCWSTR)*plparam );
         return (*plparam ? 1 : -1);
@@ -880,6 +885,7 @@
 /* Combobox */
     case CB_ADDSTRING:
     case CB_INSERTSTRING:
+        if(!*plparam) return 0;
 	if ( WINPROC_TestCBForStr( hwnd ))
           *plparam = (LPARAM)HEAP_strdupWtoA( GetProcessHeap(), 0, (LPCWSTR)*plparam );
         return (*plparam ? 1 : -1);
@@ -2354,10 +2360,15 @@
                                          LPARAM lParam )
 {
     LRESULT result;
+    int unmap;
 
-    if (WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam ) == -1) return 0;
+    if( (unmap = WINPROC_MapMsg32ATo32W( hwnd, msg, &wParam, &lParam )) == -1) {
+        ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",
+                       SPY_GetMsgName(msg), wParam, lParam );
+        return 0;
+    }
     result = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
-    WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam );
+    if( unmap ) WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam );
     return result;
 }
 
@@ -2372,10 +2383,15 @@
                                          LPARAM lParam )
 {
     LRESULT result;
+    int unmap;
 
-    if (WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam ) == -1) return 0;
+    if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) {
+        ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",
+                       SPY_GetMsgName(msg), wParam, lParam );
+        return 0;
+    }
     result = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam );
-    WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam );
+    if( unmap ) WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam );
     return result;
 }