ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
April 2007
----- 2025 -----
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
19 participants
380 discussions
Start a n
N
ew thread
[cwittich] 26393: fix some bugs in CreateActCtxA
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Apr 18 16:31:39 2007 New Revision: 26393 URL:
http://svn.reactos.org/svn/reactos?rev=26393&view=rev
Log: fix some bugs in CreateActCtxA Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac…
============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c Wed Apr 18 16:31:39 2007 @@ -65,44 +65,48 @@ ACTCTXW pActCtxW; HANDLE hRetVal; - ZeroMemory(&pActCtxW, sizeof(pActCtxW)); - pActCtxW.cbSize = sizeof(pActCtxW); + ZeroMemory(&pActCtxW, sizeof(ACTCTXW)); + pActCtxW.cbSize = sizeof(ACTCTXW); pActCtxW.dwFlags = pActCtx->dwFlags; + pActCtxW.wLangId = pActCtx->wLangId; + pActCtxW.hModule = pActCtx->hModule; pActCtxW.wProcessorArchitecture = pActCtx->wProcessorArchitecture; - pActCtxW.dwFlags = pActCtx->wProcessorArchitecture; pActCtxW.hModule = pActCtx->hModule; /* Convert ActCtx Strings */ - if (pActCtx->lpAssemblyDirectory) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpSource, - (LPWSTR*) &pActCtxW.lpSource); - } - - if (pActCtx->lpAssemblyDirectory) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpAssemblyDirectory, - (LPWSTR*) &pActCtxW.lpAssemblyDirectory); - } - if (pActCtx->lpResourceName) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpResourceName, - (LPWSTR*) &pActCtxW.lpResourceName); - } - if (pActCtx->lpApplicationName) - { - BasepAnsiStringToHeapUnicodeString(pActCtx->lpApplicationName, - (LPWSTR*) &pActCtxW.lpApplicationName); - } - + if (pActCtx->lpSource) + { + BasepAnsiStringToHeapUnicodeString(pActCtx->lpSource, + (LPWSTR*) &pActCtxW.lpSource); + } + if (pActCtx->lpAssemblyDirectory) + { + BasepAnsiStringToHeapUnicodeString(pActCtx->lpAssemblyDirectory, + (LPWSTR*) &pActCtxW.lpAssemblyDirectory); + } + if (HIWORD(pActCtx->lpResourceName)) + { + BasepAnsiStringToHeapUnicodeString(pActCtx->lpResourceName, + (LPWSTR*) &pActCtxW.lpResourceName); + } + else + { + pActCtxW.lpResourceName = (LPWSTR) pActCtx->lpResourceName; + } + if (pActCtx->lpApplicationName) + { + BasepAnsiStringToHeapUnicodeString(pActCtx->lpApplicationName, + (LPWSTR*) &pActCtxW.lpApplicationName); + } /* Call the Unicode function */ hRetVal = CreateActCtxW(&pActCtxW); /* Clean up */ RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpSource); RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpAssemblyDirectory); - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpResourceName); + if (HIWORD(pActCtx->lpResourceName)) + RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpResourceName); RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) pActCtxW.lpApplicationName); return hRetVal;
17 years, 9 months
1
0
0
0
[dgorbachev] 26392: Chinese translations by Zhangbing (bugs 2179, 2180).
by dgorbachev@svn.reactos.org
Author: dgorbachev Date: Wed Apr 18 12:53:15 2007 New Revision: 26392 URL:
http://svn.reactos.org/svn/reactos?rev=26392&view=rev
Log: Chinese translations by Zhangbing (bugs 2179, 2180). Added: trunk/reactos/base/applications/calc/lang/zh-CN.rc trunk/reactos/base/applications/wordpad/lang/zh-CN.rc Modified: trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/wordpad/rsrc.rc Added: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…
============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc Wed Apr 18 12:53:15 2007 @@ -1,0 +1,168 @@ +/* + * Calculator (Simplified Chinese resources) + * ¼ÆËãÆ÷(¼òÌåÖÐÎÄ×ÊÔ´) + * Copyright 2007 zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +//#define IDC_STATIC 1000 + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "¼ÆËãÆ÷" + + IDS_COPYRIGHT1, "¼ÆËãÆ÷ 5.0. »ùÓÚ LGPL 2 ÐÒé" + IDS_COPYRIGHT2 "°æȨ 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "
http://www.ActionMessage.com/winecalc/
" + + IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Degrees" + IDS_BTN_RADIANS, "Radians" + IDS_BTN_GRADS, "Grads" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" + IDS_ERR_INVALID_INPUT, "º¯ÊýÊäÈëÎÞЧ¡£" + IDS_ERR_DIVIDE_BY_ZERO, "³ýÊý²»ÄÜΪÁã¡£" + IDS_ERR_UNDEFINED, "º¯Êý½á¹û䶨Òå¡£" +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "±à¼(&E)" { + MENUITEM "¸´ÖÆ(&C) Ctrl+C", IDM_COPY + MENUITEM "Õ³Ìù(&P) Ctrl+V", IDM_PASTE + } + POPUP "²é¿´(&V)" { + MENUITEM "±ê×¼ÐÍ", IDM_MODE_STANDARD + MENUITEM "¿ÆѧÐÍ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Êý×Ö·Ö×é", IDM_DIGIT_GROUPING + } + POPUP "°ïÖú(&H)" { + MENUITEM "°ïÖúÖ÷Ìâ", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "¹ØÓÚ¼ÆËãÆ÷", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "±à¼(&E)" { + MENUITEM "¸´ÖÆ(&C) Ctrl+C", IDM_COPY + MENUITEM "Õ³Ìù(&P) Ctrl+V", IDM_PASTE + } + POPUP "²é¿´(&V)" { + MENUITEM "±ê×¼ÐÍ", IDM_MODE_STANDARD + MENUITEM "¿ÆѧÐÍ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Ê®Áù½øÖÆ(H)\tF5", ID_CALC_NS_HEX + MENUITEM "Ê®½øÖÆ(D)\tF6", ID_CALC_NS_DEC + MENUITEM "°Ë½øÖÆ(O)\tF7", ID_CALC_NS_OCT + MENUITEM "¶þ½øÖÆ(B)\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "½Ç¶È\tF2", ID_CALC_MS_DEGREES + MENUITEM "»¡¶È\tF3", ID_CALC_MS_RADIANS + MENUITEM "ÌݶÈ\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Êý×Ö·Ö×é", IDM_DIGIT_GROUPING + } + POPUP "°ïÖú(&H)" { + MENUITEM "°ïÖúÖ÷Ìâ", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "¹ØÓÚ¼ÆËãÆ÷", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "±à¼(&E)" { + MENUITEM "¸´ÖÆ(&C) Ctrl+C", IDM_COPY + MENUITEM "Õ³Ìù(&P) Ctrl+V", IDM_PASTE + } + POPUP "²é¿´(&V)" { + MENUITEM "±ê×¼ÐÍ", IDM_MODE_STANDARD + MENUITEM "¿ÆѧÐÍ", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Ê®Áù½øÖÆ(H)\tF5", ID_CALC_NS_HEX + MENUITEM "Ê®½øÖÆ(D)\tF6", ID_CALC_NS_DEC + MENUITEM "°Ë½øÖÆ(O)\tF7", ID_CALC_NS_OCT + MENUITEM "¶þ½øÖÆ(B)\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "ËÄ×Ö\tF12", ID_CALC_WS_QWORD + MENUITEM "Ë«×Ö\tF2", ID_CALC_WS_DWORD + MENUITEM "µ¥×Ö\tF3", ID_CALC_WS_WORD + MENUITEM "×Ö½Ú\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Êý×Ö·Ö×é", IDM_DIGIT_GROUPING + } + POPUP "°ïÖú(&H)" { + MENUITEM "°ïÖúÖ÷Ìâ", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "¹ØÓÚ¼ÆËãÆ÷", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + + +DLG_ABOUT DIALOGEX 12, 0, 140, 95 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU +CAPTION "¹ØÓÚ GNU winecalc" +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + //LTEXT "ÖÐÎÄ·Òë:Õűù (e_zb(a)21cn.com, ezb(a)mail.gywb.cn)",IDC_STATIC, 5, 57, 111, 25 + DEFPUSHBUTTON "È·¶¨",IDOK, 55, 75, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "What's This?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "ͳ¼Æ¿ò" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 9, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "·µ»Ø(&R)", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "¼ÓÔØ(&L)", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "ÇåÁã(&C)" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "È«Çå(&A)", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Modified: trunk/reactos/base/applications/calc/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr…
============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Wed Apr 18 12:53:15 2007 @@ -41,5 +41,6 @@ #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" -LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL Added: trunk/reactos/base/applications/wordpad/lang/zh-CN.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
============================================================================== --- trunk/reactos/base/applications/wordpad/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/wordpad/lang/zh-CN.rc Wed Apr 18 12:53:15 2007 @@ -1,0 +1,190 @@ +/* + * WordPad (Simplified Chinese resources) + * д×Ö°å(¼òÌåÖÐÎÄ×ÊÔ´) + * Copyright 2007 zhangbing <e_zb(a)21cn.com, ezb(a)mail.gywb.cn> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDR_MAINMENU MENU +BEGIN + POPUP "Îļþ(&F)" + BEGIN + MENUITEM "н¨(&N)...", ID_NEW + MENUITEM "´ò¿ª(&O)", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "¹Ø±Õ(&C)\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "¹Ø±ÕÈ«²¿(&L)", ID_CLOSEALL, GRAYED + MENUITEM SEPARATOR + MENUITEM "±£´æ(&S)", ID_SAVE, GRAYED + MENUITEM "Áí´æΪ(&A)...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "´òÓ¡Ô¤ÀÀ(&V)", ID_PRINTPRE, GRAYED + MENUITEM "´òÓ¡(&P)...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Ò³ÃæÉèÖÃ(&U)...", ID_PAGESETUP, GRAYED + MENUITEM SEPARATOR + MENUITEM "Í˳ö(&X)\tAlt+F4", ID_EXIT + END + POPUP "±à¼(&E)" + BEGIN + MENUITEM "³·Ïú(&U)", ID_UNDO, GRAYED + MENUITEM "ÖØ×ö(&R)", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "¼ôÇÐ(&T)", ID_CUT, GRAYED + MENUITEM "¸´ÖÆ(&C)", ID_COPY, GRAYED + MENUITEM "Õ³Ìù(&P)", ID_PASTE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Çå³ý", -1, GRAYED + MENUITEM "È«Ñ¡(&A)", ID_SELALL, GRAYED + MENUITEM SEPARATOR + MENUITEM "²éÕÒ(&F)...\tCtrl+F", -1, GRAYED + MENUITEM "²éÕÒÏÂÒ»¸ö", -1, GRAYED + MENUITEM "Ìæ»»\tCtrl+H", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "¶ÔÏóÊôÐÔ", -1, GRAYED + MENUITEM "¶ÔÏó", -1, GRAYED + END + POPUP "²é¿´(&V)" + BEGIN + MENUITEM "¹¤¾ßÀ¸(&T)", -1, CHECKED + MENUITEM "¸ñʽÀ¸(&F)", -1, CHECKED + MENUITEM "±ê³ß(&R)", -1, CHECKED + MENUITEM "״̬À¸(&S)", ID_STATUSBAR, CHECKED + END + POPUP "²åÈë(&I)" + BEGIN + MENUITEM "ÈÕÆÚºÍʱ¼ä(&D)...", -1, GRAYED + MENUITEM "¶ÔÏó(&O)...", -1, GRAYED + END + POPUP "¸ñʽ(&F)" + BEGIN + MENUITEM "×ÖÌå(&F)...", -1 GRAYED + MENUITEM "ÏîÄ¿·ûºÅÑùʽ", -1, GRAYED + MENUITEM "¶ÎÂä...", -1, GRAYED + MENUITEM "Ìø¸ñ¼ü...", -1, GRAYED + END + POPUP "´°¿Ú(&W)" + BEGIN + MENUITEM "²ãµþ´°¿Ú(&C)", ID_WINDOW_CASCADE + MENUITEM "ºáÏòƽÆÌ´°¿Ú(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "×ÝÏòƽÆÌ´°¿Ú(&V)", ID_WINDOW_TILE_VERT + MENUITEM "ÅÅÁÐͼ±ê(&A)", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "ÏÂÒ»¸ö´°¿Ú(&T)\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "°ïÖú(&H)" + BEGIN + MENUITEM "¹ØÓÚд×Ö°å(&A)...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_NEWDOCSEL DIALOGEX 6,6,159,67 +CAPTION "н¨" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + LTEXT "н¨ÎĵµÀàÐÍ:", IDC_STATIC, 4, 3, 72, 9 + LISTBOX IDC_LIST, 4, 16, 104, 46, WS_TABSTOP + PUSHBUTTON "È·¶¨(&O)", IDOK, 112, 16, 44, 13 + PUSHBUTTON "È¡Ïû(&C)", IDCANCEL, 112, 33, 44, 13 +END + + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "¹ØÓÚWordPad" +FONT 8, "MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "WordPad II v0.1\n°æȨ (C) 2006\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "ÖÐÎÄ·Òë:Õűù (e_zb(a)21cn.com, ezb(a)mail.gywb.cn)",IDC_STATIC, 48, 32, 111, 25 + PUSHBUTTON "È·¶¨", IDOK, 65, 165, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 50, 174, 110, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_DEFAULT_NAME "Document %1!u!" + IDS_READY " Ready." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DOC_TYPE_RICH_TEXT "RTF Îĵµ" + IDS_DOC_TYPE_UNICODE_TEXT "Îı¾Îĵµ" + IDS_DOC_TYPE_TEXT "Unicode Îı¾Îĵµ" +END + + + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "н¨" + IDS_TOOLTIP_OPEN "´ò¿ª" + IDS_TOOLTIP_SAVE "±£´æ" + IDS_TOOLTIP_PRINTPRE "´òÓ¡Ô¤ÀÀ" + IDS_TOOLTIP_PRINT "´òÓ¡" + IDS_TOOLTIP_CUT "¼ôÇÐ" + IDS_TOOLTIP_COPY "¸´ÖÆ" + IDS_TOOLTIP_PASTE "Õ³Ìù" + IDS_TOOLTIP_UNDO "³·Ïú" + IDS_TOOLTIP_REDO "ÖØ×ö" +END + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " ´´½¨ÐÂÎĵµ¡£" + IDS_HINT_OPEN " ´ò¿ªÒÑ´æÎĵµ¡£" + IDS_HINT_CLOSE " ¹Ø±Õ»î¶¯Îĵµ¡£" + IDS_HINT_CLOSEALL " ¹Ø±ÕËùÓÐÎĵµ¡£" + IDS_HINT_SAVE " ±£´æ»î¶¯Îĵµ¡£" + IDS_HINT_SAVEAS " ÓÃÐÂÃû×Ö±£´æ»î¶¯Îĵµ¡£" + IDS_HINT_PRINT " ´òÓ¡»î¶¯Îĵµ¡£" + IDS_HINT_PRINTPRE " ÏÔʾÕû¸öÒ³Ãæ¡£" + IDS_HINT_PAGESETUP " ¸Ä±äÒ³ÃæÉèÖá£" + IDS_HINT_EXIT " Í˳öÓ¦ÓóÌÐò£»ÌáÐÑÄú±£´æÎĵµ¡£" + + IDS_HINT_CASCADE " ÒÔÖصþ·½Ê½ÅÅÁд°¿Ú" + IDS_HINT_TILE_HORZ " ÒÔ·ÇÖصþµÄƽÆÌ·½Ê½ÅÅÁд°¿Ú" + IDS_HINT_TILE_VERT " ÒÔ·ÇÖصþµÄƽÆÌ·½Ê½ÅÅÁд°¿Ú" + IDS_HINT_ARRANGE " ÔÚ´°¿Úµ×²¿ÅÅÁÐͼ±ê" + IDS_HINT_NEXT " ¼¤»îÏÂÒ»¸ö´°¿Ú" + + IDS_HINT_SYS_RESTORE " »Ö¸´´°¿Ú" + IDS_HINT_SYS_MOVE " Òƶ¯´°¿Ú" + IDS_HINT_SYS_SIZE " Ð޸Ĵ°¿Ú³ß´ç" + IDS_HINT_SYS_MINIMIZE " ×îС»¯" + IDS_HINT_SYS_MAXIMIZE " ×î´ó»¯" +END + Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
============================================================================== --- trunk/reactos/base/applications/wordpad/rsrc.rc (original) +++ trunk/reactos/base/applications/wordpad/rsrc.rc Wed Apr 18 12:53:15 2007 @@ -9,4 +9,4 @@ #include "lang/it-IT.rc" #include "lang/nb-NO.rc" #include "lang/th-TH.rc" - +#include "lang/zh-CN.rc"
17 years, 9 months
1
0
0
0
[arty] 26391: Make disk ident work on qemu. Revision to bootcd method.
by arty@svn.reactos.org
Author: arty Date: Wed Apr 18 10:55:07 2007 New Revision: 26391 URL:
http://svn.reactos.org/svn/reactos?rev=26391&view=rev
Log: Make disk ident work on qemu. Revision to bootcd method. Added: branches/powerpc/reactos/tools/ppc.lost+found/hfsmap.lst Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c branches/powerpc/reactos/tools/ppc.lost+found/bootcd Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.c Wed Apr 18 10:55:07 2007 @@ -5,7 +5,7 @@ int prep_serial = 0x800003f8; -void sync() { __asm__("sync\n\teieio"); } +void sync() { __asm__("eieio\n\tsync"); } /* Simple serial */ @@ -63,7 +63,6 @@ void PpcPrepVideoPrepareForReactOS() { } - ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize ) { @@ -77,7 +76,8 @@ void PpcPrepInit() { MachVtbl.ConsPutChar = PpcPrepPutChar; - printf("Breathing ...\n"); + + printf("Serial on\n"); ide_setup( &ide1_desc ); Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep.h Wed Apr 18 10:55:07 2007 @@ -6,7 +6,7 @@ void sync(); void PpcPrepInit(); void ide_seek( void *extension, int low, int high ); -void ide_read( void *extension, char *buffer, int bytes ); +int ide_read( void *extension, char *buffer, int bytes ); void ide_setup( void *extension ); #endif//FREELDR_ARCH_POWERPC_PREP_H Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr…
============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c Wed Apr 18 10:55:07 2007 @@ -30,12 +30,21 @@ /* Wait for ready */ void ide_rdy( void *extension ) { idectl_desc *desc = (idectl_desc *)extension; - while( !(GetPhysByte(desc->port+7) & 8) ) sync(); + while( !(GetPhysByte(desc->port+7) & 0x40) ) sync(); +} + +void ide_drq( void *extension ) { + idectl_desc *desc = (idectl_desc *)extension; + while( !(GetPhysByte(desc->port+7) & 0x08) ) sync(); } void ide_bsy( void *extension ) { idectl_desc *desc = (idectl_desc *)extension; - while( GetPhysByte(desc->port+7) & 0x80 ) sync(); + while( GetPhysByte(desc->port+7) & 0x80 ) + { + printf("Waiting for not busy\n"); + sync(); + } } int ide_read( void *extension, char *buffer, int bytes ) { @@ -52,10 +61,7 @@ SetPhysByte(desc->port+6, desc->seek_head | 0xa0); SetPhysByte(desc->port+7, 0x20); - sync(); - for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) { - ide_rdy( extension ); in = GetPhysHalf(desc->port); databuf[inwords] = SWAP_W(in); sync(); @@ -74,14 +80,18 @@ short *databuf = (short *)identbuffer, in; int inwords; + ide_rdy( extension ); ide_bsy( extension ); + desc->bytespersec = 512; + SetPhysByte(desc->port+2, 1); + SetPhysByte(desc->port+3, 0); + SetPhysByte(desc->port+4, 0); + SetPhysByte(desc->port+5, 0); + SetPhysByte(desc->port+6, 0); SetPhysByte(desc->port+7, 0xec); - desc->bytespersec = 512; - - sync(); + ide_drq( extension ); for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) { - ide_rdy( extension ); in = GetPhysHalf(desc->port); databuf[inwords] = SWAP_W(in); sync(); Modified: branches/powerpc/reactos/tools/ppc.lost+found/bootcd URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%…
============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/bootcd (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/bootcd Wed Apr 18 10:55:07 2007 @@ -7,8 +7,9 @@ CD=output-ppc/ppcboot I=$CD/install +TOOLS=tools/ppc.lost+found -tools/ppc.lost+found/link-freeldr +$TOOLS/link-freeldr mkdir -p $I cp freeldr.elf $I/yaboot @@ -16,5 +17,5 @@ mkisofs -chrp-boot -U -part -hfs -T -r -l -J -A "ReactOS" -sysid PPC \ -V "ReactOS" -volset 1 -volset-size 1 -volset-seqno 1 \ - -hfs-volid "ReactOS" -hfs-bless $I -map hfsmap.lst \ + -hfs-volid "ReactOS" -hfs-bless $I -map $TOOLS/hfsmap.lst \ -no-desktop -allow-multidot -o ppcboot.iso $CD Added: branches/powerpc/reactos/tools/ppc.lost+found/hfsmap.lst URL:
http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%…
============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/hfsmap.lst (added) +++ branches/powerpc/reactos/tools/ppc.lost+found/hfsmap.lst Wed Apr 18 10:55:07 2007 @@ -1,0 +1,12 @@ +# ext. xlate creator type comment +.hqx Ascii 'BnHx' 'TEXT' "BinHex file" +.sit Raw 'SIT!' 'SITD' "StuffIT Expander" +.mov Raw 'TVOD' 'MooV' "QuickTime Movie" +.deb Raw 'Debn' 'bina' "Debian package" +.bin Raw 'ddsk' 'DDim' "Floppy or ramdisk image" +.img Raw 'ddsk' 'DDim' "Floppy or ramdisk image" +.b Raw 'UNIX' 'tbxi' "bootstrap" +yaboot Raw 'UNIX' 'boot' "bootstrap" +vmlinux Raw 'UNIX' 'boot' "bootstrap" +.conf Raw 'UNIX' 'conf' "bootstrap" +* Ascii '????' '????' "Text file"
17 years, 9 months
1
0
0
0
[cwittich] 26390: forgot to commit this file
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Apr 18 06:50:29 2007 New Revision: 26390 URL:
http://svn.reactos.org/svn/reactos?rev=26390&view=rev
Log: forgot to commit this file Added: trunk/reactos/dll/directx/d3d9/d3d9.rbuild Added: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (added) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Wed Apr 18 06:50:29 2007 @@ -1,0 +1,5 @@ +<module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll"> + <importlibrary definition="d3d9.def" /> + <file>d3d9.c</file> + <file>d3d9.rc</file> +</module>
17 years, 9 months
1
0
0
0
[cwittich] 26389: fix build of d3d9.dll and add it to bootcd
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Apr 18 06:40:09 2007 New Revision: 26389 URL:
http://svn.reactos.org/svn/reactos?rev=26389&view=rev
Log: fix build of d3d9.dll and add it to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/directx.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Wed Apr 18 06:40:09 2007 @@ -114,6 +114,7 @@ dll\directx\dxdiagn\dxdiagn.dll 1 dll\directx\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 +dll\directx\d3d9\d3d9.dll 1 dll\directx\devenum\devenum.dll 1 dll\keyboard\kbdbe\kbdbe.dll 1 Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re…
============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Wed Apr 18 06:40:09 2007 @@ -1,39 +1,41 @@ #include <windows.h> #include "d3d9.h" +#include <debug.h> + HRESULT DLLAPI Direct3DShaderValidatorCreate9(void) { - OutputDebugString("Direct3DShaderValidatorCreate9 not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI PSGPError(void) { - OutputDebugString("PSGPError not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI PSGPSampleTexture(void) { - OutputDebugString("PSGPSampleTexture not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI DebugSetLevel(void) { - OutputDebugString("DebugSetLevel not implemented."); + UNIMPLEMENTED return 0; } HRESULT DLLAPI DebugSetMute(DWORD dw1) { - OutputDebugString("DebugSetMute not implemented."); + UNIMPLEMENTED return 0; } DWORD DLLAPI Direct3DCreate9( UINT SDKVersion ) { - OutputDebugString("Direct3DCreate9 not implemented."); + UNIMPLEMENTED return 0; } Modified: trunk/reactos/dll/directx/directx.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild…
============================================================================== --- trunk/reactos/dll/directx/directx.rbuild (original) +++ trunk/reactos/dll/directx/directx.rbuild Wed Apr 18 06:40:09 2007 @@ -28,5 +28,8 @@ <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" /> </directory> +<directory name="d3d9"> + <xi:include href="d3d9/d3d9.rbuild" /> +</directory> </group>
17 years, 9 months
1
0
0
0
[cwittich] 26388: include npfs.h before debug.h - this fixes compilation with MSVC
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Apr 18 05:51:27 2007 New Revision: 26388 URL:
http://svn.reactos.org/svn/reactos?rev=26388&view=rev
Log: include npfs.h before debug.h - this fixes compilation with MSVC Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.c trunk/reactos/drivers/filesystems/npfs/rw.c trunk/reactos/drivers/filesystems/npfs/volume.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c…
============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f…
============================================================================== --- trunk/reactos/drivers/filesystems/npfs/finfo.c (original) +++ trunk/reactos/drivers/filesystems/npfs/finfo.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f…
============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c Wed Apr 18 05:51:27 2007 @@ -9,10 +9,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n…
============================================================================== --- trunk/reactos/drivers/filesystems/npfs/npfs.c (original) +++ trunk/reactos/drivers/filesystems/npfs/npfs.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r…
============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES ******************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/filesystems/npfs/volume.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v…
============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volume.c (original) +++ trunk/reactos/drivers/filesystems/npfs/volume.c Wed Apr 18 05:51:27 2007 @@ -8,10 +8,10 @@ /* INCLUDES *****************************************************************/ +#include "npfs.h" + #define NDEBUG #include <debug.h> - -#include "npfs.h" /* FUNCTIONS ****************************************************************/
17 years, 9 months
1
0
0
0
[cwittich] 26387: fix formatting (no code changes)
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Apr 18 05:25:28 2007 New Revision: 26387 URL:
http://svn.reactos.org/svn/reactos?rev=26387&view=rev
Log: fix formatting (no code changes) Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/finfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/npfs.c trunk/reactos/drivers/filesystems/npfs/npfs.h trunk/reactos/drivers/filesystems/npfs/rw.c trunk/reactos/drivers/filesystems/npfs/volume.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c…
Modified: trunk/reactos/drivers/filesystems/npfs/finfo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f…
Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f…
Modified: trunk/reactos/drivers/filesystems/npfs/npfs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n…
Modified: trunk/reactos/drivers/filesystems/npfs/npfs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/n…
Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r…
Modified: trunk/reactos/drivers/filesystems/npfs/volume.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v…
17 years, 9 months
1
0
0
0
[cwittich] 26386: don't cast HBITMAP to HICON in when type is IMAGE_BITMAP
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Apr 18 04:55:04 2007 New Revision: 26386 URL:
http://svn.reactos.org/svn/reactos?rev=26386&view=rev
Log: don't cast HBITMAP to HICON in when type is IMAGE_BITMAP Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b…
============================================================================== --- trunk/reactos/dll/win32/user32/windows/bitmap.c (original) +++ trunk/reactos/dll/win32/user32/windows/bitmap.c Wed Apr 18 04:55:04 2007 @@ -763,7 +763,7 @@ } } HeapFree(GetProcessHeap(), 0, bi); - return (HICON)res; + return res; } case IMAGE_ICON: {
17 years, 9 months
1
0
0
0
[cwittich] 26385: take care of DIB_PAL_COLORS in NtGdiStretchDIBits
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Apr 18 04:38:36 2007 New Revision: 26385 URL:
http://svn.reactos.org/svn/reactos?rev=26385&view=rev
Log: take care of DIB_PAL_COLORS in NtGdiStretchDIBits Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c 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 Wed Apr 18 04:38:36 2007 @@ -575,6 +575,7 @@ { HBITMAP hBitmap, hOldBitmap; HDC hdcMem; + HPALETTE hPal = NULL; if (!Bits || !BitsInfo) { @@ -586,6 +587,12 @@ hBitmap = NtGdiCreateCompatibleBitmap(hDC, BitsInfo->bmiHeader.biWidth, BitsInfo->bmiHeader.biHeight); hOldBitmap = NtGdiSelectObject(hdcMem, hBitmap); + + if(Usage == DIB_PAL_COLORS) + { + hPal = NtGdiGetCurrentObject(hDC, OBJ_PAL); + hPal = NtGdiSelectPalette(hdcMem, hPal, FALSE); + } if (BitsInfo->bmiHeader.biCompression == BI_RLE4 || BitsInfo->bmiHeader.biCompression == BI_RLE8) @@ -613,6 +620,9 @@ NtGdiStretchBlt(hDC, XDest, YDest, DestWidth, DestHeight, hdcMem, XSrc, abs(BitsInfo->bmiHeader.biHeight) - SrcHeight - YSrc, SrcWidth, SrcHeight, ROP, 0); + + if(hPal) + NtGdiSelectPalette(hdcMem, hPal, FALSE); NtGdiSelectObject(hdcMem, hOldBitmap); NtGdiDeleteObjectApp(hdcMem);
17 years, 9 months
1
0
0
0
[cwittich] 26384: fix console font
by cwittich@svn.reactos.org
Author: cwittich Date: Wed Apr 18 03:38:39 2007 New Revision: 26384 URL:
http://svn.reactos.org/svn/reactos?rev=26384&view=rev
Log: fix console font Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Wed Apr 18 03:38:39 2007 @@ -860,7 +860,7 @@ PWCHAR To; BYTE LastAttribute, Attribute; ULONG CursorX, CursorY, CursorHeight; - HBRUSH CursorBrush, OldBrush; + HBRUSH CursorBrush, OldBrush, BackgroundBrush; HFONT OldFont; Buff = Console->ActiveBuffer; @@ -881,6 +881,10 @@ OldFont = SelectObject(hDC, GuiData->Font); + + BackgroundBrush = CreateSolidBrush(GuiData->ScreenBackground); + FillRect(hDC, rc, BackgroundBrush); + DeleteObject(BackgroundBrush); for (Line = TopLine; Line <= BottomLine; Line++) {
17 years, 9 months
1
0
0
0
← Newer
1
...
19
20
21
22
23
24
25
...
38
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
Results per page:
10
25
50
100
200