Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 26491: Fix some prototypes, prepare Wine sync of msvfw32
by hpoussin＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: hpoussin Date: Wed Apr 25 12:18:48 2007 New Revision: 26491 URL: http://svn.reactos.org/svn/reactos?rev=26491&view=rev Log: Fix some prototypes, prepare Wine sync of msvfw32 Modified: trunk/reactos/include/psdk/commctrl.h trunk/reactos/include/psdk/vfw.h trunk/reactos/media/doc/README.WINE trunk/reactos/tools/rgenstat/module_list.txt Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h (original) +++ trunk/reactos/include/psdk/commctrl.h Wed Apr 25 12:18:48 2007 @@ -28,7 +28,7 @@ #endif BOOL WINAPI ShowHideMenuCtl (HWND, UINT_PTR, LPINT); -VOID WINAPI GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, LPINT lpInfo); +VOID WINAPI GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, const INT *lpInfo); VOID WINAPI InitCommonControls (VOID); typedef struct tagINITCOMMONCONTROLSEX { @@ -344,8 +344,8 @@ HWND WINAPI CreateStatusWindowA (LONG, LPCSTR, HWND, UINT); HWND WINAPI CreateStatusWindowW (LONG, LPCWSTR, HWND, UINT); #define CreateStatusWindow WINELIB_NAME_AW(CreateStatusWindow) -void WINAPI DrawStatusTextA (HDC hdc, LPRECT lprc, LPCSTR text, UINT style); -void WINAPI DrawStatusTextW (HDC hdc, LPRECT lprc, LPCWSTR text, UINT style); +void WINAPI DrawStatusTextA (HDC hdc, LPCRECT lprc, LPCSTR text, UINT style); +void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style); #define DrawStatusText WINELIB_NAME_AW(DrawStatusText) VOID WINAPI MenuHelp (UINT, WPARAM, LPARAM, HMENU, HINSTANCE, HWND, UINT*); Modified: trunk/reactos/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vfw.h?rev=264… ============================================================================== --- trunk/reactos/include/psdk/vfw.h (original) +++ trunk/reactos/include/psdk/vfw.h Wed Apr 25 12:18:48 2007 @@ -379,6 +379,15 @@ typedef WORD TWOCC; typedef BOOL (CALLBACK *AVISAVECALLBACK)(INT); typedef struct { + LONG timeCount; + LONG timeDraw; + LONG timeDecompress; + LONG timeDither; + LONG timeStretch; + LONG timeBlt; + LONG timeSetDIBits; +} DRAWDIBTIME, *LPDRAWDIBTIME; +typedef struct { DWORD dwSize; DWORD fccType; DWORD fccHandler; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Wed Apr 25 12:18:48 2007 @@ -56,7 +56,7 @@ reactos/dll/win32/msacm # Out of sync reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Autosync -reactos/dll/win32/msvideo # Out of sync +reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. Modified: trunk/reactos/tools/rgenstat/module_list.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/module_list… ============================================================================== --- trunk/reactos/tools/rgenstat/module_list.txt (original) +++ trunk/reactos/tools/rgenstat/module_list.txt Wed Apr 25 12:18:48 2007 @@ -82,7 +82,7 @@ msimg32 dll\win32\msimg32 msvcrt dll\win32\msvcrt msvcrt20 dll\win32\msvcrt20 -msvfw32 dll\win32\msvideo +msvfw32 dll\win32\msvfw32 mswsock dll\win32\mswsock netapi32 dll\win32\netapi32 netcfgx dll\win32\netcfgx

1 0

[hpoussin] 26490: Oops, typo
by hpoussin＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: hpoussin Date: Wed Apr 25 11:57:40 2007 New Revision: 26490 URL: http://svn.reactos.org/svn/reactos?rev=26490&view=rev Log: Oops, typo Modified: trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Wed Apr 25 11:57:40 2007 @@ -130,7 +130,7 @@ <directory name="msvcrt20"> <xi:include href="msvcrt20/msvcrt20.rbuild" /> </directory> -<directory name="msvideo"> +<directory name="msvfw32"> <xi:include href="msvfw32/msvfw32.rbuild" /> </directory> <directory name="mswsock">

1 0

[hpoussin] 26489: Rename msvideo to msvfw32, part 2/2
by hpoussin＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: hpoussin Date: Wed Apr 25 11:51:26 2007 New Revision: 26489 URL: http://svn.reactos.org/svn/reactos?rev=26489&view=rev Log: Rename msvideo to msvfw32, part 2/2 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.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 25 11:51:26 2007 @@ -181,7 +181,7 @@ dll\win32\msimg32\msimg32.dll 1 dll\win32\msvcrt\msvcrt.dll 1 dll\win32\msvcrt20\msvcrt20.dll 1 -dll\win32\msvideo\msvfw32.dll 1 +dll\win32\msvfw32\msvfw32.dll 1 dll\win32\mswsock\mswsock.dll 1 dll\win32\netapi32\netapi32.dll 1 dll\win32\netcfgx\netcfgx.dll 1 Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Wed Apr 25 11:51:26 2007 @@ -131,7 +131,7 @@ <xi:include href="msvcrt20/msvcrt20.rbuild" /> </directory> <directory name="msvideo"> - <xi:include href="msvideo/msvfw32.rbuild" /> + <xi:include href="msvfw32/msvfw32.rbuild" /> </directory> <directory name="mswsock"> <xi:include href="mswsock/mswsock.rbuild" />

1 0

[hpoussin] 26488: Rename msvideo to msvfw32, part 1/2
by hpoussin＠svn.reactos.org 25 Apr '07

25 Apr '07

Author: hpoussin Date: Wed Apr 25 11:49:34 2007 New Revision: 26488 URL: http://svn.reactos.org/svn/reactos?rev=26488&view=rev Log: Rename msvideo to msvfw32, part 1/2 Added: trunk/reactos/dll/win32/msvfw32/ - copied from r26487, trunk/reactos/dll/win32/msvideo/ Removed: trunk/reactos/dll/win32/msvideo/

1 0

[janderwald] 26487: - remove reference
by janderwald＠svn.reactos.org 24 Apr '07

24 Apr '07

Author: janderwald Date: Wed Apr 25 02:53:40 2007 New Revision: 26487 URL: http://svn.reactos.org/svn/reactos?rev=26487&view=rev Log: - remove reference Modified: trunk/reactos/base/applications/applications.rbuild Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild (original) +++ trunk/reactos/base/applications/applications.rbuild Wed Apr 25 02:53:40 2007 @@ -55,8 +55,4 @@ <directory name="wordpad"> <xi:include href="wordpad/wordpad.rbuild" /> </directory> -<directory name="winver"> - <xi:include href="winver/winver.rbuild" /> -</directory> - </group>

1 0

[janderwald] 26486: - this module should only live in rosapps
by janderwald＠svn.reactos.org 24 Apr '07

24 Apr '07

Author: janderwald Date: Wed Apr 25 02:53:01 2007 New Revision: 26486 URL: http://svn.reactos.org/svn/reactos?rev=26486&view=rev Log: - this module should only live in rosapps Removed: trunk/reactos/base/applications/winver/

1 0

[tkreuzer] 26485: - Fix BITMAP_GetObject() - NtGdiExtGetObjectW: return 0 if IntGdiGetObject returns 0
by tkreuzer＠svn.reactos.org 24 Apr '07

24 Apr '07

Author: tkreuzer Date: Tue Apr 24 23:01:52 2007 New Revision: 26485 URL: http://svn.reactos.org/svn/reactos?rev=26485&view=rev Log: - Fix BITMAP_GetObject() - NtGdiExtGetObjectW: return 0 if IntGdiGetObject returns 0 Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dc.c 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 Tue Apr 24 23:01:52 2007 @@ -1566,14 +1566,6 @@ BITMAP_GetObject(BITMAPOBJ * bmp, INT Count, LPVOID buffer) { if ((UINT)Count < sizeof(BITMAP)) return 0; - if( buffer == NULL ) - { - if ((UINT)Count < sizeof(DIBSECTION)) - { - return sizeof(BITMAP); - } - return sizeof(DIBSECTION); - } if(bmp->dib) { @@ -1585,23 +1577,30 @@ { Count = sizeof(DIBSECTION); } - memcpy(buffer, bmp->dib, Count); + if (buffer) + { + memcpy(buffer, bmp->dib, Count); + } return Count; } else { - BITMAP Bitmap; - Count = sizeof(BITMAP); - Bitmap.bmType = 0; - Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx; - Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy; - Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta); - Bitmap.bmPlanes = 1; - Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat); - //Bitmap.bmBits = bmp->SurfObj.pvBits; - Bitmap.bmBits = NULL; /* not set accoring wine test confirm in win2k */ - memcpy(buffer, &Bitmap, Count); + if (buffer) + { + BITMAP Bitmap; + + Count = sizeof(BITMAP); + Bitmap.bmType = 0; + Bitmap.bmWidth = bmp->SurfObj.sizlBitmap.cx; + Bitmap.bmHeight = bmp->SurfObj.sizlBitmap.cy; + Bitmap.bmWidthBytes = abs(bmp->SurfObj.lDelta); + Bitmap.bmPlanes = 1; + Bitmap.bmBitsPixel = BitsPerFormat(bmp->SurfObj.iBitmapFormat); + //Bitmap.bmBits = bmp->SurfObj.pvBits; + Bitmap.bmBits = NULL; /* not set accoring wine test confirm in win2k */ + memcpy(buffer, &Bitmap, Count); + } return Count; } } 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 Tue Apr 24 23:01:52 2007 @@ -1832,6 +1832,10 @@ } RetCount = IntGdiGetObject(hGdiObj, cbCount, NULL); + if (!RetCount) + { + return 0; + } if ((UINT)cbCount > RetCount) { cbCount = RetCount;

1 0

[dgorbachev] 26484: Simplified Chinese resources from Zhangbing (bug #2202).
by dgorbachev＠svn.reactos.org 24 Apr '07

24 Apr '07

Author: dgorbachev Date: Tue Apr 24 16:58:14 2007 New Revision: 26484 URL: http://svn.reactos.org/svn/reactos?rev=26484&view=rev Log: Simplified Chinese resources from Zhangbing (bug #2202). Added: trunk/reactos/base/setup/reactos/lang/zh-CN.rc trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc trunk/reactos/base/setup/welcome/lang/zh-CN.rc Modified: trunk/reactos/base/setup/reactos/reactos.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/setup/welcome/rsrc.rc Added: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/zh-CN.rc (added) +++ trunk/reactos/base/setup/reactos/lang/zh-CN.rc Tue Apr 24 16:58:14 2007 @@ -1,0 +1,30 @@ +/* + * reactos (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 + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION " ReactOS °²×° " + IDS_TEXT " ²»ÄÜÖ±½Ó´ÓÕâ¸ö CD °²×° ReactOS! \n\n ÇëÖØÐÂÆô¶¯ÄãµÄ¼ÆËã»úÑ¡Ôñ´Ó¹âÅÌÒýµ¼À´°²×° ReactOS¡£" +END + +/* EOF */ Modified: trunk/reactos/base/setup/reactos/reactos.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rc (original) +++ trunk/reactos/base/setup/reactos/reactos.rc Tue Apr 24 16:58:14 2007 @@ -32,5 +32,6 @@ #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" /* EOF */ Added: trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/zh… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc (added) +++ trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc Tue Apr 24 16:58:14 2007 @@ -1,0 +1,152 @@ +/* + * vmwinst (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 + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT " ReactOS °²×°³ÌÐò¼ì²âµ½ÄãµÄÏµÍ³ÔËÐÐÔÚ VMware(r) »·¾³ÖÐ¡£", -1, 100, 8, 160, 24 + LTEXT " Èç¹ûÄúÏ£Íû°²×° VMware(r) µÄ SVGA Çý¶¯³ÌÐòÇëµã»÷ ¡°ÏÂÒ»²½¡± ·ñÔòÇëµã»÷¡°È¡Ïû¡± ¡£", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT " ReactOS °²×°³ÌÐò²»ÄÜ¼ÌÐø VMware(r) SVGA Çý¶¯³ÌÐòµÄ°²×°¡£\n\n Ñ¡Ôñ VMware(r) workstation ²Ëµ¥µÄ [File] ²¢Ñ¡Ôñ [ Install VMware tools...]( °²×° VMware Tools)¡£\n\n\n µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø»òµã»÷¡°È¡Ïû¡±Ìø¹ý SVGA Çý¶¯³ÌÐò°²×°½øÈë ¡£",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT " VMware(r) SVGA Çý¶¯³ÌÐòÒÑ¾³É¹¦°²×°¡£ÇëÑ¡ÔñÏëÊ¹ÓÃµÄÆÁÄ»·Ö±æÂÊ :",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT " ÇëÑ¡ÔñÏëÊ¹ÓÃµÄÑÕÉ«ÊýÁ¿ :",-1,25,93,225,12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT " ReactOS °²×°³ÌÐòÎÞ·¨°²×° VMware(r) SVGA Çý¶¯³ÌÐò¡£\n\n\n Çëµã»÷¡°Íê³É¡±¼ÌÐøReactOS µÄ°²×° ¡£",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT " VMware(r) SVGA Çý¶¯³ÌÐòÒÑ¾°²×°¡£\n\n ÇëÑ¡ÔñÄúÐèÒªµÄÉè¶¨:",-1,25,5,225,30 + PUSHBUTTON " ÅäÖÃÆÁÄ»ÉèÖÃ ", IDC_CONFIGSETTINGS,25,40,200,15, BS_AUTORADIOBUTTON + PUSHBUTTON " Ê¹ÓÃÁíÍâµÄÍ¼ÐÎÇý¶¯³ÌÐò ", IDC_USEOTHERDRIVER,25,55,200,15, BS_AUTORADIOBUTTON + PUSHBUTTON " Ð¶ÔØ VMware(r) SVGA Çý¶¯³ÌÐò ", IDC_UNINSTALL,25,70,200,15, BS_AUTORADIOBUTTON + LTEXT " µã»÷¡°ÏÂÒ»²½¡±¼ÌÐø£¬»ò¡°È¡Ïû¡±ÊøÏòµ¼ ¡£", -1, 25, 93, 225, 12 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT " ÇëÑ¡ÔñÏëÊ¹ÓÃµÄÍ¼ÐÎÇý¶¯³ÌÐò :",-1,25,25,225,15 + PUSHBUTTON " ReactOS VGA Çý¶¯³ÌÐò ", IDC_VGA,25,40,225,15, BS_AUTORADIOBUTTON + PUSHBUTTON " ReactOS VBE Çý¶¯³ÌÐò ( SVGA)", IDC_VBE,25,55,225,15, BS_AUTORADIOBUTTON + LTEXT " µã»÷¡°½áÊø¡±Íê³É°²×°»òµã»÷¡°È¡Ïû¡±²»±£´æÈÎºÎÐÞ¸Ä¡£", -1, 25, 93, 225, 20 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION " ÊÓÆµÇý¶¯³ÌÐò°²×° " +FONT 9, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT " ReactOS °²×°³ÌÐò½«ÒªÐ¶ÔØ VMware(r) SVGA Çý¶¯³ÌÐò !!!\n\n\n µã»÷¡°Íê³É¡±Ð¶ÔØÇý¶¯³ÌÐò£¬·ñÔòÇëµã»÷¡°È¡Ïû¡± ¡£",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME " ¼ì²âµ½ VMware(r) " + IDS_FAILEDTOLOCATEDRIVERS " ReactOS °²×°³ÌÐòÃ»·¢ÏÖÐèÒªµÄÎÄ¼þ¡£\n ÇëÈ·ÈÏ²åÈëVMware(r) Tools µÄ CD-ROM ¡£" + IDS_FAILEDTOCOPYFILES " ReactOS °²×°³ÌÐò¸´ÖÆÎÄ¼þÊ§°Ü¡£\n ÇëÈ·ÈÏ²åÈëVMware(r) Tools µÄ CD-ROM ¡£" + IDS_FAILEDTOACTIVATEDRIVER " VMware(r) SVGA Çý¶¯³ÌÐòÆô¶¯Ê§°Ü !" + IDS_FAILEDTOSELVGADRIVER " ReactOS VGA Çý¶¯³ÌÐòÆô¶¯Ê§°Ü !" + IDS_FAILEDTOSELVBEDRIVER " ReactOS VBE Çý¶¯³ÌÐòÆô¶¯Ê§°Ü !" + IDS_UNINSTNOTICE " VMware(r) SVGA Çý¶¯³ÌÐòÎ´±»É¾³ý¡£\n ÔÚÏµÍ³´ÓÐÂÆô¶¯Ö®ºó£¬ÇëÒÔÊÖ¶¯É¾³ýÎ´±»É¾³ýµÄÎÄ¼þ¡£" + IDS_FAILEDTOADDREGENTRIES " VMware(r) SVGA Çý¶¯³ÌÐò×¢²á±í²Ù×÷Ê§°Ü!" +END + +STRINGTABLE +BEGIN + 10001 " ×îµÍ (8 BPP)" + 10002 " ÖÐ (16 BPP)" + 10003 " ×î¸ß (32 BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM " ÕýÔÚËÑË÷ VMware(r) Tools µÄ CD- ROM..." + IDS_COPYINGFILES " ÕýÔÚ¸´ÖÆÎÄ¼þ ..." + IDS_ENABLINGDRIVER " ÕýÔÚÆô¶¯ VMware(r) SVGA Çý¶¯³ÌÐò ..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE " VMware(r) SVGA Çý¶¯³ÌÐò°²×°Ïòµ¼ " + IDD_INSERT_VMWARE_TOOLSSUBTITLE " Çë²åÈë VMware tools µÄ CD- ROM ¡£" + IDD_INSTALLING_VMWARE_TOOLSTITLE " VMware(r) SVGA Çý¶¯³ÌÐò°²×°Ïòµ¼ " + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE " VMware(r) SVGA Çý¶¯³ÌÐòµÄ²éÑ¯ºÍ¸´Ó¡¡£" + IDD_CONFIGTITLE " VMware(r) SVGA Çý¶¯³ÌÐò°²×°Ïòµ¼ " + IDD_CONFIGSUBTITLE " ÇëÑ¡ÔñÏëÊ¹ÓÃµÄÆÁÄ»·Ö±æÂÊ¡£" + IDD_INSTALLATION_FAILEDTITLE " VMware(r) SVGA Çý¶¯³ÌÐò°²×°Ïòµ¼ " + IDD_INSTALLATION_FAILEDSUBTITLE " VMware(r) SVGA Çý¶¯³ÌÐò°²×°Ê§°Ü¡£" + IDD_CHOOSEACTIONTITLE " VMware(r) SVGA Çý¶¯³ÌÐò°²×°Ïòµ¼ " + IDD_CHOOSEACTIONSUBTITLE " Ñ¡Ôñ¡£" + IDD_SELECTDRIVERTITLE " VMware(r) SVGA Çý¶¯³ÌÐò°²×°Ïòµ¼ " + IDD_SELECTDRIVERSUBTITLE " Ñ¡ÔñÇý¶¯³ÌÐò¡£" + IDD_DOUNINSTALLTITLE " VMware(r) SVGA Çý¶¯³ÌÐò°²×°Ïòµ¼ " + IDD_DOUNINSTALLSUBTITLE " Ð¶ÔØÇý¶¯³ÌÐò¡£" +END Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/vmwinst/rsrc.rc (original) +++ trunk/reactos/base/setup/vmwinst/rsrc.rc Tue Apr 24 16:58:14 2007 @@ -27,3 +27,4 @@ #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc" Added: trunk/reactos/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/zh… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/zh-CN.rc (added) +++ trunk/reactos/base/setup/welcome/lang/zh-CN.rc Tue Apr 24 16:58:14 2007 @@ -1,0 +1,80 @@ +/* + * welcome (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 + +/* String Tables */ + +/* Default settings */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPTITLE "ReactOS - »¶Ó" + IDS_DEFAULTTOPICTITLE "ReactOS" + IDS_DEFAULTTOPICDESC " »¶ÓÊ¹ÓÃ React ²Ù×÷ÏµÍ³¡£\n\n Çëµã»÷×ó±ßµÄÖ÷Ìâ¡£" +// IDS_CHECKTEXT "Show this dialog again" +// IDS_CLOSETEXT "Exit" +END + +/* Topic buttons */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICBUTTON0 " °²×° ReactOS" + IDS_TOPICBUTTON1 " ä¯ÀÀ CD" + IDS_TOPICBUTTON2 " ÍË³ö " +// IDS_TOPICBUTTON3 "Empty Topic 3" +// IDS_TOPICBUTTON4 "Empty Topic 4" +// IDS_TOPICBUTTON5 "Empty Topic 5" +// IDS_TOPICBUTTON6 "Empty Topic 6" +// IDS_TOPICBUTTON7 "Empty Topic 7" +// IDS_TOPICBUTTON8 "Empty Topic 8" +// IDS_TOPICBUTTON9 "Empty Topic 9" +END + +/* Topic titles */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICTITLE0 " °²×° ReactOS" + IDS_TOPICTITLE1 " ä¯ÀÀ CD" + IDS_TOPICTITLE2 " ÍË³ö " +// IDS_TOPICTITLE3 "Empty Topic Title 3" +// IDS_TOPICTITLE4 "Empty Topic Title 4" +// IDS_TOPICTITLE5 "Empty Topic Title 5" +// IDS_TOPICTITLE6 "Empty Topic Title 6" +// IDS_TOPICTITLE7 "Empty Topic Title 7" +// IDS_TOPICTITLE8 "Empty Topic Title 8" +// IDS_TOPICTITLE9 "Empty Topic Title 9" +END + +/* Topic descriptions */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOPICDESC0 " ÖØÐÂ°²×° ReactOS »ò ¸üÐÂÄãµÄReactOS ¡£" + IDS_TOPICDESC1 " ä¯ÀÀ CD µÄÄÚÈÝ¡£" + IDS_TOPICDESC2 " µã»÷ÍË³öÓ¦ÓÃ³ÌÐò¡£" +// IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." +// IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." +// IDS_TOPICDESC5 "Topic description 5.\n\nDescribe topic 5 here." +// IDS_TOPICDESC6 "Topic description 6.\n\nDescribe topic 6 here." +// IDS_TOPICDESC7 "Topic description 7.\n\nDescribe topic 7 here." +// IDS_TOPICDESC8 "Topic description 8.\n\nDescribe topic 8 here." +// IDS_TOPICDESC9 "Topic description 9.\n\nDescribe topic 9 here." +END + +/* EOF */ Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… ============================================================================== --- trunk/reactos/base/setup/welcome/rsrc.rc (original) +++ trunk/reactos/base/setup/welcome/rsrc.rc Tue Apr 24 16:58:14 2007 @@ -58,3 +58,4 @@ #include "lang/th-TH.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/zh-CN.rc"

1 0

[dgorbachev] 26483: Undo r26482 change, waste more stack space.
by dgorbachev＠svn.reactos.org 24 Apr '07

24 Apr '07

Author: dgorbachev Date: Tue Apr 24 09:05:49 2007 New Revision: 26483 URL: http://svn.reactos.org/svn/reactos?rev=26483&view=rev Log: Undo r26482 change, waste more stack space. Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Tue Apr 24 09:05:49 2007 @@ -106,9 +106,15 @@ // #ifdef __GNUC__ -#define DEFINE_WAIT_BLOCK(x) \ - PEX_PUSH_LOCK_WAIT_BLOCK x = __builtin_alloca(sizeof(EX_PUSH_LOCK_WAIT_BLOCK)); - +#define DEFINE_WAIT_BLOCK(x) \ + struct _AlignHack \ + { \ + UCHAR Hack[15]; \ + EX_PUSH_LOCK_WAIT_BLOCK UnalignedBlock; \ + } WaitBlockBuffer; \ + PEX_PUSH_LOCK_WAIT_BLOCK x = (PEX_PUSH_LOCK_WAIT_BLOCK) \ + ((ULONG_PTR)&WaitBlockBuffer.UnalignedBlock &~ 0xF); + #else // @@ -116,8 +122,8 @@ // local variable (the actual pointer) away, so we don't take any perf hit // by doing this. // -#define DEFINE_WAIT_BLOCK(x) \ - EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ +#define DEFINE_WAIT_BLOCK(x) \ + EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ PEX_PUSH_LOCK_WAIT_BLOCK x = &WaitBlockBuffer; #endif

1 0

[dgorbachev] 26482: Use allocation function instead of hack, save 12 bytes.
by dgorbachev＠svn.reactos.org 23 Apr '07

23 Apr '07

Author: dgorbachev Date: Tue Apr 24 02:06:34 2007 New Revision: 26482 URL: http://svn.reactos.org/svn/reactos?rev=26482&view=rev Log: Use allocation function instead of hack, save 12 bytes. Modified: trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Tue Apr 24 02:06:34 2007 @@ -102,22 +102,13 @@ #define MAX_HIGH_INDEX (MID_LEVEL_ENTRIES * MID_LEVEL_ENTRIES * LOW_LEVEL_ENTRIES) // -// Detect GCC 4.1.2+ +// Detect GCC // -#if 1 // (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40102 - -// -// Broken GCC with Alignment Bug. We'll do alignment ourselves at higher cost. -// -#define DEFINE_WAIT_BLOCK(x) \ - struct _AlignHack \ - { \ - UCHAR Hack[15]; \ - EX_PUSH_LOCK_WAIT_BLOCK UnalignedBlock; \ - } WaitBlockBuffer; \ - PEX_PUSH_LOCK_WAIT_BLOCK x = (PEX_PUSH_LOCK_WAIT_BLOCK) \ - ((ULONG_PTR)&WaitBlockBuffer.UnalignedBlock &~ 0xF); - +#ifdef __GNUC__ + +#define DEFINE_WAIT_BLOCK(x) \ + PEX_PUSH_LOCK_WAIT_BLOCK x = __builtin_alloca(sizeof(EX_PUSH_LOCK_WAIT_BLOCK)); + #else // @@ -125,8 +116,8 @@ // local variable (the actual pointer) away, so we don't take any perf hit // by doing this. // -#define DEFINE_WAIT_BLOCK(x) \ - EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ +#define DEFINE_WAIT_BLOCK(x) \ + EX_PUSH_LOCK_WAIT_BLOCK WaitBlockBuffer; \ PEX_PUSH_LOCK_WAIT_BLOCK x = &WaitBlockBuffer; #endif @@ -725,7 +716,7 @@ if (InterlockedBitTestAndSet((PLONG)PushLock, EX_PUSH_LOCK_LOCK_V)) { /* Someone changed it, use the slow path */ - DbgPrint("%s - Contention!\n", __FUNCTION__); + // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfAcquirePushLockExclusive(PushLock); } @@ -763,7 +754,7 @@ if (ExpChangePushlock(PushLock, NewValue.Ptr, 0)) { /* Someone changed it, use the slow path */ - DbgPrint("%s - Contention!\n", __FUNCTION__); + // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfAcquirePushLockShared(PushLock); } @@ -977,7 +968,7 @@ OldValue.Ptr)) { /* We have waiters, use the long path */ - DbgPrint("%s - Contention!\n", __FUNCTION__); + // DbgPrint("%s - Contention!\n", __FUNCTION__); ExfReleasePushLock(PushLock); } }

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