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

Alexandre Julliard : Release 1.0-rc2.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: 3c1c6172779510a7ed693d922fb3061948999ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1c6172779510a7ed693d922… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 23 17:08:29 2008 +0200 Release 1.0-rc2. --- ANNOUNCE | 711 +++++++++++++++++++++++++------------------ ChangeLog | 1019 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1447 insertions(+), 303 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c1c6172779510a7ed693…

1 0

Tag wine-1.0-rc2 : Alexandre Julliard : Release 1.0-rc2
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: refs/tags/wine-1.0-rc2 Tag: 58c881984592b5cb3fb01fcbdcc02f088bfc8fc6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=58c881984592b5cb3fb01fcbdcc0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 23 17:08:29 2008 +0200 Release 1.0-rc2

1 0

James Hawkins : opengl32: Trace a test result that fails inconsistently across different drivers.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: 0fad82a9c7b16e9207da8528b26c164657469226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fad82a9c7b16e9207da8528b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri May 23 03:21:29 2008 -0500 opengl32: Trace a test result that fails inconsistently across different drivers. --- dlls/opengl32/tests/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index db9504f..ad05822 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -210,9 +210,11 @@ static void test_setpixelformat(HDC winhdc) pf = ChoosePixelFormat(hdc, &pfd); ok(pf != 0, "ChoosePixelFormat failed on main device context\n"); - /* SetPixelFormat on the main device context 'X root window' should fail */ + /* SetPixelFormat on the main device context 'X root window' should fail, + * but some broken drivers allow it + */ res = SetPixelFormat(hdc, pf, &pfd); - ok(res == 0, "SetPixelFormat on main device context should fail\n"); + trace("SetPixelFormat on main device context %s\n", res ? "succeeded" : "failed"); /* Setting the same format that was set on the HDC is allowed; other formats fail */

1 0

Alexandre Julliard : README: Updated.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: 6504ee442b8c7b4afceadde644c8a05e81b353e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6504ee442b8c7b4afceadde64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 23 12:10:24 2008 +0200 README: Updated. --- README | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/README b/README index 913e734..46a4b1e 100644 --- a/README +++ b/README @@ -66,30 +66,28 @@ Mac OS X info: Supported file systems: - Wine should run on most file systems. However, Wine will fail to start - if umsdos is used for the /tmp directory. A few compatibility problems have - also been reported using files accessed through Samba. Also, NTFS does not - provide all the file system features needed by some applications. - Using a native Linux file system such as ext3 is recommended. + Wine should run on most file systems. A few compatibility problems + have also been reported using files accessed through Samba. Also, + NTFS does not provide all the file system features needed by some + applications. Using a native Linux file system such as ext3 is + recommended. Basic requirements: You need to have the X11 development include files installed (called xlib6g-dev in Debian and XFree86-devel in Red Hat). -Build tool requirements: - On x86 Systems gcc >= 2.7.2 is required. - Versions earlier than 2.7.2.3 may have problems when certain files - are compiled with optimization, often due to problems with header file - management. - Of course you also need "make" (most likely GNU make). You also need flex version 2.5 or later and bison. Optional support libraries: - Run ./configure --verbose to see the optional libraries that could - be used but aren't found on your system. + Configure will display notices when optional libraries are not found + on your system. See http://wiki.winehq.org/Recommended_Packages for + hints about the packages you should install. + On 64-bit platforms you have to make sure to install the 32-bit + versions of these libraries; see http://wiki.winehq.org/WineOn64bit + for details. 4. COMPILATION @@ -128,12 +126,8 @@ Don't forget to uninstall any conflicting previous Wine installation first. Try either "dpkg -r wine" or "rpm -e wine" or "make uninstall" before installing. -See the Support area at http://www.winehq.org/ for configuration -hints. - -In case of library loading errors -(e.g. "Error while loading shared libraries: libntdll.so"), make sure -to add the library path to /etc/ld.so.conf and run ldconfig as root. +Once installed, you can run the "winecfg" configuration tool. See the +Support area at http://www.winehq.org/ for configuration hints. 6. RUNNING PROGRAMS @@ -148,7 +142,7 @@ For example: to run Solitaire: wine c:\\windows\\sol.exe (using DOS filename syntax) - wine /usr/windows/sol.exe (using Unix filename syntax) + wine ~/.wine/drive_c/windows/sol.exe (using Unix filename syntax) wine sol.exe /parameter1 -parameter2 parameter3 (calling program with parameters)

1 0

Markus Weiland : dxdiagn: Implemented OS version properties for DXDiagSystemInfoContainer.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: df51bbf49f6d755f6f55ff4019cc87b3827aa511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df51bbf49f6d755f6f55ff401… Author: Markus Weiland <kde(a)graph-ix.net> Date: Fri May 23 08:55:27 2008 +0200 dxdiagn: Implemented OS version properties for DXDiagSystemInfoContainer. --- dlls/dxdiagn/provider.c | 47 +++++++++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 006310a..7fc7aa5 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -259,7 +259,6 @@ static HRESULT DXDiag_AddFileDescContainer(IDxDiagContainer* pSubCont, const WCH } static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) { - HRESULT hr = S_OK; static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0}; static const WCHAR dwDirectXVersionMinor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','i','n','o','r',0}; static const WCHAR szDirectXVersionLetter[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','e','t','t','e','r',0}; @@ -273,40 +272,52 @@ static HRESULT DXDiag_InitDXDiagSystemInfoContainer(IDxDiagContainer* pSubCont) /*static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0};*/ /*szWindowsDir*/ /*szWindowsDir*/ - /*"dwOSMajorVersion"*/ - /*"dwOSMinorVersion"*/ - /*"dwOSBuildNumber"*/ - /*"dwOSPlatformID"*/ + static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; + static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; + static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; MEMORYSTATUSEX msex; + OSVERSIONINFOW info; VARIANT v; V_VT(&v) = VT_UI4; V_UI4(&v) = 9; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMajor, &v); - VariantClear(&v); + IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMajor, &v); V_VT(&v) = VT_UI4; V_UI4(&v) = 0; - hr = IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMinor, &v); - VariantClear(&v); + IDxDiagContainerImpl_AddProp(pSubCont, dwDirectXVersionMinor, &v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLetter_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLetter, &v); + IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLetter, &v); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionEnglish, &v); + IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionEnglish, &v); VariantClear(&v); V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(szDirectXVersionLongEnglish_v); - hr = IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLongEnglish, &v); + IDxDiagContainerImpl_AddProp(pSubCont, szDirectXVersionLongEnglish, &v); VariantClear(&v); V_VT(&v) = VT_BOOL; V_BOOL(&v) = FALSE; - hr = IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); - VariantClear(&v); + IDxDiagContainerImpl_AddProp(pSubCont, bDebug, &v); msex.dwLength = sizeof(msex); GlobalMemoryStatusEx( &msex ); V_VT(&v) = VT_UI8; V_UI8(&v) = msex.ullTotalPhys; - hr = IDxDiagContainerImpl_AddProp(pSubCont, ullPhysicalMemory, &v); - VariantClear(&v); - - return hr; + IDxDiagContainerImpl_AddProp(pSubCont, ullPhysicalMemory, &v); + + info.dwOSVersionInfoSize = sizeof(info); + GetVersionExW( &info ); + V_VT(&v) = VT_UI4; + V_UI4(&v) = info.dwMajorVersion; + IDxDiagContainerImpl_AddProp(pSubCont, dwOSMajorVersion, &v); + V_VT(&v) = VT_UI4; + V_UI4(&v) = info.dwMinorVersion; + IDxDiagContainerImpl_AddProp(pSubCont, dwOSMinorVersion, &v); + V_VT(&v) = VT_UI4; + V_UI4(&v) = info.dwBuildNumber; + IDxDiagContainerImpl_AddProp(pSubCont, dwOSBuildNumber, &v); + V_VT(&v) = VT_UI4; + V_UI4(&v) = info.dwPlatformId; + IDxDiagContainerImpl_AddProp(pSubCont, dwOSPlatformID, &v); + + return S_OK; } static HRESULT DXDiag_InitDXDiagSystemDevicesContainer(IDxDiagContainer* pSubCont) {

1 0

Alam Arias : include: Modify UNREFERENCED macros to cast to void.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: a3b7030ee85a03e684279067f42a8b85c019db77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b7030ee85a03e684279067f… Author: Alam Arias <Alam.GBC(a)gmail.com> Date: Thu May 8 20:22:03 2008 -0400 include: Modify UNREFERENCED macros to cast to void. --- include/winnt.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 96ed387..9d6e05d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1470,9 +1470,9 @@ typedef CONTEXT *PCONTEXT; #define LOCALE_USER_DEFAULT (MAKELCID(LANG_USER_DEFAULT, SORT_DEFAULT)) #define LOCALE_NEUTRAL (MAKELCID(MAKELANGID(LANG_NEUTRAL,SUBLANG_NEUTRAL),SORT_DEFAULT)) -#define UNREFERENCED_PARAMETER(u) (u) -#define DBG_UNREFERENCED_PARAMETER(u) (u) -#define DBG_UNREFERENCED_LOCAL_VARIABLE(u) (u) +#define UNREFERENCED_PARAMETER(u) (void)(u) +#define DBG_UNREFERENCED_PARAMETER(u) (void)(u) +#define DBG_UNREFERENCED_LOCAL_VARIABLE(u) (void)(u) #define LANG_NEUTRAL 0x00 #define LANG_INVARIANT 0x7f

1 0

James Hawkins : kernel32: Don' t test the invalid locale 0 if it is enumerated.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: e92f9054dd8fa23bde8e5f82b7c3bca54cef935f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e92f9054dd8fa23bde8e5f82b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri May 23 03:10:46 2008 -0500 kernel32: Don't test the invalid locale 0 if it is enumerated. --- dlls/kernel32/tests/locale.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4f1907d..1475ebe 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2056,6 +2056,10 @@ static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, { trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam); + /* invalid locale enumerated on some platforms */ + if (lcid == 0) + return TRUE; + ok(pIsValidLanguageGroup(lgrpid, LGRPID_SUPPORTED) == TRUE, "Enumerated grp %d not valid\n", lgrpid); ok(IsValidLocale(lcid, LCID_SUPPORTED) == TRUE,

1 0

James Hawkins : mshtml: Fix a few test failures in win2k3.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: 8c68e18d5333ac4ca65e60f0ea454eda9780b10d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c68e18d5333ac4ca65e60f0e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Fri May 23 03:17:04 2008 -0500 mshtml: Fix a few test failures in win2k3. --- dlls/mshtml/tests/htmldoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 34a7f24..6c1640b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -356,7 +356,9 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(bindinfo.dwBindVerb == 0, "bindinfo.dwBindVerb=%d\n", bindinfo.dwBindVerb); ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); ok(bindinfo.cbstgmedData == 0, "bindinfo.cbstgmedData=%d\n", bindinfo.cbstgmedData); - ok(bindinfo.dwOptions == 0x80000, "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); + ok(bindinfo.dwOptions == 0x80000 || + bindinfo.dwOptions == 0x4080000, /* win2k3 */ + "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%d\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */

1 0

Maarten Lankhorst : winmm: Fix valgrind warnings on exit.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: 72be44ee7dd777903c9605d4fb455a9f5382bb77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72be44ee7dd777903c9605d4f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu May 22 11:39:40 2008 -0700 winmm: Fix valgrind warnings on exit. --- dlls/winmm/lolvldrv.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index e0bf737..d50f329 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -763,10 +763,16 @@ void MMDRV_Exit(void) MMDRV_ExitPerType(&MMDrvs[i], MMDRV_WAVEOUT); CloseDriver(MMDrvs[i].hDriver, 0, 0); } - HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_AUX].lpMlds - 1); - HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIXER].lpMlds - 1); - HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIDIIN].lpMlds - 1); - HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIDIOUT].lpMlds - 1); - HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_WAVEIN].lpMlds - 1); - HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_WAVEOUT].lpMlds - 1); + if (llTypes[MMDRV_AUX].lpMlds) + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_AUX].lpMlds - 1); + if (llTypes[MMDRV_MIXER].lpMlds) + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIXER].lpMlds - 1); + if (llTypes[MMDRV_MIDIIN].lpMlds) + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIDIIN].lpMlds - 1); + if (llTypes[MMDRV_MIDIOUT].lpMlds) + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_MIDIOUT].lpMlds - 1); + if (llTypes[MMDRV_WAVEIN].lpMlds) + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_WAVEIN].lpMlds - 1); + if (llTypes[MMDRV_WAVEOUT].lpMlds) + HeapFree(GetProcessHeap(), 0, llTypes[MMDRV_WAVEOUT].lpMlds - 1); }

1 0

Andrew Talbot : comctl32: Indentation fix.
by Alexandre Julliard 23 May '08

23 May '08

Module: wine Branch: master Commit: 3c5308b804f84dbeda163e62794b474cdccb0559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c5308b804f84dbeda163e627… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu May 22 22:57:03 2008 +0100 comctl32: Indentation fix. --- dlls/comctl32/listview.c | 36 ++++++++++++++++++------------------ dlls/comctl32/toolbar.c | 6 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 0bec1d4..ab9cefe 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3339,26 +3339,26 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN else infoPtr->bLButtonDown = FALSE; - /* see if we are supposed to be tracking mouse hovering */ - if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) { - /* fill in the trackinfo struct */ - trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); - trackinfo.dwFlags = TME_QUERY; - trackinfo.hwndTrack = infoPtr->hwndSelf; - trackinfo.dwHoverTime = infoPtr->dwHoverTime; - - /* see if we are already tracking this hwnd */ - _TrackMouseEvent(&trackinfo); - - if(!(trackinfo.dwFlags & TME_HOVER)) { - trackinfo.dwFlags = TME_HOVER; - - /* call TRACKMOUSEEVENT so we receive WM_MOUSEHOVER messages */ - _TrackMouseEvent(&trackinfo); + /* see if we are supposed to be tracking mouse hovering */ + if(infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) { + /* fill in the trackinfo struct */ + trackinfo.cbSize = sizeof(TRACKMOUSEEVENT); + trackinfo.dwFlags = TME_QUERY; + trackinfo.hwndTrack = infoPtr->hwndSelf; + trackinfo.dwHoverTime = infoPtr->dwHoverTime; + + /* see if we are already tracking this hwnd */ + _TrackMouseEvent(&trackinfo); + + if(!(trackinfo.dwFlags & TME_HOVER)) { + trackinfo.dwFlags = TME_HOVER; + + /* call TRACKMOUSEEVENT so we receive WM_MOUSEHOVER messages */ + _TrackMouseEvent(&trackinfo); + } } - } - return 0; + return 0; } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9669a80..bd37e19 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2405,8 +2405,8 @@ TOOLBAR_CustomizeDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETCURSEL, index, 0); SendDlgItemMessageW (hwnd, IDC_TOOLBARBTN_LBOX, LB_SETTOPINDEX, index, 0); - MakeDragList(GetDlgItem(hwnd, IDC_TOOLBARBTN_LBOX)); - MakeDragList(GetDlgItem(hwnd, IDC_AVAILBTN_LBOX)); + MakeDragList(GetDlgItem(hwnd, IDC_TOOLBARBTN_LBOX)); + MakeDragList(GetDlgItem(hwnd, IDC_AVAILBTN_LBOX)); /* set focus and disable buttons */ PostMessageW (hwnd, WM_USER, 0, 0); @@ -6071,7 +6071,7 @@ TOOLBAR_MouseMove (HWND hwnd, WPARAM wParam, LPARAM lParam) /* call TRACKMOUSEEVENT so we receive a WM_MOUSELEAVE message */ /* and can properly deactivate the hot toolbar button */ _TrackMouseEvent(&trackinfo); - } + } } if (infoPtr->hwndToolTip)

1 0