Ros-diffs January 2015

ros-diffs@reactos.org

17 participants
207 discussions

[hbelusca] 65994: [TOOLS]: Adds back kbdtool (Keyboard Layout Compiler), and hpp (Header File Preprocessor) too, to host-tools compilation.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Jan 7 17:55:58 2015 New Revision: 65994 URL: http://svn.reactos.org/svn/reactos?rev=65994&view=rev Log: [TOOLS]: Adds back kbdtool (Keyboard Layout Compiler), and hpp (Header File Preprocessor) too, to host-tools compilation. Added: trunk/reactos/tools/kbdtool/CMakeLists.txt (with props) Modified: trunk/reactos/tools/CMakeLists.txt Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=6… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Wed Jan 7 17:55:58 2015 @@ -15,6 +15,8 @@ add_subdirectory(cabman) add_subdirectory(cdmake) +add_subdirectory(hpp) +add_subdirectory(kbdtool) add_subdirectory(mkhive) add_subdirectory(unicode) add_subdirectory(widl) Added: trunk/reactos/tools/kbdtool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/kbdtool/CMakeLists.t… ============================================================================== --- trunk/reactos/tools/kbdtool/CMakeLists.txt (added) +++ trunk/reactos/tools/kbdtool/CMakeLists.txt [iso-8859-1] Wed Jan 7 17:55:58 2015 @@ -0,0 +1,2 @@ + +add_executable(kbdtool data.c main.c output.c parser.c) Propchange: trunk/reactos/tools/kbdtool/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 11 months

[jimtabor] 65993: [Win32k] - Answer my own question. Use the Extra Information long pointer to help traffic data. See CORE-7447.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jan 7 14:02:45 2015 New Revision: 65993 URL: http://svn.reactos.org/svn/reactos?rev=65993&view=rev Log: [Win32k] - Answer my own question. Use the Extra Information long pointer to help traffic data. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Wed Jan 7 14:02:45 2015 @@ -772,6 +772,7 @@ UINT MsgFilterMin, UINT MsgFilterMax, UINT RemoveMsg, + LONG_PTR *ExtraInfo, BOOL bGMSG ) { PTHREADINFO pti; @@ -835,6 +836,7 @@ MsgFilterMin, MsgFilterMax, ProcessMask, + ExtraInfo, Msg )) { return TRUE; @@ -916,6 +918,7 @@ PTHREADINFO pti; NTSTATUS Status = STATUS_SUCCESS; MSG Msg; + LONG_PTR ExtraInfo = 0; pti = PsGetCurrentThreadWin32Thread(); @@ -926,6 +929,7 @@ MsgFilterMin, MsgFilterMax, MAKELONG( PM_NOREMOVE, GetWakeMask( MsgFilterMin, MsgFilterMax)), + &ExtraInfo, TRUE ) ) // act like GetMessage. { return TRUE; @@ -964,6 +968,7 @@ PTHREADINFO pti; BOOL Present = FALSE; NTSTATUS Status; + LONG_PTR ExtraInfo = 0; if ( hWnd == HWND_TOPMOST || hWnd == HWND_BROADCAST ) hWnd = HWND_BOTTOM; @@ -1005,6 +1010,7 @@ MsgFilterMin, MsgFilterMax, RemoveMsg, + &ExtraInfo, bGMSG ); if (Present) { @@ -1122,6 +1128,7 @@ PTHREADINFO pti; MSG Message; LARGE_INTEGER LargeTickCount; + LONG_PTR ExtraInfo = 0; Message.hwnd = Wnd; Message.message = Msg; @@ -1212,7 +1219,7 @@ } else { - MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, 0); + MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, ExtraInfo); } } return TRUE; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Wed Jan 7 14:02:45 2015 @@ -2026,6 +2026,7 @@ IN UINT MsgFilterLow, IN UINT MsgFilterHigh, IN UINT QSflags, + OUT LONG_PTR *ExtraInfo, OUT PMSG Message) { PUSER_MESSAGE CurrentMessage; @@ -2053,8 +2054,9 @@ ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { - *Message = CurrentMessage->Msg; - QS_Flags = CurrentMessage->QS_Flags; + *Message = CurrentMessage->Msg; + *ExtraInfo = CurrentMessage->ExtraInfo; + QS_Flags = CurrentMessage->QS_Flags; if (Remove) { Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Wed Jan 7 14:02:45 2015 @@ -131,6 +131,7 @@ IN UINT MsgFilterLow, IN UINT MsgFilterHigh, IN UINT QSflags, + OUT LONG_PTR *ExtraInfo, OUT PMSG Message); BOOL APIENTRY co_MsqPeekHardwareMessage(IN PTHREADINFO pti,

9 years, 11 months

[cwittich] 65992: [SHELL32_WINETEST] do not skip progman_dde tests anymore

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 7 09:58:38 2015 New Revision: 65992 URL: http://svn.reactos.org/svn/reactos?rev=65992&view=rev Log: [SHELL32_WINETEST] do not skip progman_dde tests anymore Modified: trunk/rostests/winetests/shell32/progman_dde.c Modified: trunk/rostests/winetests/shell32/progman_dde.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/progman… ============================================================================== --- trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/progman_dde.c [iso-8859-1] Wed Jan 7 09:58:38 2015 @@ -701,12 +701,6 @@ HCONV hConv; int testnum; - if(!winetest_interactive) - { - skip("Skipping progman_dde() until we have a sane DDE implementation. CORE-6559.\n"); - return; - } - init_function_pointers(); init_strings();

9 years, 11 months

[jimtabor] 65991: [Win32k] - Pass process ID to process information structure.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jan 6 04:17:20 2015 New Revision: 65991 URL: http://svn.reactos.org/svn/reactos?rev=65991&view=rev Log: [Win32k] - Pass process ID to process information structure. Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Tue Jan 6 04:17:20 2015 @@ -161,6 +161,7 @@ } ppiCurrent->peProcess = Process; + ppiCurrent->W32Pid = HandleToUlong(PsGetProcessId(Process)); /* Setup process flags */ ppiCurrent->W32PF_flags |= W32PF_PROCESSCONNECTED;

9 years, 11 months

[jimtabor] 65990: [Win32k] - Fix control list of atoms. - Add DDE atom.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jan 5 22:32:16 2015 New Revision: 65990 URL: http://svn.reactos.org/svn/reactos?rev=65990&view=rev Log: [Win32k] - Fix control list of atoms. - Add DDE atom. Modified: trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/ntuser.c Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Mon Jan 5 22:32:16 2015 @@ -8,6 +8,27 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserClass); + +static PWSTR ControlsList[] = +{ + L"Button", + L"Edit", + L"Static", + L"ListBox", + L"ScrollBar", + L"ComboBox", + L"MDIClient", + L"ComboLBox", + L"DDEMLEvent", + L"DDEMLMom", + L"DMGClass", + L"DDEMLAnsiClient", + L"DDEMLUnicodeClient", + L"DDEMLAnsiServer", + L"DDEMLUnicodeServer", + L"IME", + L"Ghost", +}; static NTSTATUS IntDeregisterClassAtom(IN RTL_ATOM Atom); @@ -350,6 +371,26 @@ return TRUE; } +BOOL FASTCALL +RegisterControlAtoms(VOID) +{ + RTL_ATOM Atom; + UNICODE_STRING ClassName; + INT i = 0; + + while ( i < ICLS_DESKTOP) + { + RtlInitUnicodeString(&ClassName, ControlsList[i]); + if (IntRegisterClassAtom(&ClassName, &Atom)) + { + gpsi->atomSysClass[i] = Atom; + ERR("Reg Control Atoms 0x%x\n",Atom); + } + i++; + } + return TRUE; +} + static NTSTATUS IntDeregisterClassAtom(IN RTL_ATOM Atom) { @@ -1026,7 +1067,7 @@ Class->fnid = fnID; Class->CSF_flags = dwFlags; - if (LookupFnIdToiCls(Class->fnid, &iCls)) + if (LookupFnIdToiCls(Class->fnid, &iCls) && gpsi->atomSysClass[iCls] == 0) { gpsi->atomSysClass[iCls] = Class->atomClassName; } Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Jan 5 22:32:16 2015 @@ -7,6 +7,8 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); + +BOOL FASTCALL RegisterControlAtoms(VOID); /* GLOBALS ********************************************************************/ @@ -17,6 +19,7 @@ ATOM AtomWndObj; // Window Object atom. ATOM AtomLayer; // Window Layer atom. ATOM AtomFlashWndState; // Window Flash State atom. +ATOM AtomDDETrack; // Window DDE Tracking atom. HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; ATOM gaGuiConsoleWndClass; @@ -27,6 +30,8 @@ NTSTATUS FASTCALL InitUserAtoms(VOID) { + RegisterControlAtoms(); + gpsi->atomSysClass[ICLS_MENU] = 32768; gpsi->atomSysClass[ICLS_DESKTOP] = 32769; gpsi->atomSysClass[ICLS_DIALOG] = 32770; @@ -46,12 +51,15 @@ gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE); + AtomDDETrack = IntAddGlobalAtom(L"SysDT", TRUE); + /* * FIXME: AddPropW uses the global kernel atom table, thus leading to conflicts if we use - * the win32k atom table for this ones. What is the right thing to do ? + * the win32k atom table for this one. What is the right thing to do ? */ // AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE); NtAddAtom(L"SysWNDO", 14, &AtomWndObj); + AtomLayer = IntAddGlobalAtom(L"SysLayer", TRUE); AtomFlashWndState = IntAddGlobalAtom(L"FlashWState", TRUE);

9 years, 11 months

[jimtabor] 65989: [ApiTest] - Add a test for sequential list of control atoms. This is an addition to the Real Classes tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jan 5 22:25:48 2015 New Revision: 65989 URL: http://svn.reactos.org/svn/reactos?rev=65989&view=rev Log: [ApiTest] - Add a test for sequential list of control atoms. This is an addition to the Real Classes tests. Modified: trunk/rostests/apitests/user32/RealGetWindowClass.c Modified: trunk/rostests/apitests/user32/RealGetWindowClass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/RealGetWi… ============================================================================== --- trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/RealGetWindowClass.c [iso-8859-1] Mon Jan 5 22:25:48 2015 @@ -11,6 +11,27 @@ #include <winuser.h> #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + +static PWSTR ControlsList[] = +{ + L"Button\0", + L"Edit\0", + L"Static\0", + L"ListBox\0", + L"ScrollBar\0", + L"ComboBox\0", + L"MDIClient\0", + L"ComboLBox\0", + L"DDEMLEvent\0", + L"DDEMLMom\0", + L"DMGClass\0", + L"DDEMLAnsiClient\0", + L"DDEMLUnicodeClient\0", + L"DDEMLAnsiServer\0", + L"DDEMLUnicodeServer\0", + L"IME\0", + L"\0",//L"Ghost\0", // Vista+, Ghost is registered after "Message" in XP/W2k3 Win32k.sys. +}; typedef struct _TestData { @@ -57,6 +78,41 @@ "N/A", }, }; + +// +// The Control Class Atoms are consecitively issued. +// + +void Test_ClassAtoms() +{ + ATOM atom; + int i; + WNDCLASSW cls; + + // Initialize starting Atom number. + atom = GetClassInfoW(NULL, ControlsList[0], &cls); + if (!atom) + { + skip( "No reference Atom\n" ); + return; + } + + trace("First Control Class Atom 0x%x\n",atom); + + for (i = 0; i < 17; atom++ ,i++) + { + if (lstrcmpW(ControlsList[i],L"\0")) + { + ATOM test_atom = GetClassInfoW(NULL, ControlsList[i], &cls); + // Skip unregistered Classes. + if (test_atom) + { + ok(test_atom == atom, "%S class atom did not match %x:%x\n",ControlsList[i],test_atom,atom); + ok(!lstrcmpW(cls.lpszClassName,ControlsList[i]),"GetClassName returned incorrect name\n"); + } + } + } +} void Test_RealGetWindowClass() { @@ -130,6 +186,7 @@ START_TEST(RealGetWindowClass) { + Test_ClassAtoms(); Test_RealGetWindowClass(); }

9 years, 11 months

[hbelusca] 65988: [FREELDR]: Make RamDiskLoadVirtualFile returning a BOOLEAN such that if we fail to load a Ram disk image, we can display an error message and abort boot.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 5 22:24:56 2015 New Revision: 65988 URL: http://svn.reactos.org/svn/reactos?rev=65988&view=rev Log: [FREELDR]: Make RamDiskLoadVirtualFile returning a BOOLEAN such that if we fail to load a Ram disk image, we can display an error message and abort boot. Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Mon Jan 5 22:24:56 2015 @@ -116,7 +116,7 @@ FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); } -VOID +BOOLEAN NTAPI RamDiskLoadVirtualFile(IN PCHAR FileName) { @@ -138,7 +138,7 @@ // RamFile = FsOpenFile(FileName); if (!RamFile) - return; + return FALSE; // // Get the file size @@ -147,7 +147,7 @@ if (Status != ESUCCESS) { FsCloseFile(RamFile); - return; + return FALSE; } // @@ -157,7 +157,7 @@ { UiMessageBox("RAM disk too big\n"); FsCloseFile(RamFile); - return; + return FALSE; } gRamDiskSize = Information.EndingAddress.LowPart; @@ -174,7 +174,7 @@ { UiMessageBox("Failed to allocate memory for RAM disk\n"); FsCloseFile(RamFile); - return; + return FALSE; } // @@ -222,8 +222,8 @@ gRamDiskBase = NULL; gRamDiskSize = 0; FsCloseFile(RamFile); - UiMessageBox("Failed to read RamDisk\n"); - return; + UiMessageBox("Failed to read RAM disk\n"); + return FALSE; } } @@ -231,4 +231,6 @@ // Register a new device for the ramdisk FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); -} + + return TRUE; +} Modified: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] Mon Jan 5 22:24:56 2015 @@ -11,7 +11,7 @@ // // Ramdisk Routines // -VOID +BOOLEAN NTAPI RamDiskLoadVirtualFile( IN PCHAR FileName Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Mon Jan 5 22:24:56 2015 @@ -237,7 +237,11 @@ *strstr(FileName, " ") = ANSI_NULL; /* Load the ramdisk */ - RamDiskLoadVirtualFile(FileName); + if (!RamDiskLoadVirtualFile(FileName)) + { + UiMessageBox("Failed to load RAM disk file %s\n", FileName); + return; + } } TRACE("BootPath: '%s'\n", BootPath); @@ -252,7 +256,7 @@ SystemPath = SourcePaths[i]; if (!SystemPath) { - ERR("Failed to open txtsetup.sif\n"); + UiMessageBox("Failed to open txtsetup.sif\n"); return; } strcpy(File, SystemPath); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Jan 5 22:24:56 2015 @@ -674,7 +674,11 @@ *strstr(FileName, " ") = ANSI_NULL; /* Load the ramdisk */ - RamDiskLoadVirtualFile(FileName); + if (!RamDiskLoadVirtualFile(FileName)) + { + UiMessageBox("Failed to load RAM disk file %s\n", FileName); + return; + } } /* Let user know we started loading */

9 years, 11 months

[hbelusca] 65987: [SNDREC32]: I've just learnt that in Spanish they use the "principle of least capitalization", so follow this rule :D Thanks Ismael for having taught me this rule xD

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 5 22:00:00 2015 New Revision: 65987 URL: http://svn.reactos.org/svn/reactos?rev=65987&view=rev Log: [SNDREC32]: I've just learnt that in Spanish they use the "principle of least capitalization", so follow this rule :D Thanks Ismael for having taught me this rule xD Modified: trunk/reactos/base/applications/sndrec32/lang/es-ES.rc Modified: trunk/reactos/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] Mon Jan 5 22:00:00 2015 @@ -11,11 +11,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Acerca de la Grabadora de Sonidos de ReactOS" +CAPTION "Acerca de la Grabadora de sonidos de ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "Grabadora de Sonidos de ReactOS, versiÃ³n 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "Grabadora de sonidos de ReactOS, versiÃ³n 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Aceptar", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -66,7 +66,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Grabadora de Sonidos" + IDS_APP_TITLE "Grabadora de sonidos" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END

9 years, 11 months

[hbelusca] 65986: [SNDREC] - Uppercase fixing for the english app title of Sound Recorder. From a suggestion by Jared. - Fix some french translation. - Fix some "reactos_sndrec32" thingie in other ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jan 5 21:26:46 2015 New Revision: 65986 URL: http://svn.reactos.org/svn/reactos?rev=65986&view=rev Log: [SNDREC] - Uppercase fixing for the english app title of Sound Recorder. From a suggestion by Jared. - Fix some french translation. - Fix some "reactos_sndrec32" thingie in other languages. Translators, please review and fix the translations! CORE-9029 #resolve #comment Corrected in revision 65986, thanks! Modified: trunk/reactos/base/applications/sndrec32/lang/en-US.rc trunk/reactos/base/applications/sndrec32/lang/es-ES.rc trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc trunk/reactos/base/applications/sndrec32/lang/it-IT.rc trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc Modified: trunk/reactos/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] Mon Jan 5 21:26:46 2015 @@ -63,7 +63,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Sound recorder" + IDS_APP_TITLE "Sound Recorder" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END Modified: trunk/reactos/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] Mon Jan 5 21:26:46 2015 @@ -11,11 +11,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Acerca de la Grabadora de sonidos de ReactOS" +CAPTION "Acerca de la Grabadora de Sonidos de ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "Grabadora de sonidos de ReactOS, versiÃ³n 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "Grabadora de Sonidos de ReactOS, versiÃ³n 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Aceptar", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -66,7 +66,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Grabadora de sonidos" + IDS_APP_TITLE "Grabadora de Sonidos" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END Modified: trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc [iso-8859-1] Mon Jan 5 21:26:46 2015 @@ -25,26 +25,26 @@ MENUITEM "Ouvrir...", ID_FILE_OPEN MENUITEM "Enregistrer", ID_FILE_SAVE, GRAYED MENUITEM "Enregistrer sous...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED - MENUITEM "Properties", ID_FILE_PROPERTIES + MENUITEM "Restorer...", ID_FILE_RESTORE, GRAYED + MENUITEM "PropriÃ©tÃ©s", ID_FILE_PROPERTIES MENUITEM SEPARATOR MENUITEM "Sortir", ID_FILE_EXIT END - POPUP "&Edit" + POPUP "&Edition" BEGIN - MENUITEM "&Copy", ID_EDIT_COPY + MENUITEM "&Copie", ID_EDIT_COPY MENUITEM "&Paste Insert", ID_EDIT_PASTE, GRAYED MENUITEM "Paste Mi&x", ID_EDIT_PASTEMIX, GRAYED MENUITEM SEPARATOR - MENUITEM "&Insert File...", ID_EDIT_INSERTFILE + MENUITEM "&InsÃ©rer un fichier...", ID_EDIT_INSERTFILE MENUITEM "&Mix with File...", ID_EDIT_MIXFILE MENUITEM SEPARATOR MENUITEM "Delete &Before Current Position",ID_EDIT_DELETEBEFORE, GRAYED MENUITEM "Delete &After Current Position",ID_EDIT_DELETEAFTER, GRAYED MENUITEM SEPARATOR - MENUITEM "A&udio Properties", ID_EDIT_AUDIOPROPS + MENUITEM "PropriÃ©tÃ©s A&udio", ID_EDIT_AUDIOPROPS END - POPUP "Effect&s" + POPUP "Effet&s" BEGIN MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL Modified: trunk/reactos/base/applications/sndrec32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] Mon Jan 5 21:26:46 2015 @@ -8,11 +8,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Informazioni su reactOS_sndrec32" +CAPTION "Informazioni su ReactOS Registratore Audio" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "ReactOS registratore audio, versione 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "ReactOS Registratore Audio, versione 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -63,7 +63,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Registratore di suoni" + IDS_APP_TITLE "Registratore Audio" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END Modified: trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] Mon Jan 5 21:26:46 2015 @@ -8,11 +8,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "reactOS_sndrec32 ã«é¢ããæå ±" +CAPTION "ãµã¦ã³ã ã¬ã³ã¼ã ã«é¢ããæå ±" FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "reactOS_sndrec32, ãã¼ã¸ã§ã³ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "ãµã¦ã³ã ã¬ã³ã¼ã, ãã¼ã¸ã§ã³ 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Copyright (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END Modified: trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] Mon Jan 5 21:26:46 2015 @@ -17,11 +17,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Informacje o Rejestratorze dÅºwiÄku ReactOS" +CAPTION "Informacje o Rejestratorze DÅºwiÄku ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "Rejestrator dÅºwiÄku ReactOS, wersja 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "Rejestrator DÅºwiÄku ReactOS, wersja 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Prawa autorskie (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "OK", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -72,7 +72,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Rejestrator dÅºwiÄku" + IDS_APP_TITLE "Rejestrator DÅºwiÄku" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END Modified: trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc [iso-8859-1] Mon Jan 5 21:26:46 2015 @@ -14,11 +14,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Despre Ã®nregistratorul audio" +CAPTION "Despre Ãnregistratorul Audio" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN ICON IDI_SNDREC32, -1, 19, 14, 21, 20 - LTEXT "Ãnregistrator audio, versiunea 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX + LTEXT "Ãnregistrator Audio, versiunea 1.0", IDC_STATIC, 56, 16, 114, 8, SS_NOPREFIX LTEXT "Drept de autor (C) 2009", IDC_STATIC, 56, 25, 114, 8 DEFPUSHBUTTON "Ã&nchide", IDOK, 139, 54, 50, 14, WS_GROUP END @@ -69,7 +69,7 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Ãnregistrator audio" + IDS_APP_TITLE "Ãnregistrator Audio" IDC_REACTOS_SNDREC32 "REACTOS_SNDREC32" END

9 years, 11 months

[jimtabor] 65985: [Win32k] - Get DDE working halfway. Pass more tests but still missing other tests. See CORE-7447.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jan 5 19:44:49 2015 New Revision: 65985 URL: http://svn.reactos.org/svn/reactos?rev=65985&view=rev Log: [Win32k] - Get DDE working halfway. Pass more tests but still missing other tests. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/dde.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/userfuncs.h Modified: trunk/reactos/win32ss/user/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Mon Jan 5 19:44:49 2015 @@ -1,7 +1,71 @@ #include <win32k.h> -//DBG_DEFAULT_CHANNEL(UserMisc); +#include <dde.h> + +DBG_DEFAULT_CHANNEL(UserMisc); + + +BOOL FASTCALL +IntDdeSendMessageHook(PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PWND pWndServer; + + if (pWnd->head.pti->ppi != gptiCurrent->ppi) + { + // Allow only Acknowledge and Initiate to be sent across borders. + if (Msg != WM_DDE_ACK ) + { + if (Msg == WM_DDE_INITIATE) return TRUE; + return FALSE; + } + + pWndServer = UserGetWindowObject((HWND)wParam); + if (pWndServer == NULL) + { + ERR("Invalid DDE Server Window handle\n"); + return FALSE; + } + ERR("Sending DDE 0x%x\n",Msg); + } + return TRUE; +} + +BOOL FASTCALL +IntDdePostMessageHook(PWND pWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PWND pWndClient; + + if (pWnd->head.pti->ppi != gptiCurrent->ppi) + { + // Initiate is sent only across borders. + if (Msg == WM_DDE_INITIATE) + { + return FALSE; + } + + pWndClient = UserGetWindowObject((HWND)wParam); + if (pWndClient == NULL) + { + // This is terminating so post it. + if ( Msg == WM_DDE_TERMINATE) return TRUE; + ERR("Invalid DDE Client Window handle\n"); + return FALSE; + } + ERR("Posting and do CB DDE 0x%x\n",Msg); + } + return TRUE; +} + +VOID FASTCALL +IntDdeGetMessageHook(PMSG pMsg) +{ + if (pMsg->message == WM_DDE_TERMINATE) + { + return; + } + ERR("Do Callback Msg 0x%x\n",pMsg->message); +} BOOL APIENTRY Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Jan 5 19:44:49 2015 @@ -1008,8 +1008,15 @@ bGMSG ); if (Present) { - /* GetMessage or PostMessage must never get messages that contain pointers */ - ASSERT(FindMsgMemory(pMsg->message) == NULL); + if ( pMsg->message >= WM_DDE_FIRST && pMsg->message <= WM_DDE_LAST ) + { + IntDdeGetMessageHook(pMsg); + } + else + { + /* GetMessage or PostMessage must never get messages that contain pointers */ + ASSERT(FindMsgMemory(pMsg->message) == NULL); + } if (pMsg->message != WM_PAINT && pMsg->message != WM_QUIT) { @@ -1113,7 +1120,7 @@ LPARAM lParam ) { PTHREADINFO pti; - MSG Message, KernelModeMsg; + MSG Message; LARGE_INTEGER LargeTickCount; Message.hwnd = Wnd; @@ -1130,38 +1137,6 @@ return FALSE; } - if( Msg >= WM_DDE_FIRST && Msg <= WM_DDE_LAST ) - { - NTSTATUS Status; - PMSGMEMORY MsgMemoryEntry; - - MsgMemoryEntry = FindMsgMemory(Message.message); - - Status = CopyMsgToKernelMem(&KernelModeMsg, &Message, MsgMemoryEntry); - if (! NT_SUCCESS(Status)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - co_IntSendMessageNoWait(KernelModeMsg.hwnd, - KernelModeMsg.message, - KernelModeMsg.wParam, - KernelModeMsg.lParam); - - if (MsgMemoryEntry && KernelModeMsg.lParam) - ExFreePool((PVOID) KernelModeMsg.lParam); - - return TRUE; - } - - if (!Wnd) - { - pti = PsGetCurrentThreadWin32Thread(); - return UserPostThreadMessage( pti, - Msg, - wParam, - lParam); - } if (Wnd == HWND_BROADCAST) { HWND *List; @@ -1192,6 +1167,14 @@ { PWND Window; + if (!Wnd) + { + return UserPostThreadMessage( gptiCurrent, + Msg, + wParam, + lParam); + } + Window = UserGetWindowObject(Wnd); if ( !Window ) { @@ -1200,6 +1183,7 @@ } pti = Window->head.pti; + if ( pti->TIF_flags & TIF_INCLEANUP ) { ERR("Attempted to post message to window %p when the thread is in cleanup!\n", Wnd); @@ -1211,6 +1195,15 @@ ERR("Attempted to post message to window %p that is being destroyed!\n", Wnd); /* FIXME: Last error code? */ return FALSE; + } + + if ( Msg >= WM_DDE_FIRST && Msg <= WM_DDE_LAST ) + { + if (!IntDdePostMessageHook(Window, Msg, wParam, lParam)) + { + ERR("Posting Exit DDE 0x%x\n",Msg); + return FALSE; + } } if (WM_QUIT == Msg) @@ -1270,6 +1263,15 @@ Win32Thread = PsGetCurrentThreadWin32Thread(); ptiSendTo = IntSendTo(Window, Win32Thread, Msg); + + if ( Msg >= WM_DDE_FIRST && Msg <= WM_DDE_LAST ) + { + if (!IntDdeSendMessageHook(Window, Msg, wParam, lParam)) + { + ERR("Sending Exit DDE 0x%x\n",Msg); + RETURN( FALSE); + } + } if ( !ptiSendTo ) { Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Mon Jan 5 19:44:49 2015 @@ -39,6 +39,12 @@ #define DUMP_REFS(obj) TRACE_CH(UserObj,"obj 0x%x, refs %i\n",obj, ((PHEAD)obj)->cLockObj) PWND FASTCALL IntGetWindowObject(HWND hWnd); + +/*************** DDE.C ****************/ + +BOOL FASTCALL IntDdeSendMessageHook(PWND,UINT,WPARAM,LPARAM); +BOOL FASTCALL IntDdePostMessageHook(PWND,UINT,WPARAM,LPARAM); +VOID FASTCALL IntDdeGetMessageHook(PMSG); /*************** MAIN.C ***************/

9 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2015