system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 02:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes: LB_/CB_/EM_ messages for getting/setting text and a bug in

Browse source 
16->32 bit conversion.
This commit is contained in:
Juergen Schmied 1998-11-08 16:28:49 +00:00 committed by Alexandre Julliard
parent cd67edd365
commit fdf6aa4eed
4 changed files with 262 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/winproc.h
View file

@ -47,14 +47,14 @@ extern BOOL32 WINPROC_SetProc( HWINDOWPROC *pFirst, WNDPROC16 func,
extern void WINPROC_FreeProc( HWINDOWPROC proc, WINDOWPROCUSER user ); extern void WINPROC_FreeProc( HWINDOWPROC proc, WINDOWPROCUSER user );
extern WINDOWPROCTYPE WINPROC_GetProcType( HWINDOWPROC proc ); extern WINDOWPROCTYPE WINPROC_GetProcType( HWINDOWPROC proc );
extern INT32 WINPROC_MapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, extern INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
LPARAM *plparam ); LPARAM *plparam );
extern INT32 WINPROC_MapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, extern INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
LPARAM *plparam ); LPARAM *plparam );
extern INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, extern INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16,
UINT32 *pmsg32, WPARAM32 *pwparam32, UINT32 *pmsg32, WPARAM32 *pwparam32,
LPARAM *plparam ); LPARAM *plparam );
extern INT32 WINPROC_MapMsg16To32W( UINT16 msg16, WPARAM16 wParam16, extern INT32 WINPROC_MapMsg16To32W( HWND16, UINT16 msg16, WPARAM16 wParam16,
UINT32 *pmsg32, WPARAM32 *pwparam32, UINT32 *pmsg32, WPARAM32 *pwparam32,
LPARAM *plparam ); LPARAM *plparam );
extern INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, extern INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32,
@ -63,16 +63,16 @@ extern INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32,
extern INT32 WINPROC_MapMsg32WTo16( HWND32 hwnd, UINT32 msg32, extern INT32 WINPROC_MapMsg32WTo16( HWND32 hwnd, UINT32 msg32,
WPARAM32 wParam32, UINT16 *pmsg16, WPARAM32 wParam32, UINT16 *pmsg16,
WPARAM16 *pwparam16, LPARAM *plparam ); WPARAM16 *pwparam16, LPARAM *plparam );
extern void WINPROC_UnmapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, extern void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
LPARAM lParam ); LPARAM lParam );
extern void WINPROC_UnmapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, extern void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
LPARAM lParam ); LPARAM lParam );
extern LRESULT WINPROC_UnmapMsg16To32A( UINT32 msg, WPARAM32 wParam, extern LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam,
LPARAM lParam, LRESULT result ); LPARAM lParam, LRESULT result );
extern LRESULT WINPROC_UnmapMsg16To32W( UINT32 msg, WPARAM32 wParam, extern LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT32 msg, WPARAM32 wParam,
LPARAM lParam, LRESULT result ); LPARAM lParam, LRESULT result );
extern void WINPROC_UnmapMsg32ATo16( UINT32 msg, WPARAM32 wParam, extern void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
LPARAM lParam, MSGPARAM16* pm16 ); LPARAM lParam, MSGPARAM16* pm16 );
extern void WINPROC_UnmapMsg32WTo16( UINT32 msg, WPARAM32 wParam, extern void WINPROC_UnmapMsg32WTo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam,
LPARAM lParam, MSGPARAM16* pm16 ); LPARAM lParam, MSGPARAM16* pm16 );
#endif /* __WINE_WINPROC_H */ #endif /* __WINE_WINPROC_H */

8
misc/commdlg.c
View file

@ -34,7 +34,7 @@ static const char defaultfilter[]=" \0\0";
/*********************************************************************** /***********************************************************************
* FileDlg_Init [internal] * FileDlg_Init [internal]
*/ */
static BOOL32 FileDlg_Init() static BOOL32 FileDlg_Init(void)
{ {
static BOOL32 initialized = 0; static BOOL32 initialized = 0;
@ -2286,7 +2286,7 @@ static void CC_SwitchToFullSize(HWND16 hDlg,COLORREF result,LPRECT16 lprect)
EnableWindow32(GetDlgItem32(hDlg,0x2c8),TRUE); EnableWindow32(GetDlgItem32(hDlg,0x2c8),TRUE);
if (lprect) if (lprect)
SetWindowPos32(hDlg,NULL,0,0,lprect->right-lprect->left, SetWindowPos32(hDlg,0,0,0,lprect->right-lprect->left,
lprect->bottom-lprect->top, SWP_NOMOVE|SWP_NOZORDER); lprect->bottom-lprect->top, SWP_NOMOVE|SWP_NOZORDER);
ShowWindow32(GetDlgItem32(hDlg,0x2c6),SW_SHOW); ShowWindow32(GetDlgItem32(hDlg,0x2c6),SW_SHOW);
@ -2447,7 +2447,7 @@ static LONG CC_WMInitDialog(HWND16 hDlg, WPARAM16 wParam, LPARAM lParam)
ScreenToClient16(hDlg,&point); ScreenToClient16(hDlg,&point);
GetClientRect16(hDlg,&rect); GetClientRect16(hDlg,&rect);
point.x+=GetSystemMetrics32(SM_CXDLGFRAME); point.x+=GetSystemMetrics32(SM_CXDLGFRAME);
SetWindowPos32(hDlg,NULL,0,0,point.x,res,SWP_NOMOVE|SWP_NOZORDER); SetWindowPos32(hDlg,0,0,0,point.x,res,SWP_NOMOVE|SWP_NOZORDER);
ShowWindow32(GetDlgItem32(hDlg,0x2c6),SW_HIDE); ShowWindow32(GetDlgItem32(hDlg,0x2c6),SW_HIDE);
ShowWindow32(GetDlgItem32(hDlg,0x2c5),SW_HIDE); ShowWindow32(GetDlgItem32(hDlg,0x2c5),SW_HIDE);
@ -3565,7 +3565,7 @@ LRESULT WINAPI FormatCharDlgProc16(HWND16 hDlg, UINT16 message, WPARAM16 wParam,
FIXME(commdlg, "current logfont back to caller\n"); FIXME(commdlg, "current logfont back to caller\n");
break; break;
} }
WINPROC_UnmapMsg16To32A(uMsg32, wParam32, lParam, res); WINPROC_UnmapMsg16To32A(hDlg,uMsg32, wParam32, lParam, res);
return res; return res;
} }

10
windows/hook.c
View file

@ -95,7 +95,7 @@ static void HOOK_Map16To32Common(INT32 id, INT32 code, WPARAM32 *pwParam,
if (bA) WINPROC_MapMsg16To32A( lpcwp16->message, lpcwp16->wParam, if (bA) WINPROC_MapMsg16To32A( lpcwp16->message, lpcwp16->wParam,
&lpcwp32->message, &lpcwp32->wParam, &lpcwp32->message, &lpcwp32->wParam,
&lpcwp32->lParam ); &lpcwp32->lParam );
else WINPROC_MapMsg16To32W( lpcwp16->message, lpcwp16->wParam, else WINPROC_MapMsg16To32W( lpcwp16->hwnd,lpcwp16->message, lpcwp16->wParam,
&lpcwp32->message, &lpcwp32->wParam, &lpcwp32->message, &lpcwp32->wParam,
&lpcwp32->lParam ); &lpcwp32->lParam );
*plParam = (LPARAM)lpcwp32; *plParam = (LPARAM)lpcwp32;
@ -266,9 +266,9 @@ static void HOOK_UnMap16To32Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
case WH_CALLWNDPROC: case WH_CALLWNDPROC:
{ {
LPCWPSTRUCT32 lpcwp32 = (LPCWPSTRUCT32)lParam; LPCWPSTRUCT32 lpcwp32 = (LPCWPSTRUCT32)lParam;
if (bA) WINPROC_UnmapMsg16To32A( lpcwp32->message, lpcwp32->wParam, if (bA) WINPROC_UnmapMsg16To32A( lpcwp32->hwnd,lpcwp32->message, lpcwp32->wParam,
lpcwp32->lParam, 0 ); lpcwp32->lParam, 0 );
else WINPROC_UnmapMsg16To32W( lpcwp32->message, lpcwp32->wParam, else WINPROC_UnmapMsg16To32W( lpcwp32->hwnd,lpcwp32->message, lpcwp32->wParam,
lpcwp32->lParam, 0 ); lpcwp32->lParam, 0 );
HeapFree( SystemHeap, 0, lpcwp32 ); HeapFree( SystemHeap, 0, lpcwp32 );
break; break;
@ -582,9 +582,9 @@ static void HOOK_UnMap32To16Common(INT32 id, INT32 code, WPARAM32 wParamOrig,
LPCWPSTRUCT32 lpcwp32 = (LPCWPSTRUCT32)lParamOrig; LPCWPSTRUCT32 lpcwp32 = (LPCWPSTRUCT32)lParamOrig;
MSGPARAM16 mp16 = { lpcwp16->wParam, lpcwp16->lParam, 0 }; MSGPARAM16 mp16 = { lpcwp16->wParam, lpcwp16->lParam, 0 };
if (bA) WINPROC_UnmapMsg32ATo16( lpcwp32->message, lpcwp32->wParam, if (bA) WINPROC_UnmapMsg32ATo16( lpcwp32->hwnd,lpcwp32->message, lpcwp32->wParam,
lpcwp32->lParam, &mp16 ); lpcwp32->lParam, &mp16 );
else WINPROC_UnmapMsg32WTo16( lpcwp32->message, lpcwp32->wParam, else WINPROC_UnmapMsg32WTo16( lpcwp32->hwnd,lpcwp32->message, lpcwp32->wParam,
lpcwp32->lParam, &mp16 ); lpcwp32->lParam, &mp16 );
SEGPTR_FREE( PTR_SEG_TO_LIN(lParam) ); SEGPTR_FREE( PTR_SEG_TO_LIN(lParam) );
break; break;

348
windows/winproc.c
View file

@ -382,8 +382,26 @@ WINDOWPROCTYPE WINPROC_GetProcType( HWINDOWPROC proc )
return WIN_PROC_INVALID; return WIN_PROC_INVALID;
return ((WINDOWPROC *)proc)->type; return ((WINDOWPROC *)proc)->type;
} }
/**********************************************************************
* WINPROC_TestCBForStr
*
* Return TRUE if the lparam is a string
*/
BOOL32 WINPROC_TestCBForStr ( HWND32 hwnd )
{ WND * wnd = WIN_FindWndPtr(hwnd);
return ( !(LOWORD(wnd->dwStyle) & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) ||
(LOWORD(wnd->dwStyle) & CBS_HASSTRINGS) );
}
/**********************************************************************
* WINPROC_TestLBForStr
*
* Return TRUE if the lparam is a string
*/
BOOL32 WINPROC_TestLBForStr ( HWND32 hwnd )
{ WND * wnd = WIN_FindWndPtr(hwnd);
return ( !(LOWORD(wnd->dwStyle) & (LBS_OWNERDRAWFIXED | LBS_OWNERDRAWVARIABLE)) ||
(LOWORD(wnd->dwStyle) & LBS_HASSTRINGS) );
}
/********************************************************************** /**********************************************************************
* WINPROC_MapMsg32ATo32W * WINPROC_MapMsg32ATo32W
* *
@ -392,9 +410,8 @@ WINDOWPROCTYPE WINPROC_GetProcType( HWINDOWPROC proc )
* fixme WM_CHAR, WM_CHARTOITEM, WM_DEADCHAR, WM_MENUCHAR, WM_SYSCHAR, * fixme WM_CHAR, WM_CHARTOITEM, WM_DEADCHAR, WM_MENUCHAR, WM_SYSCHAR,
* WM_SYSDEADCHAR ??? * WM_SYSDEADCHAR ???
*/ */
INT32 WINPROC_MapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, LPARAM *plparam ) INT32 WINPROC_MapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
{ { switch(msg)
switch(msg)
{ {
case WM_GETTEXT: case WM_GETTEXT:
{ {
@ -405,28 +422,15 @@ INT32 WINPROC_MapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
*plparam = (LPARAM)ptr; *plparam = (LPARAM)ptr;
} }
return 1; return 1;
case LB_GETTEXT32:
case CB_GETLBTEXT32:
/* fixme: fixed sized buffer */
{
LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0,
256 * sizeof(WCHAR) + sizeof(LPARAM) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
*plparam = (LPARAM)ptr;
}
return 1;
case WM_SETTEXT: case WM_SETTEXT:
case CB_ADDSTRING32:
case CB_DIR32: case CB_DIR32:
case CB_FINDSTRING32: case CB_FINDSTRING32:
case CB_FINDSTRINGEXACT32: case CB_FINDSTRINGEXACT32:
case CB_INSERTSTRING32:
case CB_SELECTSTRING32: case CB_SELECTSTRING32:
case LB_ADDSTRING32:
case LB_INSERTSTRING32:
*plparam = (LPARAM)HEAP_strdupAtoW( SystemHeap, 0, (LPCSTR)*plparam ); *plparam = (LPARAM)HEAP_strdupAtoW( SystemHeap, 0, (LPCSTR)*plparam );
return (*plparam ? 1 : -1); return (*plparam ? 1 : -1);
case WM_NCCREATE: case WM_NCCREATE:
case WM_CREATE: case WM_CREATE:
{ {
@ -458,12 +462,57 @@ INT32 WINPROC_MapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
*plparam = (LPARAM)cs; *plparam = (LPARAM)cs;
} }
return 1; return 1;
/* Listbox */
case LB_ADDSTRING32:
case LB_INSERTSTRING32:
if ( WINPROC_TestLBForStr( hwnd ))
*plparam = (LPARAM)HEAP_strdupAtoW( SystemHeap, 0, (LPCSTR)*plparam );
return (*plparam ? 1 : -1);
case LB_GETTEXT32: /* fixme: fixed sized buffer */
{ if ( WINPROC_TestLBForStr( hwnd ))
{ LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0, 256 * sizeof(WCHAR) + sizeof(LPARAM) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
*plparam = (LPARAM)ptr;
}
}
return 1;
/* Combobox */
case CB_ADDSTRING32:
case CB_INSERTSTRING32:
if ( WINPROC_TestCBForStr( hwnd ))
*plparam = (LPARAM)HEAP_strdupAtoW( SystemHeap, 0, (LPCSTR)*plparam );
return (*plparam ? 1 : -1);
case CB_GETLBTEXT32: /* fixme: fixed sized buffer */
{ if ( WINPROC_TestCBForStr( hwnd ))
{ LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0, 256 * sizeof(WCHAR) + sizeof(LPARAM) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
*plparam = (LPARAM)ptr;
}
}
return 1;
/* Multiline edit */
case EM_GETLINE32:
{ WORD len = (WORD)*plparam;
LPARAM *ptr = (LPARAM *) HEAP_xalloc( SystemHeap, 0, sizeof(LPARAM) + sizeof (WORD) + len*sizeof(WCHAR) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
(WORD)*ptr = len; /* Store the lenght */
*plparam = (LPARAM)ptr;
}
return 1;
case WM_ASKCBFORMATNAME: case WM_ASKCBFORMATNAME:
case WM_DEVMODECHANGE: case WM_DEVMODECHANGE:
case WM_PAINTCLIPBOARD: case WM_PAINTCLIPBOARD:
case WM_SIZECLIPBOARD: case WM_SIZECLIPBOARD:
case WM_WININICHANGE: case WM_WININICHANGE:
case EM_GETLINE32:
case EM_REPLACESEL32: case EM_REPLACESEL32:
case EM_SETPASSWORDCHAR32: case EM_SETPASSWORDCHAR32:
case LB_ADDFILE32: case LB_ADDFILE32:
@ -483,37 +532,17 @@ INT32 WINPROC_MapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
* *
* Unmap a message that was mapped from Ansi to Unicode. * Unmap a message that was mapped from Ansi to Unicode.
*/ */
void WINPROC_UnmapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, LPARAM lParam ) void WINPROC_UnmapMsg32ATo32W( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam )
{ { switch(msg)
switch(msg)
{ {
case WM_GETTEXT: case WM_GETTEXT:
{ {
LPARAM *ptr = (LPARAM *)lParam - 1; LPARAM *ptr = (LPARAM *)lParam - 1;
lstrcpynWtoA( (LPSTR)*ptr, (LPWSTR)(ptr + 1), wParam ); lstrcpynWtoA( (LPSTR)*ptr, (LPWSTR)(ptr + 1), wParam ); /* fixme: shouldn't be there lParam instead of ptr ???*/
HeapFree( SystemHeap, 0, ptr );
}
break;
case LB_GETTEXT32:
case CB_GETLBTEXT32:
{
LPARAM *ptr = (LPARAM *)lParam - 1;
lstrcpyWtoA( (LPSTR)*ptr, (LPWSTR)(ptr + 1) );
HeapFree( SystemHeap, 0, ptr ); HeapFree( SystemHeap, 0, ptr );
} }
break; break;
case LB_ADDSTRING32:
case LB_INSERTSTRING32:
case CB_ADDSTRING32:
case CB_DIR32:
case CB_FINDSTRING32:
case CB_FINDSTRINGEXACT32:
case CB_INSERTSTRING32:
case CB_SELECTSTRING32:
case WM_SETTEXT:
HeapFree( SystemHeap, 0, (void *)lParam );
break;
case WM_NCCREATE: case WM_NCCREATE:
case WM_CREATE: case WM_CREATE:
{ {
@ -525,6 +554,7 @@ void WINPROC_UnmapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, LPARAM lParam )
HeapFree( SystemHeap, 0, cs ); HeapFree( SystemHeap, 0, cs );
} }
break; break;
case WM_MDICREATE: case WM_MDICREATE:
{ {
MDICREATESTRUCT32W *cs = (MDICREATESTRUCT32W *)lParam; MDICREATESTRUCT32W *cs = (MDICREATESTRUCT32W *)lParam;
@ -535,6 +565,55 @@ void WINPROC_UnmapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, LPARAM lParam )
HeapFree( SystemHeap, 0, cs ); HeapFree( SystemHeap, 0, cs );
} }
break; break;
case WM_SETTEXT:
case CB_DIR32:
case CB_FINDSTRING32:
case CB_FINDSTRINGEXACT32:
case CB_SELECTSTRING32:
HeapFree( SystemHeap, 0, (void *)lParam );
break;
/* Listbox */
case LB_ADDSTRING32:
case LB_INSERTSTRING32:
if ( WINPROC_TestLBForStr( hwnd ))
HeapFree( SystemHeap, 0, (void *)lParam );
break;
case LB_GETTEXT32:
{ if ( WINPROC_TestLBForStr( hwnd ))
{ LPARAM *ptr = (LPARAM *)lParam - 1;
lstrcpyWtoA( (LPSTR)*ptr, (LPWSTR)(lParam) );
HeapFree( SystemHeap, 0, ptr );
}
}
break;
/* Combobox */
case CB_ADDSTRING32:
case CB_INSERTSTRING32:
if ( WINPROC_TestCBForStr( hwnd ))
HeapFree( SystemHeap, 0, (void *)lParam );
break;
case CB_GETLBTEXT32:
{ if ( WINPROC_TestCBForStr( hwnd ))
{ LPARAM *ptr = (LPARAM *)lParam - 1;
lstrcpyWtoA( (LPSTR)*ptr, (LPWSTR)(lParam) );
HeapFree( SystemHeap, 0, ptr );
}
}
break;
/* Multiline edit */
case EM_GETLINE32:
{ LPARAM *ptr = (LPARAM *)lParam - 1; /* get the old lParam */
WORD len = *(WORD *)ptr;
lstrcpynWtoA( ((LPSTR)*ptr)+2, ((LPWSTR)(lParam + 1))+1, len );
HeapFree( SystemHeap, 0, ptr );
}
break;
} }
} }
@ -545,9 +624,8 @@ void WINPROC_UnmapMsg32ATo32W( UINT32 msg, WPARAM32 wParam, LPARAM lParam )
* Map a message from Unicode to Ansi. * Map a message from Unicode to Ansi.
* Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed.
*/ */
INT32 WINPROC_MapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, LPARAM *plparam ) INT32 WINPROC_MapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
{ { switch(msg)
switch(msg)
{ {
case WM_GETTEXT: case WM_GETTEXT:
{ {
@ -559,29 +637,14 @@ INT32 WINPROC_MapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
} }
return 1; return 1;
case LB_GETTEXT32: case WM_SETTEXT:
case CB_GETLBTEXT32:
/* fixme: fixed sized buffer */
{
LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0,
256 + sizeof(LPARAM) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
*plparam = (LPARAM)ptr;
}
return 1;
case LB_ADDSTRING32:
case LB_INSERTSTRING32:
case CB_ADDSTRING32:
case CB_DIR32: case CB_DIR32:
case CB_FINDSTRING32: case CB_FINDSTRING32:
case CB_FINDSTRINGEXACT32: case CB_FINDSTRINGEXACT32:
case CB_INSERTSTRING32:
case CB_SELECTSTRING32: case CB_SELECTSTRING32:
case WM_SETTEXT:
*plparam = (LPARAM)HEAP_strdupWtoA( SystemHeap, 0, (LPCWSTR)*plparam ); *plparam = (LPARAM)HEAP_strdupWtoA( SystemHeap, 0, (LPCWSTR)*plparam );
return (*plparam ? 1 : -1); return (*plparam ? 1 : -1);
case WM_NCCREATE: case WM_NCCREATE:
case WM_CREATE: case WM_CREATE:
{ {
@ -613,12 +676,57 @@ INT32 WINPROC_MapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
*plparam = (LPARAM)cs; *plparam = (LPARAM)cs;
} }
return 1; return 1;
/* Listbox */
case LB_ADDSTRING32:
case LB_INSERTSTRING32:
if ( WINPROC_TestLBForStr( hwnd ))
*plparam = (LPARAM)HEAP_strdupWtoA( SystemHeap, 0, (LPCWSTR)*plparam );
return (*plparam ? 1 : -1);
case LB_GETTEXT32: /* fixme: fixed sized buffer */
{ if ( WINPROC_TestLBForStr( hwnd ))
{ LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0, 256 + sizeof(LPARAM) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
*plparam = (LPARAM)ptr;
}
}
return 1;
/* Combobox */
case CB_ADDSTRING32:
case CB_INSERTSTRING32:
if ( WINPROC_TestCBForStr( hwnd ))
*plparam = (LPARAM)HEAP_strdupWtoA( SystemHeap, 0, (LPCWSTR)*plparam );
return (*plparam ? 1 : -1);
case CB_GETLBTEXT32: /* fixme: fixed sized buffer */
{ if ( WINPROC_TestCBForStr( hwnd ))
{ LPARAM *ptr = (LPARAM *)HeapAlloc( SystemHeap, 0, 256 + sizeof(LPARAM) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
*plparam = (LPARAM)ptr;
}
}
return 1;
/* Multiline edit */
case EM_GETLINE32:
{ WORD len = (WORD)*plparam;
LPARAM *ptr = (LPARAM *) HEAP_xalloc( SystemHeap, 0, sizeof(LPARAM) + sizeof (WORD) + len*sizeof(CHAR) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
(WORD)*ptr = len; /* Store the lenght */
*plparam = (LPARAM)ptr;
}
return 1;
case WM_ASKCBFORMATNAME: case WM_ASKCBFORMATNAME:
case WM_DEVMODECHANGE: case WM_DEVMODECHANGE:
case WM_PAINTCLIPBOARD: case WM_PAINTCLIPBOARD:
case WM_SIZECLIPBOARD: case WM_SIZECLIPBOARD:
case WM_WININICHANGE: case WM_WININICHANGE:
case EM_GETLINE32:
case EM_REPLACESEL32: case EM_REPLACESEL32:
case EM_SETPASSWORDCHAR32: case EM_SETPASSWORDCHAR32:
case LB_ADDFILE32: case LB_ADDFILE32:
@ -638,36 +746,25 @@ INT32 WINPROC_MapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, LPARAM *plparam )
* *
* Unmap a message that was mapped from Unicode to Ansi. * Unmap a message that was mapped from Unicode to Ansi.
*/ */
void WINPROC_UnmapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, LPARAM lParam ) void WINPROC_UnmapMsg32WTo32A( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam )
{ { switch(msg)
switch(msg)
{ {
case WM_GETTEXT: case WM_GETTEXT:
{ {
LPARAM *ptr = (LPARAM *)lParam - 1; LPARAM *ptr = (LPARAM *)lParam - 1;
lstrcpynAtoW( (LPWSTR)*ptr, (LPSTR)(ptr + 1), wParam ); lstrcpynAtoW( (LPWSTR)*ptr, (LPSTR)(ptr + 1), wParam ); /* fixme: shouldn't be there lParam instead of ptr ???*/
HeapFree( SystemHeap, 0, ptr ); HeapFree( SystemHeap, 0, ptr );
} }
break; break;
case LB_GETTEXT32:
case CB_GETLBTEXT32: case WM_SETTEXT:
{
LPARAM *ptr = (LPARAM *)lParam - 1;
lstrcpyAtoW( (LPWSTR)*ptr, (LPSTR)(ptr + 1) );
HeapFree( SystemHeap, 0, ptr );
}
break;
case LB_ADDSTRING32:
case LB_INSERTSTRING32:
case CB_ADDSTRING32:
case CB_DIR32: case CB_DIR32:
case CB_FINDSTRING32: case CB_FINDSTRING32:
case CB_FINDSTRINGEXACT32: case CB_FINDSTRINGEXACT32:
case CB_INSERTSTRING32:
case CB_SELECTSTRING32: case CB_SELECTSTRING32:
case WM_SETTEXT:
HeapFree( SystemHeap, 0, (void *)lParam ); HeapFree( SystemHeap, 0, (void *)lParam );
break; break;
case WM_NCCREATE: case WM_NCCREATE:
case WM_CREATE: case WM_CREATE:
{ {
@ -679,6 +776,7 @@ void WINPROC_UnmapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, LPARAM lParam )
HeapFree( SystemHeap, 0, cs ); HeapFree( SystemHeap, 0, cs );
} }
break; break;
case WM_MDICREATE: case WM_MDICREATE:
{ {
MDICREATESTRUCT32A *cs = (MDICREATESTRUCT32A *)lParam; MDICREATESTRUCT32A *cs = (MDICREATESTRUCT32A *)lParam;
@ -689,6 +787,47 @@ void WINPROC_UnmapMsg32WTo32A( UINT32 msg, WPARAM32 wParam, LPARAM lParam )
HeapFree( SystemHeap, 0, cs ); HeapFree( SystemHeap, 0, cs );
} }
break; break;
/* Listbox */
case LB_ADDSTRING32:
case LB_INSERTSTRING32:
if ( WINPROC_TestLBForStr( hwnd ))
HeapFree( SystemHeap, 0, (void *)lParam );
break;
case LB_GETTEXT32:
{ if ( WINPROC_TestLBForStr( hwnd ))
{ LPARAM *ptr = (LPARAM *)lParam - 1;
lstrcpyAtoW( (LPWSTR)*ptr, (LPSTR)(lParam) );
HeapFree( SystemHeap, 0, ptr );
}
}
break;
/* Combobox */
case CB_ADDSTRING32:
case CB_INSERTSTRING32:
if ( WINPROC_TestCBForStr( hwnd ))
HeapFree( SystemHeap, 0, (void *)lParam );
break;
case CB_GETLBTEXT32:
{ if ( WINPROC_TestCBForStr( hwnd ))
{ LPARAM *ptr = (LPARAM *)lParam - 1;
lstrcpyAtoW( (LPWSTR)*ptr, (LPSTR)(lParam) );
HeapFree( SystemHeap, 0, ptr );
}
}
break;
/* Multiline edit */
case EM_GETLINE32:
{ LPARAM *ptr = (LPARAM *)lParam - 1; /* get the old lParam */
WORD len = *(WORD *)ptr;
lstrcpynAtoW( ((LPWSTR)*ptr)+1, ((LPSTR)(lParam + 1))+2, len );
HeapFree( SystemHeap, 0, ptr );
}
break;
} }
} }
@ -719,6 +858,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
*plparam = (LPARAM)(HWND32)HIWORD(*plparam); *plparam = (LPARAM)(HWND32)HIWORD(*plparam);
return 0; return 0;
case WM_CTLCOLOR: case WM_CTLCOLOR:
if ( HIWORD(*plparam) > CTLCOLOR_STATIC ) return -1;
*pmsg32 = WM_CTLCOLORMSGBOX + HIWORD(*plparam); *pmsg32 = WM_CTLCOLORMSGBOX + HIWORD(*plparam);
*pwparam32 = (WPARAM32)(HDC32)wParam16; *pwparam32 = (WPARAM32)(HDC32)wParam16;
*plparam = (LPARAM)(HWND32)LOWORD(*plparam); *plparam = (LPARAM)(HWND32)LOWORD(*plparam);
@ -940,7 +1080,7 @@ INT32 WINPROC_MapMsg16To32A( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
* *
* Unmap a message that was mapped from 16- to 32-bit Ansi. * Unmap a message that was mapped from 16- to 32-bit Ansi.
*/ */
LRESULT WINPROC_UnmapMsg16To32A( UINT32 msg, WPARAM32 wParam, LPARAM lParam, LRESULT WINPROC_UnmapMsg16To32A( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam,
LRESULT result ) LRESULT result )
{ {
switch(msg) switch(msg)
@ -1028,7 +1168,7 @@ LRESULT WINPROC_UnmapMsg16To32A( UINT32 msg, WPARAM32 wParam, LPARAM lParam,
{ {
LPMSG32 msg32 = (LPMSG32)lParam; LPMSG32 msg32 = (LPMSG32)lParam;
WINPROC_UnmapMsg16To32A( msg32->message, msg32->wParam, msg32->lParam, WINPROC_UnmapMsg16To32A( hwnd, msg32->message, msg32->wParam, msg32->lParam,
result); result);
HeapFree( SystemHeap, 0, msg32 ); HeapFree( SystemHeap, 0, msg32 );
} }
@ -1044,7 +1184,7 @@ LRESULT WINPROC_UnmapMsg16To32A( UINT32 msg, WPARAM32 wParam, LPARAM lParam,
* Map a message from 16- to 32-bit Unicode. * Map a message from 16- to 32-bit Unicode.
* Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed. * Return value is -1 on error, 0 if OK, 1 if an UnmapMsg call is needed.
*/ */
INT32 WINPROC_MapMsg16To32W( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32, INT32 WINPROC_MapMsg16To32W( HWND16 hwnd, UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
WPARAM32 *pwparam32, LPARAM *plparam ) WPARAM32 *pwparam32, LPARAM *plparam )
{ {
switch(msg16) switch(msg16)
@ -1052,7 +1192,7 @@ INT32 WINPROC_MapMsg16To32W( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
case WM_GETTEXT: case WM_GETTEXT:
case WM_SETTEXT: case WM_SETTEXT:
*plparam = (LPARAM)PTR_SEG_TO_LIN(*plparam); *plparam = (LPARAM)PTR_SEG_TO_LIN(*plparam);
return WINPROC_MapMsg32ATo32W( *pmsg32, *pwparam32, plparam ); return WINPROC_MapMsg32ATo32W( hwnd, *pmsg32, *pwparam32, plparam );
case WM_NCCREATE: case WM_NCCREATE:
case WM_CREATE: case WM_CREATE:
{ {
@ -1106,7 +1246,7 @@ INT32 WINPROC_MapMsg16To32W( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
msg32->time = msg16->time; msg32->time = msg16->time;
CONV_POINT16TO32(&msg16->pt,&msg32->pt); CONV_POINT16TO32(&msg16->pt,&msg32->pt);
/* this is right, right? */ /* this is right, right? */
if (WINPROC_MapMsg16To32W(msg16->message,msg16->wParam, if (WINPROC_MapMsg16To32W(hwnd, msg16->message,msg16->wParam,
&msg32->message,&msg32->wParam, &msg32->message,&msg32->wParam,
&msg32->lParam)<0) { &msg32->lParam)<0) {
HeapFree( SystemHeap, 0, msg32 ); HeapFree( SystemHeap, 0, msg32 );
@ -1128,14 +1268,14 @@ INT32 WINPROC_MapMsg16To32W( UINT16 msg16, WPARAM16 wParam16, UINT32 *pmsg32,
* *
* Unmap a message that was mapped from 16- to 32-bit Unicode. * Unmap a message that was mapped from 16- to 32-bit Unicode.
*/ */
LRESULT WINPROC_UnmapMsg16To32W( UINT32 msg, WPARAM32 wParam, LPARAM lParam, LRESULT WINPROC_UnmapMsg16To32W( HWND16 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam,
LRESULT result ) LRESULT result )
{ {
switch(msg) switch(msg)
{ {
case WM_GETTEXT: case WM_GETTEXT:
case WM_SETTEXT: case WM_SETTEXT:
WINPROC_UnmapMsg32ATo32W( msg, wParam, lParam ); WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam );
break; break;
case WM_NCCREATE: case WM_NCCREATE:
case WM_CREATE: case WM_CREATE:
@ -1169,13 +1309,13 @@ LRESULT WINPROC_UnmapMsg16To32W( UINT32 msg, WPARAM32 wParam, LPARAM lParam,
{ {
LPMSG32 msg32 = (LPMSG32)lParam; LPMSG32 msg32 = (LPMSG32)lParam;
WINPROC_UnmapMsg16To32W( msg32->message, msg32->wParam, msg32->lParam, WINPROC_UnmapMsg16To32W( hwnd, msg32->message, msg32->wParam, msg32->lParam,
result); result);
HeapFree( SystemHeap, 0, msg32 ); HeapFree( SystemHeap, 0, msg32 );
} }
break; break;
default: default:
return WINPROC_UnmapMsg16To32A( msg, wParam, lParam, result ); return WINPROC_UnmapMsg16To32A( hwnd, msg, wParam, lParam, result );
} }
return result; return result;
} }
@ -1622,7 +1762,7 @@ INT32 WINPROC_MapMsg32ATo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
* *
* Unmap a message that was mapped from 32-bit Ansi to 16-bit. * Unmap a message that was mapped from 32-bit Ansi to 16-bit.
*/ */
void WINPROC_UnmapMsg32ATo16( UINT32 msg, WPARAM32 wParam, LPARAM lParam, void WINPROC_UnmapMsg32ATo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam,
MSGPARAM16* p16 ) MSGPARAM16* p16 )
{ {
switch(msg) switch(msg)
@ -1762,7 +1902,7 @@ void WINPROC_UnmapMsg32ATo16( UINT32 msg, WPARAM32 wParam, LPARAM lParam,
MSGPARAM16 msgp16; MSGPARAM16 msgp16;
msgp16.wParam=msg16->wParam; msgp16.wParam=msg16->wParam;
msgp16.lParam=msg16->lParam; msgp16.lParam=msg16->lParam;
WINPROC_UnmapMsg32ATo16(((LPMSG32)lParam)->message, WINPROC_UnmapMsg32ATo16(((LPMSG32)lParam)->hwnd, ((LPMSG32)lParam)->message,
((LPMSG32)lParam)->wParam, ((LPMSG32)lParam)->lParam, ((LPMSG32)lParam)->wParam, ((LPMSG32)lParam)->lParam,
&msgp16 ); &msgp16 );
SEGPTR_FREE(msg16); SEGPTR_FREE(msg16);
@ -1871,7 +2011,7 @@ INT32 WINPROC_MapMsg32WTo16( HWND32 hwnd, UINT32 msg32, WPARAM32 wParam32,
* *
* Unmap a message that was mapped from 32-bit Unicode to 16-bit. * Unmap a message that was mapped from 32-bit Unicode to 16-bit.
*/ */
void WINPROC_UnmapMsg32WTo16( UINT32 msg, WPARAM32 wParam, LPARAM lParam, void WINPROC_UnmapMsg32WTo16( HWND32 hwnd, UINT32 msg, WPARAM32 wParam, LPARAM lParam,
MSGPARAM16* p16 ) MSGPARAM16* p16 )
{ {
switch(msg) switch(msg)
@ -1885,7 +2025,7 @@ void WINPROC_UnmapMsg32WTo16( UINT32 msg, WPARAM32 wParam, LPARAM lParam,
} }
break; break;
default: default:
WINPROC_UnmapMsg32ATo16( msg, wParam, lParam, p16 ); WINPROC_UnmapMsg32ATo16( hwnd, msg, wParam, lParam, p16 );
break; break;
} }
} }
@ -1902,9 +2042,9 @@ static LRESULT WINPROC_CallProc32ATo32W( WNDPROC32 func, HWND32 hwnd,
{ {
LRESULT result; LRESULT result;
if (WINPROC_MapMsg32ATo32W( msg, wParam, &lParam ) == -1) return 0; if (WINPROC_MapMsg32ATo32W( hwnd, msg, wParam, &lParam ) == -1) return 0;
result = WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam ); result = WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam );
WINPROC_UnmapMsg32ATo32W( msg, wParam, lParam ); WINPROC_UnmapMsg32ATo32W( hwnd, msg, wParam, lParam );
return result; return result;
} }
@ -1920,9 +2060,9 @@ static LRESULT WINPROC_CallProc32WTo32A( WNDPROC32 func, HWND32 hwnd,
{ {
LRESULT result; LRESULT result;
if (WINPROC_MapMsg32WTo32A( msg, wParam, &lParam ) == -1) return 0; if (WINPROC_MapMsg32WTo32A( hwnd, msg, wParam, &lParam ) == -1) return 0;
result = WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam ); result = WINPROC_CallWndProc32( func, hwnd, msg, wParam, lParam );
WINPROC_UnmapMsg32WTo32A( msg, wParam, lParam ); WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam );
return result; return result;
} }
@ -1943,7 +2083,7 @@ LRESULT WINPROC_CallProc16To32A( HWND16 hwnd, UINT16 msg,
if (WINPROC_MapMsg16To32A( msg, wParam, &msg32, &wParam32, &lParam ) == -1) if (WINPROC_MapMsg16To32A( msg, wParam, &msg32, &wParam32, &lParam ) == -1)
return 0; return 0;
result = WINPROC_CallWndProc32( func, hwnd, msg32, wParam32, lParam ); result = WINPROC_CallWndProc32( func, hwnd, msg32, wParam32, lParam );
return WINPROC_UnmapMsg16To32A( msg32, wParam32, lParam, result ); return WINPROC_UnmapMsg16To32A( hwnd, msg32, wParam32, lParam, result );
} }
@ -1960,10 +2100,10 @@ LRESULT WINPROC_CallProc16To32W( HWND16 hwnd, UINT16 msg,
UINT32 msg32; UINT32 msg32;
WPARAM32 wParam32; WPARAM32 wParam32;
if (WINPROC_MapMsg16To32W( msg, wParam, &msg32, &wParam32, &lParam ) == -1) if (WINPROC_MapMsg16To32W( hwnd, msg, wParam, &msg32, &wParam32, &lParam ) == -1)
return 0; return 0;
result = WINPROC_CallWndProc32( func, hwnd, msg32, wParam32, lParam ); result = WINPROC_CallWndProc32( func, hwnd, msg32, wParam32, lParam );
return WINPROC_UnmapMsg16To32W( msg32, wParam32, lParam, result ); return WINPROC_UnmapMsg16To32W( hwnd, msg32, wParam32, lParam, result );
} }
@ -1985,7 +2125,7 @@ static LRESULT WINAPI WINPROC_CallProc32ATo16( WNDPROC16 func, HWND32 hwnd,
return 0; return 0;
mp16.lResult = Callbacks->CallWndProc( func, hwnd, msg16, mp16.lResult = Callbacks->CallWndProc( func, hwnd, msg16,
mp16.wParam, mp16.lParam ); mp16.wParam, mp16.lParam );
WINPROC_UnmapMsg32ATo16( msg, wParam, lParam, &mp16 ); WINPROC_UnmapMsg32ATo16( hwnd, msg, wParam, lParam, &mp16 );
return mp16.lResult; return mp16.lResult;
} }
@ -2008,7 +2148,7 @@ static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND32 hwnd,
return 0; return 0;
mp16.lResult = Callbacks->CallWndProc( func, hwnd, msg16, mp16.lResult = Callbacks->CallWndProc( func, hwnd, msg16,
mp16.wParam, mp16.lParam ); mp16.wParam, mp16.lParam );
WINPROC_UnmapMsg32WTo16( msg, wParam, lParam, &mp16 ); WINPROC_UnmapMsg32WTo16( hwnd, msg, wParam, lParam, &mp16 );
return mp16.lResult; return mp16.lResult;
} }