Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 58047: [NTOSKRNL] In NtAllocateVirtualMemory, when MEM_RESET is passed, silence the DPRINT and also return STATUS_SUCCESS, since MEM_RESET is only an optimization (tells the memory manag...
by tkreuzer＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: tkreuzer Date: Sat Dec 29 21:40:41 2012 New Revision: 58047 URL: http://svn.reactos.org/svn/reactos?rev=58047&view=rev Log: [NTOSKRNL] In NtAllocateVirtualMemory, when MEM_RESET is passed, silence the DPRINT and also return STATUS_SUCCESS, since MEM_RESET is only an optimization (tells the memory manager that the contents shouldn't be written to the pagefile) and it won't hurt (except the performance) to pretend success. On the other hand paging out is probably never done anyway due to broken Mm. This fixes spamming the log by Firefox. It does not fix the hangs that firfox suffers from. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Dec 29 21:40:41 2012 @@ -3861,8 +3861,9 @@ } if ((AllocationType & MEM_RESET) == MEM_RESET) { - DPRINT1("MEM_RESET not supported\n"); - Status = STATUS_INVALID_PARAMETER; + /// @todo HACK: pretend success + DPRINT("MEM_RESET not supported\n"); + Status = STATUS_SUCCESS; goto FailPathNoLock; } if (Process->VmTopDown == 1)

1 0

[hbelusca] 58046: Sync with trunk revision r58045 to bring the corrections on configure.cmd and on widl/wpp.
by hbelusca＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: hbelusca Date: Sat Dec 29 20:57:10 2012 New Revision: 58046 URL: http://svn.reactos.org/svn/reactos?rev=58046&view=rev Log: Sync with trunk revision r58045 to bring the corrections on configure.cmd and on widl/wpp. Modified: branches/ros-csrss/ (props changed) branches/ros-csrss/base/applications/rapps/rapps/abiword28x.txt branches/ros-csrss/base/applications/rapps/rapps/bittorrent.txt branches/ros-csrss/base/applications/rapps/rapps/fap.txt branches/ros-csrss/base/applications/rapps/rapps/firefox5.txt branches/ros-csrss/base/applications/rapps/rapps/irfanview.txt branches/ros-csrss/base/applications/rapps/rapps/irfanviewplugins.txt branches/ros-csrss/base/applications/rapps/rapps/libreoffice.txt branches/ros-csrss/base/applications/rapps/rapps/mirandaim.txt branches/ros-csrss/base/applications/rapps/rapps/mirc.txt branches/ros-csrss/base/applications/rapps/rapps/mpc.txt branches/ros-csrss/base/applications/rapps/rapps/openttd.txt branches/ros-csrss/base/applications/rapps/rapps/opera.txt branches/ros-csrss/base/applications/rapps/rapps/rosbe.txt branches/ros-csrss/base/applications/rapps/rapps/scite.txt branches/ros-csrss/base/applications/rapps/rapps/seamonkey.txt branches/ros-csrss/base/applications/rapps/rapps/smplayer.txt branches/ros-csrss/base/applications/rapps/rapps/sumatrapdf.txt branches/ros-csrss/base/applications/rapps/rapps/thunderbird5.txt branches/ros-csrss/base/applications/rapps/rapps/ultravnc.txt branches/ros-csrss/base/applications/rapps/rapps/utorrent.txt branches/ros-csrss/base/applications/rapps/rapps/vlc.txt branches/ros-csrss/configure.cmd branches/ros-csrss/dll/win32/netapi32/apibuf.c branches/ros-csrss/dll/win32/samsrv/database.c branches/ros-csrss/dll/win32/samsrv/samrpc.c branches/ros-csrss/dll/win32/samsrv/samsrv.h branches/ros-csrss/include/ddk/ntsam.h branches/ros-csrss/include/reactos/idl/sam.idl branches/ros-csrss/tools/widl/header.c branches/ros-csrss/tools/widl/parser.tab.c branches/ros-csrss/tools/widl/parser.y branches/ros-csrss/tools/widl/proxy.c branches/ros-csrss/tools/widl/typegen.c branches/ros-csrss/tools/wpp/preproc.c branches/ros-csrss/win32ss/drivers/videoprt/child.c branches/ros-csrss/win32ss/gdi/ntgdi/cliprgn.h branches/ros-csrss/win32ss/include/ntuser.h branches/ros-csrss/win32ss/user/ntuser/accelerator.c branches/ros-csrss/win32ss/user/ntuser/callproc.c branches/ros-csrss/win32ss/user/ntuser/class.c branches/ros-csrss/win32ss/user/ntuser/clipboard.c branches/ros-csrss/win32ss/user/ntuser/cursoricon.c branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c branches/ros-csrss/win32ss/user/ntuser/event.c branches/ros-csrss/win32ss/user/ntuser/hook.c branches/ros-csrss/win32ss/user/ntuser/kbdlayout.c branches/ros-csrss/win32ss/user/ntuser/menu.c branches/ros-csrss/win32ss/user/ntuser/monitor.c branches/ros-csrss/win32ss/user/ntuser/object.c branches/ros-csrss/win32ss/user/ntuser/object.h branches/ros-csrss/win32ss/user/ntuser/painting.c branches/ros-csrss/win32ss/user/ntuser/simplecall.c branches/ros-csrss/win32ss/user/ntuser/timer.c branches/ros-csrss/win32ss/user/ntuser/win32.h branches/ros-csrss/win32ss/user/ntuser/window.c branches/ros-csrss/win32ss/user/ntuser/winpos.c branches/ros-csrss/win32ss/user/user32/misc/misc.c branches/ros-csrss/win32ss/user/user32/windows/menu.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-csrss/base/applications/rapps/rapps/abiword28x.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/firefox5.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/thunderbird5.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/base/applications/rap… Modified: branches/ros-csrss/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/configure.cmd?rev=580… Modified: branches/ros-csrss/dll/win32/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/netapi32/ap… Modified: branches/ros-csrss/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/data… Modified: branches/ros-csrss/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/samr… Modified: branches/ros-csrss/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/win32/samsrv/sams… Modified: branches/ros-csrss/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/ddk/ntsam.h?r… Modified: branches/ros-csrss/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/idl/s… Modified: branches/ros-csrss/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/header.c?r… Modified: branches/ros-csrss/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/parser.tab… Modified: branches/ros-csrss/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/parser.y?r… Modified: branches/ros-csrss/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/proxy.c?re… Modified: branches/ros-csrss/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/widl/typegen.c?… Modified: branches/ros-csrss/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/tools/wpp/preproc.c?r… Modified: branches/ros-csrss/win32ss/drivers/videoprt/child.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/drivers/video… Modified: branches/ros-csrss/win32ss/gdi/ntgdi/cliprgn.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/gdi/ntgdi/cli… Modified: branches/ros-csrss/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/include/ntuse… Modified: branches/ros-csrss/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/a… Modified: branches/ros-csrss/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/c… Modified: branches/ros-csrss/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/e… Modified: branches/ros-csrss/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/h… Modified: branches/ros-csrss/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/k… Modified: branches/ros-csrss/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/m… Modified: branches/ros-csrss/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… Modified: branches/ros-csrss/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/o… Modified: branches/ros-csrss/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/p… Modified: branches/ros-csrss/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/s… Modified: branches/ros-csrss/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/t… Modified: branches/ros-csrss/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/ntuser/w… Modified: branches/ros-csrss/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/m… Modified: branches/ros-csrss/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/user32/w…

1 0

[ekohl] 58045: [NETAPI32] Formatting! No code changes!
by ekohl＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: ekohl Date: Sat Dec 29 20:51:38 2012 New Revision: 58045 URL: http://svn.reactos.org/svn/reactos?rev=58045&view=rev Log: [NETAPI32] Formatting! No code changes! Modified: trunk/reactos/dll/win32/netapi32/apibuf.c Modified: trunk/reactos/dll/win32/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/apibuf.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/apibuf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/apibuf.c [iso-8859-1] Sat Dec 29 20:51:38 2012 @@ -54,19 +54,20 @@ LPVOID* NewBuffer) { TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer); - if (NewByteCount) + if (NewByteCount) { if (OldBuffer) *NewBuffer = HeapReAlloc(GetProcessHeap(), 0, OldBuffer, NewByteCount); else *NewBuffer = HeapAlloc(GetProcessHeap(), 0, NewByteCount); - return *NewBuffer ? NERR_Success : GetLastError(); - } - else + return *NewBuffer ? NERR_Success : GetLastError(); + } + else { - if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) return GetLastError(); - *NewBuffer = 0; - return NERR_Success; + if (!HeapFree(GetProcessHeap(), 0, OldBuffer)) + return GetLastError(); + *NewBuffer = 0; + return NERR_Success; } }

1 0

[hbelusca] 58044: [WPP] Apply Wine commit "wpp: Fix path separator on Windows platforms." by Hermès Bélusca-Maïto (9dbd1969fca9c31155c6d85ea8129d249467926b) Indeed, Windows systems use ':' as part ...
by hbelusca＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: hbelusca Date: Sat Dec 29 20:16:21 2012 New Revision: 58044 URL: http://svn.reactos.org/svn/reactos?rev=58044&view=rev Log: [WPP] Apply Wine commit "wpp: Fix path separator on Windows platforms." by Hermès Bélusca-Maïto (9dbd1969fca9c31155c6d85ea8129d249467926b) Indeed, Windows systems use ':' as part of paths and therefore, use another separator character. This enables compiling ReactOS from source files located in a different disk partition as the generated (output) files. CORE-6442 #resolve #comment Committed in r58044. Modified: trunk/reactos/tools/wpp/preproc.c Modified: trunk/reactos/tools/wpp/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/preproc.c?rev=58… ============================================================================== --- trunk/reactos/tools/wpp/preproc.c [iso-8859-1] (original) +++ trunk/reactos/tools/wpp/preproc.c [iso-8859-1] Sat Dec 29 20:16:21 2012 @@ -447,7 +447,7 @@ * Include management *------------------------------------------------------------------------- */ -#if defined(_Windows) || defined(__MSDOS__) +#if defined(_WIN32) || defined(__MSDOS__) #define INCLUDESEPARATOR ";" #else #define INCLUDESEPARATOR ":"

1 0

[hbelusca] 58043: [CONFIGURE] Fix MSVC configure build (problem of expansion of environment variables).
by hbelusca＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: hbelusca Date: Sat Dec 29 19:23:02 2012 New Revision: 58043 URL: http://svn.reactos.org/svn/reactos?rev=58043&view=rev Log: [CONFIGURE] Fix MSVC configure build (problem of expansion of environment variables). Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=58043&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sat Dec 29 19:23:02 2012 @@ -1,4 +1,11 @@ @echo off + +:: This is needed so as to avoid static expansion of environment variables +:: inside if (...) conditionals. +:: See http://stackoverflow.com/questions/305605/weird-scope-issue-in-bat-file +:: for more explanation. +:: Precisely needed for configuring Visual Studio Environment. +setlocal enabledelayedexpansion :: Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR% if /I "%1" == "arm_hosttools" ( @@ -46,7 +53,7 @@ set USE_WDK_HEADERS=0 ) else if defined VCINSTALLDIR ( - :: VS command prompt does not put this in enviroment vars + :: VS command prompt does not put this in environment vars cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm @@ -59,30 +66,30 @@ exit /b ) - echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% + echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH! if /I "%1" == "VSSolution" ( - if "%BUILD_ENVIRONMENT%" == "VS8" ( - if "%ARCH%" == "amd64" ( + if "!BUILD_ENVIRONMENT!" == "VS8" ( + if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 8 2005 Win64" ) else ( set CMAKE_GENERATOR="Visual Studio 8 2005" ) - ) else if "%BUILD_ENVIRONMENT%" == "VS9" ( - if "%ARCH%" == "amd64" ( + ) else if "!BUILD_ENVIRONMENT!" == "VS9" ( + if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 9 2008 Win64" ) else ( set CMAKE_GENERATOR="Visual Studio 9 2008" ) - ) else if "%BUILD_ENVIRONMENT%" == "VS10" ( - if "%ARCH%" == "amd64" ( + ) else if "!BUILD_ENVIRONMENT!" == "VS10" ( + if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 10 Win64" ) else ( set CMAKE_GENERATOR="Visual Studio 10" ) - ) else if "%BUILD_ENVIRONMENT%" == "VS11" ( - if "%ARCH%" == "amd64" ( + ) else if "!BUILD_ENVIRONMENT!" == "VS11" ( + if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 11 Win64" - ) else if "%ARCH%" == "arm" ( + ) else if "!ARCH!" == "arm" ( set CMAKE_GENERATOR="Visual Studio 11 ARM" ) else ( set CMAKE_GENERATOR="Visual Studio 11" @@ -111,7 +118,7 @@ :: Checkpoint if not defined ARCH ( - echo unknown build architecture + echo Unknown build architecture exit /b )

1 0

[tkreuzer] 58042: Fix build
by tkreuzer＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: tkreuzer Date: Sat Dec 29 19:17:59 2012 New Revision: 58042 URL: http://svn.reactos.org/svn/reactos?rev=58042&view=rev Log: Fix build Modified: trunk/reactos/win32ss/user/user32/misc/misc.c Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] Sat Dec 29 19:17:59 2012 @@ -320,7 +320,7 @@ TRUE, /* TYPE_MONITOR */ FALSE, /* TYPE_KBDLAYOUT */ FALSE, /* TYPE_KBDFILE */ - TRUE /* TYPE_WINEVENTHOOK */ + TRUE, /* TYPE_WINEVENTHOOK */ FALSE, /* TYPE_TIMER */ FALSE, /* TYPE_INPUTCONTEXT */ FALSE, /* TYPE_HIDDATA */

1 0

[tkreuzer] 58041: [WIN32K] Use the official HANDLE_TYPE enum instead of the custom USER_OBJECT_TYPE
by tkreuzer＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: tkreuzer Date: Sat Dec 29 19:14:30 2012 New Revision: 58041 URL: http://svn.reactos.org/svn/reactos?rev=58041&view=rev Log: [WIN32K] Use the official HANDLE_TYPE enum instead of the custom USER_OBJECT_TYPE Modified: trunk/reactos/win32ss/drivers/videoprt/child.c trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/accelerator.c trunk/reactos/win32ss/user/ntuser/callproc.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/cursoricon_new.c trunk/reactos/win32ss/user/ntuser/event.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/kbdlayout.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/monitor.c trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/timer.c trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/ntuser/winpos.c trunk/reactos/win32ss/user/user32/include/user_x.h trunk/reactos/win32ss/user/user32/misc/misc.c trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/drivers/videoprt/child.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/c… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/child.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/child.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -393,4 +393,4 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; -} +} Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.h [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -3,4 +3,4 @@ INT FASTCALL GdiGetClipBox(HDC hDC, RECTL *rc); INT FASTCALL GdiSelectVisRgn(HDC hdc, HRGN hrgn); INT FASTCALL GdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); -int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); +int FASTCALL CLIPPING_UpdateGCRegion(DC* Dc); Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -33,32 +33,33 @@ int allocated_handles; } USER_HANDLE_TABLE, * PUSER_HANDLE_TABLE; -typedef enum _USER_OBJECT_TYPE -{ - otFree = 0, - otWindow, - otMenu, - otCursorIcon, - otSMWP, - otHook, - otClipBoardData, - otCallProc, - otAccel, - otDDEaccess, - otDDEconv, - otDDExact, - otMonitor, - otKBDlayout, - otKBDfile, - otEvent, - otTimer, - otInputContext, - otHidData, - otDeviceInfo, - otTouchInput, - otGestureInfo, - USER_HANDLE_TYPE_COUNT -} USER_OBJECT_TYPE; +typedef enum _HANDLE_TYPE +{ + TYPE_FREE = 0, + TYPE_WINDOW = 1, + TYPE_MENU = 2, + TYPE_CURSOR = 3, + TYPE_SETWINDOWPOS = 4, + TYPE_HOOK = 5, + TYPE_CLIPDATA = 6, + TYPE_CALLPROC = 7, + TYPE_ACCELTABLE = 8, + TYPE_DDEACCESS = 9, + TYPE_DDECONV = 10, + TYPE_DDEXACT = 11, + TYPE_MONITOR = 12, + TYPE_KBDLAYOUT = 13, + TYPE_KBDFILE = 14, + TYPE_WINEVENTHOOK = 15, + TYPE_TIMER = 16, + TYPE_INPUTCONTEXT = 17, + TYPE_HIDDATA = 18, + TYPE_DEVICEINFO = 19, + TYPE_TOUCHINPUTINFO = 20, + TYPE_GESTUREINFOOBJ = 21, + TYPE_CTYPES, + TYPE_GENERIC = 255 +} HANDLE_TYPE, *PHANDLE_TYPE; typedef enum _USERTHREADINFOCLASS { Modified: trunk/reactos/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/accele… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/accelerator.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -28,7 +28,7 @@ return NULL; } - Accel = UserGetObject(gHandleTable, hAccel, otAccel); + Accel = UserGetObject(gHandleTable, hAccel, TYPE_ACCELTABLE); if (!Accel) { EngSetLastError(ERROR_INVALID_ACCEL_HANDLE); @@ -257,7 +257,7 @@ RETURN( (HACCEL) NULL ); } - Accel = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&hAccel, otAccel, sizeof(ACCELERATOR_TABLE)); + Accel = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&hAccel, TYPE_ACCELTABLE, sizeof(ACCELERATOR_TABLE)); if (Accel == NULL) { @@ -270,7 +270,7 @@ if (Accel->Table == NULL) { UserDereferenceObject(Accel); - UserDeleteObject(hAccel, otAccel); + UserDeleteObject(hAccel, TYPE_ACCELTABLE); SetLastNtError(STATUS_NO_MEMORY); RETURN( (HACCEL) NULL); } @@ -308,7 +308,7 @@ { ExFreePoolWithTag(Accel->Table, USERTAG_ACCEL); UserDereferenceObject(Accel); - UserDeleteObject(hAccel, otAccel); + UserDeleteObject(hAccel, TYPE_ACCELTABLE); SetLastNtError(Status); RETURN( (HACCEL) NULL); } @@ -351,7 +351,7 @@ Accel->Table = NULL; } - UserDeleteObject(hAccel, otAccel); + UserDeleteObject(hAccel, TYPE_ACCELTABLE); RETURN( TRUE); Modified: trunk/reactos/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callpr… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -21,7 +21,7 @@ DestroyCallProc(IN PDESKTOPINFO Desktop, IN OUT PCALLPROCDATA CallProc) { - UserDeleteObject(UserHMGetHandle(CallProc), otCallProc); + UserDeleteObject(UserHMGetHandle(CallProc), TYPE_CALLPROC); } PCALLPROCDATA @@ -37,7 +37,7 @@ Desktop, NULL, &Handle, - otCallProc, + TYPE_CALLPROC, sizeof(CALLPROCDATA)); if (NewCallProc != NULL) { @@ -60,7 +60,7 @@ CallProc = UserGetObject(gHandleTable, hCallProc, - otCallProc); + TYPE_CALLPROC); if (CallProc == NULL) { return FALSE; 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] Sat Dec 29 19:14:30 2012 @@ -462,7 +462,7 @@ // Check if CallProc handle and retrieve previous call proc address and set. if (IsCallProcHandle(WndProc)) { - pcpd = UserGetObject(gHandleTable, WndProc, otCallProc); + pcpd = UserGetObject(gHandleTable, WndProc, TYPE_CALLPROC); if (pcpd) chWndProc = pcpd->pfnClientPrevious; } Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -58,7 +58,7 @@ !IS_DATA_SYNTHESIZED(pElement)) { if (pElement->fGlobalHandle) - UserDeleteObject(pElement->hData, otClipBoardData); + UserDeleteObject(pElement->hData, TYPE_CLIPDATA); else if (pElement->fmt == CF_BITMAP || pElement->fmt == CF_PALETTE || pElement->fmt == CF_DSPBITMAP) { @@ -184,7 +184,7 @@ NULL, NULL, &hMem, - otClipBoardData, + TYPE_CLIPDATA, cjDataSize); if (!pClipboardData) { @@ -235,7 +235,7 @@ if(!pDibEl->fGlobalHandle) return; - pMemObj = (PCLIPBOARDDATA)UserGetObject(gHandleTable, pDibEl->hData, otClipBoardData); + pMemObj = (PCLIPBOARDDATA)UserGetObject(gHandleTable, pDibEl->hData, TYPE_CLIPDATA); if (!pMemObj) return; @@ -297,7 +297,7 @@ PCLIPBOARDDATA pMemObj; HANDLE hMem; - pMemObj = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, NULL, &hMem, otClipBoardData, + pMemObj = (PCLIPBOARDDATA)UserCreateObject(gHandleTable, NULL, NULL, &hMem, TYPE_CLIPDATA, sizeof(CLIPBOARDDATA) + sizeof(LCID)); if (pMemObj) { @@ -1087,7 +1087,7 @@ UserEnterExclusive(); /* Create Clipboard data object */ - pMemObj = UserCreateObject(gHandleTable, NULL, NULL, &hMem, otClipBoardData, sizeof(CLIPBOARDDATA) + cbData); + pMemObj = UserCreateObject(gHandleTable, NULL, NULL, &hMem, TYPE_CLIPDATA, sizeof(CLIPBOARDDATA) + cbData); if (!pMemObj) goto cleanup; @@ -1111,7 +1111,7 @@ /* If we failed to copy data, remove handle */ if (!pMemObj) { - UserDeleteObject(hMem, otClipBoardData); + UserDeleteObject(hMem, TYPE_CLIPDATA); hMem = NULL; } @@ -1134,7 +1134,7 @@ UserEnterShared(); /* Get Clipboard data object */ - pMemObj = (PCLIPBOARDDATA)UserGetObject(gHandleTable, hMem, otClipBoardData); + pMemObj = (PCLIPBOARDDATA)UserGetObject(gHandleTable, hMem, TYPE_CLIPDATA); if (!pMemObj) { Status = STATUS_INVALID_HANDLE; Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -77,7 +77,7 @@ return NULL; } - CurIcon = (PCURICON_OBJECT)UserReferenceObjectByHandle(hCurIcon, otCursorIcon); + CurIcon = (PCURICON_OBJECT)UserReferenceObjectByHandle(hCurIcon, TYPE_CURSOR); if (!CurIcon) { /* We never set ERROR_INVALID_ICON_HANDLE. lets hope noone ever checks for it */ @@ -178,7 +178,7 @@ LIST_FOR_EACH(CurIcon, &gCurIconList, CURICON_OBJECT, ListEntry) { - // if (NT_SUCCESS(UserReferenceObjectByPointer(Object, otCursorIcon))) // <- huh???? + // if (NT_SUCCESS(UserReferenceObjectByPointer(Object, TYPE_CURSOR))) // <- huh???? // UserReferenceObject( CurIcon); // { if ((CurIcon->hModule == hModule) && (CurIcon->hRsrc == hRsrc)) @@ -209,7 +209,7 @@ PCURICON_OBJECT CurIcon; HANDLE hCurIcon; - CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); + CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, TYPE_CURSOR, sizeof(CURICON_OBJECT)); if (!CurIcon) { @@ -223,7 +223,7 @@ if (! ReferenceCurIconByProcess(CurIcon)) { ERR("Failed to add process\n"); - UserDeleteObject(hCurIcon, otCursorIcon); + UserDeleteObject(hCurIcon, TYPE_CURSOR); UserDereferenceObject(CurIcon); return NULL; } @@ -273,7 +273,7 @@ { /* Set the first process of the list as owner */ Current = CONTAINING_RECORD(CurIcon->ProcessList.Flink, CURICON_PROCESS, ListEntry); - UserSetObjectOwner(CurIcon, otCursorIcon, Current->Process); + UserSetObjectOwner(CurIcon, TYPE_CURSOR, Current->Process); } UserDereferenceObject(CurIcon); return TRUE; @@ -310,7 +310,7 @@ /* We were given a pointer, no need to keep the reference anylonger! */ UserDereferenceObject(CurIcon); - Ret = UserDeleteObject(CurIcon->Self, otCursorIcon); + Ret = UserDeleteObject(CurIcon->Self, TYPE_CURSOR); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -84,7 +84,7 @@ return NULL; } - CurIcon = (PCURICON_OBJECT)UserReferenceObjectByHandle(hCurIcon, otCursorIcon); + CurIcon = (PCURICON_OBJECT)UserReferenceObjectByHandle(hCurIcon, TYPE_CURSOR); if (!CurIcon) { /* We never set ERROR_INVALID_ICON_HANDLE. lets hope noone ever checks for it */ @@ -229,7 +229,7 @@ if(dwNumber == 0) dwNumber = 1; - CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, otCursorIcon, sizeof(CURICON_OBJECT)); + CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, TYPE_CURSOR, sizeof(CURICON_OBJECT)); if (!CurIcon) { @@ -244,7 +244,7 @@ { ERR("Failed to add process\n"); UserDereferenceObject(CurIcon); - UserDeleteObject(hCurIcon, otCursorIcon); + UserDeleteObject(hCurIcon, TYPE_CURSOR); return NULL; } @@ -309,7 +309,7 @@ { /* Set the first process of the list as owner */ Current = CONTAINING_RECORD(CurIcon->ProcessList.Flink, CURICON_PROCESS, ListEntry); - UserSetObjectOwner(CurIcon, otCursorIcon, Current->Process); + UserSetObjectOwner(CurIcon, TYPE_CURSOR, Current->Process); } UserDereferenceObject(CurIcon); return TRUE; @@ -350,7 +350,7 @@ /* We were given a pointer, no need to keep the reference anylonger! */ UserDereferenceObject(CurIcon); - Ret = UserDeleteObject(CurIcon->Self, otCursorIcon); + Ret = UserDeleteObject(CurIcon->Self, TYPE_CURSOR); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -141,7 +141,7 @@ RemoveEntryList(&pEH->Chain); GlobalEvents->Counts--; if (!GlobalEvents->Counts) gpsi->dwInstalledEventHooks = 0; - UserDeleteObject(UserHMGetHandle(pEH), otEvent); + UserDeleteObject(UserHMGetHandle(pEH), TYPE_WINEVENTHOOK); KeLeaveCriticalRegion(); return TRUE; } @@ -378,7 +378,7 @@ } } // Creator, pti is set here. - pEH = UserCreateObject(gHandleTable, NULL, NULL, &Handle, otEvent, sizeof(EVENTHOOK)); + pEH = UserCreateObject(gHandleTable, NULL, NULL, &Handle, TYPE_WINEVENTHOOK, sizeof(EVENTHOOK)); if (pEH) { InsertTailList(&GlobalEvents->Events, &pEH->Chain); @@ -428,7 +428,7 @@ UserEnterExclusive(); - pEH = (PEVENTHOOK)UserGetObject(gHandleTable, hWinEventHook, otEvent); + pEH = (PEVENTHOOK)UserGetObject(gHandleTable, hWinEventHook, TYPE_WINEVENTHOOK); if (pEH) { Ret = IntRemoveEvent(pEH); Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -937,7 +937,7 @@ return NULL; } - Hook = (PHOOK)UserGetObject(gHandleTable, hHook, otHook); + Hook = (PHOOK)UserGetObject(gHandleTable, hHook, TYPE_HOOK); if (!Hook) { EngSetLastError(ERROR_INVALID_HOOK_HANDLE); @@ -1020,7 +1020,7 @@ Hook->ModuleName.Buffer = NULL; } /* Close handle */ - UserDeleteObject(UserHMGetHandle(Hook), otHook); + UserDeleteObject(UserHMGetHandle(Hook), TYPE_HOOK); } /* Remove a hook, freeing it from the chain */ @@ -1270,7 +1270,7 @@ */ for(i = 0; pHookHandles[i]; ++i) { - Hook = (PHOOK)UserGetObject(gHandleTable, pHookHandles[i], otHook); + Hook = (PHOOK)UserGetObject(gHandleTable, pHookHandles[i], TYPE_HOOK); if(!Hook) { ERR("Invalid hook!\n"); @@ -1571,7 +1571,7 @@ } ObDereferenceObject(WinStaObj); - Hook = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&Handle, otHook, sizeof(HOOK)); + Hook = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&Handle, TYPE_HOOK, sizeof(HOOK)); if (!Hook) { Modified: trunk/reactos/win32ss/user/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/kbdlay… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/kbdlayout.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -131,7 +131,7 @@ L"Control\\Keyboard Layouts\\"; /* Create keyboard layout file object */ - pkf = UserCreateObject(gHandleTable, NULL, NULL, NULL, otKBDfile, sizeof(KBDFILE)); + pkf = UserCreateObject(gHandleTable, NULL, NULL, NULL, TYPE_KBDFILE, sizeof(KBDFILE)); if (!pkf) { ERR("Failed to create object!\n"); @@ -187,7 +187,7 @@ { /* We have failed - destroy created object */ if (pkf) - UserDeleteObject(pkf->head.h, otKBDfile); + UserDeleteObject(pkf->head.h, TYPE_KBDFILE); } return pRet; @@ -206,7 +206,7 @@ PKL pKl; /* Create keyboard layout object */ - pKl = UserCreateObject(gHandleTable, NULL, NULL, NULL, otKBDlayout, sizeof(KL)); + pKl = UserCreateObject(gHandleTable, NULL, NULL, NULL, TYPE_KBDLAYOUT, sizeof(KL)); if (!pKl) { ERR("Failed to create object!\n"); @@ -223,7 +223,7 @@ if (!pKl->spkf) { ERR("UserLoadKbdFile(%wZ) failed!\n", pwszKLID); - UserDeleteObject(pKl->head.h, otKBDlayout); + UserDeleteObject(pKl->head.h, TYPE_KBDLAYOUT); return NULL; } @@ -272,7 +272,7 @@ *ppkfLink = pkf->pkfNext; EngUnloadImage(pkf->hBase); - UserDeleteObject(pkf->head.h, otKBDfile); + UserDeleteObject(pkf->head.h, TYPE_KBDFILE); } /* @@ -308,7 +308,7 @@ pKl->pklPrev->pklNext = pKl->pklNext; pKl->pklNext->pklPrev = pKl->pklPrev; UnloadKbdFile(pKl->spkf); - UserDeleteObject(pKl->head.h, otKBDlayout); + UserDeleteObject(pKl->head.h, TYPE_KBDLAYOUT); return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -63,7 +63,7 @@ return NULL; } - Menu = (PMENU_OBJECT)UserGetObject(gHandleTable, hMenu, otMenu); + Menu = (PMENU_OBJECT)UserGetObject(gHandleTable, hMenu, TYPE_MENU); if (!Menu) { EngSetLastError(ERROR_INVALID_MENU_HANDLE); @@ -234,7 +234,7 @@ } } // UserDereferenceObject(Menu); - ret = UserDeleteObject(Menu->MenuInfo.Self, otMenu); + ret = UserDeleteObject(Menu->MenuInfo.Self, TYPE_MENU); ObDereferenceObject(WindowStation); return ret; } @@ -252,7 +252,7 @@ NULL, NULL, Handle, - otMenu, + TYPE_MENU, sizeof(MENU_OBJECT)); if(!Menu) { @@ -364,7 +364,7 @@ NULL, NULL, &hMenu, - otMenu, + TYPE_MENU, sizeof(MENU_OBJECT)); if(!Menu) return NULL; Modified: trunk/reactos/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/monito… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -32,7 +32,7 @@ PMONITOR IntCreateMonitorObject() { - return UserCreateObject(gHandleTable, NULL, NULL, NULL, otMonitor, sizeof(MONITOR)); + return UserCreateObject(gHandleTable, NULL, NULL, NULL, TYPE_MONITOR, sizeof(MONITOR)); } /* IntDestroyMonitorObject @@ -58,7 +58,7 @@ /* Destroy monitor object */ UserDereferenceObject(pMonitor); - UserDeleteObject(UserHMGetHandle(pMonitor), otMonitor); + UserDeleteObject(UserHMGetHandle(pMonitor), TYPE_MONITOR); } /* UserGetMonitorObject @@ -81,7 +81,7 @@ return NULL; } - pMonitor = (PMONITOR)UserGetObject(gHandleTable, hMonitor, otMonitor); + pMonitor = (PMONITOR)UserGetObject(gHandleTable, hMonitor, TYPE_MONITOR); if (!pMonitor) { EngSetLastError(ERROR_INVALID_MONITOR_HANDLE); Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -16,7 +16,7 @@ void DbgUserDumpHandleTable() { - int HandleCounts[USER_HANDLE_TYPE_COUNT]; + int HandleCounts[TYPE_CTYPES]; PPROCESSINFO ppiList; int i; PWCHAR TypeNames[] = {L"Free",L"Window",L"Menu", L"CursorIcon", L"SMWP", L"Hook", L"ClipBoardData", L"CallProc", @@ -33,7 +33,7 @@ { ERR("Process %s (%d) handles count: %d\n\t", ppiList->peProcess->ImageFileName, ppiList->peProcess->UniqueProcessId, ppiList->UserHandleCount); - for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + for (i = 1 ;i < TYPE_CTYPES; i++) { HandleCounts[i] += ppiList->DbgHandleCount[i]; @@ -48,7 +48,7 @@ /* Print total type counts */ ERR("Total handles of the running processes: \n\t"); - for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + for (i = 1 ;i < TYPE_CTYPES; i++) { DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); if (i % 6 == 0) @@ -62,7 +62,7 @@ HandleCounts[gHandleTable->handles[i].type]++; ERR("Total handles count allocated: \n\t"); - for (i = 1 ;i < USER_HANDLE_TYPE_COUNT; i++) + for (i = 1 ;i < TYPE_CTYPES; i++) { DbgPrint("%S: %d, ", TypeNames[i], HandleCounts[i]); if (i % 6 == 0) @@ -174,27 +174,27 @@ } static __inline PVOID -UserHandleOwnerByType(USER_OBJECT_TYPE type) +UserHandleOwnerByType(HANDLE_TYPE type) { PVOID pi; switch (type) { - case otWindow: - case otInputContext: + case TYPE_WINDOW: + case TYPE_INPUTCONTEXT: pi = GetW32ThreadInfo(); break; - case otMenu: - case otCursorIcon: - case otHook: - case otCallProc: - case otAccel: - case otSMWP: + case TYPE_MENU: + case TYPE_CURSOR: + case TYPE_HOOK: + case TYPE_CALLPROC: + case TYPE_ACCELTABLE: + case TYPE_SETWINDOWPOS: pi = GetW32ProcessInfo(); break; - case otMonitor: + case TYPE_MONITOR: pi = NULL; /* System */ break; @@ -207,7 +207,7 @@ } /* allocate a user handle for a given object */ -HANDLE UserAllocHandle(PUSER_HANDLE_TABLE ht, PVOID object, USER_OBJECT_TYPE type ) +HANDLE UserAllocHandle(PUSER_HANDLE_TABLE ht, PVOID object, HANDLE_TYPE type ) { PUSER_HANDLE_ENTRY entry = alloc_user_entry(ht); if (!entry) @@ -226,7 +226,7 @@ } /* return a pointer to a user object from its handle without setting an error */ -PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ) +PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE ht, HANDLE handle, HANDLE_TYPE type ) { PUSER_HANDLE_ENTRY entry; @@ -240,7 +240,7 @@ } /* return a pointer to a user object from its handle */ -PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ) +PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, HANDLE_TYPE type ) { PUSER_HANDLE_ENTRY entry; @@ -269,7 +269,7 @@ /* Same as get_user_object plus set the handle to the full 32-bit value */ -void *get_user_object_handle(PUSER_HANDLE_TABLE ht, HANDLE* handle, USER_OBJECT_TYPE type ) +void *get_user_object_handle(PUSER_HANDLE_TABLE ht, HANDLE* handle, HANDLE_TYPE type ) { PUSER_HANDLE_ENTRY entry; @@ -317,7 +317,7 @@ PDESKTOP pDesktop, PTHREADINFO pti, HANDLE* h, - USER_OBJECT_TYPE type, + HANDLE_TYPE type, ULONG size) { HANDLE hi; @@ -336,11 +336,11 @@ switch (type) { - case otWindow: -// case otMenu: - case otHook: - case otCallProc: - case otInputContext: + case TYPE_WINDOW: +// case TYPE_MENU: + case TYPE_HOOK: + case TYPE_CALLPROC: + case TYPE_INPUTCONTEXT: Object = DesktopHeapAlloc(rpdesk, size); dt = TRUE; break; @@ -373,22 +373,22 @@ switch (type) { - case otWindow: - case otHook: - case otInputContext: + case TYPE_WINDOW: + case TYPE_HOOK: + case TYPE_INPUTCONTEXT: ((PTHRDESKHEAD)Object)->rpdesk = rpdesk; ((PTHRDESKHEAD)Object)->pSelf = Object; - case otEvent: + case TYPE_WINEVENTHOOK: ((PTHROBJHEAD)Object)->pti = pti; break; - case otMenu: - case otCallProc: + case TYPE_MENU: + case TYPE_CALLPROC: ((PPROCDESKHEAD)Object)->rpdesk = rpdesk; ((PPROCDESKHEAD)Object)->pSelf = Object; break; - case otCursorIcon: + case TYPE_CURSOR: ((PPROCMARKHEAD)Object)->ppi = ppi; break; @@ -410,7 +410,7 @@ UserDereferenceObject(PVOID object) { PUSER_HANDLE_ENTRY entry; - USER_OBJECT_TYPE type; + HANDLE_TYPE type; ASSERT(((PHEAD)object)->cLockObj >= 1); @@ -435,11 +435,11 @@ switch (type) { - case otWindow: -// case otMenu: - case otHook: - case otCallProc: - case otInputContext: + case TYPE_WINDOW: +// case TYPE_MENU: + case TYPE_HOOK: + case TYPE_CALLPROC: + case TYPE_INPUTCONTEXT: return DesktopHeapFree(((PTHRDESKHEAD)object)->rpdesk, object); default: @@ -482,7 +482,7 @@ BOOL FASTCALL -UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ) +UserDeleteObject(HANDLE h, HANDLE_TYPE type ) { PVOID body = UserGetObject(gHandleTable, h, type); @@ -504,7 +504,7 @@ PVOID FASTCALL -UserReferenceObjectByHandle(HANDLE handle, USER_OBJECT_TYPE type) +UserReferenceObjectByHandle(HANDLE handle, HANDLE_TYPE type) { PVOID object; @@ -518,7 +518,7 @@ VOID FASTCALL -UserSetObjectOwner(PVOID obj, USER_OBJECT_TYPE type, PVOID owner) +UserSetObjectOwner(PVOID obj, HANDLE_TYPE type, PVOID owner) { PUSER_HANDLE_ENTRY entry = handle_to_entry(gHandleTable, ((PHEAD)obj)->h ); PPROCESSINFO ppi, oldppi; @@ -529,7 +529,7 @@ /* For now, only supported for CursorIcon object */ switch(type) { - case otCursorIcon: + case TYPE_CURSOR: ppi = (PPROCESSINFO)owner; entry->pi = ppi; oldppi = ((PPROCMARKHEAD)obj)->ppi; @@ -575,37 +575,37 @@ } switch (uType) { - case otWindow: + case TYPE_WINDOW: { if (UserGetWindowObject((HWND) handle)) return TRUE; return FALSE; } - case otMenu: + case TYPE_MENU: { if (UserGetMenuObject((HMENU) handle)) return TRUE; return FALSE; } - case otAccel: + case TYPE_ACCELTABLE: { if (UserGetAccelObject((HACCEL) handle)) return TRUE; return FALSE; } - case otCursorIcon: + case TYPE_CURSOR: { if (UserGetCurIconObject((HCURSOR) handle)) return TRUE; return FALSE; } - case otHook: + case TYPE_HOOK: { if (IntGetHookObject((HHOOK) handle)) return TRUE; return FALSE; } - case otMonitor: + case TYPE_MONITOR: { if (UserGetMonitorObject((HMONITOR) handle)) return TRUE; return FALSE; } - case otCallProc: + case TYPE_CALLPROC: { WNDPROC_INFO Proc; return UserGetCallProcInfo( handle, &Proc ); Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -31,16 +31,16 @@ extern PUSER_HANDLE_TABLE gHandleTable; VOID FASTCALL UserReferenceObject(PVOID obj); -PVOID FASTCALL UserReferenceObjectByHandle(HANDLE handle, USER_OBJECT_TYPE type); +PVOID FASTCALL UserReferenceObjectByHandle(HANDLE handle, HANDLE_TYPE type); BOOL FASTCALL UserDereferenceObject(PVOID obj); -PVOID FASTCALL UserCreateObject(PUSER_HANDLE_TABLE ht, struct _DESKTOP* pDesktop, PTHREADINFO pti, HANDLE* h,USER_OBJECT_TYPE type , ULONG size); -BOOL FASTCALL UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type ); -PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, USER_OBJECT_TYPE type ); -PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE, HANDLE, USER_OBJECT_TYPE); +PVOID FASTCALL UserCreateObject(PUSER_HANDLE_TABLE ht, struct _DESKTOP* pDesktop, PTHREADINFO pti, HANDLE* h,HANDLE_TYPE type , ULONG size); +BOOL FASTCALL UserDeleteObject(HANDLE h, HANDLE_TYPE type ); +PVOID UserGetObject(PUSER_HANDLE_TABLE ht, HANDLE handle, HANDLE_TYPE type ); +PVOID UserGetObjectNoErr(PUSER_HANDLE_TABLE, HANDLE, HANDLE_TYPE); BOOL FASTCALL UserCreateHandleTable(VOID); BOOL FASTCALL UserObjectInDestroy(HANDLE); void DbgUserDumpHandleTable(); -VOID FASTCALL UserSetObjectOwner(PVOID obj, USER_OBJECT_TYPE type, PVOID owner); +VOID FASTCALL UserSetObjectOwner(PVOID obj, HANDLE_TYPE type, PVOID owner); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -1141,7 +1141,7 @@ if (!Ret) goto Exit; - if (!( pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, otWindow)) || + if (!( pWnd = (PWND)UserGetObject(gHandleTable, finfo.hwnd, TYPE_WINDOW)) || finfo.cbSize != sizeof(FLASHWINFO) || finfo.dwFlags & ~(FLASHW_ALL|FLASHW_TIMER|FLASHW_TIMERNOFG) ) { Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -186,13 +186,13 @@ NULL, NULL, (PHANDLE)&hDwp, - otSMWP, + TYPE_SETWINDOWPOS, sizeof(SMWP)); if (!psmwp) RETURN(0); psmwp->acvr = ExAllocatePoolWithTag(PagedPool, count * sizeof(CVR), USERTAG_SWP); if (!psmwp->acvr) { - UserDeleteObject(hDwp, otSMWP); + UserDeleteObject(hDwp, TYPE_SETWINDOWPOS); RETURN(0); } RtlZeroMemory(psmwp->acvr, count * sizeof(CVR)); Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -56,7 +56,7 @@ HANDLE Handle; PTIMER Ret = NULL; - Ret = UserCreateObject(gHandleTable, NULL, NULL, &Handle, otTimer, sizeof(TIMER)); + Ret = UserCreateObject(gHandleTable, NULL, NULL, &Handle, TYPE_TIMER, sizeof(TIMER)); if (Ret) { Ret->head.h = Handle; @@ -86,7 +86,7 @@ IntUnlockWindowlessTimerBitmap(); } UserDereferenceObject(pTmr); - Ret = UserDeleteObject( UserHMGetHandle(pTmr), otTimer); + Ret = UserDeleteObject( UserHMGetHandle(pTmr), TYPE_TIMER); } if (!Ret) ERR("Warning: Unable to delete timer\n"); Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -225,7 +225,7 @@ #if DBG BYTE DbgChannelLevel[DbgChCount]; - DWORD DbgHandleCount[USER_HANDLE_TYPE_COUNT]; + DWORD DbgHandleCount[TYPE_CTYPES]; #endif } PROCESSINFO; Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -90,7 +90,7 @@ PWND FASTCALL ValidateHwndNoErr(HWND hWnd) { - if (hWnd) return (PWND)UserGetObjectNoErr(gHandleTable, hWnd, otWindow); + if (hWnd) return (PWND)UserGetObjectNoErr(gHandleTable, hWnd, TYPE_WINDOW); return NULL; } @@ -105,7 +105,7 @@ return NULL; } - Window = (PWND)UserGetObject(gHandleTable, hWnd, otWindow); + Window = (PWND)UserGetObject(gHandleTable, hWnd, TYPE_WINDOW); if (!Window || 0 != (Window->state & WNDS_DESTROYED)) { EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); @@ -555,7 +555,7 @@ IntUnlinkWindow(Window); UserReferenceObject(Window); - UserDeleteObject(Window->head.h, otWindow); + UserDeleteObject(Window->head.h, TYPE_WINDOW); IntDestroyScrollBars(Window); @@ -662,7 +662,7 @@ if (IsCallProcHandle(NewWndProc)) { - CallProc = UserGetObject(gHandleTable, NewWndProc, otCallProc); + CallProc = UserGetObject(gHandleTable, NewWndProc, TYPE_CALLPROC); if (CallProc) { // Reset new WndProc. NewWndProc = CallProc->pfnClientPrevious; @@ -1717,7 +1717,7 @@ pdeskCreated ? pdeskCreated : pti->rpdesk, pti, (PHANDLE)&hWnd, - otWindow, + TYPE_WINDOW, sizeof(WND) + Class->cbwndExtra); if (!pWnd) Modified: trunk/reactos/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -2472,7 +2472,7 @@ return NULL; } - if (!(pDWP = (PSMWP)UserGetObject(gHandleTable, hdwp, otSMWP))) + if (!(pDWP = (PSMWP)UserGetObject(gHandleTable, hdwp, TYPE_SETWINDOWPOS))) { EngSetLastError(ERROR_INVALID_DWP_HANDLE); return NULL; @@ -2543,7 +2543,7 @@ TRACE("%p\n", hdwp); - if (!(pDWP = (PSMWP)UserGetObject(gHandleTable, hdwp, otSMWP))) + if (!(pDWP = (PSMWP)UserGetObject(gHandleTable, hdwp, TYPE_SETWINDOWPOS))) { EngSetLastError(ERROR_INVALID_DWP_HANDLE); return FALSE; @@ -2597,7 +2597,7 @@ } ExFreePoolWithTag(pDWP->acvr, USERTAG_SWP); UserDereferenceObject(pDWP); - UserDeleteObject(hdwp, otSMWP); + UserDeleteObject(hdwp, TYPE_SETWINDOWPOS); return res; } Modified: trunk/reactos/win32ss/user/user32/include/user_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user_x.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user_x.h [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -109,4 +109,4 @@ #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) #define ISITHOOKED(HookId) (GetWin32ClientInfo()->fsHooks & HOOKID_TO_FLAG(HookId) ||\ (GetWin32ClientInfo()->pDeskInfo && GetWin32ClientInfo()->pDeskInfo->fsHooks & HOOKID_TO_FLAG(HookId))) - + Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -303,24 +303,30 @@ /* * Decide whether an object is located on the desktop or shared heap */ -static const BOOL g_ObjectHeapTypeShared[otEvent + 1] = -{ - FALSE, /* otFree (not used) */ - FALSE, /* otWindow */ - TRUE, /* otMenu FALSE */ - TRUE, /* otCursorIcon */ - TRUE, /* otSMWP */ - FALSE, /* otHook */ - FALSE, /* (not used) */ - FALSE, /* otCallProc */ - TRUE, /* otAccel */ - FALSE, /* (not used) */ - FALSE, /* (not used) */ - FALSE, /* (not used) */ - TRUE, /* otMonitor */ - FALSE, /* (not used) */ - FALSE, /* (not used) */ - TRUE /* otEvent */ +static const BOOL g_ObjectHeapTypeShared[TYPE_CTYPES] = +{ + FALSE, /* TYPE_FREE (not used) */ + FALSE, /* TYPE_WINDOW */ + TRUE, /* TYPE_MENU FALSE */ + TRUE, /* TYPE_CURSOR */ + TRUE, /* TYPE_SETWINDOWPOS */ + FALSE, /* TYPE_HOOK */ + FALSE, /* TYPE_CLIPDATA */ + FALSE, /* TYPE_CALLPROC */ + TRUE, /* TYPE_ACCELTABLE */ + FALSE, /* TYPE_DDEACCESS */ + FALSE, /* TYPE_DDECONV */ + FALSE, /* TYPE_DDEXACT */ + TRUE, /* TYPE_MONITOR */ + FALSE, /* TYPE_KBDLAYOUT */ + FALSE, /* TYPE_KBDFILE */ + TRUE /* TYPE_WINEVENTHOOK */ + FALSE, /* TYPE_TIMER */ + FALSE, /* TYPE_INPUTCONTEXT */ + FALSE, /* TYPE_HIDDATA */ + FALSE, /* TYPE_DEVICEINFO */ + FALSE, /* TYPE_TOUCHINPUTINFO */ + FALSE, /* TYPE_GESTUREINFOOBJ */ }; // @@ -333,7 +339,7 @@ PVOID ret; PUSER_HANDLE_ENTRY pEntry; - ASSERT(uType <= otEvent); + ASSERT(uType < TYPE_CTYPES); pEntry = GetUser32Handle(handle); @@ -348,22 +354,22 @@ { switch ( uType ) { // Test (with wine too) confirms these results! - case otWindow: + case TYPE_WINDOW: SetLastError(ERROR_INVALID_WINDOW_HANDLE); break; - case otMenu: + case TYPE_MENU: SetLastError(ERROR_INVALID_MENU_HANDLE); break; - case otCursorIcon: + case TYPE_CURSOR: SetLastError(ERROR_INVALID_CURSOR_HANDLE); break; - case otSMWP: + case TYPE_SETWINDOWPOS: SetLastError(ERROR_INVALID_DWP_HANDLE); break; - case otHook: + case TYPE_HOOK: SetLastError(ERROR_INVALID_HOOK_HANDLE); break; - case otAccel: + case TYPE_ACCELTABLE: SetLastError(ERROR_INVALID_ACCEL_HANDLE); break; default: @@ -391,7 +397,7 @@ PVOID ret; PUSER_HANDLE_ENTRY pEntry; - ASSERT(uType <= otEvent); + ASSERT(uType < TYPE_CTYPES); pEntry = GetUser32Handle(handle); @@ -419,7 +425,7 @@ { PUSER_HANDLE_ENTRY pEntry; - PCALLPROCDATA CallProc = ValidateHandle(hCallProc, otCallProc); + PCALLPROCDATA CallProc = ValidateHandle(hCallProc, TYPE_CALLPROC); pEntry = GetUser32Handle(hCallProc); @@ -444,7 +450,7 @@ if (hwnd && hwnd == ClientInfo->CallbackWnd.hWnd) return ClientInfo->CallbackWnd.pWnd; - return ValidateHandle((HANDLE)hwnd, otWindow); + return ValidateHandle((HANDLE)hwnd, TYPE_WINDOW); } // @@ -462,7 +468,7 @@ if (hwnd == ClientInfo->CallbackWnd.hWnd) return ClientInfo->CallbackWnd.pWnd; - Wnd = ValidateHandleNoErr((HANDLE)hwnd, otWindow); + Wnd = ValidateHandleNoErr((HANDLE)hwnd, TYPE_WINDOW); if (Wnd != NULL) { return Wnd; Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Sat Dec 29 19:14:30 2012 @@ -3241,7 +3241,7 @@ while (! fEndMenu) { BOOL ErrorExit = FALSE; - PVOID menu = ValidateHandle(mt.CurrentMenu, otMenu); + PVOID menu = ValidateHandle(mt.CurrentMenu, TYPE_MENU); if (!menu) /* sometimes happens if I do a window manager close */ break; @@ -4767,7 +4767,7 @@ IsMenu( HMENU Menu) { - if (ValidateHandle(Menu, otMenu)) return TRUE; + if (ValidateHandle(Menu, TYPE_MENU)) return TRUE; return FALSE; }

1 0

[ekohl] 58040: [INCLUDE] Add some domain information types to ntsam.h and fix sam.idl accordingly.
by ekohl＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: ekohl Date: Sat Dec 29 16:22:00 2012 New Revision: 58040 URL: http://svn.reactos.org/svn/reactos?rev=58040&view=rev Log: [INCLUDE] Add some domain information types to ntsam.h and fix sam.idl accordingly. Modified: trunk/reactos/include/ddk/ntsam.h trunk/reactos/include/reactos/idl/sam.idl Modified: trunk/reactos/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=58… ============================================================================== --- trunk/reactos/include/ddk/ntsam.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntsam.h [iso-8859-1] Sat Dec 29 16:22:00 2012 @@ -262,10 +262,67 @@ DomainServerRolePrimary } DOMAIN_SERVER_ROLE, *PDOMAIN_SERVER_ROLE; +#include "pshpack4.h" +typedef struct _DOMAIN_GENERAL_INFORMATION +{ + LARGE_INTEGER ForceLogoff; + UNICODE_STRING OemInformation; + UNICODE_STRING DomainName; + UNICODE_STRING ReplicaSourceNodeName; + LARGE_INTEGER DomainModifiedCount; + DOMAIN_SERVER_ENABLE_STATE DomainServerState; + DOMAIN_SERVER_ROLE DomainServerRole; + BOOLEAN UasCompatibilityRequired; + ULONG UserCount; + ULONG GroupCount; + ULONG AliasCount; +} DOMAIN_GENERAL_INFORMATION, *PDOMAIN_GENERAL_INFORMATION; +#include "poppack.h" + +typedef struct _DOMAIN_LOGOFF_INFORMATION +{ + LARGE_INTEGER ForceLogoff; +} DOMAIN_LOGOFF_INFORMATION, *PDOMAIN_LOGOFF_INFORMATION; + +typedef struct _DOMAIN_OEM_INFORMATION +{ + UNICODE_STRING OemInformation; +} DOMAIN_OEM_INFORMATION, *PDOMAIN_OEM_INFORMATION; + typedef struct _DOMAIN_NAME_INFORMATION { UNICODE_STRING DomainName; } DOMAIN_NAME_INFORMATION, *PDOMAIN_NAME_INFORMATION; + +typedef struct _DOMAIN_REPLICATION_INFORMATION +{ + UNICODE_STRING ReplicaSourceNodeName; +} DOMAIN_REPLICATION_INFORMATION, *PDOMAIN_REPLICATION_INFORMATION; + +typedef struct _DOMAIN_SERVER_ROLE_INFORMATION +{ + DOMAIN_SERVER_ROLE DomainServerRole; +} DOMAIN_SERVER_ROLE_INFORMATION, *PDOMAIN_SERVER_ROLE_INFORMATION; + +typedef struct _DOMAIN_STATE_INFORMATION +{ + DOMAIN_SERVER_ENABLE_STATE DomainServerState; +} DOMAIN_STATE_INFORMATION, *PDOMAIN_STATE_INFORMATION; + +typedef struct _DOMAIN_UAS_INFORMATION +{ + BOOLEAN UasCompatibilityRequired; +} DOMAIN_UAS_INFORMATION; + +#include "pshpack4.h" +typedef struct _DOMAIN_GENERAL_INFORMATION2 +{ + DOMAIN_GENERAL_INFORMATION I1; + LARGE_INTEGER LockoutDuration; + LARGE_INTEGER LockoutObservationWindow; + USHORT LockoutThreshold; +} DOMAIN_GENERAL_INFORMATION2, *PDOMAIN_GENERAL_INFORMATION2; +#include "poppack.h" typedef enum _GROUP_INFORMATION_CLASS { Modified: trunk/reactos/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id… ============================================================================== --- trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/sam.idl [iso-8859-1] Sat Dec 29 16:22:00 2012 @@ -143,12 +143,12 @@ DomainServerEnabled = 1, DomainServerDisabled } DOMAIN_SERVER_ENABLE_STATE, *PDOMAIN_SERVER_ENABLE_STATE; -cpp_quote("#endif") typedef struct _DOMAIN_STATE_INFORMATION { DOMAIN_SERVER_ENABLE_STATE DomainServerState; } DOMAIN_STATE_INFORMATION, *PDOMAIN_STATE_INFORMATION; +cpp_quote("#endif") cpp_quote("#ifndef _NTSAM_") typedef enum _DOMAIN_SERVER_ROLE @@ -169,6 +169,7 @@ } DOMAIN_PASSWORD_INFORMATION, *PDOMAIN_PASSWORD_INFORMATION; cpp_quote("#endif") +cpp_quote("#ifndef _NTSAM_") typedef struct _DOMAIN_LOGOFF_INFORMATION { OLD_LARGE_INTEGER ForceLogoff; @@ -178,6 +179,7 @@ { DOMAIN_SERVER_ROLE DomainServerRole; } DOMAIN_SERVER_ROLE_INFORMATION, *PDOMAIN_SERVER_ROLE_INFORMATION; +cpp_quote("#endif") typedef struct _DOMAIN_MODIFIED_INFORMATION {

1 0

[tfaber] 58039: [WIDL] - Apply Wine commit "widl: Print large enum constants in hex." by Alexandre Julliard (756d33ddae316c71b1241e7c8684c07cd82b9e05) - Remove some minor differences to Wine
by tfaber＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: tfaber Date: Sat Dec 29 15:18:09 2012 New Revision: 58039 URL: http://svn.reactos.org/svn/reactos?rev=58039&view=rev Log: [WIDL] - Apply Wine commit "widl: Print large enum constants in hex." by Alexandre Julliard (756d33ddae316c71b1241e7c8684c07cd82b9e05) - Remove some minor differences to Wine Modified: trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/typegen.c Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=58… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Sat Dec 29 15:18:09 2012 @@ -1223,7 +1223,8 @@ write_method_macro(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); fprintf(header, "#else\n"); write_inline_wrappers(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); - fprintf(header, "#endif\n"); fprintf(header, "#endif\n"); + fprintf(header, "#endif\n"); + fprintf(header, "#endif\n"); fprintf(header, "\n"); fprintf(header, "#endif\n"); fprintf(header, "\n"); Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Sat Dec 29 15:18:09 2012 @@ -960,28 +960,28 @@ 559, 560, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 576, 577, 578, 579, 580, 581, 585, 586, 591, 592, 593, 594, 597, - 598, 601, 605, 611, 612, 613, 616, 620, 629, 633, - 638, 641, 642, 645, 646, 649, 650, 651, 652, 653, - 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, - 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, - 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, - 684, 685, 686, 688, 690, 691, 694, 695, 698, 704, - 710, 711, 714, 719, 726, 727, 730, 731, 735, 736, - 739, 743, 749, 757, 761, 766, 767, 770, 771, 772, - 775, 777, 780, 781, 782, 783, 784, 785, 786, 787, - 788, 789, 790, 793, 794, 797, 798, 799, 800, 801, - 802, 803, 804, 807, 808, 816, 822, 826, 827, 831, - 834, 835, 838, 847, 848, 851, 852, 855, 861, 867, - 868, 871, 872, 875, 885, 892, 898, 902, 903, 906, - 907, 910, 915, 922, 923, 924, 928, 932, 935, 936, - 939, 940, 944, 945, 949, 950, 951, 955, 957, 959, - 963, 964, 965, 966, 974, 976, 978, 983, 985, 990, - 991, 996, 997, 998, 999, 1004, 1013, 1015, 1016, 1021, - 1023, 1027, 1028, 1035, 1036, 1037, 1038, 1039, 1044, 1052, - 1053, 1056, 1057, 1060, 1067, 1068, 1073, 1074, 1078, 1079, - 1080, 1081, 1082, 1086, 1087, 1088, 1091, 1094, 1095, 1096, - 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1106, 1112, 1114, - 1120, 1121 + 598, 601, 605, 611, 612, 613, 616, 620, 632, 636, + 641, 644, 645, 648, 649, 652, 653, 654, 655, 656, + 657, 658, 659, 660, 661, 662, 663, 664, 665, 666, + 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, + 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, + 687, 688, 689, 691, 693, 694, 697, 698, 701, 707, + 713, 714, 717, 722, 729, 730, 733, 734, 738, 739, + 742, 746, 752, 760, 764, 769, 770, 773, 774, 775, + 778, 780, 783, 784, 785, 786, 787, 788, 789, 790, + 791, 792, 793, 796, 797, 800, 801, 802, 803, 804, + 805, 806, 807, 810, 811, 819, 825, 829, 830, 834, + 837, 838, 841, 850, 851, 854, 855, 858, 864, 870, + 871, 874, 875, 878, 888, 895, 901, 905, 906, 909, + 910, 913, 918, 925, 926, 927, 931, 935, 938, 939, + 942, 943, 947, 948, 952, 953, 954, 958, 960, 962, + 966, 967, 968, 969, 977, 979, 981, 986, 988, 993, + 994, 999, 1000, 1001, 1002, 1007, 1016, 1018, 1019, 1024, + 1026, 1030, 1031, 1038, 1039, 1040, 1041, 1042, 1047, 1055, + 1056, 1059, 1060, 1063, 1070, 1071, 1076, 1077, 1081, 1082, + 1083, 1084, 1085, 1089, 1090, 1091, 1094, 1097, 1098, 1099, + 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1109, 1115, 1117, + 1123, 1124 }; #endif @@ -4033,7 +4033,10 @@ { if (!(yyvsp[(3) - (3)].var)->eval) { var_t *last = LIST_ENTRY( list_tail((yyval.var_list)), var_t, entry ); - (yyvsp[(3) - (3)].var)->eval = make_exprl(EXPR_NUM, last->eval->cval + 1); + enum expr_type type = EXPR_NUM; + if (last->eval->type == EXPR_HEXNUM) type = EXPR_HEXNUM; + if (last->eval->cval + 1 < 0) type = EXPR_HEXNUM; + (yyvsp[(3) - (3)].var)->eval = make_exprl(type, last->eval->cval + 1); } (yyval.var_list) = append_var( (yyvsp[(1) - (3)].var_list), (yyvsp[(3) - (3)].var) ); } @@ -4042,7 +4045,7 @@ case 178: /* Line 1806 of yacc.c */ -#line 629 "parser.y" +#line 632 "parser.y" { (yyval.var) = reg_const((yyvsp[(1) - (3)].var)); (yyval.var)->eval = (yyvsp[(3) - (3)].expr); (yyval.var)->type = type_new_int(TYPE_BASIC_INT, 0); @@ -4052,7 +4055,7 @@ case 179: /* Line 1806 of yacc.c */ -#line 633 "parser.y" +#line 636 "parser.y" { (yyval.var) = reg_const((yyvsp[(1) - (1)].var)); (yyval.var)->type = type_new_int(TYPE_BASIC_INT, 0); } @@ -4061,336 +4064,336 @@ case 180: /* Line 1806 of yacc.c */ -#line 638 "parser.y" +#line 641 "parser.y" { (yyval.type) = type_new_enum((yyvsp[(2) - (5)].str), TRUE, (yyvsp[(4) - (5)].var_list)); } break; case 181: /* Line 1806 of yacc.c */ -#line 641 "parser.y" +#line 644 "parser.y" { (yyval.expr_list) = append_expr( NULL, (yyvsp[(1) - (1)].expr) ); } break; case 182: /* Line 1806 of yacc.c */ -#line 642 "parser.y" +#line 645 "parser.y" { (yyval.expr_list) = append_expr( (yyvsp[(1) - (3)].expr_list), (yyvsp[(3) - (3)].expr) ); } break; case 183: /* Line 1806 of yacc.c */ -#line 645 "parser.y" +#line 648 "parser.y" { (yyval.expr) = make_expr(EXPR_VOID); } break; case 185: /* Line 1806 of yacc.c */ -#line 649 "parser.y" +#line 652 "parser.y" { (yyval.expr) = make_exprl(EXPR_NUM, (yyvsp[(1) - (1)].num)); } break; case 186: /* Line 1806 of yacc.c */ -#line 650 "parser.y" +#line 653 "parser.y" { (yyval.expr) = make_exprl(EXPR_HEXNUM, (yyvsp[(1) - (1)].num)); } break; case 187: /* Line 1806 of yacc.c */ -#line 651 "parser.y" +#line 654 "parser.y" { (yyval.expr) = make_exprd(EXPR_DOUBLE, (yyvsp[(1) - (1)].dbl)); } break; case 188: /* Line 1806 of yacc.c */ -#line 652 "parser.y" +#line 655 "parser.y" { (yyval.expr) = make_exprl(EXPR_TRUEFALSE, 0); } break; case 189: /* Line 1806 of yacc.c */ -#line 653 "parser.y" +#line 656 "parser.y" { (yyval.expr) = make_exprl(EXPR_NUM, 0); } break; case 190: /* Line 1806 of yacc.c */ -#line 654 "parser.y" +#line 657 "parser.y" { (yyval.expr) = make_exprl(EXPR_TRUEFALSE, 1); } break; case 191: /* Line 1806 of yacc.c */ -#line 655 "parser.y" +#line 658 "parser.y" { (yyval.expr) = make_exprs(EXPR_STRLIT, (yyvsp[(1) - (1)].str)); } break; case 192: /* Line 1806 of yacc.c */ -#line 656 "parser.y" +#line 659 "parser.y" { (yyval.expr) = make_exprs(EXPR_WSTRLIT, (yyvsp[(1) - (1)].str)); } break; case 193: /* Line 1806 of yacc.c */ -#line 657 "parser.y" +#line 660 "parser.y" { (yyval.expr) = make_exprs(EXPR_CHARCONST, (yyvsp[(1) - (1)].str)); } break; case 194: /* Line 1806 of yacc.c */ -#line 658 "parser.y" +#line 661 "parser.y" { (yyval.expr) = make_exprs(EXPR_IDENTIFIER, (yyvsp[(1) - (1)].str)); } break; case 195: /* Line 1806 of yacc.c */ -#line 659 "parser.y" +#line 662 "parser.y" { (yyval.expr) = make_expr3(EXPR_COND, (yyvsp[(1) - (5)].expr), (yyvsp[(3) - (5)].expr), (yyvsp[(5) - (5)].expr)); } break; case 196: /* Line 1806 of yacc.c */ -#line 660 "parser.y" +#line 663 "parser.y" { (yyval.expr) = make_expr2(EXPR_LOGOR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 197: /* Line 1806 of yacc.c */ -#line 661 "parser.y" +#line 664 "parser.y" { (yyval.expr) = make_expr2(EXPR_LOGAND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 198: /* Line 1806 of yacc.c */ -#line 662 "parser.y" +#line 665 "parser.y" { (yyval.expr) = make_expr2(EXPR_OR , (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 199: /* Line 1806 of yacc.c */ -#line 663 "parser.y" +#line 666 "parser.y" { (yyval.expr) = make_expr2(EXPR_XOR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 200: /* Line 1806 of yacc.c */ -#line 664 "parser.y" +#line 667 "parser.y" { (yyval.expr) = make_expr2(EXPR_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 201: /* Line 1806 of yacc.c */ -#line 665 "parser.y" +#line 668 "parser.y" { (yyval.expr) = make_expr2(EXPR_EQUALITY, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 202: /* Line 1806 of yacc.c */ -#line 666 "parser.y" +#line 669 "parser.y" { (yyval.expr) = make_expr2(EXPR_INEQUALITY, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 203: /* Line 1806 of yacc.c */ -#line 667 "parser.y" +#line 670 "parser.y" { (yyval.expr) = make_expr2(EXPR_GTR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 204: /* Line 1806 of yacc.c */ -#line 668 "parser.y" +#line 671 "parser.y" { (yyval.expr) = make_expr2(EXPR_LESS, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 205: /* Line 1806 of yacc.c */ -#line 669 "parser.y" +#line 672 "parser.y" { (yyval.expr) = make_expr2(EXPR_GTREQL, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 206: /* Line 1806 of yacc.c */ -#line 670 "parser.y" +#line 673 "parser.y" { (yyval.expr) = make_expr2(EXPR_LESSEQL, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 207: /* Line 1806 of yacc.c */ -#line 671 "parser.y" +#line 674 "parser.y" { (yyval.expr) = make_expr2(EXPR_SHL, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 208: /* Line 1806 of yacc.c */ -#line 672 "parser.y" +#line 675 "parser.y" { (yyval.expr) = make_expr2(EXPR_SHR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 209: /* Line 1806 of yacc.c */ -#line 673 "parser.y" +#line 676 "parser.y" { (yyval.expr) = make_expr2(EXPR_ADD, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 210: /* Line 1806 of yacc.c */ -#line 674 "parser.y" +#line 677 "parser.y" { (yyval.expr) = make_expr2(EXPR_SUB, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 211: /* Line 1806 of yacc.c */ -#line 675 "parser.y" +#line 678 "parser.y" { (yyval.expr) = make_expr2(EXPR_MOD, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 212: /* Line 1806 of yacc.c */ -#line 676 "parser.y" +#line 679 "parser.y" { (yyval.expr) = make_expr2(EXPR_MUL, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 213: /* Line 1806 of yacc.c */ -#line 677 "parser.y" +#line 680 "parser.y" { (yyval.expr) = make_expr2(EXPR_DIV, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); } break; case 214: /* Line 1806 of yacc.c */ -#line 678 "parser.y" +#line 681 "parser.y" { (yyval.expr) = make_expr1(EXPR_LOGNOT, (yyvsp[(2) - (2)].expr)); } break; case 215: /* Line 1806 of yacc.c */ -#line 679 "parser.y" +#line 682 "parser.y" { (yyval.expr) = make_expr1(EXPR_NOT, (yyvsp[(2) - (2)].expr)); } break; case 216: /* Line 1806 of yacc.c */ -#line 680 "parser.y" +#line 683 "parser.y" { (yyval.expr) = make_expr1(EXPR_POS, (yyvsp[(2) - (2)].expr)); } break; case 217: /* Line 1806 of yacc.c */ -#line 681 "parser.y" +#line 684 "parser.y" { (yyval.expr) = make_expr1(EXPR_NEG, (yyvsp[(2) - (2)].expr)); } break; case 218: /* Line 1806 of yacc.c */ -#line 682 "parser.y" +#line 685 "parser.y" { (yyval.expr) = make_expr1(EXPR_ADDRESSOF, (yyvsp[(2) - (2)].expr)); } break; case 219: /* Line 1806 of yacc.c */ -#line 683 "parser.y" +#line 686 "parser.y" { (yyval.expr) = make_expr1(EXPR_PPTR, (yyvsp[(2) - (2)].expr)); } break; case 220: /* Line 1806 of yacc.c */ -#line 684 "parser.y" +#line 687 "parser.y" { (yyval.expr) = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, (yyvsp[(1) - (3)].expr)), make_exprs(EXPR_IDENTIFIER, (yyvsp[(3) - (3)].str))); } break; case 221: /* Line 1806 of yacc.c */ -#line 685 "parser.y" +#line 688 "parser.y" { (yyval.expr) = make_expr2(EXPR_MEMBER, (yyvsp[(1) - (3)].expr), make_exprs(EXPR_IDENTIFIER, (yyvsp[(3) - (3)].str))); } break; case 222: /* Line 1806 of yacc.c */ -#line 687 "parser.y" +#line 690 "parser.y" { (yyval.expr) = make_exprt(EXPR_CAST, declare_var(NULL, (yyvsp[(2) - (5)].declspec), (yyvsp[(3) - (5)].declarator), 0), (yyvsp[(5) - (5)].expr)); free((yyvsp[(2) - (5)].declspec)); free((yyvsp[(3) - (5)].declarator)); } break; case 223: /* Line 1806 of yacc.c */ -#line 689 "parser.y" +#line 692 "parser.y" { (yyval.expr) = make_exprt(EXPR_SIZEOF, declare_var(NULL, (yyvsp[(3) - (5)].declspec), (yyvsp[(4) - (5)].declarator), 0), NULL); free((yyvsp[(3) - (5)].declspec)); free((yyvsp[(4) - (5)].declarator)); } break; case 224: /* Line 1806 of yacc.c */ -#line 690 "parser.y" +#line 693 "parser.y" { (yyval.expr) = make_expr2(EXPR_ARRAY, (yyvsp[(1) - (4)].expr), (yyvsp[(3) - (4)].expr)); } break; case 225: /* Line 1806 of yacc.c */ -#line 691 "parser.y" +#line 694 "parser.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); } break; case 226: /* Line 1806 of yacc.c */ -#line 694 "parser.y" +#line 697 "parser.y" { (yyval.expr_list) = append_expr( NULL, (yyvsp[(1) - (1)].expr) ); } break; case 227: /* Line 1806 of yacc.c */ -#line 695 "parser.y" +#line 698 "parser.y" { (yyval.expr_list) = append_expr( (yyvsp[(1) - (3)].expr_list), (yyvsp[(3) - (3)].expr) ); } break; case 228: /* Line 1806 of yacc.c */ -#line 698 "parser.y" +#line 701 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); if (!(yyval.expr)->is_const) error_loc("expression is not an integer constant\n"); @@ -4400,7 +4403,7 @@ case 229: /* Line 1806 of yacc.c */ -#line 704 "parser.y" +#line 707 "parser.y" { (yyval.expr) = (yyvsp[(1) - (1)].expr); if (!(yyval.expr)->is_const && (yyval.expr)->type != EXPR_STRLIT && (yyval.expr)->type != EXPR_WSTRLIT) error_loc("expression is not constant\n"); @@ -4410,21 +4413,21 @@ case 230: /* Line 1806 of yacc.c */ -#line 710 "parser.y" +#line 713 "parser.y" { (yyval.var_list) = NULL; } break; case 231: /* Line 1806 of yacc.c */ -#line 711 "parser.y" +#line 714 "parser.y" { (yyval.var_list) = append_var_list((yyvsp[(1) - (2)].var_list), (yyvsp[(2) - (2)].var_list)); } break; case 232: /* Line 1806 of yacc.c */ -#line 715 "parser.y" +#line 718 "parser.y" { const char *first = LIST_ENTRY(list_head((yyvsp[(3) - (4)].declarator_list)), declarator_t, entry)->var->name; check_field_attrs(first, (yyvsp[(1) - (4)].attr_list)); (yyval.var_list) = set_var_types((yyvsp[(1) - (4)].attr_list), (yyvsp[(2) - (4)].declspec), (yyvsp[(3) - (4)].declarator_list)); @@ -4434,7 +4437,7 @@ case 233: /* Line 1806 of yacc.c */ -#line 719 "parser.y" +#line 722 "parser.y" { var_t *v = make_var(NULL); v->type = (yyvsp[(2) - (3)].type); v->attrs = (yyvsp[(1) - (3)].attr_list); (yyval.var_list) = append_var(NULL, v); @@ -4444,49 +4447,49 @@ case 234: /* Line 1806 of yacc.c */ -#line 726 "parser.y" +#line 729 "parser.y" { (yyval.var) = (yyvsp[(1) - (2)].var); } break; case 235: /* Line 1806 of yacc.c */ -#line 727 "parser.y" +#line 730 "parser.y" { (yyval.var) = make_var(NULL); (yyval.var)->attrs = (yyvsp[(1) - (2)].attr_list); } break; case 236: /* Line 1806 of yacc.c */ -#line 730 "parser.y" +#line 733 "parser.y" { (yyval.var_list) = NULL; } break; case 237: /* Line 1806 of yacc.c */ -#line 731 "parser.y" +#line 734 "parser.y" { (yyval.var_list) = append_var( (yyvsp[(1) - (2)].var_list), (yyvsp[(2) - (2)].var) ); } break; case 238: /* Line 1806 of yacc.c */ -#line 735 "parser.y" +#line 738 "parser.y" { (yyval.var) = (yyvsp[(1) - (2)].var); } break; case 239: /* Line 1806 of yacc.c */ -#line 736 "parser.y" +#line 739 "parser.y" { (yyval.var) = NULL; } break; case 240: /* Line 1806 of yacc.c */ -#line 739 "parser.y" +#line 742 "parser.y" { (yyval.var) = declare_var(check_field_attrs((yyvsp[(3) - (3)].declarator)->var->name, (yyvsp[(1) - (3)].attr_list)), (yyvsp[(2) - (3)].declspec), (yyvsp[(3) - (3)].declarator), FALSE); free((yyvsp[(3) - (3)].declarator)); @@ -4496,7 +4499,7 @@ case 241: /* Line 1806 of yacc.c */ -#line 743 "parser.y" +#line 746 "parser.y" { var_t *v = make_var(NULL); v->type = (yyvsp[(2) - (2)].type); v->attrs = (yyvsp[(1) - (2)].attr_list); (yyval.var) = v; @@ -4506,7 +4509,7 @@ case 242: /* Line 1806 of yacc.c */ -#line 749 "parser.y" +#line 752 "parser.y" { (yyval.var) = (yyvsp[(1) - (1)].var); if (type_get_type((yyval.var)->type) != TYPE_FUNCTION) error_loc("only methods may be declared inside the methods section of a dispinterface\n"); @@ -4517,7 +4520,7 @@ case 243: /* Line 1806 of yacc.c */ -#line 758 "parser.y" +#line 761 "parser.y" { (yyval.var) = declare_var((yyvsp[(1) - (3)].attr_list), (yyvsp[(2) - (3)].declspec), (yyvsp[(3) - (3)].declarator), FALSE); free((yyvsp[(3) - (3)].declarator)); } @@ -4526,7 +4529,7 @@ case 244: /* Line 1806 of yacc.c */ -#line 761 "parser.y" +#line 764 "parser.y" { (yyval.var) = declare_var(NULL, (yyvsp[(1) - (2)].declspec), (yyvsp[(2) - (2)].declarator), FALSE); free((yyvsp[(2) - (2)].declarator)); } @@ -4535,182 +4538,182 @@ case 245: /* Line 1806 of yacc.c */ -#line 766 "parser.y" +#line 769 "parser.y" { (yyval.var) = NULL; } break; case 247: /* Line 1806 of yacc.c */ -#line 770 "parser.y" +#line 773 "parser.y" { (yyval.str) = NULL; } break; case 248: /* Line 1806 of yacc.c */ -#line 771 "parser.y" +#line 774 "parser.y" { (yyval.str) = (yyvsp[(1) - (1)].str); } break; case 249: /* Line 1806 of yacc.c */ -#line 772 "parser.y" +#line 775 "parser.y" { (yyval.str) = (yyvsp[(1) - (1)].str); } break; case 250: /* Line 1806 of yacc.c */ -#line 775 "parser.y" +#line 778 "parser.y" { (yyval.var) = make_var((yyvsp[(1) - (1)].str)); } break; case 251: /* Line 1806 of yacc.c */ -#line 777 "parser.y" +#line 780 "parser.y" { (yyval.var) = make_var((yyvsp[(1) - (1)].str)); } break; case 252: /* Line 1806 of yacc.c */ -#line 780 "parser.y" +#line 783 "parser.y" { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } break; case 253: /* Line 1806 of yacc.c */ -#line 781 "parser.y" +#line 784 "parser.y" { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } break; case 255: /* Line 1806 of yacc.c */ -#line 783 "parser.y" +#line 786 "parser.y" { (yyval.type) = type_new_int(type_basic_get_type((yyvsp[(2) - (2)].type)), -1); } break; case 256: /* Line 1806 of yacc.c */ -#line 784 "parser.y" +#line 787 "parser.y" { (yyval.type) = type_new_int(type_basic_get_type((yyvsp[(2) - (2)].type)), 1); } break; case 257: /* Line 1806 of yacc.c */ -#line 785 "parser.y" +#line 788 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_INT, 1); } break; case 258: - -/* Line 1806 of yacc.c */ -#line 786 "parser.y" - { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } - break; - - case 259: - -/* Line 1806 of yacc.c */ -#line 787 "parser.y" - { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } - break; - - case 260: - -/* Line 1806 of yacc.c */ -#line 788 "parser.y" - { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } - break; - - case 261: /* Line 1806 of yacc.c */ #line 789 "parser.y" { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } break; - case 262: + case 259: /* Line 1806 of yacc.c */ #line 790 "parser.y" { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } break; + case 260: + +/* Line 1806 of yacc.c */ +#line 791 "parser.y" + { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } + break; + + case 261: + +/* Line 1806 of yacc.c */ +#line 792 "parser.y" + { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } + break; + + case 262: + +/* Line 1806 of yacc.c */ +#line 793 "parser.y" + { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } + break; + case 265: /* Line 1806 of yacc.c */ -#line 797 "parser.y" +#line 800 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_INT, 0); } break; case 266: /* Line 1806 of yacc.c */ -#line 798 "parser.y" +#line 801 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_INT16, 0); } break; case 267: /* Line 1806 of yacc.c */ -#line 799 "parser.y" +#line 802 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_INT8, 0); } break; case 268: /* Line 1806 of yacc.c */ -#line 800 "parser.y" +#line 803 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_INT32, 0); } break; case 269: /* Line 1806 of yacc.c */ -#line 801 "parser.y" +#line 804 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_HYPER, 0); } break; case 270: /* Line 1806 of yacc.c */ -#line 802 "parser.y" +#line 805 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_INT64, 0); } break; case 271: /* Line 1806 of yacc.c */ -#line 803 "parser.y" +#line 806 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_CHAR, 0); } break; case 272: /* Line 1806 of yacc.c */ -#line 804 "parser.y" +#line 807 "parser.y" { (yyval.type) = type_new_int(TYPE_BASIC_INT3264, 0); } break; case 273: /* Line 1806 of yacc.c */ -#line 807 "parser.y" +#line 810 "parser.y" { (yyval.type) = type_new_coclass((yyvsp[(2) - (2)].str)); } break; case 274: /* Line 1806 of yacc.c */ -#line 808 "parser.y" +#line 811 "parser.y" { (yyval.type) = find_type((yyvsp[(2) - (2)].str), 0); if (type_get_type_detect_alias((yyval.type)) != TYPE_COCLASS) error_loc("%s was not declared a coclass at %s:%d\n", @@ -4722,7 +4725,7 @@ case 275: /* Line 1806 of yacc.c */ -#line 816 "parser.y" +#line 819 "parser.y" { (yyval.type) = (yyvsp[(2) - (2)].type); check_def((yyval.type)); (yyval.type)->attrs = check_coclass_attrs((yyvsp[(2) - (2)].type)->name, (yyvsp[(1) - (2)].attr_list)); @@ -4732,49 +4735,49 @@ case 276: /* Line 1806 of yacc.c */ -#line 823 "parser.y" +#line 826 "parser.y" { (yyval.type) = type_coclass_define((yyvsp[(1) - (5)].type), (yyvsp[(3) - (5)].ifref_list)); } break; case 277: /* Line 1806 of yacc.c */ -#line 826 "parser.y" +#line 829 "parser.y" { (yyval.ifref_list) = NULL; } break; case 278: /* Line 1806 of yacc.c */ -#line 827 "parser.y" +#line 830 "parser.y" { (yyval.ifref_list) = append_ifref( (yyvsp[(1) - (2)].ifref_list), (yyvsp[(2) - (2)].ifref) ); } break; case 279: /* Line 1806 of yacc.c */ -#line 831 "parser.y" +#line 834 "parser.y" { (yyval.ifref) = make_ifref((yyvsp[(2) - (2)].type)); (yyval.ifref)->attrs = (yyvsp[(1) - (2)].attr_list); } break; case 280: /* Line 1806 of yacc.c */ -#line 834 "parser.y" +#line 837 "parser.y" { (yyval.type) = get_type(TYPE_INTERFACE, (yyvsp[(2) - (2)].str), 0); } break; case 281: /* Line 1806 of yacc.c */ -#line 835 "parser.y" +#line 838 "parser.y" { (yyval.type) = get_type(TYPE_INTERFACE, (yyvsp[(2) - (2)].str), 0); } break; case 282: /* Line 1806 of yacc.c */ -#line 838 "parser.y" +#line 841 "parser.y" { attr_t *attrs; (yyval.type) = (yyvsp[(2) - (2)].type); check_def((yyval.type)); @@ -4787,35 +4790,35 @@ case 283: /* Line 1806 of yacc.c */ -#line 847 "parser.y" +#line 850 "parser.y" { (yyval.var_list) = NULL; } break; case 284: /* Line 1806 of yacc.c */ -#line 848 "parser.y" +#line 851 "parser.y" { (yyval.var_list) = append_var( (yyvsp[(1) - (3)].var_list), (yyvsp[(2) - (3)].var) ); } break; case 285: /* Line 1806 of yacc.c */ -#line 851 "parser.y" +#line 854 "parser.y" { (yyval.var_list) = NULL; } break; case 286: /* Line 1806 of yacc.c */ -#line 852 "parser.y" +#line 855 "parser.y" { (yyval.var_list) = append_var( (yyvsp[(1) - (3)].var_list), (yyvsp[(2) - (3)].var) ); } break; case 287: /* Line 1806 of yacc.c */ -#line 858 "parser.y" +#line 861 "parser.y" { (yyval.type) = (yyvsp[(1) - (5)].type); type_dispinterface_define((yyval.type), (yyvsp[(3) - (5)].var_list), (yyvsp[(4) - (5)].var_list)); } @@ -4824,7 +4827,7 @@ case 288: /* Line 1806 of yacc.c */ -#line 862 "parser.y" +#line 865 "parser.y" { (yyval.type) = (yyvsp[(1) - (5)].type); type_dispinterface_define_from_iface((yyval.type), (yyvsp[(3) - (5)].type)); } @@ -4833,35 +4836,35 @@ case 289: /* Line 1806 of yacc.c */ -#line 867 "parser.y" +#line 870 "parser.y" { (yyval.type) = NULL; } break; case 290: /* Line 1806 of yacc.c */ -#line 868 "parser.y" +#line 871 "parser.y" { (yyval.type) = find_type_or_error2((yyvsp[(2) - (2)].str), 0); } break; case 291: /* Line 1806 of yacc.c */ -#line 871 "parser.y" +#line 874 "parser.y" { (yyval.type) = get_type(TYPE_INTERFACE, (yyvsp[(2) - (2)].str), 0); } break; case 292: /* Line 1806 of yacc.c */ -#line 872 "parser.y" +#line 875 "parser.y" { (yyval.type) = get_type(TYPE_INTERFACE, (yyvsp[(2) - (2)].str), 0); } break; case 293: /* Line 1806 of yacc.c */ -#line 875 "parser.y" +#line 878 "parser.y" { (yyval.ifinfo).interface = (yyvsp[(2) - (2)].type); (yyval.ifinfo).old_pointer_default = pointer_default; if (is_attr((yyvsp[(1) - (2)].attr_list), ATTR_POINTERDEFAULT)) @@ -4875,7 +4878,7 @@ case 294: /* Line 1806 of yacc.c */ -#line 886 "parser.y" +#line 889 "parser.y" { (yyval.type) = (yyvsp[(1) - (6)].ifinfo).interface; type_interface_define((yyval.type), (yyvsp[(2) - (6)].type), (yyvsp[(4) - (6)].stmt_list)); pointer_default = (yyvsp[(1) - (6)].ifinfo).old_pointer_default; @@ -4885,7 +4888,7 @@ case 295: /* Line 1806 of yacc.c */ -#line 894 "parser.y" +#line 897 "parser.y" { (yyval.type) = (yyvsp[(1) - (8)].ifinfo).interface; type_interface_define((yyval.type), find_type_or_error2((yyvsp[(3) - (8)].str), 0), (yyvsp[(6) - (8)].stmt_list)); pointer_default = (yyvsp[(1) - (8)].ifinfo).old_pointer_default; @@ -4895,42 +4898,42 @@ case 296: /* Line 1806 of yacc.c */ -#line 898 "parser.y" +#line 901 "parser.y" { (yyval.type) = (yyvsp[(1) - (2)].type); } break; case 297: /* Line 1806 of yacc.c */ -#line 902 "parser.y" +#line 905 "parser.y" { (yyval.type) = (yyvsp[(1) - (2)].type); } break; case 298: /* Line 1806 of yacc.c */ -#line 903 "parser.y" +#line 906 "parser.y" { (yyval.type) = (yyvsp[(1) - (2)].type); } break; case 299: /* Line 1806 of yacc.c */ -#line 906 "parser.y" +#line 909 "parser.y" { (yyval.type) = type_new_module((yyvsp[(2) - (2)].str)); } break; case 300: /* Line 1806 of yacc.c */ -#line 907 "parser.y" +#line 910 "parser.y" { (yyval.type) = type_new_module((yyvsp[(2) - (2)].str)); } break; case 301: /* Line 1806 of yacc.c */ -#line 910 "parser.y" +#line 913 "parser.y" { (yyval.type) = (yyvsp[(2) - (2)].type); (yyval.type)->attrs = check_module_attrs((yyvsp[(2) - (2)].type)->name, (yyvsp[(1) - (2)].attr_list)); } @@ -4939,7 +4942,7 @@ case 302: /* Line 1806 of yacc.c */ -#line 916 "parser.y" +#line 919 "parser.y" { (yyval.type) = (yyvsp[(1) - (5)].type); type_module_define((yyval.type), (yyvsp[(3) - (5)].stmt_list)); } @@ -4948,105 +4951,105 @@ case 303: /* Line 1806 of yacc.c */ -#line 922 "parser.y" +#line 925 "parser.y" { (yyval.stgclass) = STG_EXTERN; } break; case 304: /* Line 1806 of yacc.c */ -#line 923 "parser.y" +#line 926 "parser.y" { (yyval.stgclass) = STG_STATIC; } break; case 305: /* Line 1806 of yacc.c */ -#line 924 "parser.y" +#line 927 "parser.y" { (yyval.stgclass) = STG_REGISTER; } break; case 306: /* Line 1806 of yacc.c */ -#line 928 "parser.y" +#line 931 "parser.y" { (yyval.attr) = make_attr(ATTR_INLINE); } break; case 307: /* Line 1806 of yacc.c */ -#line 932 "parser.y" +#line 935 "parser.y" { (yyval.attr) = make_attr(ATTR_CONST); } break; case 308: /* Line 1806 of yacc.c */ -#line 935 "parser.y" +#line 938 "parser.y" { (yyval.attr_list) = NULL; } break; case 309: /* Line 1806 of yacc.c */ -#line 936 "parser.y" +#line 939 "parser.y" { (yyval.attr_list) = append_attr((yyvsp[(1) - (2)].attr_list), (yyvsp[(2) - (2)].attr)); } break; case 310: /* Line 1806 of yacc.c */ -#line 939 "parser.y" +#line 942 "parser.y" { (yyval.declspec) = make_decl_spec((yyvsp[(1) - (2)].type), (yyvsp[(2) - (2)].declspec), NULL, NULL, STG_NONE); } break; case 311: /* Line 1806 of yacc.c */ -#line 941 "parser.y" +#line 944 "parser.y" { (yyval.declspec) = make_decl_spec((yyvsp[(2) - (3)].type), (yyvsp[(1) - (3)].declspec), (yyvsp[(3) - (3)].declspec), NULL, STG_NONE); } break; case 312: /* Line 1806 of yacc.c */ -#line 944 "parser.y" +#line 947 "parser.y" { (yyval.declspec) = NULL; } break; case 314: /* Line 1806 of yacc.c */ -#line 949 "parser.y" +#line 952 "parser.y" { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[(2) - (2)].declspec), NULL, (yyvsp[(1) - (2)].attr), STG_NONE); } break; case 315: /* Line 1806 of yacc.c */ -#line 950 "parser.y" +#line 953 "parser.y" { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[(2) - (2)].declspec), NULL, (yyvsp[(1) - (2)].attr), STG_NONE); } break; case 316: /* Line 1806 of yacc.c */ -#line 951 "parser.y" +#line 954 "parser.y" { (yyval.declspec) = make_decl_spec(NULL, (yyvsp[(2) - (2)].declspec), NULL, NULL, (yyvsp[(1) - (2)].stgclass)); } break; case 317: /* Line 1806 of yacc.c */ -#line 956 "parser.y" +#line 959 "parser.y" { (yyval.declarator) = (yyvsp[(3) - (3)].declarator); (yyval.declarator)->type = append_ptrchain_type((yyval.declarator)->type, type_new_pointer(pointer_default, NULL, (yyvsp[(2) - (3)].attr_list))); } break; case 318: /* Line 1806 of yacc.c */ -#line 957 "parser.y" +#line 960 "parser.y" { (yyval.declarator) = (yyvsp[(2) - (2)].declarator); if ((yyval.declarator)->func_type) (yyval.declarator)->func_type->attrs = append_attr((yyval.declarator)->func_type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[(1) - (2)].str))); else if ((yyval.declarator)->type) (yyval.declarator)->type->attrs = append_attr((yyval.declarator)->type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[(1) - (2)].str))); } break; @@ -5054,28 +5057,28 @@ case 320: /* Line 1806 of yacc.c */ -#line 963 "parser.y" +#line 966 "parser.y" { (yyval.declarator) = make_declarator((yyvsp[(1) - (1)].var)); } break; case 321: /* Line 1806 of yacc.c */ -#line 964 "parser.y" +#line 967 "parser.y" { (yyval.declarator) = (yyvsp[(2) - (3)].declarator); } break; case 322: /* Line 1806 of yacc.c */ -#line 965 "parser.y" +#line 968 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (2)].declarator); (yyval.declarator)->array = append_array((yyval.declarator)->array, (yyvsp[(2) - (2)].expr)); } break; case 323: /* Line 1806 of yacc.c */ -#line 966 "parser.y" +#line 969 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (4)].declarator); (yyval.declarator)->func_type = append_ptrchain_type((yyval.declarator)->type, type_new_function((yyvsp[(3) - (4)].var_list))); (yyval.declarator)->type = NULL; @@ -5085,14 +5088,14 @@ case 324: /* Line 1806 of yacc.c */ -#line 975 "parser.y" +#line 978 "parser.y" { (yyval.declarator) = (yyvsp[(3) - (3)].declarator); (yyval.declarator)->type = append_ptrchain_type((yyval.declarator)->type, type_new_pointer(pointer_default, NULL, (yyvsp[(2) - (3)].attr_list))); } break; case 325: /* Line 1806 of yacc.c */ -#line 976 "parser.y" +#line 979 "parser.y" { (yyval.declarator) = (yyvsp[(2) - (2)].declarator); if ((yyval.declarator)->func_type) (yyval.declarator)->func_type->attrs = append_attr((yyval.declarator)->func_type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[(1) - (2)].str))); else if ((yyval.declarator)->type) (yyval.declarator)->type->attrs = append_attr((yyval.declarator)->type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[(1) - (2)].str))); } break; @@ -5100,14 +5103,14 @@ case 327: /* Line 1806 of yacc.c */ -#line 984 "parser.y" +#line 987 "parser.y" { (yyval.declarator) = (yyvsp[(3) - (3)].declarator); (yyval.declarator)->type = append_ptrchain_type((yyval.declarator)->type, type_new_pointer(pointer_default, NULL, (yyvsp[(2) - (3)].attr_list))); } break; case 328: /* Line 1806 of yacc.c */ -#line 985 "parser.y" +#line 988 "parser.y" { (yyval.declarator) = (yyvsp[(2) - (2)].declarator); if ((yyval.declarator)->func_type) (yyval.declarator)->func_type->attrs = append_attr((yyval.declarator)->func_type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[(1) - (2)].str))); else if ((yyval.declarator)->type) (yyval.declarator)->type->attrs = append_attr((yyval.declarator)->type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[(1) - (2)].str))); } break; @@ -5115,35 +5118,35 @@ case 329: /* Line 1806 of yacc.c */ -#line 990 "parser.y" +#line 993 "parser.y" { (yyval.declarator) = make_declarator(NULL); } break; case 331: /* Line 1806 of yacc.c */ -#line 996 "parser.y" +#line 999 "parser.y" { (yyval.declarator) = (yyvsp[(2) - (3)].declarator); } break; case 332: /* Line 1806 of yacc.c */ -#line 997 "parser.y" +#line 1000 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (2)].declarator); (yyval.declarator)->array = append_array((yyval.declarator)->array, (yyvsp[(2) - (2)].expr)); } break; case 333: /* Line 1806 of yacc.c */ -#line 998 "parser.y" +#line 1001 "parser.y" { (yyval.declarator) = make_declarator(NULL); (yyval.declarator)->array = append_array((yyval.declarator)->array, (yyvsp[(1) - (1)].expr)); } break; case 334: /* Line 1806 of yacc.c */ -#line 1000 "parser.y" +#line 1003 "parser.y" { (yyval.declarator) = make_declarator(NULL); (yyval.declarator)->func_type = append_ptrchain_type((yyval.declarator)->type, type_new_function((yyvsp[(2) - (3)].var_list))); (yyval.declarator)->type = NULL; @@ -5153,7 +5156,7 @@ case 335: /* Line 1806 of yacc.c */ -#line 1005 "parser.y" +#line 1008 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (4)].declarator); (yyval.declarator)->func_type = append_ptrchain_type((yyval.declarator)->type, type_new_function((yyvsp[(3) - (4)].var_list))); (yyval.declarator)->type = NULL; @@ -5163,70 +5166,70 @@ case 336: /* Line 1806 of yacc.c */ -#line 1014 "parser.y" +#line 1017 "parser.y" { (yyval.declarator) = (yyvsp[(3) - (3)].declarator); (yyval.declarator)->type = append_ptrchain_type((yyval.declarator)->type, type_new_pointer(pointer_default, NULL, (yyvsp[(2) - (3)].attr_list))); } break; case 337: /* Line 1806 of yacc.c */ -#line 1015 "parser.y" +#line 1018 "parser.y" { (yyval.declarator) = (yyvsp[(2) - (2)].declarator); (yyval.declarator)->type->attrs = append_attr((yyval.declarator)->type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[(1) - (2)].str))); } break; case 339: /* Line 1806 of yacc.c */ -#line 1022 "parser.y" +#line 1025 "parser.y" { (yyval.declarator) = (yyvsp[(3) - (3)].declarator); (yyval.declarator)->type = append_ptrchain_type((yyval.declarator)->type, type_new_pointer(pointer_default, NULL, (yyvsp[(2) - (3)].attr_list))); } break; case 340: /* Line 1806 of yacc.c */ -#line 1023 "parser.y" +#line 1026 "parser.y" { (yyval.declarator) = (yyvsp[(2) - (2)].declarator); (yyval.declarator)->type->attrs = append_attr((yyval.declarator)->type->attrs, make_attrp(ATTR_CALLCONV, (yyvsp[(1) - (2)].str))); } break; case 341: /* Line 1806 of yacc.c */ -#line 1027 "parser.y" +#line 1030 "parser.y" { (yyval.declarator) = make_declarator(NULL); } break; case 343: /* Line 1806 of yacc.c */ -#line 1035 "parser.y" +#line 1038 "parser.y" { (yyval.declarator) = make_declarator((yyvsp[(1) - (1)].var)); } break; case 344: /* Line 1806 of yacc.c */ -#line 1036 "parser.y" +#line 1039 "parser.y" { (yyval.declarator) = (yyvsp[(2) - (3)].declarator); } break; case 345: /* Line 1806 of yacc.c */ -#line 1037 "parser.y" +#line 1040 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (2)].declarator); (yyval.declarator)->array = append_array((yyval.declarator)->array, (yyvsp[(2) - (2)].expr)); } break; case 346: /* Line 1806 of yacc.c */ -#line 1038 "parser.y" +#line 1041 "parser.y" { (yyval.declarator) = make_declarator(NULL); (yyval.declarator)->array = append_array((yyval.declarator)->array, (yyvsp[(1) - (1)].expr)); } break; case 347: /* Line 1806 of yacc.c */ -#line 1040 "parser.y" +#line 1043 "parser.y" { (yyval.declarator) = make_declarator(NULL); (yyval.declarator)->func_type = append_ptrchain_type((yyval.declarator)->type, type_new_function((yyvsp[(2) - (3)].var_list))); (yyval.declarator)->type = NULL; @@ -5236,7 +5239,7 @@ case 348: /* Line 1806 of yacc.c */ -#line 1045 "parser.y" +#line 1048 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (4)].declarator); (yyval.declarator)->func_type = append_ptrchain_type((yyval.declarator)->type, type_new_function((yyvsp[(3) - (4)].var_list))); (yyval.declarator)->type = NULL; @@ -5246,35 +5249,35 @@ case 349: /* Line 1806 of yacc.c */ -#line 1052 "parser.y" +#line 1055 "parser.y" { (yyval.declarator_list) = append_declarator( NULL, (yyvsp[(1) - (1)].declarator) ); } break; case 350: /* Line 1806 of yacc.c */ -#line 1053 "parser.y" +#line 1056 "parser.y" { (yyval.declarator_list) = append_declarator( (yyvsp[(1) - (3)].declarator_list), (yyvsp[(3) - (3)].declarator) ); } break; case 351: /* Line 1806 of yacc.c */ -#line 1056 "parser.y" +#line 1059 "parser.y" { (yyval.expr) = NULL; } break; case 352: /* Line 1806 of yacc.c */ -#line 1057 "parser.y" +#line 1060 "parser.y" { (yyval.expr) = (yyvsp[(2) - (2)].expr); } break; case 353: /* Line 1806 of yacc.c */ -#line 1060 "parser.y" +#line 1063 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (2)].declarator); (yyval.declarator)->bits = (yyvsp[(2) - (2)].expr); if (!(yyval.declarator)->bits && !(yyval.declarator)->var->name) error_loc("unnamed fields are not allowed\n"); @@ -5284,168 +5287,168 @@ case 354: /* Line 1806 of yacc.c */ -#line 1067 "parser.y" +#line 1070 "parser.y" { (yyval.declarator_list) = append_declarator( NULL, (yyvsp[(1) - (1)].declarator) ); } break; case 355: /* Line 1806 of yacc.c */ -#line 1069 "parser.y" +#line 1072 "parser.y" { (yyval.declarator_list) = append_declarator( (yyvsp[(1) - (3)].declarator_list), (yyvsp[(3) - (3)].declarator) ); } break; case 356: /* Line 1806 of yacc.c */ -#line 1073 "parser.y" +#line 1076 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (1)].declarator); } break; case 357: /* Line 1806 of yacc.c */ -#line 1074 "parser.y" +#line 1077 "parser.y" { (yyval.declarator) = (yyvsp[(1) - (3)].declarator); (yyvsp[(1) - (3)].declarator)->var->eval = (yyvsp[(3) - (3)].expr); } break; case 358: /* Line 1806 of yacc.c */ -#line 1078 "parser.y" +#line 1081 "parser.y" { (yyval.num) = THREADING_APARTMENT; } break; case 359: /* Line 1806 of yacc.c */ -#line 1079 "parser.y" +#line 1082 "parser.y" { (yyval.num) = THREADING_NEUTRAL; } break; case 360: /* Line 1806 of yacc.c */ -#line 1080 "parser.y" +#line 1083 "parser.y" { (yyval.num) = THREADING_SINGLE; } break; case 361: /* Line 1806 of yacc.c */ -#line 1081 "parser.y" +#line 1084 "parser.y" { (yyval.num) = THREADING_FREE; } break; case 362: /* Line 1806 of yacc.c */ -#line 1082 "parser.y" +#line 1085 "parser.y" { (yyval.num) = THREADING_BOTH; } break; case 363: /* Line 1806 of yacc.c */ -#line 1086 "parser.y" +#line 1089 "parser.y" { (yyval.num) = RPC_FC_RP; } break; case 364: /* Line 1806 of yacc.c */ -#line 1087 "parser.y" +#line 1090 "parser.y" { (yyval.num) = RPC_FC_UP; } break; case 365: /* Line 1806 of yacc.c */ -#line 1088 "parser.y" +#line 1091 "parser.y" { (yyval.num) = RPC_FC_FP; } break; case 366: /* Line 1806 of yacc.c */ -#line 1091 "parser.y" +#line 1094 "parser.y" { (yyval.type) = type_new_struct((yyvsp[(2) - (5)].str), TRUE, (yyvsp[(4) - (5)].var_list)); } break; case 367: /* Line 1806 of yacc.c */ -#line 1094 "parser.y" +#line 1097 "parser.y" { (yyval.type) = type_new_void(); } break; case 368: /* Line 1806 of yacc.c */ -#line 1095 "parser.y" +#line 1098 "parser.y" { (yyval.type) = find_type_or_error((yyvsp[(1) - (1)].str), 0); } break; case 369: - -/* Line 1806 of yacc.c */ -#line 1096 "parser.y" - { (yyval.type) = (yyvsp[(1) - (1)].type); } - break; - - case 370: - -/* Line 1806 of yacc.c */ -#line 1097 "parser.y" - { (yyval.type) = (yyvsp[(1) - (1)].type); } - break; - - case 371: - -/* Line 1806 of yacc.c */ -#line 1098 "parser.y" - { (yyval.type) = type_new_enum((yyvsp[(2) - (2)].str), FALSE, NULL); } - break; - - case 372: /* Line 1806 of yacc.c */ #line 1099 "parser.y" { (yyval.type) = (yyvsp[(1) - (1)].type); } break; + case 370: + +/* Line 1806 of yacc.c */ +#line 1100 "parser.y" + { (yyval.type) = (yyvsp[(1) - (1)].type); } + break; + + case 371: + +/* Line 1806 of yacc.c */ +#line 1101 "parser.y" + { (yyval.type) = type_new_enum((yyvsp[(2) - (2)].str), FALSE, NULL); } + break; + + case 372: + +/* Line 1806 of yacc.c */ +#line 1102 "parser.y" + { (yyval.type) = (yyvsp[(1) - (1)].type); } + break; + case 373: /* Line 1806 of yacc.c */ -#line 1100 "parser.y" +#line 1103 "parser.y" { (yyval.type) = type_new_struct((yyvsp[(2) - (2)].str), FALSE, NULL); } break; case 374: /* Line 1806 of yacc.c */ -#line 1101 "parser.y" +#line 1104 "parser.y" { (yyval.type) = (yyvsp[(1) - (1)].type); } break; case 375: /* Line 1806 of yacc.c */ -#line 1102 "parser.y" +#line 1105 "parser.y" { (yyval.type) = type_new_nonencapsulated_union((yyvsp[(2) - (2)].str), FALSE, NULL); } break; case 376: /* Line 1806 of yacc.c */ -#line 1103 "parser.y" +#line 1106 "parser.y" { (yyval.type) = make_safearray((yyvsp[(3) - (4)].type)); } break; case 377: /* Line 1806 of yacc.c */ -#line 1107 "parser.y" +#line 1110 "parser.y" { reg_typedefs((yyvsp[(3) - (4)].declspec), (yyvsp[(4) - (4)].declarator_list), check_typedef_attrs((yyvsp[(2) - (4)].attr_list))); (yyval.statement) = make_statement_typedef((yyvsp[(4) - (4)].declarator_list)); } @@ -5454,35 +5457,35 @@ case 378: /* Line 1806 of yacc.c */ -#line 1113 "parser.y" +#line 1116 "parser.y" { (yyval.type) = type_new_nonencapsulated_union((yyvsp[(2) - (5)].str), TRUE, (yyvsp[(4) - (5)].var_list)); } break; case 379: /* Line 1806 of yacc.c */ -#line 1116 "parser.y" +#line 1119 "parser.y" { (yyval.type) = type_new_encapsulated_union((yyvsp[(2) - (10)].str), (yyvsp[(5) - (10)].var), (yyvsp[(7) - (10)].var), (yyvsp[(9) - (10)].var_list)); } break; case 380: /* Line 1806 of yacc.c */ -#line 1120 "parser.y" +#line 1123 "parser.y" { (yyval.num) = MAKEVERSION((yyvsp[(1) - (1)].num), 0); } break; case 381: /* Line 1806 of yacc.c */ -#line 1121 "parser.y" +#line 1124 "parser.y" { (yyval.num) = MAKEVERSION((yyvsp[(1) - (3)].num), (yyvsp[(3) - (3)].num)); } break; /* Line 1806 of yacc.c */ -#line 5486 "parser.tab.c" +#line 5489 "parser.tab.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5713,7 +5716,7 @@ /* Line 2067 of yacc.c */ -#line 1124 "parser.y" +#line 1127 "parser.y" static void decl_builtin_basic(const char *name, enum type_basic_type type) Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=58… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Sat Dec 29 15:18:09 2012 @@ -620,7 +620,10 @@ | enum_list ',' enum { if (!$3->eval) { var_t *last = LIST_ENTRY( list_tail($$), var_t, entry ); - $3->eval = make_exprl(EXPR_NUM, last->eval->cval + 1); + enum expr_type type = EXPR_NUM; + if (last->eval->type == EXPR_HEXNUM) type = EXPR_HEXNUM; + if (last->eval->cval + 1 < 0) type = EXPR_HEXNUM; + $3->eval = make_exprl(type, last->eval->cval + 1); } $$ = append_var( $1, $3 ); } Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=580… ============================================================================== --- trunk/reactos/tools/widl/proxy.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/proxy.c [iso-8859-1] Sat Dec 29 15:18:09 2012 @@ -787,7 +787,7 @@ int need_proxy_file(const statement_list_t *stmts) { - return does_any_iface(stmts, need_proxy); + return does_any_iface(stmts, need_proxy); } int need_inline_stubs(const type_t *iface) Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=5… ============================================================================== --- trunk/reactos/tools/widl/typegen.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Sat Dec 29 15:18:09 2012 @@ -2344,7 +2344,6 @@ } } write_member_type(file, type, cont_is_complex, NULL, elem, NULL, tfsoff); - return; } static void write_end(FILE *file, unsigned int *tfsoff)

1 0

[ekohl] 58038: [SAMSRV] Store an objects relative id in the database object. This will later be used to protect pre-defined objects from being deleted.
by ekohl＠svn.reactos.org 29 Dec '12

29 Dec '12

Author: ekohl Date: Sat Dec 29 14:44:42 2012 New Revision: 58038 URL: http://svn.reactos.org/svn/reactos?rev=58038&view=rev Log: [SAMSRV] Store an objects relative id in the database object. This will later be used to protect pre-defined objects from being deleted. Modified: trunk/reactos/dll/win32/samsrv/database.c trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/database.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/database.c [iso-8859-1] Sat Dec 29 14:44:42 2012 @@ -97,6 +97,7 @@ SampCreateDbObject(IN PSAM_DB_OBJECT ParentObject, IN LPWSTR ContainerName, IN LPWSTR ObjectName, + IN ULONG RelativeId, IN SAM_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, OUT PSAM_DB_OBJECT *DbObject) @@ -240,6 +241,7 @@ NewObject->Access = DesiredAccess; NewObject->KeyHandle = ObjectKeyHandle; NewObject->MembersKeyHandle = MembersKeyHandle; + NewObject->RelativeId = RelativeId; NewObject->ParentObject = ParentObject; if (ParentObject != NULL) @@ -255,6 +257,7 @@ SampOpenDbObject(IN PSAM_DB_OBJECT ParentObject, IN LPWSTR ContainerName, IN LPWSTR ObjectName, + IN ULONG RelativeId, IN SAM_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, OUT PSAM_DB_OBJECT *DbObject) @@ -390,6 +393,7 @@ NewObject->Access = DesiredAccess; NewObject->KeyHandle = ObjectKeyHandle; NewObject->MembersKeyHandle = MembersKeyHandle; + NewObject->RelativeId = RelativeId; NewObject->ParentObject = ParentObject; if (ParentObject != NULL) Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Dec 29 14:44:42 2012 @@ -88,6 +88,7 @@ Status = SampOpenDbObject(NULL, NULL, L"SAM", + 0, SamDbServerObject, DesiredAccess, &ServerObject); @@ -509,6 +510,7 @@ Status = SampOpenDbObject(ServerObject, L"Domains", L"Builtin", + 0, SamDbDomainObject, DesiredAccess, &DomainObject); @@ -524,6 +526,7 @@ Status = SampOpenDbObject(ServerObject, L"Domains", L"Account", + 0, SamDbDomainObject, DesiredAccess, &DomainObject); @@ -1709,6 +1712,7 @@ Status = SampCreateDbObject(DomainObject, L"Groups", szRid, + ulRid, SamDbGroupObject, DesiredAccess, &GroupObject); @@ -2074,6 +2078,7 @@ Status = SampCreateDbObject(DomainObject, L"Users", szRid, + ulRid, SamDbUserObject, DesiredAccess, &UserObject); @@ -2527,6 +2532,7 @@ Status = SampCreateDbObject(DomainObject, L"Aliases", szRid, + ulRid, SamDbAliasObject, DesiredAccess, &AliasObject); @@ -3464,6 +3470,7 @@ Status = SampOpenDbObject(DomainObject, L"Groups", szRid, + GroupId, SamDbGroupObject, DesiredAccess, &GroupObject); @@ -3911,6 +3918,7 @@ Status = SampOpenDbObject(DomainObject, L"Aliases", szRid, + AliasId, SamDbAliasObject, DesiredAccess, &AliasObject); @@ -4575,6 +4583,7 @@ Status = SampOpenDbObject(DomainObject, L"Users", szRid, + UserId, SamDbUserObject, DesiredAccess, &UserObject); @@ -6335,6 +6344,7 @@ Status = SampCreateDbObject(DomainObject, L"Users", szRid, + ulRid, SamDbUserObject, DesiredAccess, &UserObject); Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Dec 29 14:44:42 2012 @@ -46,6 +46,7 @@ LPWSTR Name; HANDLE KeyHandle; HANDLE MembersKeyHandle; // only used by Aliases and Groups + ULONG RelativeId; struct _SAM_DB_OBJECT *ParentObject; } SAM_DB_OBJECT, *PSAM_DB_OBJECT; @@ -117,6 +118,7 @@ SampCreateDbObject(IN PSAM_DB_OBJECT ParentObject, IN LPWSTR ContainerName, IN LPWSTR ObjectName, + IN ULONG RelativeId, IN SAM_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, OUT PSAM_DB_OBJECT *DbObject); @@ -125,6 +127,7 @@ SampOpenDbObject(IN PSAM_DB_OBJECT ParentObject, IN LPWSTR ContainerName, IN LPWSTR ObjectName, + IN ULONG RelativeId, IN SAM_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, OUT PSAM_DB_OBJECT *DbObject);

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