winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
October 2008
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1216 discussions
Start a n
N
ew thread
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
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
0
0
← Newer
1
...
11
12
13
14
15
16
17
...
122
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
Results per page:
10
25
50
100
200