February 2007 - Wine-Commits

Dmitry Timoshkov : kernel32: Add a trace to MultiByteToWideChar.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: d32d5a4706ebe123a277c53a3667a5e29a3fb48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32d5a4706ebe123a277c53a3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 31 18:40:05 2007 +0800 kernel32: Add a trace to MultiByteToWideChar. --- dlls/kernel32/locale.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 25196da..1c6e537 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1823,6 +1823,8 @@ INT WINAPI MultiByteToWideChar( UINT pag } ret = 0; } + TRACE("cp %d %s -> %s, ret = %d\n", + page, debugstr_an(src, srclen), debugstr_wn(dst, ret), ret); return ret; }

1 0

Mikołaj Zalewski : comctl32: rebar: Merge SetBandInfoA and SetBandInfoW.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 95c74f19a7a752f3cc0171666c3670e205854fea URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c74f19a7a752f3cc0171666… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 5 00:00:52 2007 +0100 comctl32: rebar: Merge SetBandInfoA and SetBandInfoW. --- dlls/comctl32/rebar.c | 97 +++++++++---------------------------------------- 1 files changed, 18 insertions(+), 79 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 066c0d6..0fc0937 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -365,7 +365,7 @@ REBAR_FmtMask( UINT mask) static VOID -REBAR_DumpBandInfo( LPREBARBANDINFOA pB) +REBAR_DumpBandInfo(LPREBARBANDINFOW pB) { if( !TRACE_ON(rebar) ) return; TRACE("band info: "); @@ -2092,7 +2092,7 @@ REBAR_ValidateBand (REBAR_INFO *infoPtr, } static BOOL -REBAR_CommonSetupBand (HWND hwnd, LPREBARBANDINFOA lprbbi, REBAR_BAND *lpBand) +REBAR_CommonSetupBand(HWND hwnd, LPREBARBANDINFOW 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. */ @@ -2831,7 +2831,7 @@ REBAR_GetBandInfoT(REBAR_INFO *infoPtr, lprbbi->cxHeader = lpBand->cxHeader; } - REBAR_DumpBandInfo((LPREBARBANDINFOA)lprbbi); + REBAR_DumpBandInfo(lprbbi); return TRUE; } @@ -3042,7 +3042,7 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, W /* trace the index as signed to see the -1 */ TRACE("insert band at %d (bUnicode=%d)!\n", (INT)uIndex, bUnicode); - REBAR_DumpBandInfo((LPREBARBANDINFOA)lprbbi); + REBAR_DumpBandInfo(lprbbi); infoPtr->bands = ReAlloc(infoPtr->bands, (infoPtr->uNumBands+1) * sizeof(REBAR_BAND)); if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands)) @@ -3060,7 +3060,7 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, W lpBand->clrBack = infoPtr->clrBk; lpBand->iImage = -1; - REBAR_CommonSetupBand(infoPtr->hwndSelf, (LPREBARBANDINFOA)lprbbi, lpBand); + REBAR_CommonSetupBand(infoPtr->hwndSelf, lprbbi, lpBand); if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) { if (bUnicode) Str_SetPtrW(&lpBand->lpText, lprbbi->lpText); @@ -3325,9 +3325,9 @@ REBAR_strdifW( LPCWSTR a, LPCWSTR b ) } static LRESULT -REBAR_SetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +REBAR_SetBandInfoT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode) { - LPREBARBANDINFOA lprbbi = (LPREBARBANDINFOA)lParam; + LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam; REBAR_BAND *lpBand; BOOL bChanged; @@ -3347,29 +3347,18 @@ REBAR_SetBandInfoA (REBAR_INFO *infoPtr, bChanged = REBAR_CommonSetupBand (infoPtr->hwndSelf, lprbbi, lpBand); if (lprbbi->fMask & RBBIM_TEXT) { LPWSTR wstr = NULL; + if (bUnicode) + Str_SetPtrW(&wstr, lprbbi->lpText); + else + Str_SetPtrAtoW(&wstr, (LPSTR)lprbbi->lpText); - if (lprbbi->lpText) - { - INT len; - len = MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, NULL, 0 ); - if (len > 1) - wstr = (LPWSTR)Alloc (len*sizeof(WCHAR)); - if (wstr) - MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, wstr, len ); - } - if (REBAR_strdifW(lpBand->lpText, wstr)) { - if (lpBand->lpText) { - Free (lpBand->lpText); - lpBand->lpText = NULL; - } - if (wstr) { - lpBand->lpText = wstr; - wstr = NULL; - } + if (REBAR_strdifW(wstr, lprbbi->lpText)) { + Free(lpBand->lpText); + lpBand->lpText = wstr; bChanged = TRUE; } - if (wstr) - Free (wstr); + else + Free(wstr); } REBAR_ValidateBand (infoPtr, lpBand); @@ -3384,56 +3373,6 @@ REBAR_SetBandInfoA (REBAR_INFO *infoPtr, return TRUE; } -static LRESULT -REBAR_SetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) -{ - LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam; - REBAR_BAND *lpBand; - BOOL bChanged; - - if (lprbbi == NULL) - return FALSE; - if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE) - return FALSE; - if ((UINT)wParam >= infoPtr->uNumBands) - return FALSE; - - TRACE("index %u\n", (UINT)wParam); - REBAR_DumpBandInfo ((LPREBARBANDINFOA)lprbbi); - - /* set band information */ - lpBand = &infoPtr->bands[(UINT)wParam]; - - bChanged = REBAR_CommonSetupBand (infoPtr->hwndSelf, (LPREBARBANDINFOA)lprbbi, lpBand); - if( (lprbbi->fMask & RBBIM_TEXT) && - REBAR_strdifW( lpBand->lpText, lprbbi->lpText ) ) { - if (lpBand->lpText) { - Free (lpBand->lpText); - lpBand->lpText = NULL; - } - if (lprbbi->lpText) { - INT len = lstrlenW (lprbbi->lpText); - if (len > 0) - { - lpBand->lpText = (LPWSTR)Alloc ((len + 1)*sizeof(WCHAR)); - strcpyW (lpBand->lpText, lprbbi->lpText); - } - } - bChanged = TRUE; - } - - REBAR_ValidateBand (infoPtr, lpBand); - - REBAR_DumpBand (infoPtr); - - if ( bChanged && (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE)) ) { - REBAR_Layout (infoPtr, NULL, TRUE, FALSE); - InvalidateRect(infoPtr->hwndSelf, 0, 1); - } - - return TRUE; -} - static LRESULT REBAR_SetBarInfo (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) @@ -4479,10 +4418,10 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, return REBAR_PushChevron (infoPtr, wParam, lParam); case RB_SETBANDINFOA: - return REBAR_SetBandInfoA (infoPtr, wParam, lParam); + return REBAR_SetBandInfoT(infoPtr, wParam, lParam, FALSE); case RB_SETBANDINFOW: - return REBAR_SetBandInfoW (infoPtr, wParam, lParam); + return REBAR_SetBandInfoT(infoPtr, wParam, lParam, TRUE); case RB_SETBARINFO: return REBAR_SetBarInfo (infoPtr, wParam, lParam);

1 0

Mikołaj Zalewski : comctl32: rebar: Merge GetBandInfoA and GetBandInfoW.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 0f77096706b6e8e1f0a4cab8e4c2b534b5485f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f77096706b6e8e1f0a4cab8e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 5 00:00:08 2007 +0100 comctl32: rebar: Merge GetBandInfoA and GetBandInfoW. --- dlls/comctl32/rebar.c | 114 +++++------------------------------------------- 1 files changed, 12 insertions(+), 102 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index c3ea912..066c0d6 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2760,9 +2760,9 @@ REBAR_GetBandCount (REBAR_INFO *infoPtr) static LRESULT -REBAR_GetBandInfoA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +REBAR_GetBandInfoT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode) { - LPREBARBANDINFOA lprbbi = (LPREBARBANDINFOA)lParam; + LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam; REBAR_BAND *lpBand; if (lprbbi == NULL) @@ -2772,7 +2772,7 @@ REBAR_GetBandInfoA (REBAR_INFO *infoPtr, if ((UINT)wParam >= infoPtr->uNumBands) return FALSE; - TRACE("index %u\n", (UINT)wParam); + TRACE("index %u (bUnicode=%d)\n", (UINT)wParam, bUnicode); /* copy band information */ lpBand = &infoPtr->bands[(UINT)wParam]; @@ -2787,23 +2787,15 @@ REBAR_GetBandInfoA (REBAR_INFO *infoPtr, lprbbi->clrBack = infoPtr->clrBtnFace; } - if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) { - if (lpBand->lpText && (lpBand->fMask & RBBIM_TEXT)) - { - if (!WideCharToMultiByte( CP_ACP, 0, lpBand->lpText, -1, - lprbbi->lpText, lprbbi->cch, NULL, NULL )) - lprbbi->lpText[lprbbi->cch-1] = 0; - } - else - *lprbbi->lpText = 0; + if (lprbbi->fMask & RBBIM_TEXT) { + if (bUnicode) + Str_GetPtrW(lpBand->lpText, lprbbi->lpText, lprbbi->cch); + else + Str_GetPtrWtoA(lpBand->lpText, (LPSTR)lprbbi->lpText, lprbbi->cch); } - if (lprbbi->fMask & RBBIM_IMAGE) { - if (lpBand->fMask & RBBIM_IMAGE) + if (lprbbi->fMask & RBBIM_IMAGE) lprbbi->iImage = lpBand->iImage; - else - lprbbi->iImage = -1; - } if (lprbbi->fMask & RBBIM_CHILD) lprbbi->hwndChild = lpBand->hwndChild; @@ -2839,89 +2831,7 @@ REBAR_GetBandInfoA (REBAR_INFO *infoPtr, lprbbi->cxHeader = lpBand->cxHeader; } - REBAR_DumpBandInfo (lprbbi); - - return TRUE; -} - - -static LRESULT -REBAR_GetBandInfoW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) -{ - LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam; - REBAR_BAND *lpBand; - - if (lprbbi == NULL) - return FALSE; - if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE) - return FALSE; - if ((UINT)wParam >= infoPtr->uNumBands) - return FALSE; - - TRACE("index %u\n", (UINT)wParam); - - /* copy band information */ - lpBand = &infoPtr->bands[(UINT)wParam]; - - if (lprbbi->fMask & RBBIM_STYLE) - lprbbi->fStyle = lpBand->fStyle; - - if (lprbbi->fMask & RBBIM_COLORS) { - lprbbi->clrFore = lpBand->clrFore; - lprbbi->clrBack = lpBand->clrBack; - if (lprbbi->clrBack == CLR_DEFAULT) - lprbbi->clrBack = infoPtr->clrBtnFace; - } - - if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) { - if (lpBand->lpText && (lpBand->fMask & RBBIM_TEXT)) - lstrcpynW (lprbbi->lpText, lpBand->lpText, lprbbi->cch); - else - *lprbbi->lpText = 0; - } - - if (lprbbi->fMask & RBBIM_IMAGE) { - if (lpBand->fMask & RBBIM_IMAGE) - lprbbi->iImage = lpBand->iImage; - else - lprbbi->iImage = -1; - } - - if (lprbbi->fMask & RBBIM_CHILD) - lprbbi->hwndChild = lpBand->hwndChild; - - if (lprbbi->fMask & RBBIM_CHILDSIZE) { - lprbbi->cxMinChild = lpBand->cxMinChild; - lprbbi->cyMinChild = lpBand->cyMinChild; - if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) { - lprbbi->cyChild = lpBand->cyChild; - lprbbi->cyMaxChild = lpBand->cyMaxChild; - lprbbi->cyIntegral = lpBand->cyIntegral; - } - } - - if (lprbbi->fMask & RBBIM_SIZE) - lprbbi->cx = lpBand->cx; - - if (lprbbi->fMask & RBBIM_BACKGROUND) - lprbbi->hbmBack = lpBand->hbmBack; - - if (lprbbi->fMask & RBBIM_ID) - lprbbi->wID = lpBand->wID; - - /* check for additional data */ - if (lprbbi->cbSize >= sizeof (REBARBANDINFOW)) { - if (lprbbi->fMask & RBBIM_IDEALSIZE) - lprbbi->cxIdeal = lpBand->cxIdeal; - - if (lprbbi->fMask & RBBIM_LPARAM) - lprbbi->lParam = lpBand->lParam; - - if (lprbbi->fMask & RBBIM_HEADERSIZE) - lprbbi->cxHeader = lpBand->cxHeader; - } - - REBAR_DumpBandInfo ((LPREBARBANDINFOA)lprbbi); + REBAR_DumpBandInfo((LPREBARBANDINFOA)lprbbi); return TRUE; } @@ -4503,10 +4413,10 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, case RB_GETBANDINFO_OLD: case RB_GETBANDINFOA: - return REBAR_GetBandInfoA (infoPtr, wParam, lParam); + return REBAR_GetBandInfoT(infoPtr, wParam, lParam, FALSE); case RB_GETBANDINFOW: - return REBAR_GetBandInfoW (infoPtr, wParam, lParam); + return REBAR_GetBandInfoT(infoPtr, wParam, lParam, TRUE); case RB_GETBARHEIGHT: return REBAR_GetBarHeight (infoPtr, wParam, lParam);

1 0

Mikołaj Zalewski : comctl32: rebar: Merge InsertBandA and InsertBandW.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: d8d5196ddb201c8990e1cc7df5dfefd08792e6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d5196ddb201c8990e1cc7df… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 4 23:59:33 2007 +0100 comctl32: rebar: Merge InsertBandA and InsertBandW. --- dlls/comctl32/rebar.c | 146 +++++++------------------------------------------ 1 files changed, 20 insertions(+), 126 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4cf87bb..c3ea912 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3117,9 +3117,9 @@ REBAR_IdToIndex (REBAR_INFO *infoPtr, WP static LRESULT -REBAR_InsertBandA (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +REBAR_InsertBandT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnicode) { - LPREBARBANDINFOA lprbbi = (LPREBARBANDINFOA)lParam; + LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam; UINT uIndex = (UINT)wParam; REBAR_BAND *lpBand; @@ -3131,56 +3131,31 @@ REBAR_InsertBandA (REBAR_INFO *infoPtr, return FALSE; /* trace the index as signed to see the -1 */ - TRACE("insert band at %d!\n", (INT)uIndex); - REBAR_DumpBandInfo (lprbbi); - - if (infoPtr->uNumBands == 0) { - infoPtr->bands = (REBAR_BAND *)Alloc (sizeof (REBAR_BAND)); - uIndex = 0; - } - else { - REBAR_BAND *oldBands = infoPtr->bands; - infoPtr->bands = - (REBAR_BAND *)Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND)); - if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands)) - uIndex = infoPtr->uNumBands; - - /* pre insert copy */ - if (uIndex > 0) { - memcpy (&infoPtr->bands[0], &oldBands[0], - uIndex * sizeof(REBAR_BAND)); - } - - /* post copy */ - if (uIndex < infoPtr->uNumBands) { - memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex], - (infoPtr->uNumBands - uIndex) * sizeof(REBAR_BAND)); - } - - Free (oldBands); - } - + TRACE("insert band at %d (bUnicode=%d)!\n", (INT)uIndex, bUnicode); + REBAR_DumpBandInfo((LPREBARBANDINFOA)lprbbi); + + infoPtr->bands = ReAlloc(infoPtr->bands, (infoPtr->uNumBands+1) * sizeof(REBAR_BAND)); + if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands)) + uIndex = infoPtr->uNumBands; + memmove(&infoPtr->bands[uIndex+1], &infoPtr->bands[uIndex], + sizeof(REBAR_BAND) * (infoPtr->uNumBands - uIndex)); infoPtr->uNumBands++; TRACE("index %u!\n", uIndex); /* initialize band (infoPtr->bands[uIndex])*/ lpBand = &infoPtr->bands[uIndex]; - lpBand->fMask = 0; - lpBand->fStatus = 0; + ZeroMemory(lpBand, sizeof(*lpBand)); lpBand->clrFore = infoPtr->clrText; lpBand->clrBack = infoPtr->clrBk; - lpBand->hwndChild = 0; - lpBand->hwndPrevParent = 0; + lpBand->iImage = -1; - REBAR_CommonSetupBand (infoPtr->hwndSelf, lprbbi, lpBand); - lpBand->lpText = NULL; + REBAR_CommonSetupBand(infoPtr->hwndSelf, (LPREBARBANDINFOA)lprbbi, lpBand); if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) { - INT len = MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, NULL, 0 ); - if (len > 1) { - lpBand->lpText = (LPWSTR)Alloc (len*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, lprbbi->lpText, -1, lpBand->lpText, len ); - } + if (bUnicode) + Str_SetPtrW(&lpBand->lpText, lprbbi->lpText); + else + Str_SetPtrAtoW(&lpBand->lpText, (LPSTR)lprbbi->lpText); } REBAR_ValidateBand (infoPtr, lpBand); @@ -3191,88 +3166,7 @@ REBAR_InsertBandA (REBAR_INFO *infoPtr, REBAR_DumpBand (infoPtr); REBAR_Layout (infoPtr, NULL, TRUE, FALSE); - InvalidateRect(infoPtr->hwndSelf, 0, 1); - - return TRUE; -} - - -static LRESULT -REBAR_InsertBandW (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) -{ - LPREBARBANDINFOW lprbbi = (LPREBARBANDINFOW)lParam; - UINT uIndex = (UINT)wParam; - REBAR_BAND *lpBand; - - if (infoPtr == NULL) - return FALSE; - if (lprbbi == NULL) - return FALSE; - if (lprbbi->cbSize < REBARBANDINFOW_V3_SIZE) - return FALSE; - - /* trace the index as signed to see the -1 */ - TRACE("insert band at %d!\n", (INT)uIndex); - REBAR_DumpBandInfo ((LPREBARBANDINFOA)lprbbi); - - if (infoPtr->uNumBands == 0) { - infoPtr->bands = (REBAR_BAND *)Alloc (sizeof (REBAR_BAND)); - uIndex = 0; - } - else { - REBAR_BAND *oldBands = infoPtr->bands; - infoPtr->bands = - (REBAR_BAND *)Alloc ((infoPtr->uNumBands+1)*sizeof(REBAR_BAND)); - if (((INT)uIndex == -1) || (uIndex > infoPtr->uNumBands)) - uIndex = infoPtr->uNumBands; - - /* pre insert copy */ - if (uIndex > 0) { - memcpy (&infoPtr->bands[0], &oldBands[0], - uIndex * sizeof(REBAR_BAND)); - } - - /* post copy */ - if (uIndex <= infoPtr->uNumBands - 1) { - memcpy (&infoPtr->bands[uIndex+1], &oldBands[uIndex], - (infoPtr->uNumBands - uIndex) * sizeof(REBAR_BAND)); - } - - Free (oldBands); - } - - infoPtr->uNumBands++; - - TRACE("index %u!\n", uIndex); - - /* initialize band (infoPtr->bands[uIndex])*/ - lpBand = &infoPtr->bands[uIndex]; - lpBand->fMask = 0; - lpBand->fStatus = 0; - lpBand->clrFore = infoPtr->clrText; - lpBand->clrBack = infoPtr->clrBk; - lpBand->hwndChild = 0; - lpBand->hwndPrevParent = 0; - - REBAR_CommonSetupBand (infoPtr->hwndSelf, (LPREBARBANDINFOA)lprbbi, lpBand); - lpBand->lpText = NULL; - if ((lprbbi->fMask & RBBIM_TEXT) && (lprbbi->lpText)) { - INT len = lstrlenW (lprbbi->lpText); - if (len > 0) { - lpBand->lpText = (LPWSTR)Alloc ((len + 1)*sizeof(WCHAR)); - strcpyW (lpBand->lpText, lprbbi->lpText); - } - } - - REBAR_ValidateBand (infoPtr, lpBand); - /* On insert of second band, revalidate band 1 to possible add gripper */ - if (infoPtr->uNumBands == 2) - REBAR_ValidateBand (infoPtr, &infoPtr->bands[uIndex ? 0 : 1]); - - REBAR_DumpBand (infoPtr); - - REBAR_Layout (infoPtr, NULL, TRUE, FALSE); - InvalidateRect(infoPtr->hwndSelf, 0, 1); + InvalidateRect(infoPtr->hwndSelf, 0, TRUE); return TRUE; } @@ -4657,10 +4551,10 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, return REBAR_IdToIndex (infoPtr, wParam, lParam); case RB_INSERTBANDA: - return REBAR_InsertBandA (infoPtr, wParam, lParam); + return REBAR_InsertBandT(infoPtr, wParam, lParam, FALSE); case RB_INSERTBANDW: - return REBAR_InsertBandW (infoPtr, wParam, lParam); + return REBAR_InsertBandT(infoPtr, wParam, lParam, TRUE); case RB_MAXIMIZEBAND: return REBAR_MaximizeBand (infoPtr, wParam, lParam);

1 0

Huw Davies : wineps.drv: Try to use the PostSript name of a font.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: c0cb341adf307c11e870c9c39e1de28c594f303c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cb341adf307c11e870c9c39… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 1 15:00:44 2007 +0000 wineps.drv: Try to use the PostSript name of a font. --- dlls/wineps.drv/download.c | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 5d35f5d..fdc8a7c 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -52,6 +52,73 @@ static void get_download_name(PSDRV_PDEV { int len; char *p; + DWORD size; + + size = GetFontData(physDev->hdc, MS_MAKE_TAG('n','a','m','e'), 0, NULL, 0); + if(size != 0 && size != GDI_ERROR) + { + BYTE *name = HeapAlloc(GetProcessHeap(), 0, size); + if(name) + { + USHORT count, i; + BYTE *strings; + struct + { + USHORT platform_id; + USHORT encoding_id; + USHORT language_id; + USHORT name_id; + USHORT length; + USHORT offset; + } *name_record; + + GetFontData(physDev->hdc, MS_MAKE_TAG('n','a','m','e'), 0, name, size); + count = GET_BE_WORD(name + 2); + strings = name + GET_BE_WORD(name + 4); + name_record = (typeof(name_record))(name + 6); + for(i = 0; i < count; i++, name_record++) + { + name_record->platform_id = GET_BE_WORD(&name_record->platform_id); + name_record->encoding_id = GET_BE_WORD(&name_record->encoding_id); + name_record->language_id = GET_BE_WORD(&name_record->language_id); + name_record->name_id = GET_BE_WORD(&name_record->name_id); + name_record->length = GET_BE_WORD(&name_record->length); + name_record->offset = GET_BE_WORD(&name_record->offset); + + if(name_record->platform_id == 1 && name_record->encoding_id == 0 && + name_record->language_id == 0 && name_record->name_id == 6) + { + TRACE("Got Mac PS name %s\n", debugstr_an((char*)strings + name_record->offset, name_record->length)); + *str = HeapAlloc(GetProcessHeap(), 0, name_record->length + 1); + memcpy(*str, strings + name_record->offset, name_record->length); + *(*str + name_record->length) = '\0'; + HeapFree(GetProcessHeap(), 0, name); + return; + } + if(name_record->platform_id == 3 && name_record->encoding_id == 1 && + name_record->language_id == 0x409 && name_record->name_id == 6) + { + WCHAR *unicode = HeapAlloc(GetProcessHeap(), 0, name_record->length + 2); + DWORD len; + int c; + + for(c = 0; c < name_record->length / 2; c++) + unicode[c] = GET_BE_WORD(strings + name_record->offset + c * 2); + unicode[c] = 0; + TRACE("Got Windows PS name %s\n", debugstr_w(unicode)); + len = WideCharToMultiByte(1252, 0, unicode, -1, NULL, 0, NULL, NULL); + *str = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(1252, 0, unicode, -1, *str, len, NULL, NULL); + HeapFree(GetProcessHeap(), 0, unicode); + HeapFree(GetProcessHeap(), 0, name); + return; + } + } + TRACE("Unable to find PostScript name\n"); + HeapFree(GetProcessHeap(), 0, name); + } + } + len = strlen((char*)potm + (ptrdiff_t)potm->otmpFullName) + 1; *str = HeapAlloc(GetProcessHeap(),0,len); strcpy(*str, (char*)potm + (ptrdiff_t)potm->otmpFullName);

1 0

Mikołaj Zalewski : comctl32: rebar: Add some tests for rebar and change the way the header size is fixed.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 8909419b55703eba8c0f724182805a4ab100e11e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8909419b55703eba8c0f72418… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Feb 4 23:58:09 2007 +0100 comctl32: rebar: Add some tests for rebar and change the way the header size is fixed. --- dlls/comctl32/rebar.c | 6 +- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/rebar.c | 175 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 181 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index b305863..4cf87bb 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -216,6 +216,9 @@ typedef struct #define BAND_NEEDS_REDRAW 0x00000020 #define CREATE_RUNNING 0x00000040 +/* used by Windows to mark that the header size has been set by the user and shouldn't be changed */ +#define RBBS_UNDOC_FIXEDHEADER 0x40000000 + /* ---- REBAR layout constants. Mostly determined by ---- */ /* ---- experiment on WIN 98. ---- */ @@ -2049,7 +2052,7 @@ REBAR_ValidateBand (REBAR_INFO *infoPtr, } /* check if user overrode the header value */ - if (!(lpBand->fMask & RBBIM_HEADERSIZE)) + if (!(lpBand->fStyle & RBBS_UNDOC_FIXEDHEADER)) lpBand->cxHeader = header; @@ -2210,6 +2213,7 @@ REBAR_CommonSetupBand (HWND hwnd, LPREBA (lpBand->cxHeader != lprbbi->cxHeader ) ) { lpBand->cxHeader = lprbbi->cxHeader; + lpBand->fStyle |= RBBS_UNDOC_FIXEDHEADER; bChanged = TRUE; } } diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index b879575..8a4a55e 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -15,6 +15,7 @@ CTESTS = \ mru.c \ progress.c \ propsheet.c \ + rebar.c \ status.c \ string.c \ subclass.c \ diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c new file mode 100644 index 0000000..4cc6a4e --- /dev/null +++ b/dlls/comctl32/tests/rebar.c @@ -0,0 +1,175 @@ +/* Unit tests for rebar. + * + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> + +#include <windows.h> +#include <commctrl.h> +#include <uxtheme.h> + +#include "wine/test.h" + +static HWND hMainWnd; +static HWND hRebar; + +#define expect_eq(expr, value, type, format) { type ret = expr; ok((value) == ret, #expr " expected " format " got " format "\n", (value), (ret)); } + +static void rebuild_rebar(HWND *hRebar) +{ + if (hRebar) + DestroyWindow(*hRebar); + + *hRebar = CreateWindow(REBARCLASSNAME, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hMainWnd, (HMENU)17, GetModuleHandle(NULL), NULL); + SendMessageA(*hRebar, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0); +} + +static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hWnd, msg, wParam, lParam); +} + +static void expect_band_content(UINT uBand, UINT fStyle, COLORREF clrFore, + COLORREF clrBack, LPCSTR lpText, int iImage, HWND hwndChild, + UINT cxMinChild, UINT cyMinChild, UINT cx, HBITMAP hbmBack, UINT wID, + /*UINT cyChild, UINT cyMaxChild, UINT cyIntegral,*/ UINT cxIdeal, LPARAM lParam, + UINT cxHeader) +{ + CHAR buf[MAX_PATH] = "abc"; + REBARBANDINFO rb; + + memset(&rb, 0xdd, sizeof(rb)); + rb.cbSize = sizeof(rb); + rb.fMask = RBBIM_BACKGROUND | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_COLORS + | RBBIM_HEADERSIZE | RBBIM_ID | RBBIM_IDEALSIZE | RBBIM_IMAGE | RBBIM_LPARAM + | RBBIM_SIZE | RBBIM_STYLE | RBBIM_TEXT; + rb.lpText = buf; + rb.cch = MAX_PATH; + ok(SendMessageA(hRebar, RB_GETBANDINFOA, uBand, (LPARAM)&rb), "RB_GETBANDINFO failed\n"); + expect_eq(rb.fStyle, fStyle, int, "%x"); + todo_wine expect_eq(rb.clrFore, clrFore, COLORREF, "%x"); + todo_wine expect_eq(rb.clrBack, clrBack, int, "%x"); + expect_eq(strcmp(rb.lpText, lpText), 0, int, "%d"); + expect_eq(rb.iImage, iImage, int, "%x"); + expect_eq(rb.hwndChild, hwndChild, HWND, "%p"); + expect_eq(rb.cxMinChild, cxMinChild, int, "%d"); + expect_eq(rb.cyMinChild, cyMinChild, int, "%d"); + expect_eq(rb.cx, cx, int, "%d"); + expect_eq(rb.hbmBack, hbmBack, HBITMAP, "%p"); + expect_eq(rb.wID, wID, int, "%d"); + /* in Windows the values of cyChild, cyMaxChild and cyIntegral can't be read */ + todo_wine expect_eq(rb.cyChild, 0xdddddddd, int, "%x"); + todo_wine expect_eq(rb.cyMaxChild, 0xdddddddd, int, "%x"); + todo_wine expect_eq(rb.cyIntegral, 0xdddddddd, int, "%x"); + expect_eq(rb.cxIdeal, cxIdeal, int, "%d"); + expect_eq(rb.lParam, lParam, LPARAM, "%lx"); + expect_eq(rb.cxHeader, cxHeader, int, "%d"); +} + +static void bandinfo_test() +{ + REBARBANDINFOA rb; + CHAR szABC[] = "ABC"; + CHAR szABCD[] = "ABCD"; + + rebuild_rebar(&hRebar); + rb.cbSize = sizeof(REBARBANDINFO); + rb.fMask = 0; + ok(SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0, 0, 0); + + rb.fMask = RBBIM_CHILDSIZE; + rb.cxMinChild = 15; + rb.cyMinChild = 20; + rb.cyChild = 30; + rb.cyMaxChild = 20; + rb.cyIntegral = 10; + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 15, 20, 0, NULL, 0, 0, 0, 0); + + rb.fMask = RBBIM_TEXT; + rb.lpText = szABC; + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0, 0, 35); + + rb.cbSize = sizeof(REBARBANDINFO); + rb.fMask = 0; + ok(SendMessageA(hRebar, RB_INSERTBANDA, 1, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + expect_band_content(1, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 0, 0, 0, NULL, 0, 0, 0, 9); + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0, 0, 40); + + rb.fMask = RBBIM_HEADERSIZE; + rb.cxHeader = 50; + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0, 0, 50); + + rb.cxHeader = 5; + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0, 0, 5); + + rb.fMask = RBBIM_TEXT; + rb.lpText = szABCD; + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABCD", -1, NULL, 15, 20, 0, NULL, 0, 0, 0, 5); + rb.fMask = RBBIM_STYLE | RBBIM_TEXT; + rb.fStyle = 0; + rb.lpText = szABC; + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0, 0, 40); + + DestroyWindow(hRebar); +} + +START_TEST(rebar) +{ + INITCOMMONCONTROLSEX icc; + WNDCLASSA wc; + MSG msg; + RECT rc; + + icc.dwSize = sizeof(icc); + icc.dwICC = ICC_COOL_CLASSES; + InitCommonControlsEx(&icc); + + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = GetModuleHandleA(NULL); + wc.hIcon = NULL; + wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_IBEAM)); + wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); + wc.lpszMenuName = NULL; + wc.lpszClassName = "MyTestWnd"; + wc.lpfnWndProc = MyWndProc; + RegisterClassA(&wc); + + hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + GetClientRect(hMainWnd, &rc); + ShowWindow(hMainWnd, SW_SHOW); + + bandinfo_test(); + PostQuitMessage(0); + while(GetMessageA(&msg,0,0,0)) { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + DestroyWindow(hMainWnd); +}

1 0

James Hawkins : msi: Allow uncompressed files before compressed files in the same media.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 30577c253a7095184e00a4881c7d05d8a4cb5636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30577c253a7095184e00a4881… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Feb 3 22:54:42 2007 -0600 msi: Allow uncompressed files before compressed files in the same media. --- dlls/msi/files.c | 7 +++++- dlls/msi/tests/install.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index a4819fc..9af403f 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -64,6 +64,7 @@ struct media_info { LPWSTR cabinet; LPWSTR volume_label; BOOL is_continuous; + BOOL is_extracted; WCHAR source[MAX_PATH]; }; @@ -434,6 +435,9 @@ done: msi_free(cabinet); msi_free(cab_path); + if (ret) + mi->is_extracted = TRUE; + return ret; } @@ -715,7 +719,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac if (file->state != msifs_missing && file->state != msifs_overwrite) continue; - if (file->Sequence > mi->last_sequence || mi->is_continuous) + if (file->Sequence > mi->last_sequence || mi->is_continuous || + (file->IsCompressed && !mi->is_extracted)) { rc = ready_media(package, file, mi); if (rc != ERROR_SUCCESS) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 1c0fb6a..00b7763 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -202,6 +202,18 @@ static const CHAR co2_media_dat[] = "Dis "2\t12\t\ttest3.cab\tDISK3\t\n" "3\t2\t\ttest2.cab\tDISK2\t\n"; +static const CHAR mm_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t512\t1\n" + "augustus\taugustus\taugustus\t500\t\t\t512\t2\n" + "caesar\tcaesar\tcaesar\t500\t\t\t16384\t3"; + +static const CHAR mm_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t3\t\ttest1.cab\tDISK1\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -262,6 +274,18 @@ static const msi_table co2_tables[] = ADD_TABLE(property), }; +static const msi_table mm_tables[] = +{ + ADD_TABLE(cc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(mm_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(mm_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -967,6 +991,36 @@ static void test_caborder(void) DeleteFile(msifile); } +static void test_mixedmedia(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\maximus", 500); + create_file("msitest\\augustus", 500); + create_file("caesar", 500); + + create_database(msifile, mm_tables, sizeof(mm_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + create_cab_file("test1.cab", MEDIA_SIZE, "caesar\0"); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile("maximus"); + DeleteFile("augustus"); + DeleteFile("caesar"); + RemoveDirectory("msitest"); + DeleteFile("test1.cab"); + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -989,6 +1043,7 @@ START_TEST(install) test_packagecoltypes(); test_continuouscabs(); test_caborder(); + test_mixedmedia(); SetCurrentDirectoryA(prev_path); }

1 0

Huw Davies : winspool.drv: We don' t need to check for the PPD Files key before using /etc/printcap.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 37b671c59a822b0087bcebca678de90d02923a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b671c59a822b0087bcebca6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 30 21:27:11 2007 +0000 winspool.drv: We don't need to check for the PPD Files key before using /etc/printcap. --- dlls/winspool.drv/info.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 2b96f45..73bd574 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1651,15 +1651,8 @@ void WINSPOOL_LoadSystemPrinters(void) done = CUPS_LoadPrinters(); #endif - if(!done) { /* If we have any CUPS based printers, skip looking for printcap printers */ - /* Check for [ppd] section in config file before parsing /etc/printcap */ - /* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */ - if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files", - &hkey) == ERROR_SUCCESS) { - RegCloseKey(hkey); - PRINTCAP_LoadPrinters(); - } - } + if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */ + PRINTCAP_LoadPrinters(); /* Now enumerate the list again and delete any printers that a still tagged */ EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num);

1 0

Huw Davies : oleaut32: Fix marshaling of VARTYPE-less safearrays.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: 2dd3aa6293ef6b45be2fd69db81205d67cfb2252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd3aa6293ef6b45be2fd69db… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 30 12:39:37 2007 +0000 oleaut32: Fix marshaling of VARTYPE-less safearrays. --- dlls/oleaut32/tests/usrmarshal.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/oleaut32/usrmarshal.c | 25 +++++++++++++++++++++---- 2 files changed, 57 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index e3f0065..9bc282d 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -46,7 +46,16 @@ static inline SF_TYPE get_union_type(SAF hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) - return 0; + { + switch(psa->cbElements) + { + case 1: vt = VT_I1; break; + case 2: vt = VT_I2; break; + case 4: vt = VT_I4; break; + case 8: vt = VT_I8; break; + default: return 0; + } + } if (psa->fFeatures & FADF_HAVEIID) return SF_HAVEIID; @@ -111,7 +120,9 @@ static void check_safearray(void *buffer return; } - SafeArrayGetVartype(lpsa, &vt); + if(FAILED(SafeArrayGetVartype(lpsa, &vt))) + vt = 0; + sftype = get_union_type(lpsa); cell_count = get_cell_count(lpsa); @@ -159,6 +170,8 @@ static void test_marshal_LPSAFEARRAY(voi SAFEARRAYBOUND sab; MIDL_STUB_MESSAGE stubMsg = { 0 }; USER_MARSHAL_CB umcb = { 0 }; + HRESULT hr; + VARTYPE vt; umcb.Flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); umcb.pReserve = NULL; @@ -228,6 +241,27 @@ static void test_marshal_LPSAFEARRAY(voi HeapFree(GetProcessHeap(), 0, buffer); SafeArrayDestroy(lpsa); + + /* VARTYPE-less arrays can be marshaled if cbElements is 1,2,4 or 8 as type SF_In */ + hr = SafeArrayAllocDescriptor(1, &lpsa); + ok(hr == S_OK, "saad failed %08x\n", hr); + lpsa->cbElements = 8; + lpsa->rgsabound[0].lLbound = 2; + lpsa->rgsabound[0].cElements = 48; + hr = SafeArrayAllocData(lpsa); + ok(hr == S_OK, "saad failed %08x\n", hr); + + hr = SafeArrayGetVartype(lpsa, &vt); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); + ok(size == 432, "size %ld\n", size); + buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size); + LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + check_safearray(buffer, lpsa); + HeapFree(GetProcessHeap(), 0, buffer); + SafeArrayDestroyData(lpsa); + SafeArrayDestroyDescriptor(lpsa); } static void check_bstr(void *buffer, BSTR b) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 02a3ed9..71d7d6b 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -696,7 +696,17 @@ static inline SF_TYPE SAFEARRAY_GetUnion hr = SafeArrayGetVartype(psa, &vt); if (FAILED(hr)) - RpcRaiseException(hr); + { + switch(psa->cbElements) + { + case 1: vt = VT_I1; break; + case 2: vt = VT_I2; break; + case 4: vt = VT_I4; break; + case 8: vt = VT_I8; break; + default: + RpcRaiseException(hr); + } + } if (psa->fFeatures & FADF_HAVEIID) return SF_HAVEIID; @@ -846,8 +856,8 @@ unsigned char * WINAPI LPSAFEARRAY_UserM wiresa->cbElements = psa->cbElements; hr = SafeArrayGetVartype(psa, &vt); - if (FAILED(hr)) - RpcRaiseException(hr); + if (FAILED(hr)) vt = 0; + wiresa->cLocks = (USHORT)psa->cLocks | (vt << 16); Buffer += FIELD_OFFSET(struct _wireSAFEARRAY, uArrayStructs); @@ -996,7 +1006,14 @@ unsigned char * WINAPI LPSAFEARRAY_UserU wiresab = (SAFEARRAYBOUND *)Buffer; Buffer += sizeof(wiresab[0]) * wiresa->cDims; - *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); + if(vt) + *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); + else + { + SafeArrayAllocDescriptor(wiresa->cDims, ppsa); + if(*ppsa) + memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims); + } if (!*ppsa) RpcRaiseException(E_OUTOFMEMORY);

1 0

Michael Stefaniuc : msvcrt: Fix *printf() handling of negative field width.
by Alexandre Julliard Feb. 5, 2007

Feb. 5, 2007

Module: wine Branch: master Commit: bbe9c51b31e8a5d7f91853350552e63ffc638de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe9c51b31e8a5d7f91853350… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 29 23:53:46 2007 +0100 msvcrt: Fix *printf() handling of negative field width. --- dlls/msvcrt/tests/printf.c | 5 +++++ dlls/msvcrt/wcs.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 53d88f4..23cc5c8 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -279,6 +279,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"f"),"Precision ignored \"%s\"\n",buffer); ok( r==1, "return count wrong\n"); + format = "%*s"; + r = sprintf(buffer,format,-5,"foo"); + ok(!strcmp(buffer,"foo "),"Negative field width ignored \"%s\"\n",buffer); + ok( r==5, "return count wrong\n"); + format = "%#-012p"; r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index ad3887f..32668a3 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -568,9 +568,14 @@ static int pf_vsnprintf( pf_output *out, /* deal with the field width specifier */ flags.FieldLength = 0; - if( *p == '*' ) + if( *p == '*' ) { flags.FieldLength = va_arg( valist, int ); + if (flags.FieldLength < 0) + { + flags.LeftAlign = '-'; + flags.FieldLength = -flags.FieldLength; + } p++; } else while( isdigit(*p) )

1 0