Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[greatlrd] 28738: add stub for : IsValidEnhMetaRecord and IsValidEnhMetaRecordOffExt, I have not search after any info about thuse api follow api need have some part done in user mode : OffsetRgn, GetTextCharsetInfo, IntersectClipRect, OffsetClipRgn. Implement partly NamedEscape we need metadc support to finish full implement follow api have been move from redirect to smaller code into hacks.c for they are ros own syscall and does not exists in windows, GetStretchBltMode, GetTextAlign, GetTextCo
by greatlrd＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: greatlrd Date: Sat Sep 1 16:52:23 2007 New Revision: 28738 URL: http://svn.reactos.org/svn/reactos?rev=28738&view=rev Log: add stub for : IsValidEnhMetaRecord and IsValidEnhMetaRecordOffExt, I have not search after any info about thuse api follow api need have some part done in user mode : OffsetRgn, GetTextCharsetInfo, IntersectClipRect, OffsetClipRgn. Implement partly NamedEscape we need metadc support to finish full implement follow api have been move from redirect to smaller code into hacks.c for they are ros own syscall and does not exists in windows, GetStretchBltMode, GetTextAlign, GetTextColor, MoveToEx, OffsetViewportOrgEx, OffsetWindowOrgEx. redirect HT_Get8BPPMaskPalette, HT_Get8BPPFormatPalette, GetSystemPaletteUse to win32k Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/coord.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Sep 1 16:52:23 2007 @@ -366,6 +366,69 @@ GetRegionData@12 GetRelAbs@8 GetRgnBox@8 +GetStockObject@4 +GetStretchBltMode@4 +GetStringBitmapA@20 +GetStringBitmapW@20 +GetSystemPaletteEntries@16 +GetSystemPaletteUse@4=NtGdiGetSystemPaletteUse@4 +GetTextAlign@4 +GetTextCharacterExtra@4 +GetTextCharset@4 +GetTextCharsetInfo@12 +GetTextColor@4 +GetTextExtentExPointA@28 +GetTextExtentExPointI@28 +GetTextExtentExPointW@28 +GetTextExtentExPointWPri@28 +GetTextExtentPoint32A@16 +GetTextExtentPoint32W@16 +GetTextExtentPointA@16 +GetTextExtentPointI@16 +GetTextExtentPointW@16 +GetTextFaceA@12 +GetTextFaceAliasW@12 +GetTextFaceW@12 +GetTextMetricsA@8 +GetTextMetricsW@8 +GetTransform@12=NtGdiGetTransform@12 +GetViewportExtEx@8 +GetViewportOrgEx@8 +GetWinMetaFileBits@20 +GetWindowExtEx@8 +GetWindowOrgEx@8 +GetWorldTransform@8 +HT_Get8BPPFormatPalette@16=NtGdiHT_Get8BPPFormatPalette@16 +HT_Get8BPPMaskPalette@24=NtGdiHT_Get8BPPMaskPalette@24 +IntersectClipRect@20 +InvertRgn@8 +IsValidEnhMetaRecord@8 +IsValidEnhMetaRecordOffExt@16 +LPtoDP@12 +LineDDA@24 +LineTo@12 +MaskBlt@48 +MirrorRgn@8 +ModifyWorldTransform@12 +MoveToEx@16 +NamedEscape@28 +OffsetClipRgn@12 +OffsetRgn@12 +OffsetViewportOrgEx@16 +OffsetWindowOrgEx@16 + + + + + + + + + + + + + ClearBitmapAttributes@8 ClearBrushAttributes@8 @@ -429,54 +492,8 @@ GetBitmapAttributes@4 GetBrushAttributes@4 GetGlyphIndicesA@20 -GetStockObject@4 -GetStretchBltMode@4=NtGdiGetStretchBltMode@4 -GetStringBitmapA@20 -GetStringBitmapW@20 -GetSystemPaletteEntries@16 -GetSystemPaletteUse@4 -GetTextAlign@4=NtGdiGetTextAlign@4 -GetTextCharacterExtra@4 -GetTextCharset@4 -GetTextCharsetInfo@12=NtGdiGetTextCharsetInfo@12 -GetTextColor@4=NtGdiGetTextColor@4 -GetTextExtentExPointA@28 -GetTextExtentExPointI@28 -GetTextExtentExPointW@28 GetTextExtentExPointWPri@28 GetTextExtentPoint32A@16 -GetTextExtentPoint32W@16 -GetTextExtentPointA@16 -GetTextExtentPointI@16 -GetTextExtentPointW@16 -GetTextFaceA@12 -GetTextFaceW@12 -GetTextFaceAliasW@12 -GetTextMetricsA@8 -GetTextMetricsW@8 -GetTransform@12=NtGdiGetTransform@12 -GetViewportExtEx@8 -GetViewportOrgEx@8 -GetWinMetaFileBits@20 -GetWindowExtEx@8 -GetWindowOrgEx@8 -GetWorldTransform@8 -HT_Get8BPPFormatPalette@16 -HT_Get8BPPMaskPalette@24 -IntersectClipRect@20=NtGdiIntersectClipRect@20 -InvertRgn@8 -LPtoDP@12 -LineDDA@24 -LineTo@12 -MaskBlt@48 -MirrorRgn@8 -ModifyWorldTransform@12 -MoveToEx@16=NtGdiMoveToEx@16 -NamedEscape@32 -OffsetClipRgn@12=NtGdiOffsetClipRgn@12 -OffsetRgn@12=NtGdiOffsetRgn@12 -OffsetViewportOrgEx@16=NtGdiOffsetViewportOrgEx@16 -OffsetWindowOrgEx@16=NtGdiOffsetWindowOrgEx@16 PaintRgn@8 PatBlt@24=NtGdiPatBlt@24 PATHOBJ_bEnum@8 Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Sat Sep 1 16:52:23 2007 @@ -140,5 +140,81 @@ return NtGdiGetMapMode(hdc); } - - +/* + * @implemented + * + */ +int +STDCALL +GetStretchBltMode(HDC hdc) +{ + return NtGdiGetStretchBltMode(hdc); +} + +/* + * @implemented + * + */ +UINT +STDCALL +GetTextAlign(HDC hdc) +{ + return NtGdiGetTextAlign(hdc); +} + + +/* + * @implemented + * + */ +COLORREF +STDCALL +GetTextColor(HDC hdc) +{ + return NtGdiGetTextColor(hdc); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +MoveToEx(HDC hdc, + int X, + int Y, + LPPOINT lpPoint) +{ + return MoveToEx(hdc, X, Y, lpPoint); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +OffsetViewportOrgEx(HDC hdc, + int nXOffset, + int nYOffset, + LPPOINT lpPoint) +{ + return OffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint); +} + +/* + * @implemented + * + */ +BOOL +STDCALL +OffsetWindowOrgEx(HDC hdc, + int nXOffset, + int nYOffset, + LPPOINT lpPoint) +{ + return NtGdiOffsetWindowOrgEx(hdc, nXOffset, nYOffset, lpPoint); +} + + + Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Sep 1 16:52:23 2007 @@ -142,15 +142,7 @@ return 0; } -/* - * @unimplemented - */ -UINT -STDCALL -GetSystemPaletteUse(HDC hDc) -{ - return NtGdiGetSystemPaletteUse(hDc); -} + /* * @unimplemented @@ -1073,8 +1065,39 @@ - - +/* + * @unimplemented + */ +DWORD +STDCALL +IsValidEnhMetaRecord( + DWORD a0, + DWORD a1 + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + +} + +/* + * @unimplemented + */ +DWORD +STDCALL +IsValidEnhMetaRecordOffExt( + DWORD a0, + DWORD a1, + DWORD a2, + DWORD a3 + ) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; + +} /* * @unimplemented @@ -1569,29 +1592,7 @@ return retValue; } -/* - * @unimplemented - */ -LONG -STDCALL -HT_Get8BPPFormatPalette(LPPALETTEENTRY pPaletteEntry, USHORT RedGamma,USHORT GreenGamma, USHORT BlueGamma) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -LONG -STDCALL -HT_Get8BPPMaskPalette(LPPALETTEENTRY pPaletteEntry, BOOL Use8BPPMaskPal,BYTE CMYMask, USHORT RedGamma, USHORT GreenGamma, USHORT BlueGamma) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -1605,17 +1606,7 @@ return 0; } -/* - * @unimplemented - */ -int -STDCALL -NamedEscape(HDC hdc,PWCHAR pDriver,int nDriver,int iEsc,int cjIn,LPSTR pjIn,int cjOut,LPSTR pjOut) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented @@ -2719,4 +2710,80 @@ } - +/* + * @implemented + * + */ +INT +STDCALL +OffsetRgn( HRGN hrgn, + int nXOffset, + int nYOffset) +{ + /* FIXME some part are done in user mode */ + return NtGdiOffsetRgn(hrgn,nXOffset,nYOffset); +} + + +INT +STDCALL +GetTextCharsetInfo(HDC hdc, + LPFONTSIGNATURE lpSig, + DWORD dwFlags) +{ + /* FIXME some part are done in user mode */ + return NtGdiGetTextCharsetInfo(hdc, lpSig, dwFlags); +} + + + +INT +STDCALL +IntersectClipRect(HDC hdc, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect) +{ + /* FIXME some part are done in user mode */ + return NtGdiIntersectClipRect(hdc, nLeftRect, nTopRect, nRightRect, nBottomRect); +} + +INT +STDCALL +OffsetClipRgn(HDC hdc, + int nXOffset, + int nYOffset) +{ + /* FIXME some part are done in user mode */ + return NtGdiOffsetClipRgn( hdc, nXOffset, nYOffset); +} + + +INT +STDCALL +NamedEscape(HDC hdc, + PWCHAR pDriver, + INT iEsc, + INT cjIn, + LPSTR pjIn, + INT cjOut, + LPSTR pjOut) +{ + /* FIXME metadc, metadc are done most in user mode, and we do not support it + * Windows 2000/XP/Vista ignore the current hdc, that are being pass and always set hdc to NULL + * when it calls to NtGdiExtEscape from NamedEscape + */ + return NtGdiExtEscape(NULL,pDriver,wcslen(pDriver),iEsc,cjIn,pjIn,cjOut,pjOut); + +} + + + + + + + + + + Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Sat Sep 1 16:52:23 2007 @@ -143,6 +143,9 @@ } +/* + * @implemented + */ BOOL STDCALL GetWorldTransform( HDC hDC, LPXFORM lpXform )

1 0

[arty] 28737: Set needed sizes for return buffers when we return an insufficient buffer error.
by arty＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: arty Date: Sat Sep 1 15:14:25 2007 New Revision: 28737 URL: http://svn.reactos.org/svn/reactos?rev=28737&view=rev Log: Set needed sizes for return buffers when we return an insufficient buffer error. Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=28737&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c (original) +++ trunk/reactos/lib/rtl/sd.c Sat Sep 1 15:14:25 2007 @@ -732,6 +732,10 @@ DaclLength > *DaclSize || SaclLength > *SaclSize) { + *OwnerSize = OwnerLength; + *PrimaryGroupSize = GroupLength; + *DaclSize = DaclLength; + *SaclSize = SaclLength; return STATUS_BUFFER_TOO_SMALL; }

1 0

[ekohl] 28736: Make all "OK" buttons default push buttons.
by ekohl＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: ekohl Date: Sat Sep 1 14:37:01 2007 New Revision: 28736 URL: http://svn.reactos.org/svn/reactos?rev=28736&view=rev Log: Make all "OK" buttons default push buttons. Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/it-IT.rc trunk/reactos/dll/cpl/access/lang/ja-JP.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ru-RU.rc Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc Sat Sep 1 14:37:01 2007 @@ -121,7 +121,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -147,7 +147,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -161,7 +161,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -180,7 +180,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -214,7 +214,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -236,7 +236,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Sat Sep 1 14:37:01 2007 @@ -124,7 +124,7 @@ AUTOCHECKBOX "&Ausgabe eines Tons wenn die Feststelltaste gedrückt wird.",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Zeige den Status der Einrastfunktion auf dem Bildschirm",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -150,7 +150,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -164,7 +164,7 @@ LTEXT "Die Schnelltaste für ToggleKeys ist: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Wähle &Schnelltaste",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -183,7 +183,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -217,7 +217,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -239,7 +239,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc Sat Sep 1 14:37:01 2007 @@ -121,7 +121,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -147,7 +147,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -161,7 +161,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -180,7 +180,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -214,7 +214,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -236,7 +236,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc Sat Sep 1 14:37:01 2007 @@ -124,7 +124,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -150,7 +150,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -164,7 +164,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -183,7 +183,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -217,7 +217,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -239,7 +239,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc Sat Sep 1 14:37:01 2007 @@ -123,7 +123,7 @@ AUTOCHECKBOX "É&mettre un son lorsque la touche de modification est pressée",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "Afficher l'état de&s touches rémanantes à l'écran",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -149,7 +149,7 @@ AUTOCHECKBOX "&Biper quand les touches sont pressées ou acceptées",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "Montrer l'état des touches filtre à l'écran",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -163,7 +163,7 @@ LTEXT "Le raccourci pour les touches bascule est: \nMaintenir la touche <Verr num> pressée pendant cinq secondes.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Utili&ser le raccourci",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -182,7 +182,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -216,7 +216,7 @@ AUTOCHECKBOX "Montrer l'état des touches &souris à l'écran",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -238,7 +238,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc Sat Sep 1 14:37:01 2007 @@ -122,7 +122,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -148,7 +148,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -162,7 +162,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -181,7 +181,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -215,7 +215,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -237,7 +237,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc Sat Sep 1 14:37:01 2007 @@ -123,7 +123,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -149,7 +149,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -163,7 +163,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -182,7 +182,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -216,7 +216,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -238,7 +238,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/it-IT.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/access/lang/it-IT.rc Sat Sep 1 14:37:01 2007 @@ -121,7 +121,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -147,7 +147,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -161,7 +161,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -180,7 +180,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -214,7 +214,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -236,7 +236,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ja-JP.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ja-JP.rc Sat Sep 1 14:37:01 2007 @@ -121,7 +121,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -147,7 +147,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -161,7 +161,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -180,7 +180,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -214,7 +214,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -236,7 +236,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc Sat Sep 1 14:37:01 2007 @@ -123,7 +123,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -149,7 +149,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -163,7 +163,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -182,7 +182,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -216,7 +216,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -238,7 +238,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc Sat Sep 1 14:37:01 2007 @@ -124,7 +124,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -150,7 +150,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -164,7 +164,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -183,7 +183,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -217,7 +217,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -239,7 +239,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END Modified: trunk/reactos/dll/cpl/access/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ru-RU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/access/lang/ru-RU.rc Sat Sep 1 14:37:01 2007 @@ -121,7 +121,7 @@ AUTOCHECKBOX "&Make sounds when the modifier key is pressed",IDC_STICKY_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(16)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 AUTOCHECKBOX "&Show StickyKeys status on screen",IDC_STICKY_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(18),PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Îòìåíà", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -147,7 +147,7 @@ AUTOCHECKBOX "&Beep when keys pressed or accepted",IDC_FILTER_SOUND_CHECK,PROPSHEETPADDING(2),LABELLINE(19),PROPSHEETWIDTH-PROPSHEETPADDING(4),10 AUTOCHECKBOX "S&how FilterKey status on screen",IDC_FILTER_STATUS_CHECK,PROPSHEETPADDING(2),LABELLINE(20)+6,PROPSHEETWIDTH-PROPSHEETPADDING(4),10 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -161,7 +161,7 @@ LTEXT "The shortcut for ToggleKeys is: \nHold down <Num Lock> for five seconds.",-1,PROPSHEETPADDING(2),LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(2),LABELLINE(5)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -180,7 +180,7 @@ COMBOBOX IDC_CONTRAST_COMBO, PROPSHEETPADDING(2), LABELLINE(11)+2, PROPSHEETWIDTH-PROPSHEETPADDING(4), LABELLINE(6), CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -214,7 +214,7 @@ AUTOCHECKBOX "&Show MouseKey status on screen",IDC_MOUSEKEYS_STATUS_CHECK,PROPSHEETPADDING(1),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(4),14 - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -236,7 +236,7 @@ LTEXT "&Test area:",-1,PROPSHEETPADDING(1),LABELLINE(6)+1,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(1) EDITTEXT IDC_BOUNCE_TEST_EDIT,PROPSHEETPADDING(1),LABELLINE(7)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),14,WS_GROUP|ES_AUTOHSCROLL - PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 + DEFPUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END

1 0

[arty] 28735: Don't check inherit flags when checking access.
by arty＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: arty Date: Sat Sep 1 14:04:15 2007 New Revision: 28735 URL: http://svn.reactos.org/svn/reactos?rev=28735&view=rev Log: Don't check inherit flags when checking access. Modified: trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=28… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Sat Sep 1 14:04:15 2007 @@ -565,8 +565,11 @@ { /* Get the granted access and validate it */ GrantedAccess = HandleEntry->GrantedAccess; + /* Inherit flags are not a kind of access right, they indicate + * the disposition of access rights. Therefore, they should not + * be considered. */ if ((AccessMode == KernelMode) || - !(~GrantedAccess & DesiredAccess)) + !((~GrantedAccess & DesiredAccess & ~VALID_INHERIT_FLAGS))) { /* Reference the object directly since we have its header */ InterlockedIncrement(&ObjectHeader->PointerCount); @@ -596,6 +599,7 @@ else { /* Requested access failed */ + DPRINT("Rights not granted: %x\n", ~GrantedAccess & DesiredAccess); Status = STATUS_ACCESS_DENIED; } }

1 0

[greatlrd] 28734: implement GetTextFaceAliasW <- the win32k part was already implement :)
by greatlrd＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: greatlrd Date: Sat Sep 1 13:21:11 2007 New Revision: 28734 URL: http://svn.reactos.org/svn/reactos?rev=28734&view=rev Log: implement GetTextFaceAliasW <- the win32k part was already implement :) Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Sep 1 13:21:11 2007 @@ -1549,15 +1549,24 @@ } /* - * @unimplemented - */ -int -STDCALL -GetTextFaceAliasW(HDC hdc,int cChar,LPWSTR pszOut) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + * @implemented + */ +INT +STDCALL +GetTextFaceAliasW(HDC hdc, + int cChar, + LPWSTR pszOut) +{ + INT retValue = 0; + if ((!pszOut) || (cChar)) + { + retValue = NtGdiGetTextFaceW(hdc,cChar,pszOut,TRUE); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } + return retValue; } /*

1 0

[jimtabor] 28733: - Removed NtGdiPoly/Bezier/To and lineTo/Polyline/line. Updated w32ksvc.db and ntgdibad.h. - Update gdi32.def.
by jimtabor＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: jimtabor Date: Sat Sep 1 08:23:08 2007 New Revision: 28733 URL: http://svn.reactos.org/svn/reactos?rev=28733&view=rev Log: - Removed NtGdiPoly/Bezier/To and lineTo/Polyline/line. Updated w32ksvc.db and ntgdibad.h. - Update gdi32.def. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Sep 1 08:23:08 2007 @@ -492,16 +492,16 @@ PlayMetaFile@8 PlayMetaFileRecord@16 PlgBlt@40 -PolyBezier@12=NtGdiPolyBezier@12 -PolyBezierTo@12=NtGdiPolyBezierTo@12 -PolyDraw@16=NtGdiPolyDraw@16 +PolyBezier@12 +PolyBezierTo@12 +PolyDraw@16 PolyPolygon@16 -PolyPolyline@16=NtGdiPolyPolyline@16 +PolyPolyline@16 PolyTextOutA@12 PolyTextOutW@12 Polygon@12 -Polyline@12=NtGdiPolyline@12 -PolylineTo@12=NtGdiPolylineTo@12 +Polyline@12 +PolylineTo@12 PtInRegion@12=NtGdiPtInRegion@12 PtVisible@12=NtGdiPtVisible@12 QueryFontAssocStatus@0 Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sat Sep 1 08:23:08 2007 @@ -447,42 +447,6 @@ UINT Handles ); -/* Use NtGdiPolyPolyDraw with GdiPolyBezier. */ -BOOL -STDCALL -NtGdiPolyBezier(HDC hDC, - CONST LPPOINT pt, - DWORD Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyBezierTo. */ -BOOL -STDCALL -NtGdiPolyBezierTo(HDC hDC, - CONST LPPOINT pt, - DWORD Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyPolyLine. */ -BOOL -STDCALL -NtGdiPolyline(HDC hDC, - CONST LPPOINT pt, - int Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyLineTo. */ -BOOL -STDCALL -NtGdiPolylineTo(HDC hDC, - CONST LPPOINT pt, - DWORD Count); - -/* Use NtGdiPolyPolyDraw with GdiPolyPolyLine. */ -BOOL -STDCALL -NtGdiPolyPolyline(HDC hDC, - CONST LPPOINT pt, - CONST LPDWORD PolyPoints, - DWORD Count); - /* Use NtGdiPolyTextOutW with 0 at the end. */ BOOL STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Sat Sep 1 08:23:08 2007 @@ -404,181 +404,6 @@ return Ret; } -BOOL -STDCALL -NtGdiPolyBezier(HDC hDC, - CONST LPPOINT pt, - DWORD Count) -{ - DC *dc; - LPPOINT Safept; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - dc = DC_LockDc(hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if(Count > 0) - { - _SEH_TRY - { - ProbeForRead(pt, - Count * sizeof(POINT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - - Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_BEZIER); - if(!Safept) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - /* pointers were already probed */ - RtlCopyMemory(Safept, - pt, - Count * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - } - else - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Ret = IntGdiPolyBezier(dc, Safept, Count); - - ExFreePool(Safept); - DC_UnlockDc(dc); - - return Ret; -} - -BOOL -STDCALL -NtGdiPolyBezierTo(HDC hDC, - CONST LPPOINT pt, - DWORD Count) -{ - DC *dc; - LPPOINT Safept; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - dc = DC_LockDc(hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if(Count > 0) - { - _SEH_TRY - { - ProbeForRead(pt, - Count * sizeof(POINT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - - Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_BEZIER); - if(!Safept) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - /* pointers were already probed */ - RtlCopyMemory(Safept, - pt, - Count * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - } - else - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Ret = IntGdiPolyBezierTo(dc, Safept, Count); - - ExFreePool(Safept); - DC_UnlockDc(dc); - - return Ret; -} BOOL APIENTRY @@ -656,279 +481,5 @@ return result; } -BOOL -STDCALL -NtGdiPolyline(HDC hDC, - CONST LPPOINT pt, - int Count) -{ - DC *dc; - LPPOINT Safept; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - dc = DC_LockDc(hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if(Count >= 2) - { - _SEH_TRY - { - ProbeForRead(pt, - Count * sizeof(POINT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - - Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_SHAPE); - if(!Safept) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - /* pointers were already probed */ - RtlCopyMemory(Safept, - pt, - Count * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - } - else - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Ret = IntGdiPolyline(dc, Safept, Count); - - ExFreePool(Safept); - DC_UnlockDc(dc); - - return Ret; -} - -BOOL -STDCALL -NtGdiPolylineTo(HDC hDC, - CONST LPPOINT pt, - DWORD Count) -{ - DC *dc; - LPPOINT Safept; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - dc = DC_LockDc(hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if(Count > 0) - { - _SEH_TRY - { - ProbeForRead(pt, - Count * sizeof(POINT), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - - Safept = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * Count, TAG_SHAPE); - if(!Safept) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - /* pointers were already probed */ - RtlCopyMemory(Safept, - pt, - Count * sizeof(POINT)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - } - else - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Ret = IntGdiPolylineTo(dc, Safept, Count); - - ExFreePool(Safept); - DC_UnlockDc(dc); - - return Ret; -} - -BOOL -STDCALL -NtGdiPolyPolyline(HDC hDC, - CONST LPPOINT pt, - CONST LPDWORD PolyPoints, - DWORD Count) -{ - DC *dc; - LPPOINT Safept; - LPDWORD SafePolyPoints; - NTSTATUS Status = STATUS_SUCCESS; - BOOL Ret; - - dc = DC_LockDc(hDC); - if(!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (dc->IsIC) - { - DC_UnlockDc(dc); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } - - if(Count > 0) - { - _SEH_TRY - { - ProbeForRead(pt, - Count * sizeof(POINT), - 1); - ProbeForRead(PolyPoints, - Count * sizeof(DWORD), - 1); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if (!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); - return FALSE; - } - - Safept = ExAllocatePoolWithTag(PagedPool, (sizeof(POINT) + sizeof(DWORD)) * Count, TAG_SHAPE); - if(!Safept) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - SafePolyPoints = (LPDWORD)&Safept[Count]; - - _SEH_TRY - { - /* pointers were already probed */ - RtlCopyMemory(Safept, - pt, - Count * sizeof(POINT)); - RtlCopyMemory(SafePolyPoints, - PolyPoints, - Count * sizeof(DWORD)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePool(Safept); - SetLastNtError(Status); - return FALSE; - } - } - else - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Ret = IntGdiPolyPolyline(dc, Safept, SafePolyPoints, Count); - - ExFreePool(Safept); - DC_UnlockDc(dc); - - return Ret; -} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Sep 1 08:23:08 2007 @@ -795,11 +795,6 @@ NtGdiOffsetWindowOrgEx 4 NtGdiPlayEnhMetaFile 3 NtGdiPlayEnhMetaFileRecord 4 -NtGdiPolyBezier 3 -NtGdiPolyBezierTo 3 -NtGdiPolyline 3 -NtGdiPolylineTo 3 -NtGdiPolyPolyline 4 NtGdiPolyTextOut 3 NtGdiRealizePalette 1 NtGdiRemoveFontResource 1

1 0

[jimtabor] 28732: Remove fixme in GetCurrentObject.
by jimtabor＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: jimtabor Date: Sat Sep 1 06:54:36 2007 New Revision: 28732 URL: http://svn.reactos.org/svn/reactos?rev=28732&view=rev Log: Remove fixme in GetCurrentObject. Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Sat Sep 1 06:54:36 2007 @@ -362,7 +362,6 @@ GetCurrentObject(HDC hdc, UINT uObjectType) { - /* FIXME some part need be done in user mode */ switch(uObjectType) { case OBJ_EXTPEN:

1 0

[jimtabor] 28731: - Removed NtGdiPaintRgn and renamed NtGdiGetCurrentObject to NtGdiGetDCObject and NtGdiSetPixelV to GdiSetPixelV, w32ksvc.db and updated ntgdibad.h. - Full use of painting.c, imp GetCurrentObject and update gdi32.def.
by jimtabor＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: jimtabor Date: Sat Sep 1 06:51:48 2007 New Revision: 28731 URL: http://svn.reactos.org/svn/reactos?rev=28731&view=rev Log: - Removed NtGdiPaintRgn and renamed NtGdiGetCurrentObject to NtGdiGetDCObject and NtGdiSetPixelV to GdiSetPixelV, w32ksvc.db and updated ntgdibad.h. - Full use of painting.c, imp GetCurrentObject and update gdi32.def. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Sep 1 06:51:48 2007 @@ -464,10 +464,10 @@ HT_Get8BPPFormatPalette@16 HT_Get8BPPMaskPalette@24 IntersectClipRect@20=NtGdiIntersectClipRect@20 -InvertRgn@8=NtGdiInvertRgn@8 +InvertRgn@8 LPtoDP@12 LineDDA@24 -LineTo@12=NtGdiLineTo@12 +LineTo@12 MaskBlt@48 MirrorRgn@8 ModifyWorldTransform@12 @@ -477,7 +477,7 @@ OffsetRgn@12=NtGdiOffsetRgn@12 OffsetViewportOrgEx@16=NtGdiOffsetViewportOrgEx@16 OffsetWindowOrgEx@16=NtGdiOffsetWindowOrgEx@16 -PaintRgn@8=NtGdiPaintRgn@8 +PaintRgn@8 PatBlt@24=NtGdiPatBlt@24 PATHOBJ_bEnum@8 PATHOBJ_bEnumClipLines@12 @@ -508,7 +508,7 @@ RealizePalette@4=NtGdiRealizePalette@4 RectInRegion@8=NtGdiRectInRegion@8 RectVisible@8=NtGdiRectVisible@8 -Rectangle@20=NtGdiRectangle@20 +Rectangle@20 RemoveFontMemResourceEx@4 RemoveFontResourceA@4 RemoveFontResourceExA@12 @@ -519,7 +519,7 @@ ResetDCW@8 ResizePalette@8 RestoreDC@8=NtGdiRestoreDC@8 -RoundRect@28=NtGdiRoundRect@28 +RoundRect@28 SaveDC@4=NtGdiSaveDC@4 ScaleViewportExtEx@24 ScaleWindowExtEx@24 @@ -562,9 +562,9 @@ SetMetaRgn@4 SetMiterLimit@12 SetPaletteEntries@16 -SetPixel@16=NtGdiSetPixel@16 +SetPixel@16 SetPixelFormat@12 -SetPixelV@16=NtGdiSetPixelV@16 +SetPixelV@16 SetPolyFillMode@8=NtGdiSetPolyFillMode@8 SetROP2@8=NtGdiSetROP2@8 SetRectRgn@20=NtGdiSetRectRgn@20 Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Sat Sep 1 06:51:48 2007 @@ -159,6 +159,10 @@ STDCALL GetDCDWord( HDC, INT, DWORD); +HGDIOBJ +STDCALL +GetDCObject( HDC, INT); + VOID NTAPI LogFontA2W( Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Sep 1 06:51:48 2007 @@ -2174,25 +2174,6 @@ } - - -/* - * @implemented - */ -BOOL -STDCALL -Ellipse( - HDC hdc, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect) -{ - /* FIXME some parts need be done in user mode */ - return NtGdiEllipse(hdc,nLeftRect,nTopRect,nRightRect,nBottomRect); -} - - /* * @unimplemented */ @@ -2464,17 +2445,6 @@ */ BOOL STDCALL -FillRgn( IN HDC hdc, IN HRGN hrgn, IN HBRUSH hbrush) -{ - /* FIXME some part need be done on user mode size */ - return NtGdiFillRgn( hdc, hrgn, hbrush); -} - -/* - * @implemented - */ -BOOL -STDCALL GdiGradientFill( IN HDC hdc, IN PTRIVERTEX pVertex, @@ -2487,22 +2457,6 @@ return NtGdiGradientFill(hdc, pVertex, nVertex, pMesh, nMesh, ulMode); } - -/* - * @implemented - */ -BOOL -STDCALL -FrameRgn( - IN HDC hdc, - IN HRGN hrgn, - IN HBRUSH hbrush, - IN INT xWidth, - IN INT yHeight) -{ - /* FIXME some part need be done in user mode */ - return NtGdiFrameRgn(hdc, hrgn, hbrush, xWidth, yHeight); -} /* * @implemented @@ -2648,19 +2602,6 @@ * @implemented * */ -HGDIOBJ -STDCALL -GetCurrentObject(HDC hdc, - UINT uObjectType) -{ - /* FIXME some part need be done in user mode */ - return NtGdiGetCurrentObject(hdc, uObjectType); -} - -/* - * @implemented - * - */ int STDCALL GetClipBox(HDC hdc, @@ -2769,19 +2710,4 @@ } -/* - * @implemented - * - */ -DWORD -STDCALL -GetPixel(HDC hdc, - INT x, - INT y) -{ - /* FIXME some part need todo in user mode */ - return NtGdiGetPixel(hdc, x, y); -} - - - + Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Sat Sep 1 06:51:48 2007 @@ -355,6 +355,49 @@ /* * @implemented + * + */ +HGDIOBJ +STDCALL +GetCurrentObject(HDC hdc, + UINT uObjectType) +{ + /* FIXME some part need be done in user mode */ + switch(uObjectType) + { + case OBJ_EXTPEN: + case OBJ_PEN: + uObjectType = GDI_OBJECT_TYPE_PEN; + break; + case OBJ_BRUSH: + uObjectType = GDI_OBJECT_TYPE_BRUSH; + break; + case OBJ_PAL: + uObjectType = GDI_OBJECT_TYPE_PALETTE; + break; + case OBJ_FONT: + uObjectType = GDI_OBJECT_TYPE_FONT; + break; + case OBJ_BITMAP: + uObjectType = GDI_OBJECT_TYPE_BITMAP; + break; + case OBJ_COLORSPACE: + uObjectType = GDI_OBJECT_TYPE_COLORSPACE; + break; + /* tests show that OBJ_REGION is explicitly ignored */ + case OBJ_REGION: + return NULL; + /* the SDK only mentions those above */ + default: + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + return GetDCObject(hdc, uObjectType); +} + + +/* + * @implemented */ DWORD STDCALL Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Sat Sep 1 06:51:48 2007 @@ -1,35 +1,39 @@ #include "precomp.h" +/* + * @implemented + */ +BOOL +STDCALL +LineTo( HDC hDC, INT x, INT y ) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam2( hDC, META_LINETO, x, y); + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + return MFDRV_LineTo( hDC, x, y ) + } + return FALSE; + } + } +#endif + return NtGdiLineTo( hDC, x, y); +} + #if 0 /* FIXME: enable this as soon as we have working usermode gdi */ - -BOOL -STDCALL -LineTo( HDC hDC, INT x, INT y ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam2( hDC, META_LINETO, x, y); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return MFDRV_LineTo( hDC, x, y ) - } - return FALSE; - } - } - return NtGdiLineTo( hDC, x, y); -} - BOOL STDCALL @@ -79,12 +83,16 @@ Dc_Attr->ulDirty_ |= ( DIRTY_PTLCURRENT|DIRTY_STYLESTATE); // Set dirty return TRUE; } - - +#endif + +/* + * @implemented + */ BOOL STDCALL Ellipse(HDC hDC, INT Left, INT Top, INT Right, INT Bottom) { +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -105,14 +113,19 @@ return FALSE; } } +#endif return NtGdiEllipse( hDC, Left, Top, Right, Bottom); } -BOOL -STDCALL -Rectangle(HDC, INT Left, INT Top, INT Right, INT Bottom) -{ +/* + * @implemented + */ +BOOL +STDCALL +Rectangle(HDC hDC, INT Left, INT Top, INT Right, INT Bottom) +{ +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -133,15 +146,20 @@ return FALSE; } } +#endif return NtGdiRectangle( hDC, Left, Top, Right, Bottom); } -BOOL -STDCALL -RoundRect(HDC, INT Left, INT Top, INT Right, INT Bottom, +/* + * @implemented + */ +BOOL +STDCALL +RoundRect(HDC hDC, INT Left, INT Top, INT Right, INT Bottom, INT ell_Width, INT ell_Height) { +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -164,10 +182,14 @@ return FALSE; } } - return NtGdiRoundRect( hDc, Left, Top, Right, Bottom, ell_Width, ell_Height); -} - - +#endif + return NtGdiRoundRect( hDC, Left, Top, Right, Bottom, ell_Width, ell_Height); +} + + +/* + * @implemented + */ COLORREF STDCALL GetPixel( HDC hDC, INT x, INT y ) @@ -178,10 +200,14 @@ } +/* + * @implemented + */ COLORREF STDCALL SetPixel( HDC hDC, INT x, INT y, COLORREF Color ) { +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -203,27 +229,34 @@ return 0; } } +#endif return NtGdiSetPixel( hDC, x, y, Color); } +/* + * @implemented + */ BOOL STDCALL SetPixelV( HDC hDC, INT x, INT y, COLORREF Color ) { COLORREF Cr = SetPixel( hDC, x, y, Color ); - if (Cr) return TRUE; + if (Cr != CLR_INVALID) return TRUE; return FALSE; } +/* + * @implemented + */ BOOL STDCALL FillRgn( HDC hDC, HRGN hRgn, HBRUSH hBrush ) { if ( (!hRgn) || (!hBrush) ) return FALSE; - +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -244,17 +277,21 @@ return FALSE; } } +#endif return NtGdiFillRgn( hDC, hRgn, hBrush); } +/* + * @implemented + */ BOOL STDCALL FrameRgn( HDC hDC, HRGN hRgn, HBRUSH hBrush, INT nWidth, INT nHeight ) { if ( (!hRgn) || (!hBrush) ) return FALSE; - +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -275,17 +312,21 @@ return FALSE; } } +#endif return NtGdiFrameRgn( hDC, hRgn, hBrush, nWidth, nHeight); } +/* + * @implemented + */ BOOL STDCALL InvertRgn( HDC hDC, HRGN hRgn ) { if ( !hRgn ) return FALSE; - +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -306,13 +347,19 @@ return FALSE; } } +#endif return NtGdiInvertRgn( hDC, hRgn); } + +/* + * @implemented + */ BOOL STDCALL PaintRgn( HDC hDC, HRGN hRgn ) { +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -333,14 +380,17 @@ return FALSE; } } - // Could just use Dc_Attr->hbrush - HBRUSH hbrush = (HBRUSH) GetDCObject( hDC, GDI_OBJECT_TYPE_BRUSH); - +#endif + // Could just use Dc_Attr->hbrush? No. + HBRUSH hBrush = (HBRUSH) GetDCObject( hDC, GDI_OBJECT_TYPE_BRUSH); + return NtGdiFillRgn( hDC, hRgn, hBrush); } -#endif - + +/* + * @implemented + */ BOOL STDCALL PolyBezier(HDC hDC ,const POINT* Point, DWORD cPoints) @@ -375,6 +425,9 @@ } +/* + * @implemented + */ BOOL STDCALL PolyBezierTo(HDC hDC, const POINT* Point ,DWORD cPoints) @@ -405,6 +458,9 @@ } +/* + * @implemented + */ BOOL STDCALL PolyDraw(HDC hDC, const POINT* Point, const BYTE *lpbTypes, int cCount ) @@ -435,6 +491,9 @@ } +/* + * @implemented + */ BOOL STDCALL Polygon(HDC hDC, const POINT *Point, int Count) @@ -465,6 +524,9 @@ } +/* + * @implemented + */ BOOL STDCALL Polyline(HDC hDC, const POINT *Point, int Count) @@ -495,6 +557,9 @@ } +/* + * @implemented + */ BOOL STDCALL PolylineTo(HDC hDC, const POINT* Point, DWORD Count) @@ -525,6 +590,9 @@ } +/* + * @implemented + */ BOOL STDCALL PolyPolygon(HDC hDC, const POINT* Point, const INT* Count, int Polys) @@ -555,6 +623,9 @@ } +/* + * @implemented + */ BOOL STDCALL PolyPolyline(HDC hDC, const POINT* Point, const DWORD* Counts, DWORD Polys) @@ -585,6 +656,9 @@ } +/* + * @implemented + */ BOOL STDCALL ExtFloodFill( @@ -621,6 +695,9 @@ } +/* + * @implemented + */ BOOL WINAPI FloodFill( @@ -632,6 +709,10 @@ return ExtFloodFill(hDC, nXStart, nYStart, crFill, FLOODFILLBORDER); } + +/* + * @implemented + */ BOOL WINAPI MaskBlt( HDC hdcDest, @@ -663,6 +744,9 @@ } +/* + * @implemented + */ BOOL WINAPI PlgBlt( Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sat Sep 1 06:51:48 2007 @@ -280,9 +280,6 @@ STDCALL NtGdiGetColorSpace(HDC hDC); -/* Should be done in user-mode and/or NtGdiGetDCObject. */ -HGDIOBJ STDCALL NtGdiGetCurrentObject(HDC hDC, UINT ObjectType); - /* Should be done in user mode. */ BOOL STDCALL NtGdiGetCurrentPositionEx(HDC hDC, LPPOINT currentPosition); @@ -430,12 +427,6 @@ int YOffset, LPPOINT Point ); - -/* Use NtGdiFillRgn. Add 0 at the end. */ -BOOL -STDCALL -NtGdiPaintRgn(HDC hDC, - HRGN hRgn); /* Metafiles are user-mode. */ BOOL @@ -560,16 +551,6 @@ STDCALL NtGdiSetMapperFlags(HDC hDC, DWORD Flag); - -/* Use NtGdiSetPixel(hdc, x, y, color) != CLR_INVALID; */ -BOOL -STDCALL -NtGdiSetPixelV ( - HDC hDC, - INT X, - INT Y, - COLORREF Color - ); /* Needs to be done in user-mode, using shared GDI Object Attributes. */ INT STDCALL NtGdiSetPolyFillMode(HDC hDC, INT polyFillMode); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Sat Sep 1 06:51:48 2007 @@ -509,6 +509,30 @@ return TRUE; } +BOOL STDCALL +GdiSetPixelV( + HDC hDC, + INT X, + INT Y, + COLORREF Color) +{ + HBRUSH NewBrush = NtGdiCreateSolidBrush(Color, NULL); + HGDIOBJ OldBrush; + + if (NewBrush == NULL) + return(FALSE); + OldBrush = NtGdiSelectObject(hDC, NewBrush); + if (OldBrush == NULL) + { + NtGdiDeleteObject(NewBrush); + return(FALSE); + } + NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY); + NtGdiSelectObject(hDC, OldBrush); + NtGdiDeleteObject(NewBrush); + return TRUE; +} + COLORREF STDCALL NtGdiSetPixel( HDC hDC, @@ -516,47 +540,20 @@ INT Y, COLORREF Color) { - - DPRINT("0 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); - - - DPRINT("0 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); - - if (NtGdiSetPixelV(hDC,X,Y,Color)) + DPRINT("0 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); + + if (GdiSetPixelV(hDC,X,Y,Color)) { Color = NtGdiGetPixel(hDC,X,Y); DPRINT("1 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); return Color; } - Color = ((COLORREF) -1); + Color = ((COLORREF) CLR_INVALID); DPRINT("2 NtGdiSetPixel X %ld Y %ld C %ld\n",X,Y,Color); return Color; } -BOOL STDCALL -NtGdiSetPixelV( - HDC hDC, - INT X, - INT Y, - COLORREF Color) -{ - HBRUSH NewBrush = NtGdiCreateSolidBrush(Color, NULL); - HGDIOBJ OldBrush; - - if (NewBrush == NULL) - return(FALSE); - OldBrush = NtGdiSelectObject(hDC, NewBrush); - if (OldBrush == NULL) - { - NtGdiDeleteObject(NewBrush); - return(FALSE); - } - NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY); - NtGdiSelectObject(hDC, OldBrush); - NtGdiDeleteObject(NewBrush); - return TRUE; -} /* Internal Functions */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Sep 1 06:51:48 2007 @@ -1112,8 +1112,9 @@ DC_GET_VAL( INT, NtGdiGetBkMode, Dc_Attr.jBkMode ) DC_GET_VAL_EX( GetBrushOrgEx, Dc_Attr.ptlBrushOrigin.x, Dc_Attr.ptlBrushOrigin.y, POINT, x, y ) -HGDIOBJ STDCALL -NtGdiGetCurrentObject(HDC hDC, UINT ObjectType) +HANDLE +STDCALL +NtGdiGetDCObject(HDC hDC, INT ObjectType) { HGDIOBJ SelObject; DC *dc; @@ -1129,23 +1130,23 @@ switch(ObjectType) { - case OBJ_PEN: - case OBJ_EXTPEN: + case GDI_OBJECT_TYPE_EXTPEN: + case GDI_OBJECT_TYPE_PEN: SelObject = dc->Dc_Attr.hpen; break; - case OBJ_BRUSH: + case GDI_OBJECT_TYPE_BRUSH: SelObject = dc->Dc_Attr.hbrush; break; - case OBJ_PAL: + case GDI_OBJECT_TYPE_PALETTE: SelObject = dc->w.hPalette; break; - case OBJ_FONT: + case GDI_OBJECT_TYPE_FONT: SelObject = dc->Dc_Attr.hlfntNew; break; - case OBJ_BITMAP: + case GDI_OBJECT_TYPE_BITMAP: SelObject = dc->w.hBitmap; break; - case OBJ_COLORSPACE: + case GDI_OBJECT_TYPE_COLORSPACE: DPRINT1("FIXME: NtGdiGetCurrentObject() ObjectType OBJ_COLORSPACE not supported yet!\n"); SelObject = NULL; break; @@ -2104,6 +2105,7 @@ return objOrg; } + WORD STDCALL IntGdiSetHookFlags(HDC hDC, WORD Flags) { Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sat Sep 1 06:51:48 2007 @@ -585,7 +585,7 @@ if(Usage == DIB_PAL_COLORS) { - hPal = NtGdiGetCurrentObject(hDC, OBJ_PAL); + hPal = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE); hPal = NtUserSelectPalette(hdcMem, hPal, FALSE); } Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Sat Sep 1 06:51:48 2007 @@ -2598,20 +2598,6 @@ BOOL STDCALL -NtGdiPaintRgn(HDC hDC, - HRGN hRgn) -{ - DC *dc = DC_LockDc(hDC); - - BOOL Ret = IntGdiPaintRgn(dc, hRgn); - - DC_UnlockDc( dc ); - return Ret; -} - - -BOOL -STDCALL NtGdiPtInRegion(HRGN hRgn, INT X, INT Y) Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Sat Sep 1 06:51:48 2007 @@ -2567,19 +2567,6 @@ /* * @unimplemented */ -HANDLE -STDCALL -NtGdiGetDCObject( - IN HDC hdc, - IN INT itype) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ BOOL STDCALL NtGdiGetDeviceCapsAll ( Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Sep 1 06:51:48 2007 @@ -696,7 +696,6 @@ NtGdiSetGraphicsMode 2 NtGdiSetICMProfile 2 NtGdiSetMapperFlags 2 -NtGdiSetPixelV 4 NtGdiSetPolyFillMode 2 NtGdiSetROP2 2 NtGdiSetStretchBltMode 2 @@ -771,7 +770,6 @@ NtGdiGetCharWidthFloat 4 NtGdiGetClipBox 2 NtGdiGetColorSpace 1 -NtGdiGetCurrentObject 2 NtGdiGetCurrentPositionEx 2 NtGdiGetEnhMetaFile 1 NtGdiGetEnhMetaFileBits 3 @@ -795,7 +793,6 @@ NtGdiMoveToEx 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 -NtGdiPaintRgn 2 NtGdiPlayEnhMetaFile 3 NtGdiPlayEnhMetaFileRecord 4 NtGdiPolyBezier 3

1 0

[greatlrd] 28730: fix implement of GetTextFaceW checking if the param is vaild or not
by greatlrd＠svn.reactos.org 01 Sep '07

01 Sep '07

Author: greatlrd Date: Sat Sep 1 04:23:48 2007 New Revision: 28730 URL: http://svn.reactos.org/svn/reactos?rev=28730&view=rev Log: fix implement of GetTextFaceW checking if the param is vaild or not Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c Sat Sep 1 04:23:48 2007 @@ -318,15 +318,22 @@ /* * @implemented */ -int -STDCALL -GetTextFaceW( - HDC hDC, - int nCount, - LPWSTR lpFaceName - ) -{ - return NtGdiGetTextFaceW(hDC, nCount, lpFaceName, FALSE); +INT +STDCALL +GetTextFaceW(HDC hDC, + int nCount, + LPWSTR lpFaceName) +{ + INT retValue = 0; + if ((!lpFaceName) || (nCount)) + { + retValue = NtGdiGetTextFaceW(hDC,nCount,lpFaceName,0); + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } + return retValue; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007