[ros-dev] [ros-diffs] [winesync] 23203: Autosyncing with Wine HEAD
Aleksey Bragin
aleksey at studiocerebral.com
Fri Jul 21 14:23:56 CEST 2006
Hi Ged,
the first and most important thing about autosyncing is that we keep
all our ReactOS-specific changes in a DLLNAME_ros.diff file, so for
comctl32 it is the file comctl32_ros.diff.
So, for now this file (it is in SVN repository in the same folder)
has two changes:
1) Adding autoregistration to .rbuild (it's a must for us)
2) Add a hack into listview.c which changes a call to ImageList_DrawEx
() to a ImageList_Draw() call
If you could provide me a hint what went wrong in this update
"already", I will fix it. Or just properly add them to
comctl32_ros.diff and they will be kept as long as we need them.
I reviewed all changes manually, rbuild is correct, .rc changes are
correct and have corresponding counterpart in propsheet.c, and
listview.c changes are actual improvements by Wine, and can't be
considered a regression unless something from our side is really
broken a lot.
WBR,
Aleksey Bragin
On Jul 21, 2006, at 3:45 PM, Murphy, Ged (Bolton) wrote:
> I would prefer it if I could keep comctl32 up to date manually.
> I don't really trust the synching tool, I can see things it's done
> wrong
> with this merge already....
>
> I'll try fixing it later tonight.
>
>
> -----Original Message-----
> From: winesync at svn.reactos.org [mailto:winesync at svn.reactos.org]
> Sent: 21 July 2006 12:30
> To: ros-diffs at reactos.org
> Subject: [ros-diffs] [winesync] 23203: Autosyncing with Wine HEAD
>
>
> Author: winesync
> Date: Fri Jul 21 15:30:20 2006
> New Revision: 23203
>
> URL: http://svn.reactos.org/svn/reactos?rev=23203&view=rev
> Log:
> Autosyncing with Wine HEAD
>
> Added:
> trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (with props)
> Modified:
> trunk/reactos/dll/win32/comctl32/comctl32.rbuild
> trunk/reactos/dll/win32/comctl32/comctl_Bg.rc
> trunk/reactos/dll/win32/comctl32/comctl_Cn.rc
> trunk/reactos/dll/win32/comctl32/comctl_Cs.rc
> trunk/reactos/dll/win32/comctl32/comctl_De.rc
> trunk/reactos/dll/win32/comctl32/comctl_En.rc
> trunk/reactos/dll/win32/comctl32/comctl_Eo.rc
> trunk/reactos/dll/win32/comctl32/comctl_Es.rc
> trunk/reactos/dll/win32/comctl32/comctl_Fr.rc
> trunk/reactos/dll/win32/comctl32/comctl_Hu.rc
> trunk/reactos/dll/win32/comctl32/comctl_It.rc
> trunk/reactos/dll/win32/comctl32/comctl_Ja.rc
> trunk/reactos/dll/win32/comctl32/comctl_Ko.rc
> trunk/reactos/dll/win32/comctl32/comctl_Nl.rc
> trunk/reactos/dll/win32/comctl32/comctl_No.rc
> trunk/reactos/dll/win32/comctl32/comctl_Pl.rc
> trunk/reactos/dll/win32/comctl32/comctl_Pt.rc
> trunk/reactos/dll/win32/comctl32/comctl_Ru.rc
> trunk/reactos/dll/win32/comctl32/comctl_Si.rc
> trunk/reactos/dll/win32/comctl32/comctl_Sv.rc
> trunk/reactos/dll/win32/comctl32/comctl_Th.rc
> trunk/reactos/dll/win32/comctl32/comctl_Tr.rc
> trunk/reactos/dll/win32/comctl32/comctl_Uk.rc
> trunk/reactos/dll/win32/comctl32/listview.c
> trunk/reactos/dll/win32/comctl32/propsheet.c
> trunk/reactos/dll/win32/comctl32/trackbar.c
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl32
> .rbuild?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild Fri Jul 21
> 15:30:20
> 2006
> @@ -4,18 +4,19 @@
> <include base="comctl32">.</include>
> <include base="ReactOS">include/reactos/wine</include>
> <define name="__REACTOS__" />
> + <define name="__WINESRC__" />
> <define name="__USE_W32API" />
> <define name="_WIN32_IE">0x600</define>
> <define name="_WIN32_WINNT">0x501</define>
> <define name="WINVER">0x501</define>
> <library>wine</library>
> + <library>user32</library>
> + <library>gdi32</library>
> + <library>advapi32</library>
> + <library>kernel32</library>
> + <library>winmm</library>
> + <library>uxtheme</library>
> <library>ntdll</library>
> - <library>kernel32</library>
> - <library>advapi32</library>
> - <library>gdi32</library>
> - <library>user32</library>
> - <library>uxtheme</library>
> - <library>winmm</library>
> <file>animate.c</file>
> <file>comboex.c</file>
> <file>comctl32undoc.c</file>
> @@ -37,8 +38,8 @@
> <file>propsheet.c</file>
> <file>rebar.c</file>
> <file>smoothscroll.c</file>
> + <file>status.c</file>
> <file>string.c</file>
> - <file>status.c</file>
> <file>syslink.c</file>
> <file>tab.c</file>
> <file>theme_combo.c</file>
>
> Added: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl32
> _ros.diff?rev=23203&view=auto
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (added)
> +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Fri Jul 21
> 15:30:20
> 2006
> @@ -1,0 +1,26 @@
> +Index: comctl32.rbuild
> +===================================================================
> +--- comctl32.rbuild (revision 23123)
> ++++ comctl32.rbuild (working copy)
> +@@ -1,4 +1,5 @@
> + <module name="comctl32" type="win32dll"
> baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32"
> installname="comctl32.dll" allowwarnings="true">
> ++ <autoregister infsection="OleControlDlls" type="DllInstall" />
> + <importlibrary definition="comctl32.spec.def" />
> + <include base="comctl32">.</include>
> + <include base="ReactOS">include/reactos/wine</include>
> +Index: listview.c
> +===================================================================
> +--- listview.c (revision 23123)
> ++++ listview.c (working copy)
> +@@ -3770,9 +3770,8 @@
> + if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon))
> + {
> + TRACE("iImage=%d\n", lvItem.iImage);
> ++ ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left,
> rcIcon.top,
> ++ (lvItem.state & LVIS_SELECTED) && (infoPtr-
> >bFocus)
> ? ILD_SELECTED : ILD_NORMAL);
> +- ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left,
> rcIcon.top,
> +- rcIcon.right - rcIcon.left, rcIcon.bottom -
> rcIcon.top, infoPtr->clrBk, CLR_DEFAULT,
> +- (lvItem.state & LVIS_SELECTED) &&
> (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
> + }
> +
> + /* Don't bother painting item being edited */
>
> Propchange: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
> ----------------------------------------------------------------------
> ------
> --
> svn:eol-style = native
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_B
> g.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Bg.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Bg.rc Fri Jul 21
> 15:30:20 2006
> @@ -22,7 +22,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Ñâîéñòâà íà "
> +CAPTION "Ñâîéñòâà íà %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_C
> n.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Cn.rc Fri Jul 21
> 15:30:20 2006
> @@ -21,7 +21,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "ÊôÐÔ "
> +CAPTION "ÊôÐÔ %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_C
> s.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Cs.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Cs.rc Fri Jul 21
> 15:30:20 2006
> @@ -26,7 +26,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Vlastnosti "
> +CAPTION "Vlastnosti %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_D
> e.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_De.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_De.rc Fri Jul 21
> 15:30:20 2006
> @@ -41,7 +41,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Eigenschaften für "
> +CAPTION "Eigenschaften für %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_E
> n.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_En.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_En.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Properties for "
> +CAPTION "Properties for %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_E
> o.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Eo.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Ecoj laý "
> +CAPTION "Ecoj laý %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_E
> s.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Es.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Es.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Propiedades de "
> +CAPTION "Propiedades de %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_F
> r.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Fr.rc Fri Jul 21
> 15:30:20 2006
> @@ -24,7 +24,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Propriétés pour "
> +CAPTION "Propriétés pour %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_H
> u.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Hu.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Hu.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Tulajdonságok: "
> +CAPTION "Tulajdonságok: %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_I
> t.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_It.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_It.rc Fri Jul 21
> 15:30:20 2006
> @@ -21,7 +21,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Proprietà per "
> +CAPTION "Proprietà per %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_J
> a.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Ja.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Ja.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Properties for "
> +CAPTION "Properties for %s"
> FONT 9, "MS UI Gothic"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_K
> o.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Ko.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Ko.rc Fri Jul 21
> 15:30:20 2006
> @@ -21,7 +21,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "¼Ó¼º"
> +CAPTION "%s ¼Ó¼º"
> FONT 9, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
> @@ -54,11 +54,11 @@
> FONT 9, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14
> - PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14
> + PUSHBUTTON "´Ù½Ã(&E)", IDC_RESET_BTN,308,23,44,14
> PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14
> PUSHBUTTON "À§·Î À̵¿(&U)", IDC_MOVEUP_BTN,308,74,44,14
> PUSHBUTTON "¾Æ·¡·Î À̵¿(&D)", IDC_MOVEDN_BTN,308,91,44,14
> - LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10
> + LTEXT "°¡´ÉÇÑ ¹öÆ°(&V)", -1,4,5,84,10
> LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY |
> LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT |
> LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
> PUSHBUTTON "´õÇϱâ(&A) ->", IDOK, 131, 42, 44, 14
> PUSHBUTTON "<- Á¦°ÅÇϱâ(&R)", IDC_REMOVE_BTN,131,62,44,14
> @@ -81,3 +81,8 @@
> {
> IDS_SEPARATOR "ºÐ¸®ÀÚ"
> }
> +
> +STRINGTABLE DISCARDABLE
> +{
> + HKY_NONE "¾øÀ½"
> +}
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_N
> l.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Nl.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Nl.rc Fri Jul 21
> 15:30:20 2006
> @@ -22,7 +22,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Eigenschappen van "
> +CAPTION "Eigenschappen van %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_N
> o.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_No.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_No.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Egenskaper for "
> +CAPTION "Egenskaper for %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_P
> l.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Pl.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Pl.rc Fri Jul 21
> 15:30:20 2006
> @@ -21,7 +21,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "W³aœciwoœci "
> +CAPTION "W³aœciwoœci %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_P
> t.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Pt.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Propriedades para "
> +CAPTION "Propriedades para %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_R
> u.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Ru.rc Fri Jul 21
> 15:30:20 2006
> @@ -22,7 +22,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Ñâîéñòâà äëÿ "
> +CAPTION "Ñâîéñòâà äëÿ %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_S
> i.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Si.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Si.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Lastnosti"
> +CAPTION "Lastnosti %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_S
> v.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Sv.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Sv.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Egenskaper för "
> +CAPTION "Egenskaper för %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_T
> h.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Th.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Th.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ "
> +CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_T
> r.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Tr.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Tr.rc Fri Jul 21
> 15:30:20 2006
> @@ -20,7 +20,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Özellikler: "
> +CAPTION "Özellikler: %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "Tamam", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> comctl_U
> k.rc?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (original)
> +++ trunk/reactos/dll/win32/comctl32/comctl_Uk.rc Fri Jul 21
> 15:30:20 2006
> @@ -22,7 +22,7 @@
>
> IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
> STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION |
> WS_SYSMENU |
> WS_VISIBLE
> -CAPTION "Âëàñòèâîñò³ äëÿ "
> +CAPTION "Âëàñòèâîñò³ äëÿ %s"
> FONT 8, "MS Shell Dlg"
> BEGIN
> DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
>
> Modified: trunk/reactos/dll/win32/comctl32/listview.c
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> listview
> .c?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/listview.c (original)
> +++ trunk/reactos/dll/win32/comctl32/listview.c Fri Jul 21 15:30:20
> 2006
> @@ -3770,8 +3770,8 @@
> if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon))
> {
> TRACE("iImage=%d\n", lvItem.iImage);
> - ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
> - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus)
> ? ILD_SELECTED : ILD_NORMAL);
> + ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left,
> rcIcon.top,
> + (lvItem.state & LVIS_SELECTED) && (infoPtr-
> >bFocus)
> ? ILD_SELECTED : ILD_NORMAL);
> }
>
> /* Don't bother painting item being edited */
> @@ -5617,9 +5617,11 @@
> {
> POINT Position;
> LVITEMW lvItem;
> - INT nColumn = lprc->top;
> + INT nColumn;
>
> if (!lprc) return FALSE;
> +
> + nColumn = lprc->top;
>
> TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top);
> /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */
> @@ -6274,7 +6276,13 @@
> memcpy(&item, lpLVItem, offsetof( LVITEMW, iIndent ));
> }
> item.iItem = nItem;
> - if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) item.state &=
> ~LVIS_STATEIMAGEMASK;
> + if (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)
> + {
> + item.mask |= LVIF_STATE;
> + item.stateMask |= LVIS_STATEIMAGEMASK;
> + item.state &= ~LVIS_STATEIMAGEMASK;
> + item.state |= INDEXTOSTATEIMAGEMASK(1);
> + }
> if (!set_main_item(infoPtr, &item, TRUE, isW, &has_changed))
> goto undo;
>
> /* if we're sorted, sort the list, and update the index */
> @@ -6592,6 +6600,7 @@
>
> /* make space for the new column */
> LISTVIEW_ScrollColumns(infoPtr, nNewColumn + 1,
> lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left);
> + LISTVIEW_UpdateItemSize(infoPtr);
>
> return nNewColumn;
>
> @@ -6871,7 +6880,15 @@
> {
> HIMAGELIST himl = 0;
> if(infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)
> + {
> + LVITEMW item;
> + item.mask = LVIF_STATE;
> + item.stateMask = LVIS_STATEIMAGEMASK;
> + item.state = INDEXTOSTATEIMAGEMASK(1);
> + LISTVIEW_SetItemState(infoPtr, -1, &item);
> +
> himl = LISTVIEW_CreateCheckBoxIL(infoPtr);
> + }
> LISTVIEW_SetImageList(infoPtr, LVSIL_STATE, himl);
> }
>
>
> Modified: trunk/reactos/dll/win32/comctl32/propsheet.c
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> propshee
> t.c?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/propsheet.c (original)
> +++ trunk/reactos/dll/win32/comctl32/propsheet.c Fri Jul 21
> 15:30:20 2006
> @@ -2151,8 +2151,7 @@
> int lenprop = strlenW(psInfo->strPropertiesFor);
>
> dest = Alloc( (lentitle + lenprop + 1)*sizeof (WCHAR));
> - strcpyW(dest, psInfo->strPropertiesFor);
> - strcatW(dest, lpszText);
> + wsprintfW(dest, psInfo->strPropertiesFor, lpszText);
>
> SetWindowTextW(hwndDlg, dest);
> Free(dest);
>
> Modified: trunk/reactos/dll/win32/comctl32/trackbar.c
> URL:
> http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/
> trackbar
> .c?rev=23203&r1=23202&r2=23203&view=diff
> ======================================================================
> ======
> ==
> --- trunk/reactos/dll/win32/comctl32/trackbar.c (original)
> +++ trunk/reactos/dll/win32/comctl32/trackbar.c Fri Jul 21 15:30:20
> 2006
> @@ -237,7 +237,7 @@
> return 0;
> }
>
> -static void inline
> +inline static void
> TRACKBAR_PageDown (TRACKBAR_INFO *infoPtr)
> {
> if (infoPtr->lPos == infoPtr->lRangeMax) return;
> @@ -249,7 +249,7 @@
> }
>
>
> -static void inline
> +inline static void
> TRACKBAR_PageUp (TRACKBAR_INFO *infoPtr)
> {
> if (infoPtr->lPos == infoPtr->lRangeMin) return;
> @@ -260,7 +260,7 @@
> notify_with_scroll (infoPtr, TB_PAGEUP);
> }
>
> -static void inline TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
> +inline static void TRACKBAR_LineUp(TRACKBAR_INFO *infoPtr)
> {
> if (infoPtr->lPos == infoPtr->lRangeMin) return;
> infoPtr->lPos -= infoPtr->lLineSize;
> @@ -269,7 +269,7 @@
> notify_with_scroll (infoPtr, TB_LINEUP);
> }
>
> -static void inline TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
> +inline static void TRACKBAR_LineDown(TRACKBAR_INFO *infoPtr)
> {
> if (infoPtr->lPos == infoPtr->lRangeMax) return;
> infoPtr->lPos += infoPtr->lLineSize;
> @@ -404,7 +404,7 @@
> TRACKBAR_InvalidateThumb (infoPtr, newPos);
> }
>
> -static BOOL inline
> +inline static BOOL
> TRACKBAR_HasSelection (TRACKBAR_INFO *infoPtr)
> {
> return infoPtr->lSelMin != infoPtr->lSelMax;
> @@ -757,7 +757,7 @@
> }
>
>
> -static void inline
> +inline static void
> TRACKBAR_ActivateToolTip (TRACKBAR_INFO *infoPtr, BOOL fShow)
> {
> TTTOOLINFOW ti;
> @@ -1022,7 +1022,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_GetChannelRect (TRACKBAR_INFO *infoPtr, LPRECT lprc)
> {
> if (lprc == NULL) return 0;
> @@ -1036,7 +1036,7 @@
> }
>
>
> -static LONG inline
> +inline static LONG
> TRACKBAR_GetNumTics (TRACKBAR_INFO *infoPtr)
> {
> if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) & TBS_NOTICKS)
> @@ -1058,7 +1058,7 @@
> }
>
>
> -static LONG inline
> +inline static LONG
> TRACKBAR_GetTic (TRACKBAR_INFO *infoPtr, INT iTic)
> {
> if ((iTic < 0) || (iTic >= infoPtr->uNumTics) || !infoPtr->tics)
> @@ -1069,7 +1069,7 @@
> }
>
>
> -static LONG inline
> +inline static LONG
> TRACKBAR_GetTicPos (TRACKBAR_INFO *infoPtr, INT iTic)
> {
> LONG range, width, pos, tic;
> @@ -1111,7 +1111,7 @@
> }
>
>
> -static LONG inline
> +inline static LONG
> TRACKBAR_SetLineSize (TRACKBAR_INFO *infoPtr, LONG lLineSize)
> {
> LONG lTemp = infoPtr->lLineSize;
> @@ -1122,7 +1122,7 @@
> }
>
>
> -static LONG inline
> +inline static LONG
> TRACKBAR_SetPageSize (TRACKBAR_INFO *infoPtr, LONG lPageSize)
> {
> LONG lTemp = infoPtr->lPageSize;
> @@ -1133,7 +1133,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG
> lPosition)
> {
> LONG oldPos = infoPtr->lPos;
> @@ -1152,7 +1152,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lRange)
> {
> infoPtr->lRangeMin = (SHORT)LOWORD(lRange);
> @@ -1177,7 +1177,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG
> lMax)
> {
> infoPtr->lRangeMax = lMax;
> @@ -1195,7 +1195,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetRangeMin (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG
> lMin)
> {
> infoPtr->lRangeMin = lMin;
> @@ -1213,7 +1213,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetSel (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lSel)
> {
> if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) &
> TBS_ENABLESELRANGE)
> @@ -1234,7 +1234,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetSelEnd (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG lEnd)
> {
> if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) &
> TBS_ENABLESELRANGE)
> @@ -1252,7 +1252,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetSelStart (TRACKBAR_INFO *infoPtr, BOOL fRedraw, LONG
> lStart)
> {
> if (!GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) &
> TBS_ENABLESELRANGE)
> @@ -1270,7 +1270,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetThumbLength (TRACKBAR_INFO *infoPtr, UINT iLength)
> {
> if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) &
> TBS_FIXEDLENGTH) {
> @@ -1283,7 +1283,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetTic (TRACKBAR_INFO *infoPtr, LONG lPos)
> {
> if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) &
> TBS_AUTOTICKS)
> @@ -1310,7 +1310,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq)
> {
> if (GetWindowLongW (infoPtr->hwndSelf, GWL_STYLE) &
> TBS_AUTOTICKS) {
> @@ -1323,7 +1323,7 @@
> }
>
>
> -static INT inline
> +inline static INT
> TRACKBAR_SetTipSide (TRACKBAR_INFO *infoPtr, INT fLocation)
> {
> INT fTemp = infoPtr->fLocation;
> @@ -1334,7 +1334,7 @@
> }
>
>
> -static LRESULT inline
> +inline static LRESULT
> TRACKBAR_SetToolTips (TRACKBAR_INFO *infoPtr, HWND hwndTT)
> {
> infoPtr->hwndToolTip = hwndTT;
> @@ -1343,7 +1343,7 @@
> }
>
>
> -static BOOL inline
> +inline static BOOL
> TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode)
> {
> BOOL bTemp = infoPtr->bUnicode;
> @@ -1702,7 +1702,7 @@
> }
>
>
> -static BOOL inline
> +inline static BOOL
> TRACKBAR_KeyUp (TRACKBAR_INFO *infoPtr, INT nVirtKey, DWORD lKeyData)
> {
> switch (nVirtKey) {
>
> _______________________________________________
> Ros-dev mailing list
> Ros-dev at reactos.org
> http://www.reactos.org/mailman/listinfo/ros-dev
More information about the Ros-dev
mailing list