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

Clinton Stimpson : riched20: Fix crash with NULL lParam in EM_SETTEXTEX.
by Alexandre Julliard 10 Aug '06

10 Aug '06

Module: wine Branch: refs/heads/master Commit: ea755999f1c768644f507067107e471d3385ac76 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea755999f1c768644f50706… Author: Clinton Stimpson <clinton(a)elemtech.com> Date: Tue Aug 8 21:12:33 2006 -0600 riched20: Fix crash with NULL lParam in EM_SETTEXTEX. --- dlls/riched20/editor.c | 4 +- dlls/riched20/tests/editor.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 77bb7a0..28f371a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1622,7 +1622,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND { LPWSTR wszText = (LPWSTR)lParam; SETTEXTEX *pStruct = (SETTEXTEX *)wParam; - size_t len = lstrlenW(wszText); + size_t len = wszText ? lstrlenW(wszText) : 0; int from, to; ME_Style *style; TRACE("EM_SETTEXEX - %s, flags %d, cp %d\n", debugstr_w(wszText), (int)pStruct->flags, pStruct->codepage); @@ -1640,7 +1640,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } else { ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); - ME_InsertTextFromCursor(editor, 0, wszText, -1, editor->pBuffer->pDefaultStyle); + ME_InsertTextFromCursor(editor, 0, wszText, len, editor->pBuffer->pDefaultStyle); len = 1; } ME_CommitUndo(editor); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6153e6e..5c1f7c1 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -898,6 +898,80 @@ static void test_ES_PASSWORD() "EM_GETPASSWORDCHAR returned %c (%d) when set to 'x', instead of x (120)\n",result,result); } +static void test_EM_SETTEXTEX() +{ + HWND hwndRichEdit = new_richedit(NULL); + SETTEXTEX setText; + GETTEXTEX getText; + WCHAR TestItem1[] = {'T', 'e', 's', 't', + 'S', 'o', 'm', 'e', + 'T', 'e', 'x', 't', 0}; +#define MAX_BUF_LEN 1024 + WCHAR buf[MAX_BUF_LEN]; + int result; + CHARRANGE cr; + + setText.codepage = 1200; /* no constant for unicode */ + getText.codepage = 1200; /* no constant for unicode */ + getText.cb = MAX_BUF_LEN; + getText.flags = GT_DEFAULT; + + setText.flags = 0; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(lstrcmpW(buf, TestItem1) == 0, + "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); + + result = SendMessage(hwndRichEdit, EM_SETTEXTEX, + (WPARAM)&setText, (LPARAM) NULL); + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + + ok (result == 1, + "EM_SETTEXTEX returned %d, instead of 1\n",result); + ok(lstrlenW(buf) == 0, + "EM_SETTEXTEX with NULL lParam should clear rich edit.\n"); + + /* put some text back */ + setText.flags = 0; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); + /* select some text */ + cr.cpMax = 1; + cr.cpMin = 3; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + /* replace current selection */ + setText.flags = ST_SELECTION; + result = SendMessage(hwndRichEdit, EM_SETTEXTEX, + (WPARAM)&setText, (LPARAM) NULL); + ok(result == 0, + "EM_SETTEXTEX with NULL lParam to replace selection" + " with no text should return 0. Got %i\n", + result); + + /* put some text back */ + setText.flags = 0; + SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM) TestItem1); + /* select some text */ + cr.cpMax = 1; + cr.cpMin = 3; + SendMessage(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM) &cr); + /* replace current selection */ + setText.flags = ST_SELECTION; + result = SendMessage(hwndRichEdit, EM_SETTEXTEX, + (WPARAM)&setText, (LPARAM) TestItem1); + /* get text */ + SendMessage(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM) buf); + ok(result == lstrlenW(TestItem1), + "EM_SETTEXTEX with NULL lParam to replace selection" + " with no text should return 0. Got %i\n", + result); + ok(lstrlenW(buf) == 22, + "EM_SETTEXTEX to replace selection with more text failed: %i.\n", + lstrlenW(buf) ); + + DestroyWindow(hwndRichEdit); +} + + START_TEST( editor ) { MSG msg; @@ -918,6 +992,7 @@ START_TEST( editor ) test_EM_AUTOURLDETECT(); test_EM_SETUNDOLIMIT(); test_ES_PASSWORD(); + test_EM_SETTEXTEX(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

lostwages/ news/2006081001.xml wwn/wn20060810_ ...
by WineHQ 10 Aug '06

10 Aug '06

ChangeSet ID: 27281 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: wineowner(a)winehq.org 2006/08/10 01:12:17 Added files: news : 2006081001.xml wwn : wn20060810_319.xml Log message: WWN #319 Patch: http://cvs.winehq.org/patch.py?id=27281 Old revision New revision Changes Path Added 1.1 +0 -0 lostwages/news/2006081001.xml Added 1.1 +0 -0 lostwages/wwn/wn20060810_319.xml

1 0

Tijl Coosemans : msvcrt: Rename _execve to MSVCRT__execve.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 7c69033b0acb85206a2cb13f81678ecd7299a500 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c69033b0acb85206a2cb13… Author: Tijl Coosemans <tijl(a)ulyssis.org> Date: Wed Aug 9 21:28:52 2006 +0200 msvcrt: Rename _execve to MSVCRT__execve. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/process.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 83b9580..5f4b61d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -211,7 +211,7 @@ # extern _aexit_rtn @ varargs _execlp(str str) @ varargs _execlpe(str str) @ cdecl _execv(str str) -@ cdecl _execve(str str str) +@ cdecl _execve(str str str) MSVCRT__execve @ cdecl _execvp(str str) @ cdecl _execvpe(str str str) @ cdecl _exit(long) MSVCRT__exit diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 85a1e6c..b740bad 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -295,7 +295,7 @@ MSVCRT_intptr_t CDECL _execv(const char* * Like on Windows, this function does not handle arguments with spaces * or double-quotes. */ -MSVCRT_intptr_t CDECL _execve(const char* name, char* const* argv, const char* const* envv) +MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, char* const* argv, const char* const* envv) { return _spawnve(MSVCRT__P_OVERLAY, name, (const char* const*) argv, envv); }

1 0

Eric Pouech : dbghelp: Made stabs parsing a bit more robust.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 83c30a55b8beb1f5aa3cc1649ba22af32dcf778d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83c30a55b8beb1f5aa3cc16… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Aug 9 20:53:32 2006 +0200 dbghelp: Made stabs parsing a bit more robust. Enhance dbghelp's robustness against bogus stabs sections found in meetro.exe (as reported by Jan Zerebecki). --- dlls/dbghelp/stabs.c | 14 +++++++++----- dlls/dbghelp/symbol.c | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index dd9a70c..e94bd71 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1327,13 +1327,17 @@ #endif stabs_parse_type(ptr)); break; case N_LBRAC: - block = symt_open_func_block(module, curr_func, block, - stab_ptr->n_value, 0); - pending_flush(&pending, module, curr_func, block); + if (curr_func) + { + block = symt_open_func_block(module, curr_func, block, + stab_ptr->n_value, 0); + pending_flush(&pending, module, curr_func, block); + } break; case N_RBRAC: - block = symt_close_func_block(module, curr_func, block, - stab_ptr->n_value); + if (curr_func) + block = symt_close_func_block(module, curr_func, block, + stab_ptr->n_value); break; case N_PSYM: /* These are function parameters. */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index d93bdd2..2354c1a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -365,6 +365,7 @@ struct symt_block* symt_close_func_block struct symt_function* func, struct symt_block* block, unsigned pc) { + assert(func); assert(func->symt.tag == SymTagFunction); if (pc) block->size = func->address + pc - block->address;

1 0

Robert Shearman : msi: Support MSIDBOPEN_CREATEDIRECT and MSIDBOPEN_DIRECT in MSI_OpenDatabaseW.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 95d057a8390d54c3a8385f211f11e530ab173c75 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=95d057a8390d54c3a8385f2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:16:27 2006 +0100 msi: Support MSIDBOPEN_CREATEDIRECT and MSIDBOPEN_DIRECT in MSI_OpenDatabaseW. --- dlls/msi/database.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 5ac7f48..0dc3f85 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -93,8 +93,10 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); } - else if( szPersist == MSIDBOPEN_CREATE ) + else if( szPersist == MSIDBOPEN_CREATE || szPersist == MSIDBOPEN_CREATEDIRECT ) { + /* FIXME: MSIDBOPEN_CREATE should case STGM_TRANSACTED flag to be + * used here: */ r = StgCreateDocfile( szDBPath, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, 0, &stg); if( r == ERROR_SUCCESS ) @@ -105,6 +107,13 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, } else if( szPersist == MSIDBOPEN_TRANSACT ) { + /* FIXME: MSIDBOPEN_TRANSACT should case STGM_TRANSACTED flag to be + * used here: */ + r = StgOpenStorage( szDBPath, NULL, + STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + } + else if( szPersist == MSIDBOPEN_DIRECT ) + { r = StgOpenStorage( szDBPath, NULL, STGM_DIRECT|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); }

1 0

Robert Shearman : rpcrt4: Forward NdrClientCall to NdrClientCall2.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 68e867da8190acfbb5d43620414fe65ca2e64093 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68e867da8190acfbb5d4362… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:17:10 2006 +0100 rpcrt4: Forward NdrClientCall to NdrClientCall2. NdrClientCall should be implemented as a separate function when NdrClientCall2 has been factorised enough. --- dlls/rpcrt4/rpcrt4.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index ca5f45f..82f4334 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -158,7 +158,7 @@ # 9x version of I_RpcBindingSetAsync has @ stdcall NdrCStdStubBuffer_Release(ptr ptr) @ stdcall NdrClearOutParameters(ptr ptr ptr) @ varargs NdrClientCall2(ptr ptr) -@ stub NdrClientCall +@ varargs NdrClientCall(ptr ptr) NdrClientCall2 @ stdcall NdrClientContextMarshall(ptr ptr long) @ stdcall NdrClientContextUnmarshall(ptr ptr ptr) @ stub NdrClientInitialize

1 0

Robert Shearman : rpcrt4: Add some more traces and make the stack offsets easier to read in the stubless interpreter .
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: f953cc406a367448df7c8aa27b4c3734b5c8d4a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f953cc406a367448df7c8aa… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:17:05 2006 +0100 rpcrt4: Add some more traces and make the stack offsets easier to read in the stubless interpreter. --- dlls/rpcrt4/ndr_stubless.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 3b1c071..4125379 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -573,9 +573,10 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_ST { stack_size = pProcHeader->stack_size; procedure_number = pProcHeader->proc_num; - TRACE("proc num: %d\n", procedure_number); pFormat += sizeof(NDR_PROC_HEADER); } + TRACE("stack size: 0x%x\n", stack_size); + TRACE("proc num: %d\n", procedure_number); /* create the full pointer translation tables, if requested */ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_FULLPTR) @@ -856,7 +857,7 @@ #endif break; TRACE("param[%d]: old format\n", i); - TRACE("\tparam_direction: %x\n", pParam->param_direction); + TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); TRACE("\tmemory addr (before): %p\n", pArg); @@ -1320,7 +1321,7 @@ #endif TRACE("param[%d]: new format\n", i); TRACE("\tparam_attributes:"); dump_RPC_FC_PROC_PF(pParam->param_attributes); TRACE("\n"); - TRACE("\tstack_offset: %x\n", current_stack_offset); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset); TRACE("\tmemory addr (before): %p -> %p\n", pArg, *(unsigned char **)pArg); if (pParam->param_attributes.ServerAllocSize) @@ -1453,7 +1454,7 @@ #endif TRACE("param[%d]: old format\n", i); TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); - TRACE("\tstack_offset: %x\n", current_stack_offset_adjusted); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE)

1 0

Robert Shearman : rpcrt4: Set retval_ptr and allocate memory for out pointers for the old format stubless intepreter .
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: d29108c3963fef8b30041ab9913edb0863c8a2b6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d29108c3963fef8b30041ab… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:16:49 2006 +0100 rpcrt4: Set retval_ptr and allocate memory for out pointers for the old format stubless intepreter. --- dlls/rpcrt4/ndr_stubless.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 1459d91..9206c38 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1461,6 +1461,8 @@ #endif case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); + else if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) + retval_ptr = (LONG_PTR *)pArg; break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) @@ -1495,6 +1497,18 @@ #endif if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0); + else if (pParam->param_direction == RPC_FC_RETURN_PARAM) + retval_ptr = (LONG_PTR *)pArg; + else if (pParam->param_direction == RPC_FC_OUT_PARAM) + { + DWORD size = calc_arg_size(&stubMsg, pTypeFormat); + + if(size) + { + *(void **)pArg = NdrAllocate(&stubMsg, size); + memset(*(void **)pArg, 0, size); + } + } break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM ||

1 0

Robert Shearman : rpcrt4: Change call_memory_sizer to preserve the buffer contents and
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 88bbbed176807010312c96ee8e5d2ead06a2fc9d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88bbbed176807010312c96e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:17:00 2006 +0100 rpcrt4: Change call_memory_sizer to preserve the buffer contents and initialise the memory size field to zero before calling the memory sizer function. --- dlls/rpcrt4/ndr_stubless.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 9206c38..3b1c071 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -94,7 +94,18 @@ static inline void call_freer(PMIDL_STUB static inline unsigned long call_memory_sizer(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { NDR_MEMORYSIZE m = NdrMemorySizer[pFormat[0] & NDR_TABLE_MASK]; - if (m) return m(pStubMsg, pFormat); + if (m) + { + unsigned char *saved_buffer = pStubMsg->Buffer; + unsigned long ret; + int saved_ignore_embedded_pointers = pStubMsg->IgnoreEmbeddedPointers; + pStubMsg->MemorySize = 0; + pStubMsg->IgnoreEmbeddedPointers = 1; + ret = m(pStubMsg, pFormat); + pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded_pointers; + pStubMsg->Buffer = saved_buffer; + return ret; + } else { FIXME("format type 0x%x not implemented\n", pFormat[0]);

1 0

Robert Shearman : rpcrt4: Support fixed arrays in calc_arg_size.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 3db5f872a092d893a89fe1e61af3ed044d0a5231 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3db5f872a092d893a89fe1e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:16:56 2006 +0100 rpcrt4: Support fixed arrays in calc_arg_size. --- dlls/rpcrt4/ndr_stubless.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 55a7778..1459d91 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1031,6 +1031,12 @@ static DWORD calc_arg_size(MIDL_STUB_MES ComputeConformance(pStubMsg, NULL, pFormat + 4, 0); size *= pStubMsg->MaxCount; break; + case RPC_FC_SMFARRAY: + size = *(const WORD*)(pFormat + 2); + break; + case RPC_FC_LGFARRAY: + size = *(const DWORD*)(pFormat + 2); + break; default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */

1 0