July 2008 - Wine-Commits - list.winehq.org

Alexander Dorofeyev : ddraw: Force surfaces without memory flags to video memory on creation.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 59fc5a75e0962dcadb5f292dae293204efc316ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=59fc5a75e0962dcadb5f292da… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Jul 15 00:58:08 2008 +0300 ddraw: Force surfaces without memory flags to video memory on creation. Also removes now redundant setting of vidmem flag on rendertargets, prevents adding vidmem flag when sysmem flag is present. Fixes missing textures in Forsaken. --- dlls/ddraw/ddraw.c | 14 +++++++------- dlls/ddraw/texture.c | 6 ------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9a47319..8b0ad9b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1917,6 +1917,12 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, } } + if (!(pDDSD->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) && + !((pDDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE) && (pDDSD->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) ) + { + /* Tests show surfaces without memory flags get these flags added right after creation. */ + pDDSD->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; + } /* Get the correct wined3d usage */ if (pDDSD->ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_BACKBUFFER | @@ -1924,8 +1930,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, { Usage |= WINED3DUSAGE_RENDERTARGET; - pDDSD->ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY | - DDSCAPS_VISIBLE; + pDDSD->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; } if (pDDSD->ddsCaps.dwCaps & (DDSCAPS_OVERLAY)) { @@ -2345,11 +2350,6 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, /* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */ DDSD->dwFlags |= DDSD_CAPS; } - if (DDSD->ddsCaps.dwCaps == 0) - { - /* This has been checked on real Windows */ - DDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - } if (DDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) { diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index c3be680..046a51e 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -324,12 +324,6 @@ IDirect3DTextureImpl_Load(IDirect3DTexture2 *iface, TRACE(" copying surface %p to surface %p (mipmap level %d)\n", src_ptr, This, src_ptr->mipmap_level); - if ( This->surface_desc.ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD ) - /* If the surface is not allocated and its location is not yet specified, - force it to video memory */ - if ( !(This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_SYSTEMMEMORY|DDSCAPS_VIDEOMEMORY)) ) - This->surface_desc.ddsCaps.dwCaps |= DDSCAPS_VIDEOMEMORY; - /* Suppress the ALLOCONLOAD flag */ This->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;

1 0

Nikolay Sivov : gdiplus: Make GdipInvertMatrix test pass on native switching to matrix with determinant 16 .
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 3a1e2a304e509ea5d96712640937ee074b3258bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1e2a304e509ea5d96712640… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 13 11:52:29 2008 +0400 gdiplus: Make GdipInvertMatrix test pass on native switching to matrix with determinant 16. --- dlls/gdiplus/tests/matrix.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index 16c1517..16ce85a 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -124,7 +124,7 @@ static void test_invert(void) GpStatus status; GpMatrix *matrix = NULL; GpMatrix *inverted = NULL; - BOOL equal; + BOOL equal = FALSE; /* NULL */ status = GdipInvertMatrix(NULL); @@ -137,11 +137,10 @@ static void test_invert(void) GdipDeleteMatrix(matrix); /* invertible */ - GdipCreateMatrix2(1.0, 2.0, 4.0, -1.0, 6.0, 3.0, &matrix); + GdipCreateMatrix2(3.0, -2.0, 5.0, 2.0, 6.0, 3.0, &matrix); status = GdipInvertMatrix(matrix); expect(Ok, status); - - GdipCreateMatrix2(1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0, &inverted); + GdipCreateMatrix2(2.0/16.0, 2.0/16.0, -5.0/16.0, 3.0/16.0, 3.0/16.0, -21.0/16.0, &inverted); GdipIsMatrixEqual(matrix, inverted, &equal); expect(TRUE, equal);

1 0

Nikolay Sivov : gdiplus: Fix for GdipPathIterNextMarker to handle path without markers. Fix tests.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: a53b9b95b846b7fd9561177050db6e0121e86ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53b9b95b846b7fd956117705… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 13 11:52:23 2008 +0400 gdiplus: Fix for GdipPathIterNextMarker to handle path without markers. Fix tests. --- dlls/gdiplus/pathiterator.c | 3 ++- dlls/gdiplus/tests/pathiterator.c | 33 +++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index 55b0782..95f1774 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -140,7 +140,8 @@ GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator* iterator, INT *result /* first call could start with second point as all subsequent, cause path couldn't contain only one */ for(i = iterator->marker_pos + 1; i < iterator->pathdata.Count; i++){ - if(iterator->pathdata.Types[i] & PathPointTypePathMarker){ + if((iterator->pathdata.Types[i] & PathPointTypePathMarker) || + (i == iterator->pathdata.Count - 1)){ *startIndex = iterator->marker_pos; if(iterator->marker_pos > 0) (*startIndex)++; *endIndex = iterator->marker_pos = i; diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 071c1d5..a6adb19 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -95,7 +95,8 @@ static void test_nextmarker(void) GpPath *path; GpPathIterator *iter; GpStatus stat; - INT start, end, result; + INT start, end; + INT result; /* NULL args BOOL out argument is local in wrapper class method, @@ -112,19 +113,34 @@ static void test_nextmarker(void) /* no markers */ GdipCreatePathIter(&iter, path); + start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextMarker(iter, &result, &start, &end); expect(Ok, stat); + expect(0, start); + expect(3, end); + expect(4, result); + start = end = result = (INT)0xdeadbeef; + stat = GdipPathIterNextMarker(iter, &result, &start, &end); + /* start/end remain unchanged */ + expect((INT)0xdeadbeef, start); + expect((INT)0xdeadbeef, end); expect(0, result); GdipDeletePathIter(iter); /* one marker */ GdipSetPathMarker(path); GdipCreatePathIter(&iter, path); + start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextMarker(iter, &result, &start, &end); expect(Ok, stat); - expect(TRUE, (start == 0) && (end == 3) && (result == 4)); + expect(0, start); + expect(3, end); + expect(4, result); + start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextMarker(iter, &result, &start, &end); expect(Ok, stat); + expect((INT)0xdeadbeef, start); + expect((INT)0xdeadbeef, end); expect(0, result); GdipDeletePathIter(iter); @@ -132,14 +148,23 @@ static void test_nextmarker(void) GdipAddPathLine(path, 0.0, 0.0, 10.0, 30.0); GdipSetPathMarker(path); GdipCreatePathIter(&iter, path); + start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextMarker(iter, &result, &start, &end); expect(Ok, stat); - expect(TRUE, (start == 0) && (end == 3) && (result == 4)); + expect(0, start); + expect(3, end); + expect(4, result); + start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextMarker(iter, &result, &start, &end); expect(Ok, stat); - expect(TRUE, (start == 4) && (end == 5) && (result == 2)); + expect(4, start); + expect(5, end); + expect(2, result); + start = end = result = (INT)0xdeadbeef; stat = GdipPathIterNextMarker(iter, &result, &start, &end); expect(Ok, stat); + expect((INT)0xdeadbeef, start); + expect((INT)0xdeadbeef, end); expect(0, result); GdipDeletePathIter(iter);

1 0

Eric Pouech : richedit: Add an assert to point out what we're expecting.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 6ef6f7167d466a54f05e512697b492e499ffac60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef6f7167d466a54f05e51269… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Jul 12 10:36:21 2008 +0200 richedit: Add an assert to point out what we're expecting. --- dlls/riched20/paint.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index c2e8b06..a6e86b3 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -656,6 +656,8 @@ void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) { y += bounds.top; break; case diStartRow: + /* we should have seen a diParagraph before */ + assert(para); y += height; rcPara.top = y; rcPara.bottom = y+p->member.row.nHeight;

1 0

Nikolay Sivov : gdiplus: Fix GdipCreatePathIter to handle NULL as path. Fix tests.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: dcfbe58ef7cf852f7acceb4182eb87827d0eceae URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfbe58ef7cf852f7acceb418… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 13 11:52:12 2008 +0400 gdiplus: Fix GdipCreatePathIter to handle NULL as path. Fix tests. --- dlls/gdiplus/pathiterator.c | 32 +++++++++++++++++++++----------- dlls/gdiplus/tests/pathiterator.c | 2 +- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index 026665a..55b0782 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -31,24 +31,30 @@ GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator **iterator, GpPath* path) { INT size; - if(!iterator || !path) + if(!iterator) return InvalidParameter; - size = path->pathdata.Count; - *iterator = GdipAlloc(sizeof(GpPathIterator)); if(!*iterator) return OutOfMemory; - (*iterator)->pathdata.Types = GdipAlloc(size); - (*iterator)->pathdata.Points = GdipAlloc(size * sizeof(PointF)); + if(path){ + size = path->pathdata.Count; - memcpy((*iterator)->pathdata.Types, path->pathdata.Types, size); - memcpy((*iterator)->pathdata.Points, path->pathdata.Points, - size * sizeof(PointF)); - (*iterator)->pathdata.Count = size; + (*iterator)->pathdata.Types = GdipAlloc(size); + (*iterator)->pathdata.Points = GdipAlloc(size * sizeof(PointF)); - (*iterator)->subpath_pos = 0; - (*iterator)->marker_pos = 0; + memcpy((*iterator)->pathdata.Types, path->pathdata.Types, size); + memcpy((*iterator)->pathdata.Points, path->pathdata.Points,size * sizeof(PointF)); + (*iterator)->pathdata.Count = size; + } + else{ + (*iterator)->pathdata.Types = NULL; + (*iterator)->pathdata.Points = NULL; + (*iterator)->pathdata.Count = 0; + } + + (*iterator)->subpath_pos = 0; + (*iterator)->marker_pos = 0; (*iterator)->pathtype_pos = 0; return Ok; @@ -156,6 +162,10 @@ GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator* iterator, count = iterator->pathdata.Count; + /* iterator created with NULL path */ + if(count == 0) + return Ok; + if(iterator->subpath_pos == count){ *startIndex = *endIndex = *resultCount = 0; *isClosed = 1; diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c index 385be88..071c1d5 100644 --- a/dlls/gdiplus/tests/pathiterator.c +++ b/dlls/gdiplus/tests/pathiterator.c @@ -37,7 +37,7 @@ static void test_constructor_destructor(void) stat = GdipCreatePathIter(NULL, NULL); expect(InvalidParameter, stat); stat = GdipCreatePathIter(&iter, NULL); - expect(InvalidParameter, stat); + expect(Ok, stat); stat = GdipCreatePathIter(NULL, path); expect(InvalidParameter, stat); stat = GdipDeletePathIter(NULL);

1 0

Nikolay Sivov : gdiplus: Implemented GdipCreateBitmapFromResource.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: d8a25fc26c3eb3abdebbf9fbf8d0f0cbfe036e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a25fc26c3eb3abdebbf9fbf… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 12 00:43:50 2008 +0400 gdiplus: Implemented GdipCreateBitmapFromResource. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 20 ++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6b794a1..07bd6ed 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -77,7 +77,7 @@ @ stdcall GdipCreateBitmapFromGraphics(long long ptr ptr) @ stdcall GdipCreateBitmapFromHBITMAP(long long ptr) @ stub GdipCreateBitmapFromHICON -@ stub GdipCreateBitmapFromResource +@ stdcall GdipCreateBitmapFromResource(long wstr ptr) @ stdcall GdipCreateBitmapFromScan0(long long long long ptr ptr) @ stdcall GdipCreateBitmapFromStream(ptr ptr) @ stdcall GdipCreateBitmapFromStreamICM(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d2ce074..25a5c4d 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -318,6 +318,26 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR* filename, return GdipCreateBitmapFromFile(filename, bitmap); } +GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE hInstance, + GDIPCONST WCHAR* lpBitmapName, GpBitmap** bitmap) +{ + HBITMAP hbm; + GpStatus stat = InvalidParameter; + + if(!lpBitmapName || !bitmap) + return InvalidParameter; + + /* load DIB */ + hbm = (HBITMAP)LoadImageW(hInstance,lpBitmapName,IMAGE_BITMAP,0,0,LR_CREATEDIBSECTION); + + if(hbm){ + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, bitmap); + DeleteObject(hbm); + } + + return stat; +} + GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, HBITMAP* hbmReturn, ARGB background) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ef65b05..b2ca34b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -336,6 +336,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromFileICM(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGdiDib(GDIPCONST BITMAPINFO*,VOID*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); +GpStatus WINGDIPAPI GdipCreateBitmapFromResource(HINSTANCE,GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*, GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream*,GpBitmap**);

1 0

Francois Gouget : winejack: Fix detection of jack libraries with a bad soname.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 90a6fb047eb75db3472f38580fc963bf7310e1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=90a6fb047eb75db3472f38580… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 11 17:47:23 2008 +0200 winejack: Fix detection of jack libraries with a bad soname. --- configure | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 56eb2c9..36832f3 100755 --- a/configure +++ b/configure @@ -15154,8 +15154,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 $as_test_x conftest$ac_exeext; then case "$LIBEXT" in dll) ;; - dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libjack\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack\\.$LIBEXT" | sed -e "s/^.*$libjack\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + dylib) ac_cv_lib_soname_jack=`otool -L conftest$ac_exeext | grep "libjack-*[0-9.]*\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libjack-*[0-9.]*\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_jack=`$ac_cv_path_LDD conftest$ac_exeext | grep "libjack-*[0-9.]*\\.$LIBEXT" | sed -e "s/^.*$libjack-*[0-9.]*\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; esac else echo "$as_me: failed program was:" >&5 diff --git a/configure.ac b/configure.ac index bef895b..8ed54a8 100644 --- a/configure.ac +++ b/configure.ac @@ -1129,7 +1129,7 @@ WINE_NOTICE_WITH(cups,[test "x$ac_cv_lib_soname_cups" = "x"], dnl **** Check for jack **** if test "$ac_cv_header_jack_jack_h" = "yes" then - WINE_CHECK_SONAME(jack,jack_client_new) + WINE_CHECK_SONAME(jack,jack_client_new,,,,[[libjack-*[[0-9.]]*]]) fi dnl **** Check for fontconfig ****

1 0

Vincent Povirk : wininet: Always respect Proxy-Connection: or Connection: if it exists.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: fd5b97bc4d12adc69085b739061c56e9107f8d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5b97bc4d12adc69085b7390… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 10 10:42:54 2008 -0500 wininet: Always respect Proxy-Connection: or Connection: if it exists. --- dlls/wininet/http.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7607721..38023a8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4048,7 +4048,9 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) { WCHAR szVersion[10]; + WCHAR szConnectionResponse[20]; DWORD dwBufferSize = sizeof(szVersion); + BOOL keepalive = FALSE; TRACE("\n"); @@ -4058,15 +4060,19 @@ BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) &dwBufferSize, NULL) || strcmpiW(szVersion, g_szHttp1_1)) { - WCHAR szConnectionResponse[20]; - dwBufferSize = sizeof(szConnectionResponse); - if ((!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) || - strcmpiW(szConnectionResponse, szKeepAlive)) && - (!HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) || - strcmpiW(szConnectionResponse, szKeepAlive))) - { - HTTPREQ_CloseConnection(&lpwhr->hdr); - } + keepalive = TRUE; + } + + dwBufferSize = sizeof(szConnectionResponse); + if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_PROXY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL) || + HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_CONNECTION, szConnectionResponse, &dwBufferSize, NULL)) + { + keepalive = !strcmpiW(szConnectionResponse, szKeepAlive); + } + + if (!keepalive) + { + HTTPREQ_CloseConnection(&lpwhr->hdr); } /* FIXME: store data in the URL cache here */

1 0

Aric Stewart : comctl32: rebar: Prevent unnecessary triggering of RBBIM_CHILDSIZE changes.
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 11f09f3aa03694053a1dbea8beb4d0cd5cb0c59c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f09f3aa03694053a1dbea8b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 10 11:30:15 2008 +0900 comctl32: rebar: Prevent unnecessary triggering of RBBIM_CHILDSIZE changes. --- dlls/comctl32/rebar.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index dcbbf1f..16f6b9c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1647,7 +1647,7 @@ static UINT REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBand) /* Function: This routine copies the supplied values from */ /* user input (lprbbi) to the internal band structure. */ - /* It returns true if something changed and false if not. */ + /* It returns the mask of what changed. */ { UINT uChanged = 0x0; @@ -1699,7 +1699,7 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan if( (lprbbi->fMask & RBBIM_CHILDSIZE) && ( (lpBand->cxMinChild != lprbbi->cxMinChild) || (lpBand->cyMinChild != lprbbi->cyMinChild ) || - ( (lprbbi->cbSize >= sizeof (REBARBANDINFOA)) && + ( (lprbbi->cbSize >= sizeof (REBARBANDINFOA) && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) && ( (lpBand->cyChild != lprbbi->cyChild ) || (lpBand->cyMaxChild != lprbbi->cyMaxChild ) || (lpBand->cyIntegral != lprbbi->cyIntegral ) ) ) || @@ -2422,6 +2422,14 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnico lpBand->iImage = -1; REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); + + /* Make sure the defaults for these are correct */ + if (lprbbi->cbSize < sizeof (REBARBANDINFOA) || !(lpBand->fStyle & RBBS_VARIABLEHEIGHT)) { + lpBand->cyChild = lpBand->cyMinChild; + lpBand->cyMaxChild = 0x7fffffff; + lpBand->cyIntegral = 0; + } + if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) { if (bUnicode) Str_SetPtrW(&lpBand->lpText, lprbbi->lpText);

1 0

Aric Stewart : comctl32: rebar: Record what changes and only redo the Layout if something of relevance changes .
by Alexandre Julliard July 17, 2008

July 17, 2008

Module: wine Branch: master Commit: 1c2ad72b47688ede1c428c7ca95e75807245e2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2ad72b47688ede1c428c7ca… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 10 11:29:57 2008 +0900 comctl32: rebar: Record what changes and only redo the Layout if something of relevance changes. --- dlls/comctl32/rebar.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4b5c744..dcbbf1f 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1643,13 +1643,13 @@ REBAR_ValidateBand (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) lpBand->cxMinBand += CHEVRON_WIDTH; } -static BOOL +static UINT REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBand) /* Function: This routine copies the supplied values from */ /* user input (lprbbi) to the internal band structure. */ /* It returns true if something changed and false if not. */ { - BOOL bChanged = FALSE; + UINT uChanged = 0x0; lpBand->fMask |= lprbbi->fMask; @@ -1657,7 +1657,7 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan (lpBand->fStyle != lprbbi->fStyle ) ) { lpBand->fStyle = lprbbi->fStyle; - bChanged = TRUE; + uChanged |= RBBIM_STYLE; } if( (lprbbi->fMask & RBBIM_COLORS) && @@ -1666,14 +1666,14 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan { lpBand->clrFore = lprbbi->clrFore; lpBand->clrBack = lprbbi->clrBack; - bChanged = TRUE; + uChanged |= RBBIM_COLORS; } if( (lprbbi->fMask & RBBIM_IMAGE) && ( lpBand->iImage != lprbbi->iImage ) ) { lpBand->iImage = lprbbi->iImage; - bChanged = TRUE; + uChanged |= RBBIM_IMAGE; } if( (lprbbi->fMask & RBBIM_CHILD) && @@ -1693,7 +1693,7 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->hwndChild = 0; lpBand->hwndPrevParent = 0; } - bChanged = TRUE; + uChanged |= RBBIM_CHILD; } if( (lprbbi->fMask & RBBIM_CHILDSIZE) && @@ -1722,28 +1722,28 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->cyMaxChild = 0x7fffffff; lpBand->cyIntegral = 0; } - bChanged = TRUE; + uChanged |= RBBIM_CHILDSIZE; } if( (lprbbi->fMask & RBBIM_SIZE) && (lpBand->cx != lprbbi->cx ) ) { lpBand->cx = lprbbi->cx; - bChanged = TRUE; + uChanged |= RBBIM_SIZE; } if( (lprbbi->fMask & RBBIM_BACKGROUND) && ( lpBand->hbmBack != lprbbi->hbmBack ) ) { lpBand->hbmBack = lprbbi->hbmBack; - bChanged = TRUE; + uChanged |= RBBIM_BACKGROUND; } if( (lprbbi->fMask & RBBIM_ID) && (lpBand->wID != lprbbi->wID ) ) { lpBand->wID = lprbbi->wID; - bChanged = TRUE; + uChanged |= RBBIM_ID; } /* check for additional data */ @@ -1752,14 +1752,14 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan ( lpBand->cxIdeal != lprbbi->cxIdeal ) ) { lpBand->cxIdeal = lprbbi->cxIdeal; - bChanged = TRUE; + uChanged |= RBBIM_IDEALSIZE; } if( (lprbbi->fMask & RBBIM_LPARAM) && (lpBand->lParam != lprbbi->lParam ) ) { lpBand->lParam = lprbbi->lParam; - bChanged = TRUE; + uChanged |= RBBIM_LPARAM; } if( (lprbbi->fMask & RBBIM_HEADERSIZE) && @@ -1767,11 +1767,11 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan { lpBand->cxHeader = lprbbi->cxHeader; lpBand->fStyle |= RBBS_UNDOC_FIXEDHEADER; - bChanged = TRUE; + uChanged |= RBBIM_HEADERSIZE; } } - return bChanged; + return uChanged; } static LRESULT @@ -2635,7 +2635,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnic { LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam; REBAR_BAND *lpBand; - BOOL bChanged; + UINT uChanged; if (lprbbi == NULL) return FALSE; @@ -2650,7 +2650,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnic /* set band information */ lpBand = &infoPtr->bands[(UINT)wParam]; - bChanged = REBAR_CommonSetupBand (infoPtr->hwndSelf, lprbbi, lpBand); + uChanged = REBAR_CommonSetupBand (infoPtr->hwndSelf, lprbbi, lpBand); if (lprbbi->fMask & RBBIM_TEXT) { LPWSTR wstr = NULL; if (bUnicode) @@ -2661,7 +2661,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnic if (REBAR_strdifW(wstr, lpBand->lpText)) { Free(lpBand->lpText); lpBand->lpText = wstr; - bChanged = TRUE; + uChanged |= RBBIM_TEXT; } else Free(wstr); @@ -2671,7 +2671,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnic REBAR_DumpBand (infoPtr); - if (bChanged && (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE | RBBIM_IMAGE))) { + if (uChanged & (RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE | RBBIM_IMAGE)) { REBAR_Layout(infoPtr); InvalidateRect(infoPtr->hwndSelf, 0, 1); }

1 0