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
May 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
4 participants
722 discussions
Start a n
N
ew thread
Nikolay Sivov : gdiplus: Check count argument in GdipTransformMatrixPoints.
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: 5eaf84d39b82f26b280fbd6e82d93c0e27633a73 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5eaf84d39b82f26b280fbd6e8…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 13 02:04:51 2008 +0400 gdiplus: Check count argument in GdipTransformMatrixPoints. --- dlls/gdiplus/matrix.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index a8617db..cf8b44b 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -244,7 +244,7 @@ GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, REAL x, y; INT i; - if(!matrix || !pts) + if(!matrix || !pts || count <= 0) return InvalidParameter; for(i = 0; i < count; i++) @@ -265,6 +265,9 @@ GpStatus WINGDIPAPI GdipTransformMatrixPointsI(GpMatrix *matrix, GpPoint *pts, I GpStatus ret; INT i; + if(count <= 0) + return InvalidParameter; + ptsF = GdipAlloc(sizeof(GpPointF) * count); if(!ptsF) return OutOfMemory;
1
0
0
0
Nikolay Sivov : gdiplus: GdipCreateFontFromLogfontA: no reason to put CHAR to WCHAR array.
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: 4e8ef34676e413a314ddb554834fc606099ca702 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4e8ef34676e413a314ddb5548…
Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 13 01:46:46 2008 +0400 gdiplus: GdipCreateFontFromLogfontA: no reason to put CHAR to WCHAR array. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a05ef75..82523ce 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -68,7 +68,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontA(HDC hdc, if(!lfa || !font) return InvalidParameter; - memcpy(&lfw, lfa, sizeof(LOGFONTA)); + memcpy(&lfw, lfa, FIELD_OFFSET(LOGFONTA,lfFaceName) ); if(!MultiByteToWideChar(CP_ACP, 0, lfa->lfFaceName, -1, lfw.lfFaceName, LF_FACESIZE)) return GenericError;
1
0
0
0
Maarten Lankhorst : quartz: Reset time when rejecting sample in the mpeg splitter.
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: 98f0b5f4797fba0af51411c639c87d4c76d39a6a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=98f0b5f4797fba0af51411c63…
Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 9 16:38:29 2008 -0700 quartz: Reset time when rejecting sample in the mpeg splitter. --- dlls/quartz/mpegsplit.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 86c9369..ee93e2e 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -246,7 +246,7 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample, MPEGSplitterImpl *This = (MPEGSplitterImpl*)iface; BYTE *pbSrcStream; DWORD cbSrcStream = 0; - REFERENCE_TIME tStart, tStop; + REFERENCE_TIME tStart, tStop, tAviStart = This->position; Parser_OutputPin * pOutputPin; HRESULT hr; @@ -280,6 +280,7 @@ static HRESULT MPEGSplitter_process_sample(LPVOID iface, IMediaSample * pSample, { memcpy(This->header, pbSrcStream, 4); This->Parser.pInputPin->rtCurrent = tStart; + This->position = tAviStart; } }
1
0
0
0
Maarten Lankhorst : quartz: Silence a fixme.
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: 7d6e28c3bbc612ef2f7d2e70ab8fd4b273ea4be1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7d6e28c3bbc612ef2f7d2e70a…
Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon May 12 09:56:30 2008 -0700 quartz: Silence a fixme. --- dlls/quartz/acmwrapper.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 60b8fd1..d877930 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -210,9 +210,6 @@ error: This->lasttime_real = tStop; This->lasttime_sent = tMed; - if (hr != S_OK) - FIXME("FATALITY: %08x\n", hr); - return hr; }
1
0
0
0
Lei Zhang : quartz: Check input in MediaControl_GetState.
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: a4d0d4fe360759dcfabd2c8857cd81f19ee19a3b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a4d0d4fe360759dcfabd2c885…
Author: Lei Zhang <thestig(a)google.com> Date: Mon May 12 21:17:38 2008 -0700 quartz: Check input in MediaControl_GetState. --- dlls/quartz/filtergraph.c | 3 +++ dlls/quartz/tests/filtergraph.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c4b31f7..bf929d2 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1701,6 +1701,9 @@ static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, TRACE("(%p/%p)->(%d, %p): semi-stub !!!\n", This, iface, msTimeout, pfs); + if (!pfs) + return E_POINTER; + EnterCriticalSection(&This->cs); *pfs = This->state; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f1728f7..a82a685 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -232,6 +232,7 @@ static void test_mediacontrol(void) LONGLONG pos = 0xdeadbeef; IMediaSeeking *seeking = NULL; IMediaFilter *filter = NULL; + IMediaControl *control = NULL; IFilterGraph2_SetDefaultSyncSource(pgraph); hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaSeeking, (void**) &seeking); @@ -247,6 +248,15 @@ static void test_mediacontrol(void) return; } + hr = IFilterGraph2_QueryInterface(pgraph, &IID_IMediaControl, (void**) &control); + ok(hr == S_OK, "QueryInterface IMediaControl failed: %08x\n", hr); + if (FAILED(hr)) + { + IUnknown_Release(seeking); + IUnknown_Release(filter); + return; + } + hr = IMediaSeeking_GetCurrentPosition(seeking, &pos); ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); @@ -257,6 +267,10 @@ static void test_mediacontrol(void) ok(hr == S_OK, "GetCurrentPosition failed: %08x\n", hr); ok(pos == 0, "Position != 0 (%x%08x)\n", (DWORD)(pos >> 32), (DWORD)pos); + hr = IMediaControl_GetState(control, 1000, NULL); + ok(hr == E_POINTER, "GetState expected %08x, got %08x\n", E_POINTER, hr); + + IUnknown_Release(control); IUnknown_Release(seeking); IUnknown_Release(filter); releasefiltergraph();
1
0
0
0
James Hawkins : msi: Convert string variables to ints when appropriate.
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: 7ae4f695bcadd05f136b0d0a3684f379c991817c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7ae4f695bcadd05f136b0d0a3…
Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 12 23:49:46 2008 -0500 msi: Convert string variables to ints when appropriate. --- dlls/msi/cond.y | 22 ++++++++++++++-------- dlls/msi/tests/package.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 062af07..7eb48c5 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -67,13 +67,13 @@ static int cond_lex( void *COND_lval, COND_input *info); static const WCHAR szEmpty[] = { 0 }; static INT compare_int( INT a, INT operator, INT b ); -static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b ); +static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b, BOOL convert ); -static INT compare_and_free_strings( LPWSTR a, INT op, LPWSTR b ) +static INT compare_and_free_strings( LPWSTR a, INT op, LPWSTR b, BOOL convert ) { INT r; - r = compare_string( a, op, b ); + r = compare_string( a, op, b, convert ); msi_free( a ); msi_free( b ); return r; @@ -216,19 +216,19 @@ boolean_factor: } | symbol_s operator symbol_s { - $$ = compare_and_free_strings( $1, $2, $3 ); + $$ = compare_and_free_strings( $1, $2, $3, TRUE ); } | symbol_s operator literal { - $$ = compare_and_free_strings( $1, $2, $3 ); + $$ = compare_and_free_strings( $1, $2, $3, TRUE ); } | literal operator symbol_s { - $$ = compare_and_free_strings( $1, $2, $3 ); + $$ = compare_and_free_strings( $1, $2, $3, TRUE ); } | literal operator literal { - $$ = compare_and_free_strings( $1, $2, $3 ); + $$ = compare_and_free_strings( $1, $2, $3, FALSE ); } | literal operator value_i { @@ -408,6 +408,9 @@ static BOOL str_is_number( LPCWSTR str ) { int i; + if (!*str) + return FALSE; + for (i = 0; i < lstrlenW( str ); i++) if (!isdigitW(str[i])) return FALSE; @@ -454,7 +457,7 @@ static INT compare_substring( LPCWSTR a, INT operator, LPCWSTR b ) return 0; } -static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b ) +static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b, BOOL convert ) { if (operator >= COND_SS && operator <= COND_RHS) return compare_substring( a, operator, b ); @@ -463,6 +466,9 @@ static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b ) if (!a) a = szEmpty; if (!b) b = szEmpty; + if (convert && str_is_number(a) && str_is_number(b)) + return compare_int( atoiW(a), operator, atoiW(b) ); + /* a or b may be NULL */ switch (operator) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 511e3d4..5c8741b 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1631,6 +1631,46 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "&nofeature"); ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + MsiSetProperty(hpkg, "A", "2"); + MsiSetProperty(hpkg, "X", "50"); + + r = MsiEvaluateCondition(hpkg, "2 <= X"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "A <= X"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "A <= 50"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + MsiSetProperty(hpkg, "X", "50val"); + + r = MsiEvaluateCondition(hpkg, "2 <= X"); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "A <= X"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + MsiSetProperty(hpkg, "A", "7"); + MsiSetProperty(hpkg, "X", "50"); + + r = MsiEvaluateCondition(hpkg, "7 <= X"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "A <= X"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "A <= 50"); + ok( r == MSICONDITION_TRUE, "wrong return val (%d)\n", r); + + MsiSetProperty(hpkg, "X", "50val"); + + r = MsiEvaluateCondition(hpkg, "2 <= X"); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + + r = MsiEvaluateCondition(hpkg, "A <= X"); + ok( r == MSICONDITION_FALSE, "wrong return val (%d)\n", r); + MsiCloseHandle( hpkg ); DeleteFile(msifile); }
1
0
0
0
James Hawkins : msi: Test the ScreenX/Y properties.
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: ca8e867da7eeb34d144358f3d56e3b7b207725aa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ca8e867da7eeb34d144358f3d…
Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon May 12 23:47:13 2008 -0500 msi: Test the ScreenX/Y properties. --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/package.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in index 27aba87..7ceba4d 100644 --- a/dlls/msi/tests/Makefile.in +++ b/dlls/msi/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = msi.dll -IMPORTS = uuid cabinet msi shell32 ole32 oleaut32 advapi32 kernel32 version +IMPORTS = uuid cabinet msi shell32 ole32 oleaut32 user32 advapi32 kernel32 version CTESTS = \ automation.c \ diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 5178384..511e3d4 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4708,6 +4708,7 @@ static void test_installprops(void) DWORD size, type; LANGID langid; HKEY hkey1, hkey2; + int res; UINT r; GetCurrentDirectory(MAX_PATH, path); @@ -4801,6 +4802,16 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS< got %d\n", r); ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf); + res = GetSystemMetrics(SM_CXSCREEN); + size = MAX_PATH; + r = MsiGetProperty(hpkg, "ScreenX", buf, &size); + ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + + res = GetSystemMetrics(SM_CYSCREEN); + size = MAX_PATH; + r = MsiGetProperty(hpkg, "ScreenY", buf, &size); + ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + CloseHandle(hkey1); CloseHandle(hkey2); MsiCloseHandle(hpkg);
1
0
0
0
Alexandre Julliard : winex11: When re-creating a client window check the new visual against the current one instead of the default one .
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: 30a133fe00dc087a770e663bc8b6eedf6f3147bc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=30a133fe00dc087a770e663bc…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 10:43:48 2008 +0200 winex11: When re-creating a client window check the new visual against the current one instead of the default one. --- dlls/winex11.drv/window.c | 6 ++++-- dlls/winex11.drv/x11drv.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 191931a..674afaa 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -257,6 +257,7 @@ static Window create_client_window( Display *display, struct x11drv_win_data *da int cx, cy, mask; XSetWindowAttributes attr; Window client; + Visual *client_visual = vis ? vis->visual : visual; attr.bit_gravity = NorthWestGravity; attr.win_gravity = NorthWestGravity; @@ -282,7 +283,7 @@ static Window create_client_window( Display *display, struct x11drv_win_data *da data->client_rect.left - data->whole_rect.left, data->client_rect.top - data->whole_rect.top, cx, cy, 0, screen_depth, InputOutput, - vis ? vis->visual : visual, mask, &attr ); + client_visual, mask, &attr ); if (!client) { wine_tsx11_unlock(); @@ -297,6 +298,7 @@ static Window create_client_window( Display *display, struct x11drv_win_data *da XDestroyWindow( display, data->client_window ); } data->client_window = client; + data->visualid = XVisualIDFromVisual( client_visual ); if (data->colormap) XFreeColormap( display, data->colormap ); data->colormap = vis ? attr.colormap : 0; @@ -431,7 +433,7 @@ BOOL X11DRV_set_win_format( HWND hwnd, XID fbconfig_id ) Display *display = thread_display(); Window client = data->client_window; - if (vis->visualid != XVisualIDFromVisual(visual)) + if (vis->visualid != data->visualid) { client = create_client_window( display, data, vis ); TRACE( "re-created client window %lx for %p fbconfig %lx\n", client, data->hwnd, fbconfig_id ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 527f9f5..862ac8d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -677,6 +677,7 @@ struct x11drv_win_data Window client_window; /* X window for the client area */ Window icon_window; /* X window for the icon */ Colormap colormap; /* Colormap for this window */ + VisualID visualid; /* visual id of the client window */ XID fbconfig_id; /* fbconfig id for the GL drawable this hwnd uses */ Drawable gl_drawable; /* Optional GL drawable for rendering the client area */ Pixmap pixmap; /* Base pixmap for if gl_drawable is a GLXPixmap */
1
0
0
0
Alexandre Julliard : configure: Improve the libcrypto checks.
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: 8354e6a93a9b4c11f9d54a6ac40d11cf31c97741 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8354e6a93a9b4c11f9d54a6ac…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 13 10:42:54 2008 +0200 configure: Improve the libcrypto checks. --- configure | 2 +- configure.ac | 2 +- dlls/wininet/netconnection.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4bad30e..2419218 100755 --- a/configure +++ b/configure @@ -15818,7 +15818,7 @@ _ACEOF fi fi -if test "x$ac_cv_lib_soname_ssl" = "x"; then +if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; then case "x$with_openssl" in x) wine_notices="$wine_notices|OpenSSL development files not found, SSL won't be supported." ;; xno) ;; diff --git a/configure.ac b/configure.ac index 33562e3..e61f68d 100644 --- a/configure.ac +++ b/configure.ac @@ -1171,7 +1171,7 @@ then WINE_CHECK_SONAME(ssl,SSL_library_init) WINE_CHECK_SONAME(crypto,BIO_new_socket) fi -WINE_NOTICE_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x"], +WINE_NOTICE_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"], [OpenSSL development files not found, SSL won't be supported.]) dnl **** Check for libjpeg **** diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 63f3f8e..9cd7917 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -119,7 +119,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) connection->socketFD = -1; if (useSSL) { -#ifdef SONAME_LIBSSL +#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) TRACE("using SSL connection\n"); if (OpenSSL_ssl_handle) /* already initialized everything */ return TRUE;
1
0
0
0
Dmitry Timoshkov : user32: Add tests for painting minimized/clipped windows .
by Alexandre Julliard
13 May '08
13 May '08
Module: wine Branch: master Commit: 954d6e2ed94adc4466a30d84e7c64753ff008165 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=954d6e2ed94adc4466a30d84e…
Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 13 13:16:30 2008 +0900 user32: Add tests for painting minimized/clipped windows. --- dlls/user32/tests/msg.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fe4264e..f68f73a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5779,6 +5779,35 @@ static void test_paint_messages(void) flush_events(); ok_sequence(WmSWP_FrameChangedDeferErase, "SetWindowPos:FrameChangedDeferErase", FALSE ); + ok(GetWindowLong( hparent, GWL_STYLE ) & WS_VISIBLE, "parent should be visible\n"); + ok(GetWindowLong( hchild, GWL_STYLE ) & WS_VISIBLE, "child should be visible\n"); + + UpdateWindow( hparent ); + flush_events(); + flush_sequence(); + trace("testing SetWindowPos(-10000, -10000) on child\n"); + SetWindowPos( hchild, 0, -10000, -10000, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER ); + check_update_rgn( hchild, 0 ); + flush_events(); + +#if 0 /* this one doesn't pass under Wine yet */ + UpdateWindow( hparent ); + flush_events(); + flush_sequence(); + trace("testing ShowWindow(SW_MINIMIZE) on child\n"); + ShowWindow( hchild, SW_MINIMIZE ); + check_update_rgn( hchild, 0 ); + flush_events(); +#endif + + UpdateWindow( hparent ); + flush_events(); + flush_sequence(); + trace("testing SetWindowPos(-10000, -10000) on parent\n"); + SetWindowPos( hparent, 0, -10000, -10000, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER ); + check_update_rgn( hparent, 0 ); + flush_events(); + log_all_parent_messages--; DestroyWindow( hparent ); ok(!IsWindow(hchild), "child must be destroyed with its parent\n");
1
0
0
0
← Newer
1
...
34
35
36
37
38
39
40
...
73
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
Results per page:
10
25
50
100
200