February 2008 - Wine-commits

Paul Vriens : msi/tests: Fix test that depends on the order of the files in a directory.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: 1bbac341df59cbd9e9db88bdf2eb96df6677a6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bbac341df59cbd9e9db88bdf… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 27 09:16:20 2008 +0100 msi/tests: Fix test that depends on the order of the files in a directory. --- dlls/msi/tests/install.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 704d531..1f64010 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3660,8 +3660,11 @@ static void test_movefiles(void) ok(!delete_pf("msitest\\application", TRUE), "File should not exist\n"); ok(delete_pf("msitest\\wildcard", TRUE), "File not moved\n"); ok(!delete_pf("msitest\\ape", TRUE), "File moved\n"); - ok(delete_pf("msitest\\foo", TRUE), "File not moved\n"); - ok(!delete_pf("msitest\\fao", TRUE), "File should not exist\n"); + /* either fao or foo will be moved depending on directory order */ + if (delete_pf("msitest\\foo", TRUE)) + ok(!delete_pf("msitest\\fao", TRUE), "File should not exist\n"); + else + ok(delete_pf("msitest\\fao", TRUE), "File not moved\n"); ok(delete_pf("msitest\\single", TRUE), "File not moved\n"); ok(!delete_pf("msitest\\fbod", TRUE), "File moved\n"); ok(delete_pf("msitest\\budding", TRUE), "File not moved\n");

1 0

Alexandre Julliard : msvcrt: Fix incorrect uses of msvcrt_set_errno.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: a470afca6c045e5269aabedb57631eb9eb8512d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a470afca6c045e5269aabedb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 12:24:09 2008 +0100 msvcrt: Fix incorrect uses of msvcrt_set_errno. --- dlls/msvcrt/heap.c | 12 ++++++------ dlls/msvcrt/mbcs.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 2f7fb9f..227bc91 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -280,7 +280,7 @@ void* CDECL MSVCRT_malloc(MSVCRT_size_t size) { void *ret = HeapAlloc(GetProcessHeap(),0,size); if (!ret) - msvcrt_set_errno(MSVCRT_ENOMEM); + *MSVCRT__errno() = MSVCRT_ENOMEM; return ret; } @@ -348,14 +348,14 @@ void * CDECL _aligned_offset_malloc(MSVCRT_size_t size, MSVCRT_size_t alignment, /* alignment must be a power of 2 */ if ((alignment & (alignment - 1)) != 0) { - msvcrt_set_errno(EINVAL); + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } /* offset must be less than size */ if (offset >= size) { - msvcrt_set_errno(EINVAL); + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } @@ -405,14 +405,14 @@ void * CDECL _aligned_offset_realloc(void *memblock, MSVCRT_size_t size, /* alignment must be a power of 2 */ if ((alignment & (alignment - 1)) != 0) { - msvcrt_set_errno(EINVAL); + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } /* offset must be less than size */ if (offset >= size) { - msvcrt_set_errno(EINVAL); + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } @@ -430,7 +430,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, MSVCRT_size_t size, saved = SAVED_PTR(memblock); if (memblock != ALIGN_PTR(*saved, alignment, offset)) { - msvcrt_set_errno(EINVAL); + *MSVCRT__errno() = MSVCRT_EINVAL; return NULL; } diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 14a962a..392f450 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -191,7 +191,7 @@ int CDECL _setmbcp(int cp) if (!GetCPInfo(newcp, &cpi)) { WARN("Codepage %d not found\n", newcp); - msvcrt_set_errno(MSVCRT_EINVAL); + *MSVCRT__errno() = MSVCRT_EINVAL; return -1; }

1 0

Alexandre Julliard : msvcrt: Use the correct msvcrt defines for errno values.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: d66b9f7e48bc9acae4e986b006448d884a6e0862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66b9f7e48bc9acae4e986b00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 12:26:15 2008 +0100 msvcrt: Use the correct msvcrt defines for errno values. --- dlls/msvcrt/heap.c | 1 - dlls/msvcrt/mbcs.c | 11 +++++------ dlls/msvcrt/string.c | 17 ++++++++--------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 227bc91..8b92f0f 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -23,7 +23,6 @@ #include "msvcrt.h" #include "mtdll.h" -#include "msvcrt/errno.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 392f450..4acc52f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -27,7 +27,6 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "msvcrt/mbctype.h" -#include "msvcrt/errno.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -454,11 +453,11 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha MSVCRT_size_t pos = 0; if(!dst || size == 0) - return EINVAL; + return MSVCRT_EINVAL; if(!src) { dst[0] = '\0'; - return EINVAL; + return MSVCRT_EINVAL; } if(!n) return 0; @@ -471,7 +470,7 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha if(pos == size) { dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } is_lead = (!is_lead && _ismbblead(*src)); n--; @@ -489,7 +488,7 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha if(pos == size) { dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } if(!(*src)) break; @@ -502,7 +501,7 @@ int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned cha else { dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } return 0; diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 660b94d..74beefb 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -26,7 +26,6 @@ #include <stdlib.h> #include "msvcrt.h" -#include "msvcrt/errno.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -159,12 +158,12 @@ int CDECL MSVCRT_strcoll( const char* str1, const char* str2 ) int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) { MSVCRT_size_t i; - if(!elem) return EINVAL; - if(!dst) return EINVAL; + if(!elem) return MSVCRT_EINVAL; + if(!dst) return MSVCRT_EINVAL; if(!src) { dst[0] = '\0'; - return EINVAL; + return MSVCRT_EINVAL; } for(i = 0; i < elem; i++) @@ -172,7 +171,7 @@ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) if((dst[i] = src[i]) == '\0') return 0; } dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } /********************************************************************* @@ -181,12 +180,12 @@ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src ) { MSVCRT_size_t i, j; - if(!dst) return EINVAL; - if(elem == 0) return EINVAL; + if(!dst) return MSVCRT_EINVAL; + if(elem == 0) return MSVCRT_EINVAL; if(!src) { dst[0] = '\0'; - return EINVAL; + return MSVCRT_EINVAL; } for(i = 0; i < elem; i++) @@ -201,7 +200,7 @@ int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src ) } /* Set the first element to 0, not the first element after the skipped part */ dst[0] = '\0'; - return ERANGE; + return MSVCRT_ERANGE; } /*********************************************************************

1 0

Mikołaj Zalewski : comctl32: rebar: Code cleanup.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: 497239b1057a55006c864d310d3f202d4c29d8f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497239b1057a55006c864d310… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Feb 26 22:15:12 2008 +0100 comctl32: rebar: Code cleanup. --- dlls/comctl32/rebar.c | 104 ++++++++++++++++++++++-------------------------- 1 files changed, 48 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=497239b1057a55006c864…

1 0

Detlef Riekenberg : include/winspool: Add defines for dwAction.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: 841ba7de55edbee69cb59497c74c9f3bc2cee4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841ba7de55edbee69cb59497c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 26 23:07:41 2008 +0100 include/winspool: Add defines for dwAction. --- include/winspool.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/winspool.h b/include/winspool.h index f939a22..d4ba6e3 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -288,6 +288,14 @@ extern "C" { #define DPD_DELETE_SPECIFIC_VERSION 0x00000002 #define DPD_DELETE_ALL_FILES 0x00000004 +/* dwAction for PRINTER_INFO_7 */ +#define DSPRINT_PUBLISH 0x00000001 +#define DSPRINT_UPDATE 0x00000002 +#define DSPRINT_UNPUBLISH 0x00000004 +#define DSPRINT_REPUBLISH 0x00000008 +#define DSPRINT_PENDING 0x80000000 + +/* ##################################### */ /* TYPES */ typedef struct _PRINTER_DEFAULTSA {

1 0

Mikołaj Zalewski : comctl32: rebar: Invalidate children in CalcHorz/VertBand.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: bc0fe1bd8e650fe6491a2f4001cb3e4216eb961e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc0fe1bd8e650fe6491a2f400… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Feb 26 21:16:13 2008 +0100 comctl32: rebar: Invalidate children in CalcHorz/VertBand. --- dlls/comctl32/rebar.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index cd2861c..8c14336 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -796,6 +796,7 @@ REBAR_CalcHorzBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) work.right += SEP_WIDTH; work.bottom += SEP_WIDTH; InvalidateRect(infoPtr->hwndSelf, &work, TRUE); + InvalidateRect(lpBand->hwndChild, NULL, TRUE); } } @@ -916,6 +917,7 @@ REBAR_CalcVertBand (const REBAR_INFO *infoPtr, UINT rstart, UINT rend) work.bottom += SEP_WIDTH; work.right += SEP_WIDTH; InvalidateRect(infoPtr->hwndSelf, &work, TRUE); + InvalidateRect(lpBand->hwndChild, NULL, TRUE); } } @@ -2788,7 +2790,6 @@ REBAR_SizeToRect (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TRACE("[%s]\n", wine_dbgstr_rect(lpRect)); REBAR_SizeToHeight(infoPtr, get_rect_cy(infoPtr, lpRect)); - InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return TRUE; }

1 0

Mikołaj Zalewski : comctl32: rebar: Add RBS_AUTOSIZE support.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: 786dcac944e1d79c0fae442907c837597f27fe37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=786dcac944e1d79c0fae44290… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Feb 26 21:35:15 2008 +0100 comctl32: rebar: Add RBS_AUTOSIZE support. --- dlls/comctl32/rebar.c | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 8c14336..f46ec3c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -33,7 +33,6 @@ * - RBS_FIXEDORDER * - RBS_REGISTERDROP * - RBS_TOOLTIPS - * - RBS_AUTOSIZE * Messages: * - RB_BEGINDRAG * - RB_DRAGMOVE @@ -255,7 +254,7 @@ typedef struct #define REBAR_GetInfoPtr(wndPtr) ((REBAR_INFO *)GetWindowLongPtrW (hwnd, 0)) static LRESULT REBAR_NotifyFormat(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam); - +static void REBAR_AutoSize(REBAR_INFO *infoPtr, BOOL needsLayout); /* "constant values" retrieved when DLL was initialized */ /* FIXME we do this when the classes are registered. */ @@ -1389,6 +1388,7 @@ REBAR_Layout(REBAR_INFO *infoPtr, const RECT *lpRect) { NMHDR heightchange; REBAR_Notify(&heightchange, infoPtr, RBN_HEIGHTCHANGE); + REBAR_AutoSize(infoPtr, FALSE); } } @@ -1495,6 +1495,24 @@ REBAR_SizeToHeight(REBAR_INFO *infoPtr, int height) REBAR_Layout(infoPtr, NULL); } +static VOID +REBAR_AutoSize(REBAR_INFO *infoPtr, BOOL needsLayout) +{ + RECT rc, rcNew; + NMRBAUTOSIZE autosize; + + GetClientRect(infoPtr->hwndSelf, &rc); + if (needsLayout) + REBAR_Layout(infoPtr, NULL); + REBAR_SizeToHeight(infoPtr, get_rect_cy(infoPtr, &rc)); + GetClientRect(infoPtr->hwndSelf, &rcNew); + + GetClientRect(infoPtr->hwndSelf, &autosize.rcTarget); + autosize.fChanged = (memcmp(&rc, &rcNew, sizeof(RECT)) == 0); + autosize.rcTarget = rc; + autosize.rcActual = rcNew; + REBAR_Notify((NMHDR *)&autosize, infoPtr, RBN_AUTOSIZE); +} static VOID REBAR_ValidateBand (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) @@ -3397,7 +3415,7 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { TRACE("wParam=%lx, lParam=%lx\n", wParam, lParam); - /* avoid auto resize infinite recursion */ + /* avoid _Layout resize recursion (but it shouldn't be infinite and it seems Windows does recurse) */ if (infoPtr->fStatus & AUTO_RESIZE) { infoPtr->fStatus &= ~AUTO_RESIZE; TRACE("AUTO_RESIZE was set, reset, fStatus=%08x lparam=%08lx\n", @@ -3405,19 +3423,10 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) return 0; } - /* FIXME: wrong */ - if (infoPtr->dwStyle & RBS_AUTOSIZE) { - NMRBAUTOSIZE autosize; - - GetClientRect(infoPtr->hwndSelf, &autosize.rcTarget); - autosize.fChanged = 0; /* ??? */ - autosize.rcActual = autosize.rcTarget; /* ??? */ - REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE); - TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n", - autosize.rcTarget.right, autosize.rcTarget.bottom, lParam); - } - - REBAR_Layout(infoPtr, NULL); + if (infoPtr->dwStyle & RBS_AUTOSIZE) + REBAR_AutoSize(infoPtr, TRUE); + else + REBAR_Layout(infoPtr, NULL); return 0; }

1 0

Maarten Lankhorst : shlwapi: Don' t add a trailing slash in the case that nothing has to be appended to relative , with testcase.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: b254b407a494633127c3977a27794b958c776174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b254b407a494633127c3977a2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Feb 26 12:09:39 2008 -0800 shlwapi: Don't add a trailing slash in the case that nothing has to be appended to relative, with testcase. --- dlls/shlwapi/tests/url.c | 1 + dlls/shlwapi/url.c | 4 ---- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 87b8b1d..2d63a21 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -206,6 +206,7 @@ static const TEST_URL_COMBINE TEST_COMBINE[] = { {"http://www.winehq.org/tests/../tests/", "/tests10/..", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests10/.."}, {"http://www.winehq.org/tests/../", "tests11", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../tests11"}, {"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"}, + {"C:\\winehq\\winehq.txt", "C:\\Test\\test.txt", 0, S_OK, "file:///C:/Test/test.txt"}, {"http://www.winehq.org/test/", "test%20file.txt", 0, S_OK, "http://www.winehq.org/test/test%20file.txt"}, {"http://www.winehq.org/test/", "test%20file.txt", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/test/test%20file.txt"}, {"http://www.winehq.org%2ftest/", "test%20file.txt", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org%2ftest/test%20file.txt"}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 01a0919..aa232aa 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -752,7 +752,6 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, break; } while(FALSE); /* a litte trick to allow easy exit from nested if's */ - ret = S_OK; switch (process_case) { @@ -780,9 +779,6 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative, memcpy(preliminary, base.pszProtocol, (base.cchProtocol + 1)*sizeof(WCHAR)); work = preliminary + base.cchProtocol + 1; strcpyW(work, relative.pszSuffix); - if (!(dwFlags & URL_PLUGGABLE_PROTOCOL) && - URL_JustLocation(relative.pszSuffix)) - strcatW(work, single_slash); break; case 4: /*

1 0

Mikołaj Zalewski : comctl32: rebar: An implementation of RB_SIZETORECT.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: 480c0d721585025f472ecd06de2543ef7ff6450e URL: http://source.winehq.org/git/wine.git/?a=commit;h=480c0d721585025f472ecd06d… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Feb 26 21:09:01 2008 +0100 comctl32: rebar: An implementation of RB_SIZETORECT. --- dlls/comctl32/rebar.c | 146 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 121 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 0784e61..cd2861c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2,6 +2,7 @@ * Rebar control * * Copyright 1998, 1999 Eric Kohl + * Copyright 2007, 2008 Mikolaj Zalewski * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -116,10 +117,12 @@ typedef struct LPARAM lParam; UINT cxHeader; - INT cxEffective; /* current cx for band */ + INT cxEffective; /* current cx for band */ + UINT cyHeader; /* the height of the header */ UINT lcx; /* minimum cx for band */ UINT lcy; /* minimum cy for band */ + UINT cyRowSoFar; /* for RBS_VARHEIGHT - the height of the row if it would break on this band (set by _Layout) */ INT iRow; /* zero-based index of the row this band assigned to */ UINT fStatus; /* status flags, reset only by _Validate */ UINT fDraw; /* drawing flags, reset only by _Layout */ @@ -450,15 +453,21 @@ static int get_rect_cy(const REBAR_INFO *infoPtr, const RECT *lpRect) return lpRect->bottom - lpRect->top; } -static void round_child_height(REBAR_BAND *lpBand, int cyHeight) +static int round_child_height(REBAR_BAND *lpBand, int cyHeight) { int cy = 0; if (lpBand->cyIntegral == 0) - return; + return cyHeight; cy = max(cyHeight - (int)lpBand->cyMinChild, 0); cy = lpBand->cyMinChild + (cy/lpBand->cyIntegral) * lpBand->cyIntegral; cy = min(cy, lpBand->cyMaxChild); - lpBand->cyChild = cy; + return cy; +} + +static void update_min_band_height(const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) +{ + lpBand->lcy = max(lpBand->cyHeader, + (lpBand->hwndChild ? lpBand->cyChild + REBARSPACE(lpBand) : REBAR_NO_CHILD_HEIGHT)); } static void @@ -1227,6 +1236,7 @@ static int REBAR_SetBandsHeight(const REBAR_INFO *infoPtr, INT iBeginBand, INT i for (i = iBeginBand; i < iEndBand; i = next_band(infoPtr, i)) { lpBand = &infoPtr->bands[i]; + lpBand->cyRowSoFar = yMaxHeight; yMaxHeight = max(yMaxHeight, lpBand->lcy); } TRACE("Bands [%d; %d) height: %d\n", iBeginBand, iEndBand, yMaxHeight); @@ -1380,6 +1390,109 @@ REBAR_Layout(REBAR_INFO *infoPtr, const RECT *lpRect) } } +static int +REBAR_SizeChildrenToHeight(const REBAR_INFO *infoPtr, int iBeginBand, int iEndBand, int extra, BOOL *fChanged) +{ + int cyBandsOld; + int cyBandsNew = 0; + int i; + + TRACE("[%d;%d) by %d\n", iBeginBand, iEndBand, extra); + + cyBandsOld = infoPtr->bands[iBeginBand].rcBand.bottom - infoPtr->bands[iBeginBand].rcBand.top; + for (i = iBeginBand; i < iEndBand; i = next_band(infoPtr, i)) + { + REBAR_BAND *lpBand = &infoPtr->bands[i]; + int cyMaxChild = cyBandsOld - REBARSPACE(lpBand) + extra; + int cyChild = round_child_height(lpBand, cyMaxChild); + + if (lpBand->hwndChild && cyChild != lpBand->cyChild && (lpBand->fStyle & RBBS_VARIABLEHEIGHT)) + { + TRACE("Resizing %d: %d -> %d [%d]\n", i, lpBand->cyChild, cyChild, lpBand->cyMaxChild); + *fChanged = TRUE; + lpBand->cyChild = cyChild; + lpBand->fDraw |= NTF_INVALIDATE; + update_min_band_height(infoPtr, lpBand); + } + cyBandsNew = max(cyBandsNew, lpBand->lcy); + } + return cyBandsNew - cyBandsOld; +} + +/* worker function for RB_SIZETORECT and RBS_AUTOSIZE */ +static VOID +REBAR_SizeToHeight(REBAR_INFO *infoPtr, int height) +{ + int extra = height - infoPtr->calcSize.cy; /* may be negative */ + BOOL fChanged = FALSE; + UINT uNumRows = infoPtr->uNumRows; + int i; + + /* That's not exactly what Windows does but should be similar */ + + /* Pass one: break-up/glue rows */ + if (extra > 0) + { + for (i = prev_band(infoPtr, infoPtr->uNumBands); i > 0; i = prev_band(infoPtr, i)) + { + REBAR_BAND *lpBand = &infoPtr->bands[i]; + int height = lpBand->rcBand.bottom - lpBand->rcBand.top; + int cyBreakExtra; /* additional cy for the rebar after a RBBS_BREAK on this band */ + + if (infoPtr->dwStyle & RBS_VARHEIGHT) + cyBreakExtra = lpBand->cyRowSoFar; /* 'height' => 'lpBand->cyRowSoFar' + 'height'*/ + else + cyBreakExtra = height; /* 'height' => 'height' + 'height'*/ + cyBreakExtra += SEP_WIDTH; + + if (extra <= cyBreakExtra / 2) + break; + + if (!(lpBand->fStyle & RBBS_BREAK)) + { + TRACE("Adding break on band %d - extra %d -> %d\n", i, extra, extra - cyBreakExtra); + lpBand->fStyle |= RBBS_BREAK; + lpBand->fDraw |= NTF_INVALIDATE; + fChanged = TRUE; + extra -= cyBreakExtra; + uNumRows++; + /* temporary change for _SizeControlsToHeight. The true values will be computed in _Layout */ + if (infoPtr->dwStyle & RBS_VARHEIGHT) + lpBand->rcBand.bottom = lpBand->rcBand.top + lpBand->lcy; + } + } + } + /* TODO: else if (extra < 0) { try to remove some RBBS_BREAKs } */ + + /* Pass two: increase/decrease control height */ + if (infoPtr->dwStyle & RBS_VARHEIGHT) + { + int i = 0; + int iRow = 0; + while (i < infoPtr->uNumBands) + { + REBAR_BAND *lpBand = &infoPtr->bands[i]; + int extraForRow = extra / (int)(uNumRows - iRow); + int rowEnd; + + /* we can't use get_row_end_for_band as we might have added RBBS_BREAK in the first phase */ + for (rowEnd = next_band(infoPtr, i); rowEnd < infoPtr->uNumBands; rowEnd = next_band(infoPtr, rowEnd)) + if (infoPtr->bands[rowEnd].iRow != lpBand->iRow || (infoPtr->bands[rowEnd].fStyle & RBBS_BREAK)) + break; + + extra -= REBAR_SizeChildrenToHeight(infoPtr, i, rowEnd, extraForRow, &fChanged); + TRACE("extra = %d\n", extra); + i = rowEnd; + iRow++; + } + } + else + extra -= REBAR_SizeChildrenToHeight(infoPtr, 0, infoPtr->uNumBands, extra / infoPtr->uNumRows, &fChanged); + + if (fChanged) + REBAR_Layout(infoPtr, NULL); +} + static VOID REBAR_ValidateBand (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) @@ -1485,17 +1598,10 @@ REBAR_ValidateBand (const REBAR_INFO *infoPtr, REBAR_BAND *lpBand) /* check if user overrode the header value */ if (!(lpBand->fStyle & RBBS_UNDOC_FIXEDHEADER)) lpBand->cxHeader = header; - + lpBand->cyHeader = textheight; /* Now compute minimum size of child window */ - lpBand->lcy = textheight; - if (lpBand->hwndChild != NULL) { - /* Set the .cy values for CHILDSIZE case */ - lpBand->lcy = max(lpBand->lcy, lpBand->cyChild + REBARSPACE(lpBand)); - TRACE("_CHILDSIZE\n"); - } - else - lpBand->lcy = max(lpBand->lcy, REBAR_NO_CHILD_HEIGHT); + update_min_band_height(infoPtr, lpBand); /* update lpBand->lcy from cyHeader and cyChild*/ lpBand->lcx = lpBand->cxMinChild + lpBand->cxHeader + REBAR_POST_CHILD; if (lpBand->fStyle & RBBS_USECHEVRON && lpBand->cxMinChild < lpBand->cxIdeal) @@ -1574,8 +1680,7 @@ REBAR_CommonSetupBand(HWND hwnd, const REBARBANDINFOW *lprbbi, REBAR_BAND *lpBan lpBand->cyMaxChild = lprbbi->cyMaxChild; lpBand->cyIntegral = lprbbi->cyIntegral; - lpBand->cyChild = lpBand->cyMinChild; - round_child_height(lpBand, lprbbi->cyChild); /* try to increase cyChild */ + lpBand->cyChild = round_child_height(lpBand, lprbbi->cyChild); /* make (cyChild - cyMinChild) a multiple of cyIntergral */ } else { lpBand->cyChild = lpBand->cyMinChild; @@ -2677,21 +2782,12 @@ static LRESULT REBAR_SizeToRect (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { LPRECT lpRect = (LPRECT)lParam; - RECT t1; if (lpRect == NULL) return FALSE; TRACE("[%s]\n", wine_dbgstr_rect(lpRect)); - - /* what is going on???? */ - GetWindowRect(infoPtr->hwndSelf, &t1); - TRACE("window rect [%s]\n", wine_dbgstr_rect(&t1)); - GetClientRect(infoPtr->hwndSelf, &t1); - TRACE("client rect [%s]\n", wine_dbgstr_rect(&t1)); - - /* force full _Layout processing */ - REBAR_Layout(infoPtr, lpRect); + REBAR_SizeToHeight(infoPtr, get_rect_cy(infoPtr, lpRect)); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return TRUE; }

1 0

Andrew Talbot : dpnet: Assign to structs instead of using memcpy.
by Alexandre Julliard 27 Feb '08

27 Feb '08

Module: wine Branch: master Commit: 7e584e4add5f056b15c4552813e4534f3f46f271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e584e4add5f056b15c455281… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Feb 26 20:20:11 2008 +0000 dpnet: Assign to structs instead of using memcpy. --- dlls/dpnet/address.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index c0b924c..f39cf44 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(PDIRECTPLAY8ADDRESS iface, static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(PDIRECTPLAY8ADDRESS iface, GUID* pguidSP) { IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; TRACE("(%p, %p)\n", iface, pguidSP); - memcpy(pguidSP, &This->SP_guid, sizeof(GUID)); + *pguidSP = This->SP_guid; return DPN_OK; } @@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetUserData(PDIRECTPLAY8ADDRESS if static HRESULT WINAPI IDirectPlay8AddressImpl_SetSP(PDIRECTPLAY8ADDRESS iface, CONST GUID* CONST pguidSP) { IDirectPlay8AddressImpl *This = (IDirectPlay8AddressImpl *)iface; TRACE("(%p, %s)\n", iface, debugstr_SP(pguidSP)); - memcpy(&This->SP_guid, pguidSP, sizeof(GUID)); + This->SP_guid = *pguidSP; return DPN_OK; }

1 0