December 2005 - Wine-Commits

Henning Gerhardt : winecfg: Update German resource.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: ba76275e1606b90e4cf95b8eeeb63add1a427f81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba76275e1606b90e4cf95b8… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Mon Dec 19 17:42:30 2005 +0100 winecfg: Update German resource. --- programs/winecfg/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index d078963..c0e665c 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -159,13 +159,13 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 + GROUPBOX " Treiber Auswahl ",IDC_STATIC,8,4,244,195 LTEXT "Audio Treiber: ",IDC_STATIC,15,20,227,30 CONTROL "Ger�te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,50,140,140 PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,215,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DSOUND_HW_ACCEL,105,213,140,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END

1 0

Rein Klazes : wcmd: Increase maximum length of commands.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 80e695a6a46f40b7e99011620d4a20a61e7b9911 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80e695a6a46f40b7e990116… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 19 17:42:11 2005 +0100 wcmd: Increase maximum length of commands. Increase maximum length of commands to 8192 bytes as on Windows XP. Add needed braces to a multi line "if" statement. --- programs/wcmd/batch.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/wcmd/batch.c b/programs/wcmd/batch.c index 89d50aa..4751076 100644 --- a/programs/wcmd/batch.c +++ b/programs/wcmd/batch.c @@ -27,7 +27,8 @@ extern char quals[MAX_PATH], param1[MAX_ extern BATCH_CONTEXT *context; extern DWORD errorlevel; -#define MAXSTRING 1024 +/* msdn specified max for Win XP */ +#define MAXSTRING 8192 /**************************************************************************** * WCMD_batch @@ -93,13 +94,14 @@ BATCH_CONTEXT *prev_context; */ while (WCMD_fgets (string, sizeof(string), h)) { - if (strlen(string) == MAXSTRING -1) - WCMD_output_asis( "Line in Batch processing possible truncated. Using:\n"); - WCMD_output_asis( string); - WCMD_output_asis( "\n"); - if (string[0] != ':') { /* Skip over labels */ - WCMD_batch_command (string); - } + if (strlen(string) == MAXSTRING -1) { + WCMD_output_asis( "Line in Batch processing possibly truncated. Using:\n"); + WCMD_output_asis( string); + WCMD_output_asis( "\n"); + } + if (string[0] != ':') { /* Skip over labels */ + WCMD_batch_command (string); + } } CloseHandle (h);

1 0

Eric Pouech : dbghelp: New stubs (needed for windbg startup).
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: a229618ef11da18f56c4212a70ce0b96154400bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a229618ef11da18f56c4212… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 17:41:52 2005 +0100 dbghelp: New stubs (needed for windbg startup). --- dlls/dbghelp/dbghelp.spec | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 0c08921..0b41cc6 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -25,11 +25,13 @@ @ stdcall SearchTreeForFile(str str str) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) +@ stub SymAddSymbol @ stdcall SymCleanup(long) @ stdcall SymEnumLines(ptr double str str ptr ptr) @ stdcall SymEnumSourceFiles(ptr double str ptr ptr) @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr double str ptr ptr) +@ stub SymEnumSymbolsForAddr @ stdcall SymEnumTypes(ptr double ptr ptr) @ stub SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) @@ -40,9 +42,11 @@ @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) @ stdcall SymFromAddr(ptr double ptr ptr) @ stdcall SymFromName(long str ptr) +@ stub SymFromToken @ stub SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) @ stub SymGetFileLineOffsets64 +@ stub SymGetHomeDirectory @ stdcall SymGetLineFromAddr64(long double ptr ptr) @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stub SymGetLineFromName64 @@ -59,6 +63,9 @@ @ stub SymGetModuleInfoW @ stdcall SymGetOptions() @ stdcall SymGetSearchPath(long str long) +@ stub SymGetSourceFileFromToken +@ stub SymGetSourceFileToken +@ stub SymGetSourceVarFromToken @ stub SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) @ stub SymGetSymFromName64 @@ -79,6 +86,7 @@ @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) +@ stub SymSearch @ stdcall SymSetContext(long ptr ptr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) @@ -91,7 +99,7 @@ @ stdcall UnDecorateSymbolName(str str long long) @ stdcall UnmapDebugInformation(ptr) @ stub WinDbgExtensionDllInit -#@ stub dbghelp +@ stub dbghelp #@ stub dh #@ stub lm #@ stub lmi

1 0

Eric Pouech : dbghelp: Fixed loading .so modules from a living target.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 177bf4c1a64b5a3a15b1b173543af27e18264aa2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=177bf4c1a64b5a3a15b1b17… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 17:41:43 2005 +0100 dbghelp: Fixed loading .so modules from a living target. --- dlls/dbghelp/elf_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 153e63a..1c8a983 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1381,7 +1381,7 @@ static BOOL elf_load_cb(const char* name if (!p++) p = name; if (!memcmp(p, el->name, strlen(el->name))) { - elf_search_and_load_file(el->pcs, name, addr, &el->elf_info); + el->ret = elf_search_and_load_file(el->pcs, name, addr, &el->elf_info); return FALSE; } return TRUE;

1 0

Eric Pouech : dbghelp: Fixed missing parameters info in StackWalk64.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: df7be14ce2ff962d5c63dae408a14e4f3ba2ce86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df7be14ce2ff962d5c63dae… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 17:41:32 2005 +0100 dbghelp: Fixed missing parameters info in StackWalk64. --- dlls/dbghelp/stack.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 3719542..69e9c1f 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -518,6 +518,11 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp addr_32to64(&frame32.AddrStack, &frame64->AddrStack); addr_32to64(&frame32.AddrBStore, &frame64->AddrBStore); frame64->FuncTableEntry = frame32.FuncTableEntry; /* FIXME */ + frame64->Params[0] = (ULONG)frame32.Params[0]; + frame64->Params[1] = (ULONG)frame32.Params[1]; + frame64->Params[2] = (ULONG)frame32.Params[2]; + frame64->Params[3] = (ULONG)frame32.Params[3]; + frame64->Params[4] = (ULONG)frame32.Params[4]; frame64->Far = frame32.Far; frame64->Virtual = frame32.Virtual; frame64->Reserved[0] = (ULONG)frame32.Reserved[0];

1 0

Paul Vriens : d3d9: Don't crash on NULL device_ptr.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 636cb19ad072e8618f4e4ce414eb10160a3b0049 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=636cb19ad072e8618f4e4ce… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 19 10:00:08 2005 +0100 d3d9: Don't crash on NULL device_ptr. --- dlls/d3d9/tests/stateblock.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 61b5be5..a5b1938 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -90,5 +90,7 @@ START_TEST(stateblock) } device_ptr = init_d3d9(); + if (!device_ptr) return; + test_begin_end_state_block(device_ptr); }

1 0

Alexandre Julliard : ntdll: Make __wine_call_from_32_restore_regs take a context pointer.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 8651ceb18e5bfff69421c2c85c323fff84ef6a82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8651ceb18e5bfff69421c2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 09:59:50 2005 +0100 ntdll: Make __wine_call_from_32_restore_regs take a context pointer. Changed exception raise functions to call it explicitly. --- dlls/ntdll/signal_i386.c | 55 +++++++++++++++++++++++++++++++--------------- tools/winebuild/relay.c | 2 +- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4c0529f..d11e37d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -452,7 +452,7 @@ static size_t signal_stack_size; static wine_signal_handler handlers[256]; -extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( CONTEXT context ); +extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( const CONTEXT *context ); /*********************************************************************** @@ -703,6 +703,7 @@ inline static void *init_handler( const */ inline static void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { + context->ContextFlags |= CONTEXT86_FLOATING_POINT; #ifdef FPU_sig if (FPU_sig(sigcontext)) { @@ -794,6 +795,20 @@ inline static void restore_context( cons /*********************************************************************** + * set_cpu_context + * + * Set the new CPU context. + */ +inline static void DECLSPEC_NORETURN set_cpu_context( CONTEXT *context ) +{ + DWORD flags = context->ContextFlags & ~CONTEXT_i386; + + if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); + __wine_call_from_32_restore_regs( context ); +} + + +/*********************************************************************** * is_privileged_instr * * Check if the fault location is a privileged instruction. @@ -872,7 +887,6 @@ static EXCEPTION_RECORD *setup_exception void *ret_addr; /* return address from raise_func */ EXCEPTION_RECORD *rec_ptr; /* first arg for raise_func */ CONTEXT *context_ptr; /* second arg for raise_func */ - void *dummy; /* dummy ret addr for __wine_call_from_32_restore_regs */ CONTEXT context; EXCEPTION_RECORD rec; DWORD ebp; @@ -912,7 +926,7 @@ static EXCEPTION_RECORD *setup_exception } stack--; /* push the stack_layout structure */ - stack->ret_addr = __wine_call_from_32_restore_regs; + stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ stack->rec_ptr = &stack->rec; stack->context_ptr = &stack->context; @@ -977,16 +991,13 @@ static inline DWORD get_fpu_code( const /********************************************************************** * raise_segv_exception */ -static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +static void WINAPI DECLSPEC_NORETURN raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { switch(rec->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) - { - if (!(rec->ExceptionCode = VIRTUAL_HandleFault( (void *)rec->ExceptionInformation[1] ))) - return; - } + rec->ExceptionCode = VIRTUAL_HandleFault( (void *)rec->ExceptionInformation[1] ); break; case EXCEPTION_DATATYPE_MISALIGNMENT: /* FIXME: pass through exception handler first? */ @@ -994,18 +1005,20 @@ static void WINAPI raise_segv_exception( { /* Disable AC flag, return */ context->EFlags &= ~0x00040000; - return; + goto done; } break; } __regs_RtlRaiseException( rec, context ); +done: + set_cpu_context( context ); } /********************************************************************** * raise_trap_exception */ -static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +static void WINAPI DECLSPEC_NORETURN raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { DWORD dr0, dr1, dr2, dr3, dr6, dr7; @@ -1043,16 +1056,20 @@ static void WINAPI raise_trap_exception( context->ContextFlags = CONTEXT_DEBUG_REGISTERS; NtSetContextThread(GetCurrentThread(), context); } + context->ContextFlags = CONTEXT_FULL; /* restore flags */ + set_cpu_context( context ); } /********************************************************************** - * raise_fpu_exception + * raise_exception + * + * Generic raise function for exceptions that don't need special treatment. */ -static void WINAPI raise_fpu_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +static void WINAPI DECLSPEC_NORETURN raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { __regs_RtlRaiseException( rec, context ); - restore_fpu( context ); + set_cpu_context( context ); } @@ -1060,7 +1077,7 @@ static void WINAPI raise_fpu_exception( /********************************************************************** * raise_vm86_sti_exception */ -static void WINAPI raise_vm86_sti_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +static void WINAPI DECLSPEC_NORETURN raise_vm86_sti_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { /* merge_vm86_pending_flags merges the vm86_pending flag in safely */ NtCurrentTeb()->vm86_pending |= VIP_MASK; @@ -1071,7 +1088,7 @@ static void WINAPI raise_vm86_sti_except ((char*)context->Eip <= (char*)vm86_return_end) && (VM86_TYPE(context->Eax) != VM86_SIGNAL)) { /* exiting from VM86, can't throw */ - return; + goto done; } merge_vm86_pending_flags( rec ); } @@ -1083,6 +1100,8 @@ static void WINAPI raise_vm86_sti_except NtCurrentTeb()->vm86_pending = 0; __regs_RtlRaiseException( rec, context ); } +done: + set_cpu_context( context ); } @@ -1200,7 +1219,7 @@ static HANDLER_DEF(trap_handler) */ static HANDLER_DEF(fpe_handler) { - EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, raise_fpu_exception ); + EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, raise_exception ); CONTEXT *context; context = get_exception_context( rec ); @@ -1239,7 +1258,7 @@ static HANDLER_DEF(int_handler) init_handler( HANDLER_CONTEXT, &fs, &gs ); if (!dispatch_signal(SIGINT)) { - EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, __regs_RtlRaiseException ); + EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, raise_exception ); rec->ExceptionCode = CONTROL_C_EXIT; } } @@ -1251,7 +1270,7 @@ static HANDLER_DEF(int_handler) */ static HANDLER_DEF(abrt_handler) { - EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, __regs_RtlRaiseException ); + EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, raise_exception ); rec->ExceptionCode = EXCEPTION_WINE_ASSERTION; rec->ExceptionFlags = EH_NONCONTINUABLE; } diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index de8dd60..60ed6cc 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -850,7 +850,7 @@ static void BuildCallFrom32Regs( FILE *o output_function_size( outfile, "__wine_call_from_32_regs" ); function_header( outfile, "__wine_call_from_32_restore_regs" ); - fprintf( outfile, "\tleal 4(%%esp),%%ecx\n" ); + fprintf( outfile, "\tmovl 4(%%esp),%%ecx\n" ); fprintf( outfile, "\tjmp 2b\n" ); output_function_size( outfile, "__wine_call_from_32_restore_regs" ); }

1 0

Jacek Caban : urlmon: Added handling of BINDF_FROMURLMON in file protocol.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: ed7aa80765036a0185bc1b8b3a9c6c0a3c5072d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed7aa80765036a0185bc1b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 09:57:25 2005 +0100 urlmon: Added handling of BINDF_FROMURLMON in file protocol. --- dlls/urlmon/file.c | 7 +- dlls/urlmon/tests/protocol.c | 173 +++++++++++++++++++++++++++--------------- 2 files changed, 116 insertions(+), 64 deletions(-)

1 0

Jacek Caban : Fix typo in urlmon.idl.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: dd2d59818d6cd90608927ae1be370f0fd52328cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd2d59818d6cd90608927ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 09:53:30 2005 +0100 Fix typo in urlmon.idl. --- dlls/mshtml/tests/protocol.c | 2 +- include/urlmon.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index accac0e..9624b37 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -71,7 +71,7 @@ static HRESULT WINAPI ProtocolSink_Repor ok(expect_ReportProgress, "unexpected call\n"); ok(ulStatusCode == BINDSTATUS_MIMETYPEAVAILABLE - || ulStatusCode == BINDSTATUS_VERFIEDMIMETYPEAVAILABLE, "ulStatusCode=%ld\n", ulStatusCode); + || ulStatusCode == BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, "ulStatusCode=%ld\n", ulStatusCode); ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); expect_ReportProgress = FALSE; called_ReportProgress = TRUE; diff --git a/include/urlmon.idl b/include/urlmon.idl index 97ab839..85a9277 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -193,7 +193,7 @@ interface IBindStatusCallback : IUnknown BINDSTATUS_ENDUPLOADINGDATA, BINDSTATUS_PROTOCOLCLASSID, BINDSTATUS_ENCODING, - BINDSTATUS_VERFIEDMIMETYPEAVAILABLE, + BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, BINDSTATUS_CLASSINSTALLLOCATION, BINDSTATUS_DECODING, BINDSTATUS_LOADINGMIMEHANDLER,

1 0

Lauri Tulmin : user32: Don't truncate text when creating edit control.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 86f45494b6fb92cf1151317921cad23fe8e81667 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86f45494b6fb92cf1151317… Author: Lauri Tulmin <tulmin(a)gmail.com> Date: Mon Dec 19 09:53:19 2005 +0100 user32: Don't truncate text when creating edit control. --- dlls/user/edit.c | 2 +- dlls/user/tests/edit.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/user/edit.c b/dlls/user/edit.c index 47f317d..bc67e43 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -4061,7 +4061,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE EDIT_SetRectNP(es, &clientRect); if (name && *name) { - EDIT_EM_ReplaceSel(es, FALSE, name, FALSE, TRUE); + EDIT_EM_ReplaceSel(es, FALSE, name, FALSE, FALSE); /* if we insert text to the editline, the text scrolls out * of the window, as the caret is placed after the insert * pos normally; thus we reset es->selection... to 0 and diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c index 846ed2d..0bd521b 100644 --- a/dlls/user/tests/edit.c +++ b/dlls/user/tests/edit.c @@ -671,6 +671,40 @@ static void test_edit_control_4(void) DestroyWindow(hwEdit); } +/* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL + * truncates text that doesn't fit. + */ +static void test_edit_control_5(void) +{ + static const char *str = "test\r\ntest"; + HWND hWnd; + int len; + + hWnd = CreateWindowEx(0, + "EDIT", + str, + 0, + 10, 10, 1, 1, + NULL, NULL, NULL, NULL); + assert(hWnd); + + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); + + hWnd = CreateWindowEx(0, + "EDIT", + str, + ES_MULTILINE, + 10, 10, 1, 1, + NULL, NULL, NULL, NULL); + assert(hWnd); + + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); +} + static void test_margins(void) { HWND hwEdit; @@ -931,6 +965,7 @@ START_TEST(edit) test_edit_control_2(); test_edit_control_3(); test_edit_control_4(); + test_edit_control_5(); test_margins(); test_text_position();

1 0