Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[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

[janderwald] 43774: - Add an initial stub of DSound
by janderwald＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: janderwald Date: Mon Oct 26 11:54:05 2009 New Revision: 43774 URL: http://svn.reactos.org/svn/reactos?rev=43774&view=rev Log: - Add an initial stub of DSound Added: trunk/reactos/dll/directx/dsound_new/ (with props) trunk/reactos/dll/directx/dsound_new/classfactory.c (contents, props changed) - copied, changed from r43773, trunk/reactos/dll/win32/netshell/classfactory.c trunk/reactos/dll/directx/dsound_new/dsound.c (with props) trunk/reactos/dll/directx/dsound_new/dsound.spec (props changed) - copied unchanged from r43773, trunk/reactos/dll/directx/dsound/dsound.spec trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild (with props) trunk/reactos/dll/directx/dsound_new/precomp.h (with props) trunk/reactos/dll/directx/dsound_new/stubs.c (with props) trunk/reactos/dll/directx/dsound_new/version.rc (with props) Propchange: trunk/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Oct 26 11:54:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/dll/directx/dsound_new/classfactory.c (from r43773, trunk/reactos/dll/win32/netshell/classfactory.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/cla… ============================================================================== --- trunk/reactos/dll/win32/netshell/classfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound_new/classfactory.c [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,4 +1,14 @@ -#include <precomp.h> +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/directx/dsound_new/classfactory.c + * PURPOSE: IClassFactory implementation + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + + +#include "precomp.h" typedef struct { Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Oct 26 11:54:05 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 Added: trunk/reactos/dll/directx/dsound_new/dsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/dsound.c (added) +++ trunk/reactos/dll/directx/dsound_new/dsound.c [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,52 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/directx/dsound_new/dsound.c + * PURPOSE: Handles DSound initialization + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + + +HINSTANCE dsound_hInstance; + +HRESULT +WINAPI +DllCanUnloadNow() +{ + return S_FALSE; +} + +HRESULT +WINAPI +DllGetClassObject( + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + UNIMPLEMENTED + return CLASS_E_CLASSNOTAVAILABLE; +} + +BOOL +WINAPI +DllMain( + HINSTANCE hInstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + dsound_hInstance = hInstDLL; + DisableThreadLibraryCalls(dsound_hInstance); + break; + default: + break; + } + + return TRUE; +} + Propchange: trunk/reactos/dll/directx/dsound_new/dsound.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Oct 26 11:54:05 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 Added: trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/dso… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild (added) +++ trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="dsound_new" type="win32dll" baseaddress="${BASEADDRESS_DSOUND}" installbase="system32" installname="dsound_new.dll" crt="msvcrt"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="dsound.spec" /> + <include base="dsound">.</include> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>advapi32</library> + <library>ole32</library> + <library>winmm</library> + <library>dxguid</library> + <file>classfactory.c</file> + <file>dsound.c</file> + <file>stubs.c</file> + <file>version.rc</file> +</module> Propchange: trunk/reactos/dll/directx/dsound_new/dsound_new.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/dsound_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/pre… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/precomp.h (added) +++ trunk/reactos/dll/directx/dsound_new/precomp.h [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,30 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windows.h> +#include <setupapi.h> +#include <olectl.h> +#include <unknwn.h> +#include <dsound.h> +#include <debug.h> + + +/* factory method */ +typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown* pUnkOuter, REFIID riid, LPVOID* ppvObject); + +/* factory table */ +typedef struct +{ + REFIID riid; + LPFNCREATEINSTANCE lpfnCI; +} INTERFACE_TABLE; + +/* globals */ +extern HINSTANCE dsound_hInstance; + + +#endif Propchange: trunk/reactos/dll/directx/dsound_new/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/dsound_new/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/stu… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/stubs.c (added) +++ trunk/reactos/dll/directx/dsound_new/stubs.c [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,137 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Configuration of network devices + * FILE: dll/directx/dsound_new/stubs.c + * PURPOSE: DSound stubs + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ + +#include "precomp.h" + +HRESULT +WINAPI +DirectSoundCreate( + LPCGUID lpcGUID, + LPDIRECTSOUND *ppDS, + IUnknown *pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + + +HRESULT +WINAPI +DirectSoundEnumerateA( + LPDSENUMCALLBACKA lpDSEnumCallback, + LPVOID lpContext) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundEnumerateW( + LPDSENUMCALLBACKW lpDSEnumCallback, + LPVOID lpContext ) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DllRegisterServer(void) +{ + UNIMPLEMENTED + return SELFREG_E_CLASS; +} + +HRESULT +WINAPI +DllUnregisterServer(void) +{ + UNIMPLEMENTED + return SELFREG_E_CLASS; +} + +HRESULT +WINAPI +DirectSoundCaptureCreate( + LPCGUID lpcGUID, + LPDIRECTSOUNDCAPTURE *ppDSC, + LPUNKNOWN pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundCaptureCreate8( + LPCGUID lpcGUID, + LPDIRECTSOUNDCAPTURE8 *ppDSC8, + LPUNKNOWN pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundCreate8( + LPCGUID lpcGUID, + LPDIRECTSOUND8 *ppDS, + IUnknown *pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundFullDuplexCreate( + LPCGUID pcGuidCaptureDevice, + LPCGUID pcGuidRenderDevice, + LPCDSCBUFFERDESC pcDSCBufferDesc, + LPCDSBUFFERDESC pcDSBufferDesc, + HWND hWnd, + DWORD dwLevel, + LPDIRECTSOUNDFULLDUPLEX *ppDSFD, + LPDIRECTSOUNDCAPTUREBUFFER8 *ppDSCBuffer8, + LPDIRECTSOUNDBUFFER8 *ppDSBuffer8, + LPUNKNOWN pUnkOuter) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundCaptureEnumerateA( + LPDSENUMCALLBACKA lpDSEnumCallback, + LPVOID lpContext) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +DirectSoundCaptureEnumerateW( + LPDSENUMCALLBACKW lpDSEnumCallback, + LPVOID lpContext) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} + +HRESULT +WINAPI +GetDeviceID(LPCGUID pGuidSrc, LPGUID pGuidDest) +{ + UNIMPLEMENTED + return DSERR_INVALIDPARAM; +} Propchange: trunk/reactos/dll/directx/dsound_new/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/dsound_new/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound_new/ver… ============================================================================== --- trunk/reactos/dll/directx/dsound_new/version.rc (added) +++ trunk/reactos/dll/directx/dsound_new/version.rc [iso-8859-1] Mon Oct 26 11:54:05 2009 @@ -1,0 +1,14 @@ +#include <windows.h> +#include "shlobj.h" +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "DirectSound\0" +#define REACTOS_STR_INTERNAL_NAME "dsound.dll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "dsound.dll\0" +#define REACTOS_STR_PRODUCT_VERSION "5.3.1.904\0" +#define REACTOS_STR_FILE_VERSION "5.3.1.904\0" + +#include <reactos/version.rc> Propchange: trunk/reactos/dll/directx/dsound_new/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gadamopoulos] 43773: We should send WM_SYSCOMMAND when we get a WM_SYSKEYUP , not when we get a WM_SYSKEYDOWN message
by gadamopoulos＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: gadamopoulos Date: Mon Oct 26 09:53:47 2009 New Revision: 43773 URL: http://svn.reactos.org/svn/reactos?rev=43773&view=rev Log: We should send WM_SYSCOMMAND when we get a WM_SYSKEYUP , not when we get a WM_SYSKEYDOWN message Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Mon Oct 26 09:53:47 2009 @@ -1393,11 +1393,7 @@ /* if( HIWORD(lParam) & ~KEYDATA_PREVSTATE ) */ if ( (wParam == VK_MENU || wParam == VK_LMENU || wParam == VK_RMENU) && !iMenuSysKey ) - { iMenuSysKey = 1; - /* mimic behaviour of XP, sending a WM_SYSCOMMAND when pressing <alt> */ - SendMessageW( top, WM_SYSCOMMAND, SC_KEYMENU, 0L ); - } else iMenuSysKey = 0;

1 0

[cwittich] 43772: implement IntKeyboardInput based on wine
by cwittich＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: cwittich Date: Mon Oct 26 09:50:00 2009 New Revision: 43772 URL: http://svn.reactos.org/svn/reactos?rev=43772&view=rev Log: implement IntKeyboardInput based on wine Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Mon Oct 26 09:50:00 2009 @@ -35,6 +35,8 @@ static CLIENT_ID RawInputThreadId; static KEVENT InputThreadsStart; static BOOLEAN InputThreadsRunning = FALSE; +static BYTE TrackSysKey = 0; /* determine whether ALT key up will cause a WM_SYSKEYUP + or a WM_KEYUP message */ /* FUNCTIONS *****************************************************************/ DWORD IntLastInputTick(BOOL LastInputTickSetGet); @@ -1303,7 +1305,177 @@ BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki) { - return FALSE; + PUSER_MESSAGE_QUEUE FocusMessageQueue; + PTHREADINFO pti; + MSG Msg; + LARGE_INTEGER LargeTickCount; + KBDLLHOOKSTRUCT KbdHookData; + WORD flags, wVkStripped, wVkL, wVkR, wVk = ki->wVk, vk_hook = ki->wVk; + BOOLEAN Entered = FALSE; + + Msg.lParam = 0; + + // Condition may arise when calling MsqPostMessage and waiting for an event. + if (!UserIsEntered()) + { + // Fixme: Not sure ATM if this thread is locked. + UserEnterExclusive(); + Entered = TRUE; + } + + wVk = LOBYTE(wVk); + Msg.wParam = wVk; + flags = LOBYTE(ki->wScan); + + if (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) flags |= KF_EXTENDED; + /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ + + /* strip left/right for menu, control, shift */ + switch (wVk) + { + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RMENU : VK_LMENU; + wVkStripped = VK_MENU; + wVkL = VK_LMENU; + wVkR = VK_RMENU; + break; + case VK_CONTROL: + case VK_LCONTROL: + case VK_RCONTROL: + wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RCONTROL : VK_LCONTROL; + wVkStripped = VK_CONTROL; + wVkL = VK_LCONTROL; + wVkR = VK_RCONTROL; + break; + case VK_SHIFT: + case VK_LSHIFT: + case VK_RSHIFT: + wVk = (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) ? VK_RSHIFT : VK_LSHIFT; + wVkStripped = VK_SHIFT; + wVkL = VK_LSHIFT; + wVkR = VK_RSHIFT; + break; + default: + wVkStripped = wVkL = wVkR = wVk; + } + + if (ki->dwFlags & KEYEVENTF_KEYUP) + { + Msg.message = WM_KEYUP; + if ((gQueueKeyStateTable[VK_MENU] & 0x80) && + ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) + || !(gQueueKeyStateTable[VK_CONTROL] & 0x80))) + { + if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ + (wVkStripped != VK_MENU)) /* <ALT>-down...<something else>-up */ + Msg.message = WM_SYSKEYUP; + TrackSysKey = 0; + } + flags |= KF_REPEAT | KF_UP; + } + else + { + Msg.message = WM_KEYDOWN; + if ((gQueueKeyStateTable[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && + !(gQueueKeyStateTable[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) + { + Msg.message = WM_SYSKEYDOWN; + TrackSysKey = wVkStripped; + } + if (!(ki->dwFlags & KEYEVENTF_UNICODE) && gQueueKeyStateTable[wVk] & 0x80) flags |= KF_REPEAT; + } + + if (ki->dwFlags & KEYEVENTF_UNICODE) + { + vk_hook = Msg.wParam = wVk = VK_PACKET; + Msg.lParam = MAKELPARAM(1 /* repeat count */, ki->wScan); + } + + FocusMessageQueue = IntGetFocusMessageQueue(); + + Msg.hwnd = 0; + + if (FocusMessageQueue && (FocusMessageQueue->FocusWindow != (HWND)0)) + Msg.hwnd = FocusMessageQueue->FocusWindow; + + if (!ki->time) + { + KeQueryTickCount(&LargeTickCount); + Msg.time = MsqCalculateMessageTime(&LargeTickCount); + } + else + Msg.time = ki->time; + + /* All messages have to contain the cursor point. */ + pti = PsGetCurrentThreadWin32Thread(); + IntGetCursorLocation(pti->Desktop->WindowStation, + &Msg.pt); + + DPRINT1("Kbd Hook msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + Msg.message, vk_hook, Msg.lParam); + + KbdHookData.vkCode = vk_hook; + KbdHookData.scanCode = ki->wScan; + KbdHookData.flags = flags >> 8; + KbdHookData.time = Msg.time; + KbdHookData.dwExtraInfo = ki->dwExtraInfo; + if (co_HOOK_CallHooks(WH_KEYBOARD_LL, HC_ACTION, Msg.message, (LPARAM) &KbdHookData)) + { + DPRINT("Kbd msg %d wParam %d lParam 0x%08x dropped by WH_KEYBOARD_LL hook\n", + Msg.message, vk_hook, Msg.lParam); + if (Entered) UserLeave(); + return FALSE; + } + + if (!(ki->dwFlags & KEYEVENTF_UNICODE)) + { + if (ki->dwFlags & KEYEVENTF_KEYUP) + { + gQueueKeyStateTable[wVk] &= ~0x80; + gQueueKeyStateTable[wVkStripped] = gQueueKeyStateTable[wVkL] | gQueueKeyStateTable[wVkR]; + } + else + { + if (!(gQueueKeyStateTable[wVk] & 0x80)) gQueueKeyStateTable[wVk] ^= 0x01; + gQueueKeyStateTable[wVk] |= 0xc0; + gQueueKeyStateTable[wVkStripped] = gQueueKeyStateTable[wVkL] | gQueueKeyStateTable[wVkR]; + } + + if (gQueueKeyStateTable[VK_MENU] & 0x80) flags |= KF_ALTDOWN; + + if (wVkStripped == VK_SHIFT) flags &= ~KF_EXTENDED; + + Msg.lParam = MAKELPARAM(1 /* repeat count */, flags); + } + + if (FocusMessageQueue == NULL) + { + DPRINT("No focus message queue\n"); + if (Entered) UserLeave(); + return FALSE; + } + + if (FocusMessageQueue->FocusWindow != (HWND)0) + { + Msg.hwnd = FocusMessageQueue->FocusWindow; + DPRINT("Msg.hwnd = %x\n", Msg.hwnd); + + FocusMessageQueue->Desktop->DesktopInfo->LastInputWasKbd = TRUE; + + IntGetCursorLocation(FocusMessageQueue->Desktop->WindowStation, + &Msg.pt); + MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); + } + else + { + DPRINT("Invalid focus window handle\n"); + } + + if (Entered) UserLeave(); + + return TRUE; } BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Mon Oct 26 09:50:00 2009 @@ -69,11 +69,11 @@ static UINT DontDistinguishShifts( UINT ret ) { if( ret == VK_LSHIFT || ret == VK_RSHIFT ) - ret = VK_LSHIFT; + ret = VK_SHIFT; if( ret == VK_LCONTROL || ret == VK_RCONTROL ) - ret = VK_LCONTROL; + ret = VK_CONTROL; if( ret == VK_LMENU || ret == VK_RMENU ) - ret = VK_LMENU; + ret = VK_MENU; return ret; } @@ -435,14 +435,27 @@ if( !keyLayout ) return FALSE; + if (lpMsg->message < WM_KEYFIRST || lpMsg->message > WM_KEYLAST) + return FALSE; if (lpMsg->message != WM_KEYDOWN && lpMsg->message != WM_SYSKEYDOWN) return FALSE; - - ScanCode = (lpMsg->lParam >> 16) & 0xff; /* All messages have to contain the cursor point. */ IntGetCursorLocation(pti->Desktop->WindowStation, &NewMsg.pt); + + switch (lpMsg->wParam) + { + case VK_PACKET: + NewMsg.message = (lpMsg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; + NewMsg.hwnd = lpMsg->hwnd; + NewMsg.wParam = HIWORD(lpMsg->lParam); + NewMsg.lParam = LOWORD(lpMsg->lParam); + MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY); + return TRUE; + } + + ScanCode = (lpMsg->lParam >> 16) & 0xff; UState = ToUnicodeInner(lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff, gQueueKeyStateTable, wp, 2, 0, @@ -628,11 +641,11 @@ switch( Type ) { case 0: - if( Code == VK_RSHIFT ) + if( Code == VK_SHIFT ) Code = VK_LSHIFT; - if( Code == VK_RMENU ) + if( Code == VK_MENU ) Code = VK_LMENU; - if( Code == VK_RCONTROL ) + if( Code == VK_CONTROL ) Code = VK_LCONTROL; ret = VkToScan( Code, FALSE, keyLayout ); break; @@ -706,7 +719,7 @@ DECLARE_RETURN(int); DPRINT("Enter NtUserSetKeyboardState\n"); - UserEnterShared();//faxme: this syscall doesnt seem to need any locking... + UserEnterShared();//fixme: this syscall doesnt seem to need any locking... if( !NT_SUCCESS(MmCopyFromCaller(KeyStateBuf, @@ -785,12 +798,22 @@ if( lParam & (1<<25) ) { CareVk = VkCode = ScanToVk( ScanCode, ExtKey, keyLayout ); - if( VkCode == VK_LSHIFT || VkCode == VK_RSHIFT ) - VkCode = VK_LSHIFT; - if( VkCode == VK_LCONTROL || VkCode == VK_RCONTROL ) - VkCode = VK_LCONTROL; - if( VkCode == VK_LMENU || VkCode == VK_RMENU ) - VkCode = VK_LMENU; + switch (VkCode) + { + case VK_RSHIFT: + ScanCode |= 0x100; + case VK_LSHIFT: + VkCode = VK_SHIFT; + break; + case VK_LCONTROL: + case VK_RCONTROL: + VkCode = VK_CONTROL; + break; + case VK_LMENU: + case VK_RMENU: + VkCode = VK_MENU; + break; + } } else {

1 0

[cgutman] 43771: - Comment out this unused code until I can get the headers sorted out in my WC
by cgutman＠svn.reactos.org 26 Oct '09

26 Oct '09

Author: cgutman Date: Mon Oct 26 04:28:43 2009 New Revision: 43771 URL: http://svn.reactos.org/svn/reactos?rev=43771&view=rev Log: - Comment out this unused code until I can get the headers sorted out in my WC Modified: trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ainfo.c [iso-8859-1] Mon Oct 26 04:28:43 2009 @@ -15,13 +15,14 @@ { switch (ID->toi_id) { +#if 0 case AO_OPTION_TTL: if (BufferSize < sizeof(UCHAR)) return TDI_INVALID_PARAMETER; AddrFile->TTL = *((PUCHAR)Buffer); return TDI_SUCCESS; - +#endif default: DbgPrint("Unimplemented option %x\n", ID->toi_id);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009