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
March 2007
----- 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
844 discussions
Start a n
N
ew thread
Paul Vriens : kernel32/profile: Add a few NULL checks (Coverity).
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 4a431afd6914b47c5aefe188ed42b89159e984f6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4a431afd6914b47c5aefe188e…
Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 27 22:08:14 2007 +0200 kernel32/profile: Add a few NULL checks (Coverity). --- dlls/kernel32/profile.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 0abb887..27a3d06 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1322,7 +1322,13 @@ UINT WINAPI GetPrivateProfileIntA( LPCSTR section, LPCSTR entry, INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len, LPCWSTR filename ) { - int ret = 0; + int ret = 0; + + if (!section || !buffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } TRACE("(%s, %p, %d, %s)\n", debugstr_w(section), buffer, len, debugstr_w(filename)); @@ -1346,9 +1352,14 @@ INT WINAPI GetPrivateProfileSectionA( LPCSTR section, LPSTR buffer, LPWSTR bufferW; INT retW, ret = 0; - bufferW = buffer ? HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)) : NULL; - if (section) RtlCreateUnicodeStringFromAsciiz(§ionW, section); - else sectionW.Buffer = NULL; + if (!section || !buffer) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + bufferW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + RtlCreateUnicodeStringFromAsciiz(§ionW, section); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL;
1
0
0
0
Paul Vriens : kernel32/profile: Move GetPrivateProfileSectionA to its own test.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 0230695a29d4fd807087de7c766430fd969966a6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0230695a29d4fd807087de7c7…
Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 27 22:08:07 2007 +0200 kernel32/profile: Move GetPrivateProfileSectionA to its own test. --- dlls/kernel32/tests/profile.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 64fee87..0893c1c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -116,13 +116,6 @@ static void test_profile_string(void) ok( ret == 18 && !strcmp( buf, "name1,name2,name4"), "wrong keys returned(%d): %s\n", ret, buf); - ret=GetPrivateProfileSectionA("s", buf, sizeof(buf), TESTFILE2); - for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) - p[-1] = ','; - /* and test */ - ok( ret == 35 && !strcmp( buf, "name1=val1,name2=,name3,name4=val4"), "wrong section returned(%d): %s\n", - ret, buf); - /* add a new key to test that the file is quite usable */ WritePrivateProfileStringA( "s", "name5", "val5", TESTFILE2); ret=GetPrivateProfileStringA( "s", NULL, "", buf, sizeof(buf), @@ -135,6 +128,33 @@ static void test_profile_string(void) DeleteFileA( TESTFILE2); } +static void test_profile_sections(void) +{ + HANDLE h; + int ret; + DWORD count; + char buf[100]; + char *p; + static const char content[]="[s]\r\nname1=val1\r\nname2=\r\nname3\r\nname4=val4\r\n"; + static const char testfile4[]=".\\testwine4.ini"; + + DeleteFileA( testfile4 ); + h = CreateFileA( testfile4, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok( h != INVALID_HANDLE_VALUE, " cannot create %s\n", testfile4); + if( h == INVALID_HANDLE_VALUE) return; + WriteFile( h, content, sizeof(content), &count, NULL); + CloseHandle( h); + + ret=GetPrivateProfileSectionA("s", buf, sizeof(buf), testfile4); + for( p = buf + strlen(buf) + 1; *p;p += strlen(p)+1) + p[-1] = ','; + /* and test */ + ok( ret == 35 && !strcmp( buf, "name1=val1,name2=,name3,name4=val4"), "wrong section returned(%d): %s\n", + ret, buf); + + DeleteFileA( testfile4 ); +} + static void test_profile_sections_names(void) { HANDLE h; @@ -205,5 +225,6 @@ START_TEST(profile) { test_profile_int(); test_profile_string(); + test_profile_sections(); test_profile_sections_names(); }
1
0
0
0
Paul Vriens : kernel32/profile: Rename a test.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 2559440dc92fa37434a10b539a6d3e1d77bf7e33 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2559440dc92fa37434a10b539…
Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 27 22:07:57 2007 +0200 kernel32/profile: Rename a test. --- dlls/kernel32/tests/profile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 3ee66eb..64fee87 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -135,7 +135,7 @@ static void test_profile_string(void) DeleteFileA( TESTFILE2); } -static void test_profile_sections(void) +static void test_profile_sections_names(void) { HANDLE h; int ret; @@ -205,5 +205,5 @@ START_TEST(profile) { test_profile_int(); test_profile_string(); - test_profile_sections(); + test_profile_sections_names(); }
1
0
0
0
Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 3253bf5570629fa82f4d1f2d2cacbee6e1286b5d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3253bf5570629fa82f4d1f2d2…
Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Mar 27 21:11:27 2007 +0100 comctl32: Constify some variables. --- dlls/comctl32/ipaddress.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 0ccb347..36682ae 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -77,7 +77,7 @@ static const WCHAR IP_SUBCLASS_PROP[] = static LRESULT CALLBACK IPADDRESS_SubclassProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -static LRESULT IPADDRESS_Notify (IPADDRESS_INFO *infoPtr, UINT command) +static LRESULT IPADDRESS_Notify (const IPADDRESS_INFO *infoPtr, UINT command) { HWND hwnd = infoPtr->Self; @@ -87,7 +87,7 @@ static LRESULT IPADDRESS_Notify (IPADDRESS_INFO *infoPtr, UINT command) MAKEWPARAM (GetWindowLongPtrW (hwnd, GWLP_ID), command), (LPARAM)hwnd); } -static INT IPADDRESS_IPNotify (IPADDRESS_INFO *infoPtr, INT field, INT value) +static INT IPADDRESS_IPNotify (const IPADDRESS_INFO *infoPtr, INT field, INT value) { NMIPADDRESS nmip; @@ -109,7 +109,7 @@ static INT IPADDRESS_IPNotify (IPADDRESS_INFO *infoPtr, INT field, INT value) } -static int IPADDRESS_GetPartIndex(IPADDRESS_INFO *infoPtr, HWND hwnd) +static int IPADDRESS_GetPartIndex(const IPADDRESS_INFO *infoPtr, HWND hwnd) { int i; @@ -123,7 +123,7 @@ static int IPADDRESS_GetPartIndex(IPADDRESS_INFO *infoPtr, HWND hwnd) } -static LRESULT IPADDRESS_Draw (IPADDRESS_INFO *infoPtr, HDC hdc) +static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) { static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; @@ -165,7 +165,7 @@ static LRESULT IPADDRESS_Draw (IPADDRESS_INFO *infoPtr, HDC hdc) } -static LRESULT IPADDRESS_Create (HWND hwnd, LPCREATESTRUCTA lpCreate) +static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) { static const WCHAR EDIT[] = { 'E', 'd', 'i', 't', 0 }; IPADDRESS_INFO *infoPtr; @@ -246,7 +246,7 @@ static LRESULT IPADDRESS_Enable (IPADDRESS_INFO *infoPtr, BOOL enabled) } -static LRESULT IPADDRESS_Paint (IPADDRESS_INFO *infoPtr, HDC hdc) +static LRESULT IPADDRESS_Paint (const IPADDRESS_INFO *infoPtr, HDC hdc) { PAINTSTRUCT ps; @@ -261,7 +261,7 @@ static LRESULT IPADDRESS_Paint (IPADDRESS_INFO *infoPtr, HDC hdc) } -static BOOL IPADDRESS_IsBlank (IPADDRESS_INFO *infoPtr) +static BOOL IPADDRESS_IsBlank (const IPADDRESS_INFO *infoPtr) { int i; @@ -274,7 +274,7 @@ static BOOL IPADDRESS_IsBlank (IPADDRESS_INFO *infoPtr) } -static int IPADDRESS_GetAddress (IPADDRESS_INFO *infoPtr, LPDWORD ip_address) +static int IPADDRESS_GetAddress (const IPADDRESS_INFO *infoPtr, LPDWORD ip_address) { WCHAR field[5]; int i, invalid = 0; @@ -308,7 +308,7 @@ static BOOL IPADDRESS_SetRange (IPADDRESS_INFO *infoPtr, int index, WORD range) } -static void IPADDRESS_ClearAddress (IPADDRESS_INFO *infoPtr) +static void IPADDRESS_ClearAddress (const IPADDRESS_INFO *infoPtr) { WCHAR nil[1] = { 0 }; int i; @@ -320,7 +320,7 @@ static void IPADDRESS_ClearAddress (IPADDRESS_INFO *infoPtr) } -static LRESULT IPADDRESS_SetAddress (IPADDRESS_INFO *infoPtr, DWORD ip_address) +static LRESULT IPADDRESS_SetAddress (const IPADDRESS_INFO *infoPtr, DWORD ip_address) { WCHAR buf[20]; static const WCHAR fmt[] = { '%', 'd', 0 }; @@ -329,7 +329,7 @@ static LRESULT IPADDRESS_SetAddress (IPADDRESS_INFO *infoPtr, DWORD ip_address) TRACE("\n"); for (i = 3; i >= 0; i--) { - IPPART_INFO* part = &infoPtr->Part[i]; + const IPPART_INFO* part = &infoPtr->Part[i]; int value = ip_address & 0xff; if ( (value >= part->LowerLimit) && (value <= part->UpperLimit) ) { wsprintfW (buf, fmt, value); @@ -343,7 +343,7 @@ static LRESULT IPADDRESS_SetAddress (IPADDRESS_INFO *infoPtr, DWORD ip_address) } -static void IPADDRESS_SetFocusToField (IPADDRESS_INFO *infoPtr, INT index) +static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) { TRACE("(index=%d)\n", index); @@ -353,9 +353,9 @@ static void IPADDRESS_SetFocusToField (IPADDRESS_INFO *infoPtr, INT index) } -static BOOL IPADDRESS_ConstrainField (IPADDRESS_INFO *infoPtr, int currentfield) +static BOOL IPADDRESS_ConstrainField (const IPADDRESS_INFO *infoPtr, int currentfield) { - IPPART_INFO *part = &infoPtr->Part[currentfield]; + const IPPART_INFO *part = &infoPtr->Part[currentfield]; WCHAR field[10]; static const WCHAR fmt[] = { '%', 'd', 0 }; int curValue, newValue; @@ -383,7 +383,7 @@ static BOOL IPADDRESS_ConstrainField (IPADDRESS_INFO *infoPtr, int currentfield) } -static BOOL IPADDRESS_GotoNextField (IPADDRESS_INFO *infoPtr, int cur, int sel) +static BOOL IPADDRESS_GotoNextField (const IPADDRESS_INFO *infoPtr, int cur, int sel) { TRACE("\n"); @@ -391,7 +391,7 @@ static BOOL IPADDRESS_GotoNextField (IPADDRESS_INFO *infoPtr, int cur, int sel) IPADDRESS_ConstrainField(infoPtr, cur); if(cur < 3) { - IPPART_INFO *next = &infoPtr->Part[cur + 1]; + const IPPART_INFO *next = &infoPtr->Part[cur + 1]; int start = 0, end = 0; SetFocus (next->EditHwnd); if (sel != POS_DEFAULT) {
1
0
0
0
Chris Robinson : winemp3: Clear stream buffers when the stream is reset.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 7d085d2cd4cd1d626944e8591232a328ae615773 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7d085d2cd4cd1d626944e8591…
Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Mar 27 21:47:09 2007 -0700 winemp3: Clear stream buffers when the stream is reset. --- dlls/winemp3.acm/mpegl3.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 4c639e5..6d95a0b 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -374,6 +374,8 @@ static LRESULT MPEG3_FormatSuggest(PACMDRVFORMATSUGGEST adfs) */ static void MPEG3_Reset(PACMDRVSTREAMINSTANCE adsi, AcmMpeg3Data* aad) { + ExitMP3(&aad->mp); + InitMP3(&aad->mp); } /***********************************************************************
1
0
0
0
Chris Robinson : quartz: Protect DSound buffer creation with a critical section lock.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 8a1d4d1e4c6dca0b3be6c0784861aed4c6451679 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8a1d4d1e4c6dca0b3be6c0784…
Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Tue Mar 27 02:45:15 2007 -0700 quartz: Protect DSound buffer creation with a critical section lock. --- dlls/quartz/dsoundrender.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 80f7257..259a25b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -132,11 +132,20 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); TRACE("cbSize = %d\n", format->cbSize); - + + /* Lock the critical section to make sure we're still marked to play while + setting up the playback buffer */ + EnterCriticalSection(&This->csFilter); + + if (This->state != State_Running) { + hr = VFW_E_WRONG_STATE; + goto getout; + } + hr = DirectSoundCreate(NULL, &This->dsound, NULL); if (FAILED(hr)) { ERR("Cannot create Direct Sound object\n"); - return hr; + goto getout; } wav_fmt = *format; @@ -151,7 +160,7 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) if (FAILED(hr)) { ERR("Can't create sound buffer !\n"); IDirectSound_Release(This->dsound); - return hr; + goto getout; } hr = IDirectSoundBuffer_SetVolume(This->dsbuffer, This->volume); @@ -167,11 +176,13 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) ERR("Can't start sound buffer (%x)!\n", hr); IDirectSoundBuffer_Release(This->dsbuffer); IDirectSound_Release(This->dsound); - return hr; + goto getout; } This->write_pos = 0; - + +getout: + LeaveCriticalSection(&This->csFilter); return hr; }
1
0
0
0
Dmitry Timoshkov : gdi32: Make the EMF driver return sane NUMCOLORS value.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: dab3825b180ecf3517af6e5166c1ed84e7f35944 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dab3825b180ecf3517af6e516…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 27 16:54:49 2007 +0900 gdi32: Make the EMF driver return sane NUMCOLORS value. --- dlls/gdi32/enhmfdrv/dc.c | 4 ++-- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 485d205..74300b4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -317,10 +317,10 @@ INT EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) return physDev->technology; case PLANES: return physDev->planes; - + case NUMCOLORS: + return physDev->numcolors; default: FIXME("Unimplemented cap %d\n", cap); return 0; - } } diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 6d84d19..b0d6bf0 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -46,6 +46,7 @@ typedef struct INT rastercaps; INT technology; INT planes; + INT numcolors; } EMFDRV_PDEVICE; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 82d61c6..4f418e1 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -356,6 +356,7 @@ HDC WINAPI CreateEnhMetaFileW( physDev->rastercaps = GetDeviceCaps(hRefDC, RASTERCAPS); physDev->technology = GetDeviceCaps(hRefDC, TECHNOLOGY); physDev->planes = GetDeviceCaps(hRefDC, PLANES); + physDev->numcolors = GetDeviceCaps(hRefDC, NUMCOLORS); physDev->emh->iType = EMR_HEADER; physDev->emh->nSize = size;
1
0
0
0
Mikołaj Zalewski : comctl32: toolbar: TB_HIDEBUTTON and TB_MOVEBUTTON shouldn't force a recalc.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 7bf7cdd1a9d46ac403f5f94cae009dc53334fdfd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7bf7cdd1a9d46ac403f5f94ca…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Mar 27 09:44:46 2007 +0200 comctl32: toolbar: TB_HIDEBUTTON and TB_MOVEBUTTON shouldn't force a recalc. --- dlls/comctl32/tests/toolbar.c | 12 ++++++++++++ dlls/comctl32/toolbar.c | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d5b055e..08ce4e0 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -843,6 +843,18 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_INSERTBUTTON, 1, (LPARAM)&buttons2[0]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size\n"); + /* TB_HIDEBUTTON and TB_MOVEBUTTON doesn't force a recalc */ + SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); + ok(SendMessageA(hToolbar, TB_MOVEBUTTON, 0, 1), "TB_MOVEBUTTON failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_HIDEBUTTON, 20, TRUE), "TB_HIDEBUTTON failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + /* however changing the hidden flag with TB_SETSTATE does */ + ok(SendMessageA(hToolbar, TB_SETSTATE, 20, TBSTATE_ENABLED|TBSTATE_HIDDEN), "TB_SETSTATE failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(100, 100), "Unexpected button size\n"); + ok(SendMessageA(hToolbar, TB_SETSTATE, 20, TBSTATE_ENABLED), "TB_SETSTATE failed\n"); + ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(23, 22), "Unexpected button size\n"); + rebuild_toolbar(&hToolbar); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 39), "Unexpected button size\n"); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c17e7b9..56dde25 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3757,7 +3757,7 @@ TOOLBAR_HideButton (HWND hwnd, WPARAM wParam, LPARAM lParam) else btnPtr->fsState |= TBSTATE_HIDDEN; - TOOLBAR_CalcToolbar (hwnd); + TOOLBAR_LayoutToolbar (hwnd); InvalidateRect (hwnd, NULL, TRUE); @@ -4099,7 +4099,7 @@ TOOLBAR_MoveButton (HWND hwnd, WPARAM wParam, LPARAM lParam) TOOLBAR_MoveFixupIndex(&infoPtr->nHotItem, nIndex, nMoveIndex, FALSE); } - TOOLBAR_CalcToolbar(hwnd); + TOOLBAR_LayoutToolbar(hwnd); TOOLBAR_AutoSize(hwnd); InvalidateRect(hwnd, NULL, TRUE);
1
0
0
0
Andrew Riedi : winex11.drv: Add Xcursor support for 32 bit cursors.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 23e2cb1f5936a832c3596f5258b08a5e88632de3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=23e2cb1f5936a832c3596f525…
Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Thu Mar 22 12:06:19 2007 -0700 winex11.drv: Add Xcursor support for 32 bit cursors. Based on patch by Henri Verbeet. --- configure | 78 +++++++++++++++++ configure.ac | 2 + dlls/winex11.drv/init.c | 3 + dlls/winex11.drv/mouse.c | 205 +++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + include/config.h.in | 6 ++ 6 files changed, 295 insertions(+), 0 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=23e2cb1f5936a832c3596…
1
0
0
0
Alexandre Julliard : Makefile: More portable invocation of ctags/etags.
by Alexandre Julliard
28 Mar '07
28 Mar '07
Module: wine Branch: master Commit: 7b289821b11fd3204a616e7af1e0ef778bf8a6d3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7b289821b11fd3204a616e7af…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 21:45:54 2007 +0200 Makefile: More portable invocation of ctags/etags. --- Makefile.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7b3f8e0..923a33e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -132,10 +132,12 @@ $(TESTSUBDIRS:%=%/__crosstest__): tools include # Misc rules TAGS etags: - (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | etags - + $(RM) TAGS + (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs etags -a tags ctags: - (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | ctags - + $(RM) tags + (test -d .git && git-ls-files '*.[chly]' '*.idl' || find -L $(TOPSRCDIR) -name '*.[ch]' -print) | xargs ctags -a manpages htmlpages sgmlpages: dummy @cd documentation && $(MAKE) $@
1
0
0
0
← Newer
1
...
5
6
7
8
9
10
11
...
85
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
Results per page:
10
25
50
100
200