October 2008 - Wine-commits

Vincent Povirk : shell32: Try to guess the working directory in the run dialog.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 2f1c02e7b78b71eacb66e4e1a029614538b9d3d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1c02e7b78b71eacb66e4e1a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 21 16:07:47 2008 -0500 shell32: Try to guess the working directory in the run dialog. --- dlls/shell32/dialogs.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 77eea18..a39b392 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -113,6 +113,58 @@ void WINAPI RunFileDlgW( } +/* find the directory that contains the file being run */ +static LPWSTR RunDlg_GetParentDir(LPCWSTR cmdline) +{ + const WCHAR *src; + WCHAR *dest, *result, *result_end=NULL; + static WCHAR dotexeW[] = {'.','e','x','e',0}; + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(strlenW(cmdline)+5)); + + src = cmdline; + dest = result; + + if (*src == '"') + { + src++; + while (*src && *src != '"') + { + if (*src == '\\') + result_end = dest; + *dest++ = *src++; + } + } + else { + while (*src) + { + if (isspaceW(*src)) + { + *dest = 0; + if (INVALID_FILE_ATTRIBUTES != GetFileAttributesW(result)) + break; + strcatW(dest, dotexeW); + if (INVALID_FILE_ATTRIBUTES != GetFileAttributesW(result)) + break; + } + else if (*src == '\\') + result_end = dest; + *dest++ = *src++; + } + } + + if (result_end) + { + *result_end = 0; + return result; + } + else + { + HeapFree(GetProcessHeap(), 0, result); + return NULL; + } +} + /* Dialog procedure for RunFileDlg */ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -158,14 +210,20 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR HWND htxt = GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH); if ((ic = GetWindowTextLengthW (htxt))) { - WCHAR *psz ; + WCHAR *psz, *parent=NULL ; + LPCWSTR working_dir ; psz = HeapAlloc( GetProcessHeap(), 0, (ic + 1)*sizeof(WCHAR) ); GetWindowTextW (htxt, psz, ic + 1) ; /* according to http://www.codeproject.com/KB/shell/runfiledlg.aspx we should send a * WM_NOTIFY before execution */ - if (ShellExecuteW(hwnd, NULL, psz, NULL, prfdp->lpstrDirectory, SW_SHOWNORMAL) < (HINSTANCE)33) + if (prfdp->lpstrDirectory) + working_dir = prfdp->lpstrDirectory; + else + working_dir = parent = RunDlg_GetParentDir(psz); + + if (ShellExecuteW(hwnd, NULL, psz, NULL, working_dir, SW_SHOWNORMAL) < (HINSTANCE)33) { char *pszSysMsg = NULL ; char szMsg[256]; @@ -191,6 +249,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR FillList (htxt, (LPSTR)psz, FALSE) ; HeapFree(GetProcessHeap(), 0, psz); + HeapFree(GetProcessHeap(), 0, parent); EndDialog (hwnd, 0) ; } }

1 0

Dmitry Timoshkov : user32: Make ToAscii(Ex) and ToUnicode(Ex) prototypes match PSDK.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: fc48f7743df8777e94ccc6565d782d7e638af3b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc48f7743df8777e94ccc6565… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 27 18:23:02 2008 +0800 user32: Make ToAscii(Ex) and ToUnicode(Ex) prototypes match PSDK. --- dlls/user32/driver.c | 4 ++-- dlls/user32/input.c | 8 ++++---- dlls/user32/user_private.h | 2 +- dlls/winex11.drv/keyboard.c | 2 +- include/winuser.h | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 9588308..ed3375f 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -202,7 +202,7 @@ static UINT nulldrv_SendInput( UINT count, LPINPUT inputs, int size ) return 0; } -static INT nulldrv_ToUnicodeEx( UINT virt, UINT scan, LPBYTE state, LPWSTR str, +static INT nulldrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { return 0; @@ -549,7 +549,7 @@ static UINT loaderdrv_SendInput( UINT count, LPINPUT inputs, int size ) return load_driver()->pSendInput( count, inputs, size ); } -static INT loaderdrv_ToUnicodeEx( UINT virt, UINT scan, LPBYTE state, LPWSTR str, +static INT loaderdrv_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR str, int size, UINT flags, HKL layout ) { return load_driver()->pToUnicodeEx( virt, scan, state, str, size, flags, layout ); diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 8891f59..dce50b5 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -729,7 +729,7 @@ INT WINAPI GetKeyNameTextW(LONG lParam, LPWSTR lpBuffer, INT nSize) /**************************************************************************** * ToUnicode (USER32.@) */ -INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, +INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, LPWSTR lpwStr, int size, UINT flags) { return ToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, GetKeyboardLayout(0)); @@ -738,7 +738,7 @@ INT WINAPI ToUnicode(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, /**************************************************************************** * ToUnicodeEx (USER32.@) */ -INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, +INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, LPWSTR lpwStr, int size, UINT flags, HKL hkl) { return USER_Driver->pToUnicodeEx(virtKey, scanCode, lpKeyState, lpwStr, size, flags, hkl); @@ -747,7 +747,7 @@ INT WINAPI ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, /**************************************************************************** * ToAscii (USER32.@) */ -INT WINAPI ToAscii( UINT virtKey, UINT scanCode, LPBYTE lpKeyState, +INT WINAPI ToAscii( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, LPWORD lpChar, UINT flags ) { return ToAsciiEx(virtKey, scanCode, lpKeyState, lpChar, flags, GetKeyboardLayout(0)); @@ -756,7 +756,7 @@ INT WINAPI ToAscii( UINT virtKey, UINT scanCode, LPBYTE lpKeyState, /**************************************************************************** * ToAsciiEx (USER32.@) */ -INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, LPBYTE lpKeyState, +INT WINAPI ToAsciiEx( UINT virtKey, UINT scanCode, const BYTE *lpKeyState, LPWORD lpChar, UINT flags, HKL dwhkl ) { WCHAR uni_chars[2]; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 40e57e1..744a141 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -114,7 +114,7 @@ typedef struct tagUSER_DRIVER { HKL (*pLoadKeyboardLayout)(LPCWSTR, UINT); UINT (*pMapVirtualKeyEx)(UINT, UINT, HKL); UINT (*pSendInput)(UINT, LPINPUT, int); - INT (*pToUnicodeEx)(UINT, UINT, LPBYTE, LPWSTR, int, UINT, HKL); + INT (*pToUnicodeEx)(UINT, UINT, const BYTE *, LPWSTR, int, UINT, HKL); BOOL (*pUnloadKeyboardLayout)(HKL); SHORT (*pVkKeyScanEx)(WCHAR, HKL); /* mouse functions */ diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 5c501eb..ee2773b 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2439,7 +2439,7 @@ static char KEYBOARD_MapDeadKeysym(KeySym keysym) * FIXME : should do the above (return 2 for non matching deadchar+char combinations) * */ -INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, +INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState, LPWSTR bufW, int bufW_size, UINT flags, HKL hkl) { Display *display = thread_init_display(); diff --git a/include/winuser.h b/include/winuser.h index 40bf20a..142837f 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -5022,10 +5022,10 @@ WINUSERAPI LONG WINAPI TabbedTextOutA(HDC,INT,INT,LPCSTR,INT,INT,const IN WINUSERAPI LONG WINAPI TabbedTextOutW(HDC,INT,INT,LPCWSTR,INT,INT,const INT*,INT); #define TabbedTextOut WINELIB_NAME_AW(TabbedTextOut) WINUSERAPI WORD WINAPI TileWindows (HWND,UINT,const RECT *,UINT,const HWND *); -WINUSERAPI INT WINAPI ToAscii(UINT,UINT,LPBYTE,LPWORD,UINT); -WINUSERAPI INT WINAPI ToAsciiEx(UINT,UINT,LPBYTE,LPWORD,UINT,HKL); -WINUSERAPI INT WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT); -WINUSERAPI INT WINAPI ToUnicodeEx(UINT,UINT,LPBYTE,LPWSTR,int,UINT,HKL); +WINUSERAPI INT WINAPI ToAscii(UINT,UINT,const BYTE *,LPWORD,UINT); +WINUSERAPI INT WINAPI ToAsciiEx(UINT,UINT,const BYTE *,LPWORD,UINT,HKL); +WINUSERAPI INT WINAPI ToUnicode(UINT,UINT,const BYTE *,LPWSTR,int,UINT); +WINUSERAPI INT WINAPI ToUnicodeEx(UINT,UINT,const BYTE *,LPWSTR,int,UINT,HKL); WINUSERAPI BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT); WINUSERAPI BOOL WINAPI TrackPopupMenu(HMENU,UINT,INT,INT,INT,HWND,const RECT*); WINUSERAPI BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,INT,INT,HWND,LPTPMPARAMS);

1 0

Dmitry Timoshkov : winex11.drv: Print the characters returned by ToUnicode.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 0d2bc3fa3502ce490354be21b2cbea510cf2e3ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d2bc3fa3502ce490354be21b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 27 18:22:43 2008 +0800 winex11.drv: Print the characters returned by ToUnicode. --- dlls/winex11.drv/keyboard.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 6343b10..5c501eb 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2703,8 +2703,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, found: if (buf != lpChar) HeapFree(GetProcessHeap(), 0, lpChar); - TRACE_(key)("ToUnicode about to return %d with char %x %s\n", - ret, (ret && bufW) ? bufW[0] : 0, bufW ? "" : "(no buffer)"); + TRACE_(key)("returning %d with %s\n", ret, debugstr_wn(bufW, ret)); return ret; }

1 0

Austin English : ole32: Implement IEnumFORMATETC_Next_Proxy and IEnumFORMATETC_Next_Stub.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 8301325989f813dc7efd7da91ca07f5cd3c675e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8301325989f813dc7efd7da91… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 24 04:55:56 2008 -0500 ole32: Implement IEnumFORMATETC_Next_Proxy and IEnumFORMATETC_Next_Stub. --- dlls/ole32/usrmarshal.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index b8487c3..9996891 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2398,8 +2398,9 @@ HRESULT CALLBACK IEnumFORMATETC_Next_Proxy( FORMATETC *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + ULONG fetched; + if (!pceltFetched) pceltFetched = &fetched; + return IEnumFORMATETC_RemoteNext_Proxy(This, celt, rgelt, pceltFetched); } HRESULT __RPC_STUB IEnumFORMATETC_Next_Stub( @@ -2408,8 +2409,11 @@ HRESULT __RPC_STUB IEnumFORMATETC_Next_Stub( FORMATETC *rgelt, ULONG *pceltFetched) { - FIXME(":stub\n"); - return E_NOTIMPL; + HRESULT hr; + *pceltFetched = 0; + hr = IEnumFORMATETC_Next(This, celt, rgelt, pceltFetched); + if (hr == S_OK) *pceltFetched = celt; + return hr; } HRESULT CALLBACK IEnumSTATDATA_Next_Proxy(

1 0

Francois Gouget : wined3d: Fix the WineDirect3DCreate() export.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 69553c2514bc6b56afb586aad08bb4040e25995f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69553c2514bc6b56afb586aad… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Oct 26 23:39:27 2008 +0100 wined3d: Fix the WineDirect3DCreate() export. --- dlls/wined3d/wined3d.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index fc36584..2f2677c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -1,2 +1,2 @@ -@ stdcall WineDirect3DCreate(long long ptr) +@ stdcall WineDirect3DCreate(long ptr) @ stdcall WineDirect3DCreateClipper(ptr)

1 0

James Hawkins : msi: Skip the leading period of the extension to be registered.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: c261030d21eb7b9c3ae0e6e188321a0cfcffd0ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c261030d21eb7b9c3ae0e6e18… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 27 01:52:49 2008 -0500 msi: Skip the leading period of the extension to be registered. --- dlls/msi/classes.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 45254ef..cf889c1 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -461,6 +461,9 @@ static MSIEXTENSION *load_given_extension( MSIPACKAGE *package, LPCWSTR name ) if (!name) return NULL; + if (name[0] == '.') + name++; + /* check for extensions already loaded */ LIST_FOR_EACH_ENTRY( ext, &package->extensions, MSIEXTENSION, entry ) {

1 0

James Hawkins : msi: Convert command line property names to uppercase.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 2ffa433f80955565a35d91f0d9e6e95ffe4c3925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ffa433f80955565a35d91f0d… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 27 01:26:12 2008 -0500 msi: Convert command line property names to uppercase. --- dlls/msi/action.c | 1 + dlls/msi/tests/install.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 93d8ee9..37a7de3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -323,6 +323,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine ) prop = msi_alloc((len+1)*sizeof(WCHAR)); memcpy(prop,ptr,len*sizeof(WCHAR)); prop[len]=0; + struprW(prop); ptr2++; len = 0; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9773529..ee10f36 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1189,6 +1189,18 @@ static const msi_table ai_tables[] = ADD_TABLE(property) }; +static const msi_table pc_tables[] = +{ + ADD_TABLE(ca51_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -5559,6 +5571,27 @@ static void test_adminimage(void) RemoveDirectoryA("msitest"); } +static void test_propcase(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\augustus", 500); + + create_database(msifile, pc_tables, sizeof(pc_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "MyProp=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile(msifile); + DeleteFile("msitest\\augustus"); + RemoveDirectory("msitest"); +} + START_TEST(install) { DWORD len; @@ -5631,6 +5664,7 @@ START_TEST(install) test_missingcomponent(); test_sourcedirprop(); test_adminimage(); + test_propcase(); DeleteFileA("msitest.log");

1 0

James Hawkins : msi: Use the long file name in the WriteIniValues action.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: bf9538f383eba92284a6df216df717514ff4eb1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf9538f383eba92284a6df216… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 27 00:56:04 2008 -0500 msi: Use the long file name in the WriteIniValues action. --- dlls/msi/action.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0c57417..93d8ee9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3622,9 +3622,10 @@ end: static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = (MSIPACKAGE*)param; - LPCWSTR component,section,key,value,identifier,filename,dirproperty; + LPCWSTR component, section, key, value, identifier, dirproperty; LPWSTR deformated_section, deformated_key, deformated_value; - LPWSTR folder, fullname = NULL; + LPWSTR folder, filename, fullname = NULL; + LPCWSTR filenameptr; MSIRECORD * uirow; INT action; MSICOMPONENT *comp; @@ -3647,7 +3648,6 @@ static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param) comp->Action = INSTALLSTATE_LOCAL; identifier = MSI_RecordGetString(row,1); - filename = MSI_RecordGetString(row,2); dirproperty = MSI_RecordGetString(row,3); section = MSI_RecordGetString(row,4); key = MSI_RecordGetString(row,5); @@ -3658,6 +3658,12 @@ static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param) deformat_string(package,key,&deformated_key); deformat_string(package,value,&deformated_value); + filename = msi_dup_record_field(row, 2); + if (filename && (filenameptr = strchrW(filename, '|'))) + filenameptr++; + else + filenameptr = filename; + if (dirproperty) { folder = resolve_folder(package, dirproperty, FALSE, FALSE, TRUE, NULL); @@ -3673,7 +3679,7 @@ static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param) goto cleanup; } - fullname = build_directory_name(2, folder, filename); + fullname = build_directory_name(2, folder, filenameptr); if (action == 0) { @@ -3708,7 +3714,9 @@ static UINT ITERATE_WriteIniValues(MSIRECORD *row, LPVOID param) MSI_RecordSetStringW(uirow,4,deformated_value); ui_actiondata(package,szWriteIniValues,uirow); msiobj_release( &uirow->hdr ); + cleanup: + msi_free(filename); msi_free(fullname); msi_free(folder); msi_free(deformated_key);

1 0

James Hawkins : msi: Set the source path tests to "interactive" to avoid timing out on some machines.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 7616a750ba12dbeb28f6931c0a4ff4074002a1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7616a750ba12dbeb28f6931c0… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 27 00:55:39 2008 -0500 msi: Set the source path tests to "interactive" to avoid timing out on some machines. --- dlls/msi/tests/install.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8d04ff6..9773529 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -5086,6 +5086,12 @@ static void test_sourcepath(void) { UINT r, i; + if (!winetest_interactive) + { + skip("Run in interactive mode to run source path tests.\n"); + return; + } + create_database(msifile, sp_tables, sizeof(sp_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL);

1 0

Dylan Smith : richedit: Fixed initial word wrap setting when emulating 1.0.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 4c28a5bcfb7c3818eff8d9a423a954d851a1c302 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c28a5bcfb7c3818eff8d9a42… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Oct 26 23:38:15 2008 -0400 richedit: Fixed initial word wrap setting when emulating 1.0. --- dlls/riched20/editor.c | 2 ++ dlls/riched32/tests/editor.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d92397e..e35e3cb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4148,7 +4148,9 @@ LRESULT WINAPI RichEdit10ANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM { ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW(hWnd, 0); + TRACE("Emulating version 1.0 (hWnd=%p)\n", hWnd); editor->bEmulateVersion10 = TRUE; + editor->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & ES_AUTOHSCROLL) ? FALSE : TRUE; editor->pBuffer->pLast->member.para.nCharOfs = 2; assert(editor->pBuffer->pLast->prev->type == diRun); assert(editor->pBuffer->pLast->prev->member.run.nFlags & MERF_ENDPARA); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 15876f4..5fef571 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -849,13 +849,13 @@ static void test_word_wrap(void) res = SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) text); ok(res, "WM_SETTEXT failed.\n"); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - todo_wine ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); lines = SendMessage(hwnd, EM_GETLINECOUNT, 0, 0); - todo_wine ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); + ok(lines > 1, "Line was expected to wrap (lines=%d).\n", lines); SetWindowLong(hwnd, GWL_STYLE, dwCommonStyle|WS_HSCROLL|ES_AUTOHSCROLL); pos = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM) &point); - todo_wine ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); + ok(pos, "pos=%d indicating no word wrap when it is expected.\n", pos); DestroyWindow(hwnd); hwnd = CreateWindow(RICHEDIT_CLASS10A, NULL, dwCommonStyle|ES_AUTOHSCROLL,

1 0