[ros-diffs] [gedmurphy] 21401: 20060328 vendor drop

Author: gedmurphy
Date: Tue Mar 28 17:29:37 2006
New Revision: 21401

URL: http://svn.reactos.ru/svn/reactos?rev=21401&view=rev
Log:
20060328 vendor drop

Modified:
    vendor/wine/dlls/comctl32/current/comctl32undoc.c
    vendor/wine/dlls/comctl32/current/listview.c
    vendor/wine/dlls/comctl32/current/rebar.c
    vendor/wine/dlls/comctl32/current/tab.c
    vendor/wine/dlls/comctl32/current/tooltips.c

Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c
URL:
http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/comctl32/current/comctl3…
==============================================================================
--- vendor/wine/dlls/comctl32/current/comctl32undoc.c (original)
+++ vendor/wine/dlls/comctl32/current/comctl32undoc.c Tue Mar 28 17:29:37 2006
@@ -386,10 +386,8 @@
     UINT i;
     LPSTR dataA = NULL;
 
-    if (!mp->extview.lpfnCompare) {
-	ERR("MRU list not properly created. No compare procedure.\n");
+    if (!mp->extview.lpfnCompare)
 	return -1;
-    }
 
     if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) {
         DWORD len = WideCharToMultiByte(CP_ACP, 0, lpData, -1,

Modified: vendor/wine/dlls/comctl32/current/listview.c
URL:
http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/comctl32/current/listvie…
==============================================================================
--- vendor/wine/dlls/comctl32/current/listview.c (original)
+++ vendor/wine/dlls/comctl32/current/listview.c Tue Mar 28 17:29:37 2006
@@ -6740,7 +6740,7 @@
 	    hdi.mask = HDI_TEXT;
 	    hdi.cchTextMax = DISP_TEXT_SIZE;
 	    hdi.pszText = szDispText;
-	    if (Header_GetItemW(infoPtr->hwndHeader, nColumn, (LPARAM)&hdi))
+	    if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdi))
 	    {
 		HDC hdc = GetDC(infoPtr->hwndSelf);
 		HFONT old_font = SelectObject(hdc, (HFONT)SendMessageW(infoPtr->hwndHeader,
WM_GETFONT, 0, 0));
@@ -6762,7 +6762,7 @@
     hdi.mask = HDI_WIDTH;
     hdi.cxy = cx;
     TRACE("hdi.cxy=%d\n", hdi.cxy);
-    return Header_SetItemW(infoPtr->hwndHeader, nColumn, (LPARAM)&hdi);
+    return Header_SetItemW(infoPtr->hwndHeader, nColumn, &hdi);
 }
 
 /***
@@ -8385,7 +8385,7 @@
     		HDITEMW hdi;
     
 		hdi.mask = HDI_WIDTH;
-    		if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, (LPARAM)&hdi))
return 0;
+    		if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, &hdi)) return 0;
 		cxy = hdi.cxy;
 	    }
 	    else

Modified: vendor/wine/dlls/comctl32/current/rebar.c
URL:
http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/comctl32/current/rebar.c…
==============================================================================
--- vendor/wine/dlls/comctl32/current/rebar.c (original)
+++ vendor/wine/dlls/comctl32/current/rebar.c Tue Mar 28 17:29:37 2006
@@ -1920,7 +1920,7 @@
 	y = clientcy;
     }
     if (infoPtr->dwStyle & CCS_VERT) {
-        if( x < REBAR_MINSIZE )
+        if( infoPtr->uNumBands != 0 && x < REBAR_MINSIZE )
             x = REBAR_MINSIZE;
 	infoPtr->calcSize.cx = x;
 	infoPtr->calcSize.cy = clientcy;
@@ -1929,7 +1929,7 @@
 	if (notify && (x != origheight)) infoPtr->fStatus |= NTF_HGHTCHG;
     }
     else {
-        if( y < REBAR_MINSIZE )
+        if( infoPtr->uNumBands != 0 && y < REBAR_MINSIZE )
             y = REBAR_MINSIZE;
 	infoPtr->calcSize.cx = clientcx;
 	infoPtr->calcSize.cy = y;

Modified: vendor/wine/dlls/comctl32/current/tab.c
URL:
http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/comctl32/current/tab.c?r…
==============================================================================
--- vendor/wine/dlls/comctl32/current/tab.c (original)
+++ vendor/wine/dlls/comctl32/current/tab.c Tue Mar 28 17:29:37 2006
@@ -1747,13 +1747,19 @@
       if(lStyle & TCS_VERTICAL)
       {
         center_offset_h = ((drawRect->bottom - drawRect->top) - (cy +
infoPtr->uHItemPadding + (rcText.right  - rcText.left))) / 2;
-        center_offset_v = ((drawRect->right - drawRect->left) - (cx +
infoPtr->uVItemPadding)) / 2;
+        center_offset_v = (drawRect->left + (drawRect->right - drawRect->left) -
cx) / 2;
       }
       else
       {
         center_offset_h = ((drawRect->right - drawRect->left) - (cx +
infoPtr->uHItemPadding + (rcText.right  - rcText.left))) / 2;
-        center_offset_v = ((drawRect->bottom - drawRect->top) - (cy +
infoPtr->uVItemPadding)) / 2;
+        center_offset_v = (drawRect->top + (drawRect->bottom - drawRect->top) -
cy) / 2;
       }
+
+      /* if an item is selected, the icon is shifted up instead of down */
+      if (iItem == infoPtr->iSelected)
+        center_offset_v -= infoPtr->uVItemPadding / 2;
+      else
+        center_offset_v += infoPtr->uVItemPadding / 2;
 
       if (lStyle & TCS_FIXEDWIDTH && lStyle & (TCS_FORCELABELLEFT |
TCS_FORCEICONLEFT))
 	center_offset_h = infoPtr->uHItemPadding;

Modified: vendor/wine/dlls/comctl32/current/tooltips.c
URL:
http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/comctl32/current/tooltip…
==============================================================================
--- vendor/wine/dlls/comctl32/current/tooltips.c (original)
+++ vendor/wine/dlls/comctl32/current/tooltips.c Tue Mar 28 17:29:37 2006
@@ -2025,7 +2025,8 @@
 	else {
 	    if ( (toolPtr->lpszText) &&
 		 !IS_INTRESOURCE(toolPtr->lpszText) ) {
-		Free (toolPtr->lpszText);
+		if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+                    Free (toolPtr->lpszText);
 		toolPtr->lpszText = NULL;
 	    }
 	    if (lpToolInfo->lpszText) {
@@ -2082,7 +2083,8 @@
 	else {
 	    if ( (toolPtr->lpszText) &&
 		 !IS_INTRESOURCE(toolPtr->lpszText) ) {
-		Free (toolPtr->lpszText);
+		if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+                    Free (toolPtr->lpszText);
 		toolPtr->lpszText = NULL;
 	    }
 	    if (lpToolInfo->lpszText) {
@@ -2208,7 +2210,8 @@
 	else {
 	    if ( (toolPtr->lpszText) &&
 		 !IS_INTRESOURCE(toolPtr->lpszText) ) {
-		Free (toolPtr->lpszText);
+		if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+                    Free (toolPtr->lpszText);
 		toolPtr->lpszText = NULL;
 	    }
 	    if (lpToolInfo->lpszText) {
@@ -2265,7 +2268,8 @@
 	else {
 	    if ( (toolPtr->lpszText)  &&
 		 !IS_INTRESOURCE(toolPtr->lpszText) ) {
-		Free (toolPtr->lpszText);
+		if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
+                    Free (toolPtr->lpszText);
 		toolPtr->lpszText = NULL;
 	    }
 	    if (lpToolInfo->lpszText) {