May 2006 - Wine-commits - list.winehq.org

Alexandre Julliard : user: Added fast W-> A mapping for WM_CHAR and related messages.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 6c4082df74e2af15d2f542c91e73d7f55115f1fb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c4082df74e2af15d2f542c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 12:27:27 2006 +0200 user: Added fast W->A mapping for WM_CHAR and related messages. --- dlls/user/winproc.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 4fbb4c0..b0bddaa 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -992,21 +992,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND { switch(msg) { - case WM_CHARTOITEM: - case WM_MENUCHAR: - case WM_CHAR: - case WM_DEADCHAR: - case WM_SYSCHAR: - case WM_SYSDEADCHAR: - case EM_SETPASSWORDCHAR: - { - WCHAR wch = LOWORD(*pwparam); - BYTE ch; - WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)&ch, 1, NULL, NULL ); - *pwparam = MAKEWPARAM( ch, HIWORD(*pwparam) ); - } - return 0; - case WM_IME_CHAR: { WCHAR wch = LOWORD(*pwparam); @@ -3007,6 +2992,22 @@ static LRESULT WINPROC_CallProc32WTo32A( } break; + case WM_CHARTOITEM: + case WM_MENUCHAR: + case WM_CHAR: + case WM_DEADCHAR: + case WM_SYSCHAR: + case WM_SYSDEADCHAR: + case EM_SETPASSWORDCHAR: + { + WCHAR wch = LOWORD(wParam); + BYTE ch; + RtlUnicodeToMultiByteN( (LPSTR)&ch, 1, NULL, &wch, sizeof(WCHAR) ); + wParam = MAKEWPARAM( ch, HIWORD(wParam) ); + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); + } + break; + default: if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Added fast W->A mapping for EM_GETLINE.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: dd442faa2e44768652cc996b3b8cd69b53c0dcaf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd442faa2e44768652cc996… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 12:20:14 2006 +0200 user: Added fast W->A mapping for EM_GETLINE. --- dlls/user/winproc.c | 68 +++++++++++++++++---------------------------------- 1 files changed, 23 insertions(+), 45 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index d4b0db5..4fbb4c0 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -992,17 +992,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND { switch(msg) { -/* Multiline edit */ - case EM_GETLINE: - { WORD len = (WORD)*plparam; - LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(LPARAM) + sizeof (WORD) + len*sizeof(CHAR) ); - if (!ptr) return -1; - *ptr++ = *plparam; /* Store previous lParam */ - *((WORD *) ptr) = len; /* Store the length */ - *plparam = (LPARAM)ptr; - } - return 1; - case WM_CHARTOITEM: case WM_MENUCHAR: case WM_CHAR: @@ -1040,32 +1029,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND } -/********************************************************************** - * WINPROC_UnmapMsg32WTo32A - * - * Unmap a message that was mapped from Unicode to Ansi. - */ -static LRESULT WINPROC_UnmapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT result ) -{ - switch(msg) - { -/* Multiline edit */ - case EM_GETLINE: - { - LPARAM * ptr = (LPARAM *)lParam - 1; /* get the old lparam */ - WORD len = *(WORD *)ptr; - if (len) - { - result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, result, (LPWSTR)*ptr, len ); - if (result < len) ((LPWSTR)*ptr)[result] = 0; - } - HeapFree( GetProcessHeap(), 0, ptr ); - } - break; - } - return result; -} - static UINT convert_handle_16_to_32(HANDLE16 src, unsigned int flags) { HANDLE dst; @@ -3021,6 +2984,29 @@ static LRESULT WINPROC_CallProc32WTo32A( else ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); break; +/* Multiline edit */ + case EM_GETLINE: + { + char *ptr, buffer[512]; + WORD len = *(WORD *)lParam; + DWORD result; + + if (!(ptr = get_buffer( buffer, sizeof(buffer), len * 2 ))) break; + *((WORD *)ptr) = len * 2; /* store the length */ + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, (LPARAM)ptr ); + result = dialog ? GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ) : ret; + if (result) + { + RtlMultiByteToUnicodeN( (LPWSTR)lParam, len*sizeof(WCHAR), &result, buffer, result ); + result /= sizeof(WCHAR); + if (result < len) ((LPWSTR)lParam)[result] = 0; + if (dialog) SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + else ret = result; + } + free_buffer( buffer, ptr ); + } + break; + default: if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n", @@ -3028,14 +3014,6 @@ static LRESULT WINPROC_CallProc32WTo32A( return 0; } ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); - if (!unmap) break; - if (dialog) - { - LRESULT result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); - result = WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam, result ); - SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); - } - else ret = WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam, ret ); break; }

1 0

Alexandre Julliard : user: Added fast W->A mapping for WM_MDICREATE.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: d415df99bc92c16c7c444fcf3fc588be361369b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d415df99bc92c16c7c444fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 11:37:41 2006 +0200 user: Added fast W->A mapping for WM_MDICREATE. --- dlls/user/winproc.c | 71 +++++++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 34 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 15b00ee..b852fb5 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -992,29 +992,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND { switch(msg) { - case WM_MDICREATE: - { - MDICREATESTRUCTA *cs = HeapAlloc( GetProcessHeap(), 0, sizeof(*cs) ); - if (!cs) return -1; - *cs = *(MDICREATESTRUCTA *)*plparam; - if (HIWORD(cs->szTitle)) - { - int len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)cs->szTitle, -1, NULL, 0, 0, 0); - LPSTR buf = HeapAlloc(GetProcessHeap(), 0, len); - if (buf) WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)cs->szTitle, -1, buf, len, 0, 0); - cs->szTitle = buf; - } - if (HIWORD(cs->szClass)) - { - int len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)cs->szClass, -1, NULL, 0, 0, 0); - LPSTR buf = HeapAlloc(GetProcessHeap(), 0, len); - if (buf) WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)cs->szClass, -1, buf, len, 0, 0); - cs->szClass = buf; - } - *plparam = (LPARAM)cs; - } - return 1; - /* Listbox */ case LB_ADDSTRING: case LB_INSERTSTRING: @@ -1124,17 +1101,6 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( { switch(msg) { - case WM_MDICREATE: - { - MDICREATESTRUCTA *cs = (MDICREATESTRUCTA *)lParam; - if (HIWORD(cs->szTitle)) - HeapFree( GetProcessHeap(), 0, (LPVOID)cs->szTitle ); - if (HIWORD(cs->szClass)) - HeapFree( GetProcessHeap(), 0, (LPVOID)cs->szClass ); - HeapFree( GetProcessHeap(), 0, cs ); - } - break; - /* Listbox */ case LB_ADDSTRING: case LB_INSERTSTRING: @@ -3053,6 +3019,43 @@ static LRESULT WINPROC_CallProc32WTo32A( } break; + case WM_MDICREATE: + { + char *ptr, buffer[1024]; + DWORD title_lenA = 0, title_lenW = 0, class_lenA = 0, class_lenW = 0; + MDICREATESTRUCTW *csW = (MDICREATESTRUCTW *)lParam; + MDICREATESTRUCTA csA; + + memcpy( &csA, csW, sizeof(csA) ); + + if (HIWORD(csW->szTitle)) + { + title_lenW = (strlenW(csW->szTitle) + 1) * sizeof(WCHAR); + RtlUnicodeToMultiByteSize( &title_lenA, csW->szTitle, title_lenW ); + } + if (HIWORD(csW->szClass)) + { + class_lenW = (strlenW(csW->szClass) + 1) * sizeof(WCHAR); + RtlUnicodeToMultiByteSize( &class_lenA, csW->szClass, class_lenW ); + } + + if (!(ptr = get_buffer( buffer, sizeof(buffer), title_lenA + class_lenA ))) break; + + if (title_lenA) + { + RtlUnicodeToMultiByteN( ptr, title_lenA, NULL, csW->szTitle, title_lenW ); + csA.szTitle = ptr; + } + if (class_lenA) + { + RtlUnicodeToMultiByteN( ptr + title_lenA, class_lenA, NULL, csW->szClass, class_lenW ); + csA.szClass = ptr + title_lenA; + } + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, (LPARAM)&csA ); + free_buffer( buffer, ptr ); + } + break; + default: if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Added fast W-> A mapping for LB_ADDSTRING and related messages.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 96a430f530d2a43e1338d24daedd0a1343920a64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=96a430f530d2a43e1338d24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 11:46:07 2006 +0200 user: Added fast W->A mapping for LB_ADDSTRING and related messages. --- dlls/user/winproc.c | 69 ++++++++++++++++----------------------------------- 1 files changed, 21 insertions(+), 48 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index b852fb5..fe9905b 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -993,21 +993,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND switch(msg) { /* Listbox */ - case LB_ADDSTRING: - case LB_INSERTSTRING: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - if(!*plparam) return 0; - if ( WINPROC_TestLBForStr( hwnd )) - { - int len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)*plparam, -1, NULL, 0, 0, 0); - LPSTR buf = HeapAlloc(GetProcessHeap(), 0, len); - if (buf) WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)*plparam, -1, buf, len, 0, 0); - *plparam = (LPARAM)buf; - } - return (*plparam ? 1 : -1); - case LB_GETTEXT: /* FIXME: fixed sized buffer */ { if ( WINPROC_TestLBForStr( hwnd )) { LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, 512 + sizeof(LPARAM) ); @@ -1019,21 +1004,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND return 1; /* Combobox */ - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - if(!*plparam) return 0; - if ( WINPROC_TestCBForStr( hwnd )) - { - int len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)*plparam, -1, NULL, 0, 0, 0); - LPSTR buf = HeapAlloc(GetProcessHeap(), 0, len); - if (buf) WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)*plparam, -1, buf, len, 0, 0); - *plparam = (LPARAM)buf; - } - return (*plparam ? 1 : -1); - case CB_GETLBTEXT: /* FIXME: fixed sized buffer */ { if ( WINPROC_TestCBForStr( hwnd )) { LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, 512 + sizeof(LPARAM) ); @@ -1102,15 +1072,6 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( switch(msg) { /* Listbox */ - case LB_ADDSTRING: - case LB_INSERTSTRING: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - if ( WINPROC_TestLBForStr( hwnd )) - HeapFree( GetProcessHeap(), 0, (void *)lParam ); - break; - case LB_GETTEXT: if ( WINPROC_TestLBForStr( hwnd )) { @@ -1122,15 +1083,6 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( break; /* Combobox */ - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - if ( WINPROC_TestCBForStr( hwnd )) - HeapFree( GetProcessHeap(), 0, (void *)lParam ); - break; - case CB_GETLBTEXT: if ( result < 0) /* CB_ERR and CB_ERRSPACE */ { @@ -3002,6 +2954,7 @@ static LRESULT WINPROC_CallProc32WTo32A( case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: + handle_wm_settext: if (!lParam) ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); else { @@ -3056,6 +3009,26 @@ static LRESULT WINPROC_CallProc32WTo32A( } break; +/* Listbox */ + case LB_ADDSTRING: + case LB_INSERTSTRING: + case LB_FINDSTRING: + case LB_FINDSTRINGEXACT: + case LB_SELECTSTRING: + if (lParam && WINPROC_TestLBForStr( hwnd )) goto handle_wm_settext; + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); + break; + +/* Combobox */ + case CB_ADDSTRING: + case CB_INSERTSTRING: + case CB_FINDSTRING: + case CB_FINDSTRINGEXACT: + case CB_SELECTSTRING: + if (lParam && WINPROC_TestCBForStr( hwnd )) goto handle_wm_settext; + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); + break; + default: if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Added fast W-> A mapping for LB_GETTEXT and CB_GETLBTEXT.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: b34521c43d364410c52b01c40986662936937c1e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b34521c43d364410c52b01c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 12:17:44 2006 +0200 user: Added fast W->A mapping for LB_GETTEXT and CB_GETLBTEXT. --- dlls/user/winproc.c | 88 +++++++++++++++++++++++---------------------------- 1 files changed, 40 insertions(+), 48 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index fe9905b..d4b0db5 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -992,28 +992,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND { switch(msg) { -/* Listbox */ - case LB_GETTEXT: /* FIXME: fixed sized buffer */ - { if ( WINPROC_TestLBForStr( hwnd )) - { LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, 512 + sizeof(LPARAM) ); - if (!ptr) return -1; - *ptr++ = *plparam; /* Store previous lParam */ - *plparam = (LPARAM)ptr; - } - } - return 1; - -/* Combobox */ - case CB_GETLBTEXT: /* FIXME: fixed sized buffer */ - { if ( WINPROC_TestCBForStr( hwnd )) - { LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, 512 + sizeof(LPARAM) ); - if (!ptr) return -1; - *ptr++ = *plparam; /* Store previous lParam */ - *plparam = (LPARAM)ptr; - } - } - return 1; - /* Multiline edit */ case EM_GETLINE: { WORD len = (WORD)*plparam; @@ -1071,32 +1049,6 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( { switch(msg) { -/* Listbox */ - case LB_GETTEXT: - if ( WINPROC_TestLBForStr( hwnd )) - { - LPARAM *ptr = (LPARAM *)lParam - 1; - if (result >= 0) - result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, (LPWSTR)*ptr, 0x7fffffff ) - 1; - HeapFree( GetProcessHeap(), 0, ptr ); - } - break; - -/* Combobox */ - case CB_GETLBTEXT: - if ( result < 0) /* CB_ERR and CB_ERRSPACE */ - { - LPARAM *ptr = (LPARAM *)lParam - 1; - HeapFree( GetProcessHeap(), 0, ptr ); - } - else if ( WINPROC_TestCBForStr( hwnd )) - { - LPARAM *ptr = (LPARAM *)lParam - 1; - result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, (LPWSTR)*ptr, 0x7fffffff ) - 1; - HeapFree( GetProcessHeap(), 0, ptr ); - } - break; - /* Multiline edit */ case EM_GETLINE: { @@ -3019,6 +2971,26 @@ static LRESULT WINPROC_CallProc32WTo32A( ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); break; + case LB_GETTEXT: + if (lParam && WINPROC_TestLBForStr( hwnd )) + { + char buffer[512]; /* FIXME: fixed sized buffer */ + LRESULT result; + + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, (LPARAM)buffer ); + result = dialog ? GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ) : ret; + if (result >= 0) + { + DWORD len; + RtlMultiByteToUnicodeN( (LPWSTR)lParam, ~0u, &len, buffer, strlen(buffer) + 1 ); + result = len / sizeof(WCHAR) - 1; + if (dialog) SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + else ret = result; + } + } + else ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); + break; + /* Combobox */ case CB_ADDSTRING: case CB_INSERTSTRING: @@ -3029,6 +3001,26 @@ static LRESULT WINPROC_CallProc32WTo32A( ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); break; + case CB_GETLBTEXT: + if (lParam && WINPROC_TestCBForStr( hwnd )) + { + char buffer[512]; /* FIXME: fixed sized buffer */ + LRESULT result; + + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, (LPARAM)buffer ); + result = dialog ? GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ) : ret; + if (result >= 0) + { + DWORD len; + RtlMultiByteToUnicodeN( (LPWSTR)lParam, ~0u, &len, buffer, strlen(buffer) + 1 ); + result = len / sizeof(WCHAR) - 1; + if (dialog) SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); + else ret = result; + } + } + else ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); + break; + default: if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Added fast W-> A mapping for WM_SETTEXT and related messages.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: bba01599102469ad59dc18f923dab79a950f9be2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bba01599102469ad59dc18f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 11:29:31 2006 +0200 user: Added fast W->A mapping for WM_SETTEXT and related messages. --- dlls/user/winproc.c | 52 ++++++++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index be91e0f..15b00ee 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -992,24 +992,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND { switch(msg) { - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - case EM_REPLACESEL: - if (*plparam) - { - LPCWSTR str = (LPCWSTR)*plparam; - int len = WideCharToMultiByte(CP_ACP, 0, str, -1, NULL, 0, 0, 0); - *plparam = (LPARAM)HeapAlloc(GetProcessHeap(), 0, len); - if (!*plparam) return -1; - WideCharToMultiByte(CP_ACP, 0, str, -1, (LPSTR)*plparam, len, 0, 0); - return 1; - } - return 0; - case WM_MDICREATE: { MDICREATESTRUCTA *cs = HeapAlloc( GetProcessHeap(), 0, sizeof(*cs) ); @@ -1142,16 +1124,6 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( { switch(msg) { - case WM_SETTEXT: - case WM_WININICHANGE: - case WM_DEVMODECHANGE: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - case EM_REPLACESEL: - HeapFree( GetProcessHeap(), 0, (void *)lParam ); - break; - case WM_MDICREATE: { MDICREATESTRUCTA *cs = (MDICREATESTRUCTA *)lParam; @@ -3057,6 +3029,30 @@ static LRESULT WINPROC_CallProc32WTo32A( } break; + case WM_SETTEXT: + case WM_WININICHANGE: + case WM_DEVMODECHANGE: + case CB_DIR: + case LB_DIR: + case LB_ADDFILE: + case EM_REPLACESEL: + if (!lParam) ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); + else + { + char *ptr, buffer[512]; + LPCWSTR strW = (LPCWSTR)lParam; + DWORD lenA, lenW = (strlenW(strW) + 1) * sizeof(WCHAR); + + RtlUnicodeToMultiByteSize( &lenA, strW, lenW ); + if ((ptr = get_buffer( buffer, sizeof(buffer), lenA ))) + { + RtlUnicodeToMultiByteN( ptr, lenA, NULL, strW, lenW ); + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, (LPARAM)ptr ); + free_buffer( buffer, ptr ); + } + } + break; + default: if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Added helper functions for buffer management in WINPROC_CallProc32WTo32A..
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: cb36cbd0aa693444be1d028424b2a5a2ade8c1a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb36cbd0aa693444be1d028… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 11:03:30 2006 +0200 user: Added helper functions for buffer management in WINPROC_CallProc32WTo32A.. --- dlls/user/winproc.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index a6754de..5db5c90 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -2984,6 +2984,17 @@ static LRESULT WINPROC_CallProc32ATo32W( } +static inline void *get_buffer( void *static_buffer, size_t size, size_t need ) +{ + if (size >= need) return static_buffer; + return HeapAlloc( GetProcessHeap(), 0, need ); +} + +static inline void free_buffer( void *static_buffer, void *buffer ) +{ + if (buffer != static_buffer) HeapFree( GetProcessHeap(), 0, buffer ); +} + /********************************************************************** * WINPROC_CallProc32WTo32A * @@ -3005,8 +3016,7 @@ static LRESULT WINPROC_CallProc32WTo32A( { /* csW->lpszName and csW->lpszClass are NOT supposed to be atoms * at this point. */ - char buffer[1024]; - char *cls = buffer, *name; + char buffer[1024], *cls, *name; CREATESTRUCTW *csW = (CREATESTRUCTW *)lParam; CREATESTRUCTA csA = *(CREATESTRUCTA *)csW; MDICREATESTRUCTA mdi_cs; @@ -3023,11 +3033,7 @@ static LRESULT WINPROC_CallProc32WTo32A( else name_lenW = name_lenA = 0; - if (class_lenA + name_lenA + 2 > sizeof(buffer)) - { - cls = HeapAlloc(GetProcessHeap(), 0, class_lenA + name_lenA + 2); - if (!cls) break; - } + if (!(cls = get_buffer( buffer, sizeof(buffer), class_lenA + name_lenA + 2 ))) break; RtlUnicodeToMultiByteN(cls, class_lenA, NULL, csW->lpszClass, class_lenW); cls[class_lenA] = 0; @@ -3049,9 +3055,8 @@ static LRESULT WINPROC_CallProc32WTo32A( csA.lpCreateParams = &mdi_cs; } - ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, (LPARAM)&csA ); - - if (cls != buffer) HeapFree(GetProcessHeap(), 0, cls); + ret = WINPROC_CallWndProc(func, hwnd, msg, wParam, (LPARAM)&csA); + free_buffer( buffer, cls ); } break;

1 0

Alexandre Julliard : user: Added fast W-> A mapping for WM_GETTEXT and WM_ASKCBFORNAME.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: f793b818a40d118b21bd045f7169790bf2828034 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f793b818a40d118b21bd045… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 11:22:55 2006 +0200 user: Added fast W->A mapping for WM_GETTEXT and WM_ASKCBFORNAME. --- dlls/user/winproc.c | 49 +++++++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 5db5c90..be91e0f 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -992,16 +992,6 @@ static INT WINPROC_MapMsg32WTo32A( HWND { switch(msg) { - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPARAM *ptr = HeapAlloc( GetProcessHeap(), 0, *pwparam + sizeof(LPARAM) ); - if (!ptr) return -1; - *ptr++ = *plparam; /* Store previous lParam */ - *plparam = (LPARAM)ptr; - } - return 1; - case WM_SETTEXT: case WM_WININICHANGE: case WM_DEVMODECHANGE: @@ -1152,22 +1142,6 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( { switch(msg) { - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - { - LPARAM *ptr = (LPARAM *)lParam - 1; - if (!wParam) result = 0; - else if (!(result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, - (LPWSTR)*ptr, wParam ))) - { - ((LPWSTR)*ptr)[wParam-1] = 0; - result = wParam - 1; - } - else result--; /* do not count terminating null */ - HeapFree( GetProcessHeap(), 0, ptr ); - } - break; - case WM_SETTEXT: case WM_WININICHANGE: case WM_DEVMODECHANGE: @@ -3060,6 +3034,29 @@ static LRESULT WINPROC_CallProc32WTo32A( } break; + case WM_GETTEXT: + case WM_ASKCBFORMATNAME: + { + char *ptr, buffer[512]; + DWORD len = wParam * 2; + + if (!(ptr = get_buffer( buffer, sizeof(buffer), len ))) break; + ret = WINPROC_CallWndProc( func, hwnd, msg, len, (LPARAM)ptr ); + if (ret && len) + { + RtlMultiByteToUnicodeN( (LPWSTR)lParam, wParam*sizeof(WCHAR), &len, ptr, strlen(ptr)+1 ); + ret = len/sizeof(WCHAR) - 1; /* do not count terminating null */ + ((LPWSTR)lParam)[ret] = 0; + if (dialog) + { + SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, ret ); + ret = TRUE; + } + } + free_buffer( buffer, ptr ); + } + break; + default: if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n",

1 0

Alexandre Julliard : user: Merged WINPROC_CallProc32WTo32A_fast into WINPROC_CallProc32WTo32A.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: de125e656e192fc4f798fee5d4e2257864b93cec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de125e656e192fc4f798fee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 18 11:02:28 2006 +0200 user: Merged WINPROC_CallProc32WTo32A_fast into WINPROC_CallProc32WTo32A. --- dlls/user/winproc.c | 59 +++++++++++++++++++-------------------------------- 1 files changed, 22 insertions(+), 37 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index 659f1f5..a6754de 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -2985,13 +2985,19 @@ static LRESULT WINPROC_CallProc32ATo32W( /********************************************************************** - * WINPROC_CallProc32WTo32A_fast + * WINPROC_CallProc32WTo32A * + * Call a window procedure, translating args from Unicode to Ansi. */ -static BOOL WINPROC_CallProc32WTo32A_fast( WNDPROC func, HWND hwnd, - UINT msg, WPARAM wParam, - LPARAM lParam, LRESULT *result ) +static LRESULT WINPROC_CallProc32WTo32A( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, + LPARAM lParam, BOOL dialog ) { + LRESULT ret = 0; + int unmap; + + TRACE_(msg)("func %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", + func, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); + switch(msg) { case WM_NCCREATE: @@ -3020,7 +3026,7 @@ static BOOL WINPROC_CallProc32WTo32A_fas if (class_lenA + name_lenA + 2 > sizeof(buffer)) { cls = HeapAlloc(GetProcessHeap(), 0, class_lenA + name_lenA + 2); - if (!cls) return FALSE; + if (!cls) break; } RtlUnicodeToMultiByteN(cls, class_lenA, NULL, csW->lpszClass, class_lenW); @@ -3043,43 +3049,20 @@ static BOOL WINPROC_CallProc32WTo32A_fas csA.lpCreateParams = &mdi_cs; } - lParam = (LPARAM)&csA; - *result = WINPROC_CallWndProc(func, hwnd, msg, wParam, lParam); + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, (LPARAM)&csA ); if (cls != buffer) HeapFree(GetProcessHeap(), 0, cls); } - return TRUE; + break; default: - return FALSE; - } -} - -/********************************************************************** - * WINPROC_CallProc32WTo32A - * - * Call a window procedure, translating args from Unicode to Ansi. - */ -static LRESULT WINPROC_CallProc32WTo32A( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, BOOL dialog ) -{ - LRESULT ret; - int unmap; - - TRACE_(msg)("func %p (hwnd=%p,msg=%s,wp=%08x,lp=%08lx)\n", - func, hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); - - if (WINPROC_CallProc32WTo32A_fast( func, hwnd, msg, wParam, lParam, &ret )) - return ret; - - if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { - ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n", - SPY_GetMsgName(msg, hwnd), wParam, lParam ); - return 0; - } - ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); - if (unmap) - { + if ((unmap = WINPROC_MapMsg32WTo32A( hwnd, msg, &wParam, &lParam )) == -1) { + ERR_(msg)("Message translation failed. (msg=%s,wp=%08x,lp=%08lx)\n", + SPY_GetMsgName(msg, hwnd), wParam, lParam ); + return 0; + } + ret = WINPROC_CallWndProc( func, hwnd, msg, wParam, lParam ); + if (!unmap) break; if (dialog) { LRESULT result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); @@ -3087,7 +3070,9 @@ static LRESULT WINPROC_CallProc32WTo32A( SetWindowLongPtrW( hwnd, DWLP_MSGRESULT, result ); } else ret = WINPROC_UnmapMsg32WTo32A( hwnd, msg, wParam, lParam, ret ); + break; } + return ret; }

1 0

Juan Lang : crypt32: Add stubs for CertDuplicateCRLContext and CertDuplicateCTLContext.
by Alexandre Julliard 18 May '06

18 May '06

Module: wine Branch: refs/heads/master Commit: 0379d421e096c8a14e823c448f54df4ca06b3455 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0379d421e096c8a14e823c4… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed May 17 21:49:27 2006 -0700 crypt32: Add stubs for CertDuplicateCRLContext and CertDuplicateCTLContext. --- dlls/crypt32/crypt32.spec | 4 ++-- dlls/crypt32/store.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 73744ed..4692e54 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -24,8 +24,8 @@ @ stdcall CertDeleteCRLFromStore(ptr) @ stdcall CertDeleteCTLFromStore(ptr) @ stdcall CertDeleteCertificateFromStore(ptr) -@ stub CertDuplicateCRLContext -@ stub CertDuplicateCTLContext +@ stdcall CertDuplicateCRLContext(ptr) +@ stdcall CertDuplicateCTLContext(ptr) @ stdcall CertDuplicateCertificateContext(ptr) @ stdcall CertDuplicateStore(ptr) @ stub CertEnumCRLContextProperties diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index fa86abc..c197553 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -54,6 +54,7 @@ typedef BOOL (WINAPI *AddContextToStoreF typedef BOOL (WINAPI *AddEncodedContextToStoreFunc)(HCERTSTORE hCertStore, DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwAddDisposition, const void **ppContext); +typedef const void *(WINAPI *DuplicateContextFunc)(const void *context); typedef const void *(WINAPI *EnumContextsInStoreFunc)(HCERTSTORE hCertStore, const void *pPrevContext); typedef BOOL (WINAPI *GetContextPropertyFunc)(const void *context, @@ -71,6 +72,7 @@ typedef struct _WINE_CONTEXT_INTERFACE CreateContextFunc create; AddContextToStoreFunc addContextToStore; AddEncodedContextToStoreFunc addEncodedToStore; + DuplicateContextFunc duplicate; EnumContextsInStoreFunc enumContextsInStore; GetContextPropertyFunc getProp; SetContextPropertyFunc setProp; @@ -83,6 +85,7 @@ static const WINE_CONTEXT_INTERFACE gCer (CreateContextFunc)CertCreateCertificateContext, (AddContextToStoreFunc)CertAddCertificateContextToStore, (AddEncodedContextToStoreFunc)CertAddEncodedCertificateToStore, + (DuplicateContextFunc)CertDuplicateCertificateContext, (EnumContextsInStoreFunc)CertEnumCertificatesInStore, (GetContextPropertyFunc)CertGetCertificateContextProperty, (SetContextPropertyFunc)CertSetCertificateContextProperty, @@ -95,6 +98,7 @@ static const WINE_CONTEXT_INTERFACE gCRL (CreateContextFunc)CertCreateCRLContext, (AddContextToStoreFunc)CertAddCRLContextToStore, (AddEncodedContextToStoreFunc)CertAddEncodedCRLToStore, + (DuplicateContextFunc)CertDuplicateCRLContext, (EnumContextsInStoreFunc)CertEnumCRLsInStore, (GetContextPropertyFunc)CertGetCRLContextProperty, (SetContextPropertyFunc)CertSetCRLContextProperty, @@ -107,6 +111,7 @@ static const WINE_CONTEXT_INTERFACE gCTL (CreateContextFunc)CertCreateCTLContext, (AddContextToStoreFunc)CertAddCTLContextToStore, (AddEncodedContextToStoreFunc)CertAddEncodedCTLToStore, + (DuplicateContextFunc)CertDuplicateCTLContext, (EnumContextsInStoreFunc)CertEnumCTLsInStore, (GetContextPropertyFunc)CertGetCTLContextProperty, (SetContextPropertyFunc)CertSetCTLContextProperty, @@ -2355,6 +2360,12 @@ BOOL WINAPI CertAddCRLContextToStore( HC return TRUE; } +PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) +{ + FIXME("(%p): stub\n", pCrlContext); + return pCrlContext; +} + BOOL WINAPI CertFreeCRLContext( PCCRL_CONTEXT pCrlContext) { FIXME("%p\n", pCrlContext ); @@ -2402,6 +2413,12 @@ BOOL WINAPI CertAddCTLContextToStore(HCE return TRUE; } +PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) +{ + FIXME("(%p): stub\n", pCtlContext ); + return pCtlContext; +} + BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCtlContext) { FIXME("(%p): stub\n", pCtlContext );

1 0