Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 54500: [NTOS] - Remove an unnecessary semicolon. Spotted by tower.
by fireball＠svn.reactos.org 26 Nov '11

26 Nov '11

Author: fireball Date: Sat Nov 26 09:56:23 2011 New Revision: 54500 URL: http://svn.reactos.org/svn/reactos?rev=54500&view=rev Log: [NTOS] - Remove an unnecessary semicolon. Spotted by tower. Modified: trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=5450… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Nov 26 09:56:23 2011 @@ -798,7 +798,7 @@ /* Check if this is power failure simulation */ if (BugCheckCode == POWER_FAILURE_SIMULATE) { - /* Call the Callbacks and reboot */; + /* Call the Callbacks and reboot */ KiDoBugCheckCallbacks(); HalReturnToFirmware(HalRebootRoutine); }

1 0

[jimtabor] 54499: [Gdi32] - Do the same for rbuild, link to msvcrt.
by jimtabor＠svn.reactos.org 25 Nov '11

25 Nov '11

Author: jimtabor Date: Fri Nov 25 22:25:06 2011 New Revision: 54499 URL: http://svn.reactos.org/svn/reactos?rev=54499&view=rev Log: [Gdi32] - Do the same for rbuild, link to msvcrt. Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Fri Nov 25 22:25:06 2011 @@ -1,4 +1,4 @@ -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll"> +<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="msvcrt"> <importlibrary definition="gdi32.spec" /> <include base="gdi32">include</include> <define name="LANGPACK" />

1 0

[jimtabor] 54498: [User32] - Fix errno in dialog.c by linking to msvcrt with rbuild. Cmake does not have this issue, already links to msvcrt. Gdi32 rbuild does link to crtdll instead of msvcrt. Sho...
by jimtabor＠svn.reactos.org 25 Nov '11

25 Nov '11

Author: jimtabor Date: Fri Nov 25 22:18:20 2011 New Revision: 54498 URL: http://svn.reactos.org/svn/reactos?rev=54498&view=rev Log: [User32] - Fix errno in dialog.c by linking to msvcrt with rbuild. Cmake does not have this issue, already links to msvcrt. Gdi32 rbuild does link to crtdll instead of msvcrt. Should we fix this too, before the Cmake switch over to see anything is different? Modified: trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Fri Nov 25 22:18:20 2011 @@ -1,4 +1,4 @@ -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll"> +<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="msvcrt"> <importlibrary definition="user32.pspec" /> <include base="user32">.</include> <include base="user32">include</include> Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Fri Nov 25 22:18:20 2011 @@ -2105,8 +2105,7 @@ result = strtol( str, &endptr, 10 ); if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ return 0; - /* FIXME: errno? */ - if (((result == 0) || (result == 0xFFFFFFFF))/* && (errno == ERANGE) */) + if (((result == LONG_MIN) || (result == LONG_MAX)) && (errno == ERANGE) ) return 0; } else @@ -2114,8 +2113,7 @@ result = strtoul( str, &endptr, 10 ); if (!endptr || (endptr == str)) /* Conversion was unsuccessful */ return 0; - /* FIXME: errno? */ - if ((result == 0xFFFFFFFF)/* && (errno == ERANGE) */) return 0; + if ((result == ULONG_MAX) && (errno == ERANGE) ) return 0; } if (lpTranslated) *lpTranslated = TRUE; return (UINT)result;

1 0

[osiejka] 54497: [TRANSLATION] - Romanian translation update (bug no. 6677) by Stefan Fulea;
by osiejka＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: osiejka Date: Thu Nov 24 23:45:38 2011 New Revision: 54497 URL: http://svn.reactos.org/svn/reactos?rev=54497&view=rev Log: [TRANSLATION] - Romanian translation update (bug no. 6677) by Stefan Fulea; Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/system/format/lang/ro-RO.rc trunk/reactos/base/system/regsvr32/lang/ro-RO.rc trunk/reactos/base/system/rundll32/lang/ro-RO.rc trunk/reactos/base/system/subst/lang/ro-RO.rc trunk/reactos/base/system/userinit/lang/ro-RO.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/joy/lang/ro-RO.rc trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc trunk/reactos/dll/cpl/main/lang/ro-RO.rc trunk/reactos/dll/win32/netid/lang/ro-RO.rc trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/userenv/lang/ro-RO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/system/format/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/ro… Modified: trunk/reactos/base/system/regsvr32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/subst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/ro-… Modified: trunk/reactos/base/system/userinit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… Modified: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ro-RO.rc?… Modified: trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… Modified: trunk/reactos/dll/win32/netid/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ro-RO… Modified: trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ro-R… Modified: trunk/reactos/dll/win32/shimgvw/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/ro-… Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… Modified: trunk/reactos/dll/win32/userenv/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/ro-…

1 0

[tfaber] 54496: [LIBXML2][LIBXSLT] - Suppress unhelpful warnings
by tfaber＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: tfaber Date: Thu Nov 24 14:22:58 2011 New Revision: 54496 URL: http://svn.reactos.org/svn/reactos?rev=54496&view=rev Log: [LIBXML2][LIBXSLT] - Suppress unhelpful warnings Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt Modified: trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/CMake… ============================================================================== --- trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/libxslt/CMakeLists.txt [iso-8859-1] Thu Nov 24 14:22:58 2011 @@ -46,5 +46,6 @@ add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) if(NOT MSVC) + add_target_compile_flags(libxslt "-Wno-pointer-sign") allow_warnings(libxslt) endif() Modified: trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/CMake… ============================================================================== --- trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libxml2/CMakeLists.txt [iso-8859-1] Thu Nov 24 14:22:58 2011 @@ -61,5 +61,6 @@ add_dependencies(libxml2 psdk) if(NOT MSVC) + add_target_compile_flags(libxml2 "-Wno-format -Wno-pointer-sign") allow_warnings(libxml2) endif()

1 0

[tfaber] 54495: [PSEH2_TEST] - Suppress unhelpful warnings - Remove unneeded compiler flags
by tfaber＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: tfaber Date: Thu Nov 24 14:07:44 2011 New Revision: 54495 URL: http://svn.reactos.org/svn/reactos?rev=54495&view=rev Log: [PSEH2_TEST] - Suppress unhelpful warnings - Remove unneeded compiler flags Modified: trunk/rostests/tests/pseh2/CMakeLists.txt Modified: trunk/rostests/tests/pseh2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/CMakeLists.tx… ============================================================================== --- trunk/rostests/tests/pseh2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/CMakeLists.txt [iso-8859-1] Thu Nov 24 14:07:44 2011 @@ -1,5 +1,3 @@ - -add_definitions(-D_DLL -D__USE_CRTIMP) add_executable(pseh2_test psehtest.c psehtest2.c) target_link_libraries(pseh2_test wine ${PSEH_LIB}) @@ -8,5 +6,5 @@ add_cd_file(TARGET pseh2_test DESTINATION reactos/bin FOR all) if(NOT MSVC) - allow_warnings(pseh2_test) + add_target_compile_flags(pseh2_test "-Wno-format") endif()

1 0

[tfaber] 54494: [CRT] - Remove some differences to Wine. Fixes comparing a char against EOF in fgetwc.
by tfaber＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: tfaber Date: Thu Nov 24 13:27:34 2011 New Revision: 54494 URL: http://svn.reactos.org/svn/reactos?rev=54494&view=rev Log: [CRT] - Remove some differences to Wine. Fixes comparing a char against EOF in fgetwc. Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Thu Nov 24 13:27:34 2011 @@ -120,7 +120,7 @@ static inline BOOL is_valid_fd(int fd) { - return fd >= 0 && fd < fdend && (fdesc[fd].wxflag & WX_OPEN); + return fd >= 0 && fd < fdend && (fdesc[fd].wxflag & WX_OPEN); } /* INTERNAL: Get the HANDLE for a fd @@ -177,6 +177,7 @@ WARN(":files exhausted!\n"); return -1; } + fdesc[fd].handle = hand; fdesc[fd].wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT)); @@ -233,6 +234,7 @@ return fstreams[i]; } } + return NULL; } @@ -341,9 +343,10 @@ if (!(fdesc[0].wxflag & WX_OPEN) || fdesc[0].handle == INVALID_HANDLE_VALUE) { #ifndef __REACTOS__ - DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), - GetCurrentProcess(), &fdesc[0].handle, 0, TRUE, - DUPLICATE_SAME_ACCESS); + HANDLE std = GetStdHandle(STD_INPUT_HANDLE); + if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, + GetCurrentProcess(), &fdesc[0].handle, + 0, TRUE, DUPLICATE_SAME_ACCESS)) #else fdesc[0].handle = GetStdHandle(STD_INPUT_HANDLE); if (fdesc[0].handle == NULL) @@ -351,12 +354,14 @@ #endif fdesc[0].wxflag = WX_OPEN | WX_TEXT; } + if (!(fdesc[1].wxflag & WX_OPEN) || fdesc[1].handle == INVALID_HANDLE_VALUE) { #ifndef __REACTOS__ - DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_OUTPUT_HANDLE), - GetCurrentProcess(), &fdesc[1].handle, 0, TRUE, - DUPLICATE_SAME_ACCESS); + HANDLE std = GetStdHandle(STD_OUTPUT_HANDLE); + if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, + GetCurrentProcess(), &fdesc[1].handle, + 0, TRUE, DUPLICATE_SAME_ACCESS)) #else fdesc[1].handle = GetStdHandle(STD_OUTPUT_HANDLE); if (fdesc[1].handle == NULL) @@ -364,12 +369,14 @@ #endif fdesc[1].wxflag = WX_OPEN | WX_TEXT; } + if (!(fdesc[2].wxflag & WX_OPEN) || fdesc[2].handle == INVALID_HANDLE_VALUE) { #ifndef __REACTOS__ - DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_ERROR_HANDLE), - GetCurrentProcess(), &fdesc[2].handle, 0, TRUE, - DUPLICATE_SAME_ACCESS); + HANDLE std = GetStdHandle(STD_ERROR_HANDLE); + if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, + GetCurrentProcess(), &fdesc[2].handle, + 0, TRUE, DUPLICATE_SAME_ACCESS)) #else fdesc[2].handle = GetStdHandle(STD_ERROR_HANDLE); if (fdesc[2].handle == NULL) @@ -378,8 +385,8 @@ fdesc[2].wxflag = WX_OPEN | WX_TEXT; } - TRACE(":handles (%p)(%p)(%p)\n",fdesc[0].handle, - fdesc[1].handle,fdesc[2].handle); + TRACE(":handles (%p)(%p)(%p)\n", fdesc[0].handle, + fdesc[1].handle, fdesc[2].handle); memset(_iob,0,3*sizeof(FILE)); for (i = 0; i < 3; i++) @@ -425,7 +432,7 @@ } /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ -static void int_to_base32(int num, char *str) +static int int_to_base32(int num, char *str) { char *p; int n = num; @@ -445,6 +452,8 @@ *p += ('a' - '0' - 10); num >>= 5; } + + return digits; } /********************************************************************* @@ -1953,12 +1962,13 @@ */ wint_t CDECL fgetwc(FILE* file) { - char c; + int c; if (!(fdesc[file->_file].wxflag & WX_TEXT)) { wchar_t wc; - int i,j; + unsigned int i; + int j; char *chp, *wcp; wcp = (char *)&wc; for(i=0; i<sizeof(wc); i++)

1 0

[tfaber] 54493: [EXPLORER] - Fix incorrect virtual function override of Entry::do_context_menu. CID 1630
by tfaber＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: tfaber Date: Thu Nov 24 13:12:56 2011 New Revision: 54493 URL: http://svn.reactos.org/svn/reactos?rev=54493&view=rev Log: [EXPLORER] - Fix incorrect virtual function override of Entry::do_context_menu. CID 1630 Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp trunk/reactos/base/shell/explorer/shell/shellfs.h Modified: trunk/reactos/base/shell/explorer/shell/shellfs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellfs.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellfs.cpp [iso-8859-1] Thu Nov 24 13:12:56 2011 @@ -221,14 +221,14 @@ } -HRESULT ShellEntry::do_context_menu(HWND hwnd, LPPOINT pptScreen, CtxMenuInterfaces& cm_ifs) +HRESULT ShellEntry::do_context_menu(HWND hwnd, const POINT& pptScreen, CtxMenuInterfaces& cm_ifs) { ShellDirectory* dir = static_cast<ShellDirectory*>(_up); ShellFolder folder = dir? dir->_folder: GetDesktopFolder(); LPCITEMIDLIST pidl = _pidl; - return ShellFolderContextMenu(folder, hwnd, 1, &pidl, pptScreen->x, pptScreen->y, cm_ifs); + return ShellFolderContextMenu(folder, hwnd, 1, &pidl, pptScreen.x, pptScreen.y, cm_ifs); } Modified: trunk/reactos/base/shell/explorer/shell/shellfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/shellfs.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/shellfs.h [iso-8859-1] Thu Nov 24 13:12:56 2011 @@ -36,7 +36,7 @@ virtual ShellPath create_absolute_pidl() const; virtual HRESULT GetUIObjectOf(HWND hWnd, REFIID riid, LPVOID* ppvOut); virtual BOOL launch_entry(HWND hwnd, UINT nCmdShow=SW_SHOWNORMAL); - virtual HRESULT do_context_menu(HWND hwnd, LPPOINT pptScreen, CtxMenuInterfaces& cm_ifs); + virtual HRESULT do_context_menu(HWND hwnd, const POINT& pptScreen, CtxMenuInterfaces& cm_ifs); virtual ShellFolder get_shell_folder() const; IShellFolder* get_parent_folder() const;

1 0

[akhaldi] 54492: [IP] * Remove unused value. CID 11342.
by akhaldi＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: akhaldi Date: Thu Nov 24 12:51:27 2011 New Revision: 54492 URL: http://svn.reactos.org/svn/reactos?rev=54492&view=rev Log: [IP] * Remove unused value. CID 11342. Modified: trunk/reactos/lib/drivers/ip/network/arp.c Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Thu Nov 24 12:51:27 2011 @@ -228,8 +228,8 @@ /* The packet had our protocol address as target. The sender may want to communicate with us soon, so add his address to our address cache */ - NCE = NBAddNeighbor(Interface, &SrcAddress, SenderHWAddress, - Header->HWAddrLen, 0, ARP_COMPLETE_TIMEOUT); + NBAddNeighbor(Interface, &SrcAddress, SenderHWAddress, + Header->HWAddrLen, 0, ARP_COMPLETE_TIMEOUT); } if (Header->Opcode != ARP_OPCODE_REQUEST)

1 0

[akhaldi] 54491: [WIN32K] * Comment out some unused but set variables. * Check for NtDeviceIoControlFile returned status and warn on failure.
by akhaldi＠svn.reactos.org 24 Nov '11

24 Nov '11

Author: akhaldi Date: Thu Nov 24 12:38:26 2011 New Revision: 54491 URL: http://svn.reactos.org/svn/reactos?rev=54491&view=rev Log: [WIN32K] * Comment out some unused but set variables. * Check for NtDeviceIoControlFile returned status and warn on failure. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.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] Thu Nov 24 12:38:26 2011 @@ -134,14 +134,15 @@ NTSTATUS MouStatus = STATUS_UNSUCCESSFUL, KbdStatus = STATUS_UNSUCCESSFUL, Status; IO_STATUS_BLOCK MouIosb, KbdIosb; PFILE_OBJECT pKbdDevice, pMouDevice; - LARGE_INTEGER WaitTimeout, ByteOffset; + LARGE_INTEGER ByteOffset; + //LARGE_INTEGER WaitTimeout; PVOID WaitObjects[3], pSignaledObject = NULL; ULONG cWaitObjects = 0, cMaxWaitObjects = 1; MOUSE_INPUT_DATA MouseInput; KEYBOARD_INPUT_DATA KeyInput; ByteOffset.QuadPart = (LONGLONG)0; - WaitTimeout.QuadPart = (LONGLONG)(-10000000); + //WaitTimeout.QuadPart = (LONGLONG)(-10000000); ptiRawInput = PsGetCurrentThreadWin32Thread(); ptiRawInput->TIF_flags |= TIF_SYSTEMTHREAD; 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] Thu Nov 24 12:38:26 2011 @@ -170,6 +170,11 @@ IOCTL_KEYBOARD_QUERY_INDICATORS, NULL, 0, &gIndicators, sizeof(gIndicators)); + + if (!NT_SUCCESS(Status)) + { + WARN("NtDeviceIoControlFile() failed, ignored\n"); + } SET_KEY_LOCKED(gafAsyncKeyState, VK_CAPITAL, gIndicators.LedFlags & KEYBOARD_CAPS_LOCK_ON); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu Nov 24 12:38:26 2011 @@ -951,7 +951,7 @@ BOOL APIENTRY NtUserFlashWindowEx(IN PFLASHWINFO pfwi) { - PWND pWnd; + //PWND pWnd; FLASHWINFO finfo = {0}; BOOL Ret = TRUE; @@ -971,7 +971,7 @@ if (!Ret) goto Exit; - if (!(pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || + if (!(/* pWnd = */ (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || finfo.cbSize != sizeof(FLASHWINFO) || finfo.dwFlags & ~(FLASHW_ALL|FLASHW_TIMER|FLASHW_TIMERNOFG) ) {

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