Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43784: - Implement reading preferred playback / record device
by janderwald＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: janderwald Date: Mon Oct 26 20:40:21 2009 New Revision: 43784 URL: http://svn.reactos.org/svn/reactos?rev=43784&view=rev Log: - Implement reading preferred playback / record device Modified: trunk/reactos/dll/cpl/mmsys/audio.c Modified: trunk/reactos/dll/cpl/mmsys/audio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/audio.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/audio.c [iso-8859-1] Mon Oct 26 20:40:21 2009 @@ -20,7 +20,7 @@ VOID InitAudioDlg(HWND hwnd) { - WAVEOUTCAPS waveOutputPaps; + WAVEOUTCAPSW waveOutputPaps; WAVEINCAPS waveInputPaps; MIDIOUTCAPS midiOutCaps; TCHAR szNoDevices[256]; @@ -42,20 +42,33 @@ } else { + WCHAR DefaultDevice[MAX_PATH] = {0}; + HKEY hKey; + DWORD dwSize = sizeof(DefaultDevice); + UINT DefaultIndex = 0; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Multimedia\\Sound Mapper", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + RegQueryValueExW(hKey, L"Playback", NULL, NULL, (LPBYTE)DefaultDevice, &dwSize); + DefaultDevice[MAX_PATH-1] = L'\0'; + RegCloseKey(hKey); + } + for (uIndex = 0; uIndex < DevsNum; uIndex++) { - if (waveOutGetDevCaps(uIndex, &waveOutputPaps, sizeof(waveOutputPaps))) + if (waveOutGetDevCapsW(uIndex, &waveOutputPaps, sizeof(waveOutputPaps))) continue; - Res = SendMessage(hCB, CB_ADDSTRING, 0, (LPARAM) waveOutputPaps.szPname); + Res = SendMessageW(hCB, CB_ADDSTRING, 0, (LPARAM) waveOutputPaps.szPname); if (CB_ERR != Res) { SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); - // TODO: Getting default device - SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); - } - } + if (!wcsicmp(waveOutputPaps.szPname, DefaultDevice)) + DefaultIndex = Res; + } + } + SendMessage(hCB, CB_SETCURSEL, (WPARAM) DefaultIndex, 0); } // Init sound recording devices list @@ -69,6 +82,19 @@ } else { + WCHAR DefaultDevice[MAX_PATH] = {0}; + HKEY hKey; + DWORD dwSize = sizeof(DefaultDevice); + UINT DefaultIndex = 0; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Multimedia\\Sound Mapper", 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + RegQueryValueExW(hKey, L"Record", NULL, NULL, (LPBYTE)DefaultDevice, &dwSize); + DefaultDevice[MAX_PATH-1] = L'\0'; + RegCloseKey(hKey); + } + + for (uIndex = 0; uIndex < DevsNum; uIndex++) { if (waveInGetDevCaps(uIndex, &waveInputPaps, sizeof(waveInputPaps))) @@ -79,10 +105,11 @@ if (CB_ERR != Res) { SendMessage(hCB, CB_SETITEMDATA, Res, (LPARAM) uIndex); - // TODO: Getting default device - SendMessage(hCB, CB_SETCURSEL, (WPARAM) Res, 0); - } - } + if (!wcsicmp(waveInputPaps.szPname, DefaultDevice)) + DefaultIndex = Res; + } + } + SendMessage(hCB, CB_SETCURSEL, (WPARAM) DefaultIndex, 0); } // Init MIDI devices list

1 0

[janderwald] 43783: - Revert 43774
by janderwald＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: janderwald Date: Mon Oct 26 20:32:25 2009 New Revision: 43783 URL: http://svn.reactos.org/svn/reactos?rev=43783&view=rev Log: - Revert 43774 Removed: trunk/reactos/dll/directx/dsound_new/

1 0

[jimtabor] 43782: - Fix wine class test with a sync with wine edit.c.
by jimtabor＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: jimtabor Date: Mon Oct 26 19:26:48 2009 New Revision: 43782 URL: http://svn.reactos.org/svn/reactos?rev=43782&view=rev Log: - Fix wine class test with a sync with wine edit.c. Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Mon Oct 26 19:26:48 2009 @@ -5533,7 +5533,11 @@ CS_DBLCLKS | CS_PARENTDC, /* style */ EditWndProcA, /* procA */ EditWndProcW, /* procW */ +#ifdef _WIN64 sizeof(EDITSTATE *), /* extra */ +#else + sizeof(EDITSTATE *) + sizeof(WORD), /* extra */ +#endif IDC_IBEAM, /* cursor */ 0 /* brush */ };

1 0

[dreimer] 43781: No idea if this is a bug or not, but right now we always use the default "make", regardless which GCC we did set active afterwards. This "fixes" it
by dreimer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: dreimer Date: Mon Oct 26 14:58:01 2009 New Revision: 43781 URL: http://svn.reactos.org/svn/reactos?rev=43781&view=rev Log: No idea if this is a bug or not, but right now we always use the default "make", regardless which GCC we did set active afterwards. This "fixes" it Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon Oct 26 14:58:01 2009 @@ -46,7 +46,6 @@ $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" $global:_ROSBE_ORIGINALPATH = "$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH" -$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" # Fix Bison package path (just in case RosBE is installed in a path which contains spaces) $ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_HOST_MINGWPATH\share\bison")).ShortPath @@ -143,6 +142,8 @@ & "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" } +$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" + if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Mon Oct 26 14:58:01 2009 @@ -15,6 +15,7 @@ function EOA { IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" + $_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe" version settitle } Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Oct 26 14:58:01 2009 @@ -40,7 +40,6 @@ set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_HOST_MINGWPATH%\bin;%PATH% -set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison @@ -67,6 +66,8 @@ if exist "%APPDATA%\RosBE\rosbe-options-%1.cmd" ( call "%APPDATA%\RosBE\rosbe-options-%1.cmd" ) + +set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( for /f "usebackq tokens=* delims= " %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG""`) do set ROS_RBUILDFLAGS=%%i Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Mon Oct 26 14:58:01 2009 @@ -67,6 +67,7 @@ ) call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" +set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe call "%_ROSBE_BASEDIR%\version.cmd" :EOC

1 0

[spetreolle] 43780: fix wavemapper path
by spetreolle＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: spetreolle Date: Mon Oct 26 14:54:46 2009 New Revision: 43780 URL: http://svn.reactos.org/svn/reactos?rev=43780&view=rev Log: fix wavemapper path Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Mon Oct 26 14:54:46 2009 @@ -56,7 +56,7 @@ ;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00000000,"0x00000002" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midimapper",0x00000000,"midimap.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wavemapper",0x00000000,"msacm32.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wavemapper",0x00000000,"msacm32.drv" ;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wave",0x00000000,"sndblst.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midi",0x00000000,"beepmidi.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","msacm.msadpcm",0x00000000,"msadp32.acm" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Mon Oct 26 14:54:46 2009 @@ -130,7 +130,7 @@ ;HKLM,"Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\tlstest.exe","GlobalFlag",0x00000000,"0x00000002" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midimapper",0x00000000,"midimap.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wavemapper",0x00000000,"msacm32.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wavemapper",0x00000000,"msacm32.drv" ;HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","wave",0x00000000,"sndblst.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","midi",0x00000000,"beepmidi.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","msacm.msadpcm",0x00000000,"msadp32.acm"

1 0

[tkreuzer] 43779: [KDCOM] - In case of failing to receive a part of the packet, return the status to the caller instead of continuing.
by tkreuzer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: tkreuzer Date: Mon Oct 26 13:51:26 2009 New Revision: 43779 URL: http://svn.reactos.org/svn/reactos?rev=43779&view=rev Log: [KDCOM] - In case of failing to receive a part of the packet, return the status to the caller instead of continuing. Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Mon Oct 26 13:51:26 2009 @@ -149,8 +149,8 @@ KdStatus = KdpReceiveBuffer(&Packet.PacketType, sizeof(USHORT)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive a PacketType or PacketType is bad. Start over. */ - continue; + /* Didn't receive a PacketType. */ + return KdStatus; } /* Check if we got a resend packet */ @@ -164,16 +164,16 @@ KdStatus = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive ByteCount or it's too big. Start over. */ - continue; + /* Didn't receive ByteCount. */ + return KdStatus; } /* Step 4 - Read PacketId */ KdStatus = KdpReceiveBuffer(&Packet.PacketId, sizeof(ULONG)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive PacketId. Start over. */ - continue; + /* Didn't receive PacketId. */ + return KdStatus; } /* @@ -188,8 +188,8 @@ KdStatus = KdpReceiveBuffer(&Packet.Checksum, sizeof(ULONG)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive Checksum. Start over. */ - continue; + /* Didn't receive Checksum. */ + return KdStatus; } /* Step 6 - Handle control packets */ @@ -421,6 +421,7 @@ } /* Packet timed out, send it again */ + KDDBGPRINT("KdSendPacket got KdStatus 0x%x\n", KdStatus); } while (Retries > 0); }

1 0

[dreimer] 43778: - Update readme, ChangeLog. - Update RosBE64 to Version 1.2. - Add a chinese Translation to options.exe. (Elton Chung)
by dreimer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: dreimer Date: Mon Oct 26 13:39:21 2009 New Revision: 43778 URL: http://svn.reactos.org/svn/reactos?rev=43778&view=rev Log: - Update readme, ChangeLog. - Update RosBE64 to Version 1.2. - Add a chinese Translation to options.exe. (Elton Chung) Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/rsrc.rc Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Mon Oct 26 13:39:21 2009 @@ -1,6 +1,6 @@ *** Sep XXth, 2009 - RosBE 1.5 Released -- Updated SVN to 1.6.5 (Daniel Reimer) +- Updated SVN to 1.6.6 (Daniel Reimer) - Updated NASM to 2.07 (Daniel Reimer) - Updated GCC to 4.4.2 20090915 (Dmitry Gorbachev) - Updated BinUtils to 2.20.51 20090915 (Dmitry Gorbachev) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Mon Oct 26 13:39:21 2009 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows - 64 Bit Target Compiler" -!define PRODUCT_VERSION "1.1" +!define PRODUCT_VERSION "1.2" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.1.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.2.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.1.0.0" +VIProductVersion "1.2.0.0" CRCCheck force SetDatablockOptimize on Added: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc (added) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc [iso-8859-1] Mon Oct 26 13:39:21 2009 @@ -1,0 +1,88 @@ +/* + * PROJECT: Config Tool for ReactOS Build Environment + * LICENSE: GNU General Public License v2. (see LICENSE.txt) + * FILE: tools/RosBE/RosBE-Windows/Tools/config/lang/zh-TW.rc + * PURPOSE: Chinese (Traditional) Language File for config + * TRANSLATOR: Elton Chung <elton328(a)gmail.com> + */ + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS «Ø¸mÀô¹Ò³]¸m" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "I´ºÃC¦â", -1, 10, 10, 75, 12 + LTEXT "¦rÅéÃC¦â", 0x0, 10, 27, 75, 12 + COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + CONTROL "\n\n¥Ü¨Ò¤å¥»", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36 + CONTROL "Åã¥Ü«Ø¸m®É¶¡", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12 + CONTROL "¨Ï¥Î CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 + CONTROL "µô´î¿é¥X", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 + CONTROL "«Ø¥ß½Õ¸Õ¥Îªº¥]¸ËÀÉ", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12 + CONTROL "Åã¥Üª©¥»¼ÐÀY", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12 + LTEXT "MinGW/GCC ªº¸ô®|", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Àx¦s¤é»x", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "§ó§ï OBJ ªº¥Ø¿ý", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "§ó§ï OUT ªº¥Ø¿ý", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Àx¦s", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "¨ú®ø", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Åwªï¡I", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 +END + +STRINGTABLE +BEGIN + CLR0, "¶Â¦â" + CLR1, "ÂÅ¦â" + CLR2, "ºñ¦â" + CLR3, "¤ô¦â" + CLR4, "¬õ¦â" + CLR5, "µµ¦â" + CLR6, "¶À¦â" + CLR7, "¥Õ¦â" + CLR8, "¦Ç¦â" + CLR9, "²LÂÅ¦â" + CLR10, "²Lºñ¦â" + CLR11, "²L¤ô¦â" + CLR12, "²L¬õ¦â" + CLR13, "²Lµµ¦â" + CLR14, "²L¶À" + CLR15, "«G¥Õ¦â" + MSG_NOGCCFOUND, "§ä¤£¨ì MinGW/GCC¡I ½ÐÀË¬d§Aªº¥Ø¿ý¡C" + MSG_CMDFFAILED, "µLªk³Ð«Ø rosbe-options.cmd¡I" + MSG_PS1FFAILED, "µLªk³Ð«Ø rosbe-options.ps1¡I" + MSG_DIREFAILED, "µLªk³Ð«Ø¥Ø¿ý¡I" + MSG_SETLOADSUC, "¥ý«eªº³]¸m¤w³Q¦¨¥\¸ü¤J¡C" + MSG_FINDLOGDIR, "½Ð¿ï¾Ü¤@ÓÀx¦s¤é»xªº¥Ø¿ý¡G" + MSG_FINDMGWDIR, "½Ð¿ï¾Ü MinGW/GCC ©Ò¦ì©óªº¥Ø¿ý¡G" + MSG_FINDOBJDIR, "½Ð¿ï¾ÜÀx¦s OBJ ÀÉ®×ªº¥Ø¿ý¡G" + MSG_FINDOUTDIR, "½Ð¿ï¾ÜÀx¦s OUT ÀÉ®×ªº¥Ø¿ý¡G" + MSG_WARNINGBOX, "Äµ§i" + MSG_EXITCHANGE, "±z½T©wn¦b¤£Àx¦s¤U°h¥X¡H" + MSG_INVALIDDIR, "§A©Ò¿é¤Jªº¥Ø¿ý¨Ã¤£¦s¦b¡C§An³Ð«Ø¥¦¶Ü¡H" + /* Help Strings */ + HLP_BACKCOLORC, "¿ï¾Ü RosBE DOS µøµ¡ªºI´ºÃC¦â¡C" + HLP_FONTCOLORC, "¿ï¾Ü RosBE DOS µøµ¡ªº¦rÅéÃC¦â¡C" + HLP_SBUILDTIME, "Åý§A¦b«Ø¸m§¹µ²®ÉÅã¥ÜÁ`«Ø¸m®É¶¡¡C" + HLP_CCACHEUSED, "¦pªG§An¨Ï¥Î ccache (½sÄ¶¾¹½w¦s)¡A½Ð¤Ä¹º¡C" + HLP_STRIPEDEXE, "¦pªG§An»s§@µô´îªºÀ³¥Îµ{¦¡ ¡A½Ð¤Ä¹º¡C" + HLP_FINDMGWDIR, "¦¹³]¸mÅý§A©w¸q MinGW/GCC ªº¦ì¸m¡C" + HLP_FINDLOGDIR, "¦¹³]¸mÅý§A©w¸q«Ø¸m¤é»xªºÀx¦s¦ì¸m¡C" + HLP_FINDOBJDIR, "¦¹³]¸mÅý§A©w¸q OBJ ÀÉ®×ªºÀx¦s¦ì¸m¡C" + HLP_FINDOUTDIR, "¦¹³]¸mÅý§A©w¸q OUT ÀÉ®×ªºÀx¦s¦ì¸m¡C" + HLP_SAVEBUTTON, "·í³]¸m³Q§ó§ï®É·|³Q±Ò°Ê¡A¥¦µ²§ô¤ÎÀx¦s³]¸m¡C" + HLP_QUITBUTTON, "¦¹«ö¶sÅý§A¦b¤£Àx¦s¤UÂ÷¶}³]¸m¡C" + HLP_DEFAULTMSG, "±N·Æ¹«²¾¹L±±¨î¶µ¥H¨ú±o¨ó§U¡C" + HLP_NOSTRIP, "¬° ReactOS ½Õ¸Õ¾¹«Ø¥ß½Õ¸Õ¸ê°T¡C" + HLP_VERSION, "Åã¥Ü RosBE ¤¸¥óªºª©¥»¡C" +END Propchange: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Mon Oct 26 13:39:21 2009 @@ -147,7 +147,10 @@ fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); fwprintf(pFilecmd, L"set _ROSBE_SHOWVERSION=%d\n", showversion); if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath); + if (mingwpath[0] != 0) { + fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath); + fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath); + } if ((objdir[0] != 0) && objstate) { fwprintf(pFilecmd, L"set ROS_INTERMEDIATE=%s\n", objdir); fwprintf(pFilecmd, L"set ROS_TEMPORARY=%s\n", objdir); @@ -179,7 +182,10 @@ fwprintf(pFileps1, L"$global:_ROSBE_WRITELOG = %d\n", writelog); fwprintf(pFileps1, L"$global:_ROSBE_SHOWVERSION = %d\n", showversion); if (logdir[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = \"%s\"\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); + if (mingwpath[0] != 0) { + fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = \"%s\"\n", mingwpath); + fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = \"%s\"\n", mingwpath); + } if ((objdir[0] != 0) && objstate) { fwprintf(pFileps1, L"$ENV:ROS_INTERMEDIATE = \"%s\"\n", objdir); fwprintf(pFileps1, L"$ENV:ROS_TEMPORARY = \"%s\"\n", objdir); Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/rsrc.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/rsrc.rc [iso-8859-1] Mon Oct 26 13:39:21 2009 @@ -5,6 +5,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" -#include "lang/pl-PL.rc" +#include "lang/zh-TW.rc"

1 0

[tkreuzer] 43777: - Fix definition of KdDebuggerNotPresent for gcc, the MS definition is broken, don't know if it's needed that way for msvc.
by tkreuzer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: tkreuzer Date: Mon Oct 26 13:22:32 2009 New Revision: 43777 URL: http://svn.reactos.org/svn/reactos?rev=43777&view=rev Log: - Fix definition of KdDebuggerNotPresent for gcc, the MS definition is broken, don't know if it's needed that way for msvc. Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Mon Oct 26 13:22:32 2009 @@ -10417,7 +10417,14 @@ #endif /* !DBG */ -#if defined(_NTDDK_) || defined(_NTHAL_) || defined(_WDMDDK_) || defined(_NTOSP_) +#if defined(__GNUC__) + +extern NTKERNELAPI BOOLEAN KdDebuggerNotPresent; +extern NTKERNELAPI BOOLEAN KdDebuggerEnabled; +#define KD_DEBUGGER_ENABLED KdDebuggerEnabled +#define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent + +#elif defined(_NTDDK_) || defined(_NTHAL_) || defined(_WDMDDK_) || defined(_NTOSP_) extern NTKERNELAPI PBOOLEAN KdDebuggerNotPresent; extern NTKERNELAPI PBOOLEAN KdDebuggerEnabled;

1 0

[tkreuzer] 43776: [KDCOM] - take the MessageHeader length from MaximumLength field instead of depending on the packet type - Context -> KdContext - remove redundant return
by tkreuzer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: tkreuzer Date: Mon Oct 26 13:09:05 2009 New Revision: 43776 URL: http://svn.reactos.org/svn/reactos?rev=43776&view=rev Log: [KDCOM] - take the MessageHeader length from MaximumLength field instead of depending on the packet type - Context -> KdContext - remove redundant return Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Mon Oct 26 13:09:05 2009 @@ -162,7 +162,7 @@ /* Step 3 - Read ByteCount */ KdStatus = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); - if (KdStatus != KDP_PACKET_RECEIVED || Packet.ByteCount > PACKET_MAX_SIZE) + if (KdStatus != KDP_PACKET_RECEIVED) { /* Didn't receive ByteCount or it's too big. Start over. */ continue; @@ -237,29 +237,11 @@ } /* Get size of the message header */ - switch (Packet.PacketType) - { - case PACKET_TYPE_KD_STATE_CHANGE64: - MessageHeader->Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); - break; - - case PACKET_TYPE_KD_STATE_MANIPULATE: - MessageHeader->Length = sizeof(DBGKD_MANIPULATE_STATE64); - break; - - case PACKET_TYPE_KD_DEBUG_IO: - MessageHeader->Length = sizeof(DBGKD_DEBUG_IO); - break; - - default: - KDDBGPRINT("KdReceivePacket - unknown PacketType\n"); - return KDP_PACKET_RESEND; - } - - //KDDBGPRINT("KdReceivePacket - got normal PacketType\n"); - - /* Packet smaller than expected? */ - if (MessageHeader->Length > Packet.ByteCount) + MessageHeader->Length = MessageHeader->MaximumLength; + + /* Packet smaller than expected or too big? */ + if (Packet.ByteCount < MessageHeader->Length || + Packet.ByteCount > PACKET_MAX_SIZE) { KDDBGPRINT("KdReceivePacket - too few data (%d) for type %d\n", Packet.ByteCount, MessageHeader->Length); @@ -369,7 +351,7 @@ IN ULONG PacketType, IN PSTRING MessageHeader, IN PSTRING MessageData, - IN OUT PKD_CONTEXT Context) + IN OUT PKD_CONTEXT KdContext) { KD_PACKET Packet; KDP_STATUS KdStatus; @@ -390,7 +372,7 @@ MessageData->Length); } - Retries = Context->KdpDefaultRetries; + Retries = KdContext->KdpDefaultRetries; do { @@ -417,7 +399,7 @@ NULL, NULL, 0, - Context); + KdContext); /* Did we succeed? */ if (KdStatus == KDP_PACKET_RECEIVED) @@ -441,7 +423,5 @@ /* Packet timed out, send it again */ } while (Retries > 0); - - return; -} - +} +

1 0

[dreimer] 43775: Fixed build with MinGW-w64 4.4.3
by dreimer＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: dreimer Date: Mon Oct 26 13:07:33 2009 New Revision: 43775 URL: http://svn.reactos.org/svn/reactos?rev=43775&view=rev Log: Fixed build with MinGW-w64 4.4.3 Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/fathelp.S [iso-8859-1] Mon Oct 26 13:07:33 2009 @@ -155,7 +155,7 @@ add bx,dx mov es,bx mov bx,ax // Restore FAT entry offset - mov ax, [es:bx] // Get FAT entry + mov ax, es:[bx] // Get FAT entry ret @@ -173,7 +173,7 @@ mov bx,0x7000 mov es,bx mov bx,ax // Put FAT entry offset into BX - mov ax, [es:bx] // Get FAT entry + mov ax, es:[bx] // Get FAT entry pop cx // Get cluster number from stack and cx,1 jz UseLow12Bits

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