Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 13194: properly query the device map
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

properly query the device map Modified: trunk/reactos/subsys/system/autochk/autochk.c _____ Modified: trunk/reactos/subsys/system/autochk/autochk.c --- trunk/reactos/subsys/system/autochk/autochk.c 2005-01-21 21:06:40 UTC (rev 13193) +++ trunk/reactos/subsys/system/autochk/autochk.c 2005-01-21 21:29:29 UTC (rev 13194) @@ -76,8 +76,8 @@ Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessDeviceMap, - &DeviceMap, - sizeof(DeviceMap), + &DeviceMap.Query, + sizeof(DeviceMap.Query), NULL); if(NT_SUCCESS(Status)) {

1 0

[chorns] 13193: Build comdlg32, oleaut32, wine_unicode, winspool, shell32, and shlwapi
by chorns＠svn.reactos.com 21 Jan '05

21 Jan '05

Build comdlg32, oleaut32, wine_unicode, winspool, shell32, and shlwapi Modified: branches/xmlbuildsystem/reactos/include/wine/config.h Deleted: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.coff Added: branches/xmlbuildsystem/reactos/lib/comdlg32/800.bmp Added: branches/xmlbuildsystem/reactos/lib/comdlg32/cdrom.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml Added: branches/xmlbuildsystem/reactos/lib/comdlg32/floppy.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/folder.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/folder2.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/fontpics.bmp Added: branches/xmlbuildsystem/reactos/lib/comdlg32/hdisk.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/network.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_collate.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_landscape.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_nocollate.ico Added: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_portrait.ico Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml Added: branches/xmlbuildsystem/reactos/lib/shell32/cdrom.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/desktop.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/document.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/drive.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/floppy.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/folder.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/folder_open.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/mycomputer.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/netdrive.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/netdrive2.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/ramdisk.ico Added: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml Added: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml Added: branches/xmlbuildsystem/reactos/lib/unicode/unicode.xml Added: branches/xmlbuildsystem/reactos/lib/unicode/wine_unicode.rc Added: branches/xmlbuildsystem/reactos/lib/winspool/winspool.xml _____ Modified: branches/xmlbuildsystem/reactos/include/wine/config.h --- branches/xmlbuildsystem/reactos/include/wine/config.h 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/include/wine/config.h 2005-01-21 21:06:40 UTC (rev 13193) @@ -493,7 +493,7 @@ #define HAVE_SIZE_T 1 /* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 +/* #undef HAVE_SNPRINTF */ /* Define to 1 if you have the <socket.h> header file. */ /* #undef HAVE_SOCKET_H */ @@ -517,7 +517,7 @@ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 +/* #undef HAVE_STRCASECMP */ /* Define to 1 if you have the `strerror' function. */ #define HAVE_STRERROR 1 @@ -529,7 +529,7 @@ #define HAVE_STRING_H 1 /* Define to 1 if you have the `strncasecmp' function. */ -#define HAVE_STRNCASECMP 1 +/* #undef HAVE_STRNCASECMP */ /* Define to 1 if `msg_accrights' is member of `struct msghdr'. */ /* #undef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS */ _____ Deleted: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.coff (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32 ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c *.ico *.bmp *.cur + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/800.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/800.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/cdrom.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/cdrom.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml --- branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/lib/comdlg32/comdlg32.xml 2005-01-21 21:06:40 UTC (rev 13193) @@ -0,0 +1,35 @@ +<module name="comdlg32" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="comdlg32.spec.def" /> + <include base="comdlg32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>comctl32</library> + <library>shell32</library> + <library>shlwapi</library> + <library>winspool</library> + <file>cdlg32.c</file> + <file>colordlg.c</file> + <file>filedlg.c</file> + <file>filedlg31.c</file> + <file>filedlgbrowser.c</file> + <file>filetitle.c</file> + <file>finddlg32.c</file> + <file>fontdlg.c</file> + <file>printdlg.c</file> + <file>rsrc.rc</file> + <file>comdlg32.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/floppy.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/floppy.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/folder.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/folder.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/folder2.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/folder2.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/fontpics.bmp (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/fontpics.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/hdisk.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/hdisk.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/network.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/network.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_collate.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_collate.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_landscape.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_landscape.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_nocollate.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_nocollate.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_portrait.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/comdlg32/pd32_portrait.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-21 21:06:40 UTC (rev 13193) @@ -22,6 +22,9 @@ <directory name="comctl32"> <xi:include href="comctl32/comctl32.xml" /> </directory> +<directory name="comdlg32"> + <xi:include href="comdlg32/comdlg32.xml" /> +</directory> <directory name="dnsapi"> <xi:include href="dnsapi/dnsapi.xml" /> </directory> @@ -52,6 +55,9 @@ <directory name="ole32"> <xi:include href="ole32/ole32.xml" /> </directory> +<directory name="oleaut32"> + <xi:include href="oleaut32/oleaut32.xml" /> +</directory> <directory name="pseh"> <xi:include href="pseh/pseh.xml" /> </directory> @@ -64,9 +70,18 @@ <directory name="rtl"> <xi:include href="rtl/rtl.xml" /> </directory> +<directory name="shell32"> + <xi:include href="shell32/shell32.xml" /> +</directory> +<directory name="shlwapi"> + <xi:include href="shlwapi/shlwapi.xml" /> +</directory> <directory name="string"> <xi:include href="string/string.xml" /> </directory> +<directory name="unicode"> + <xi:include href="unicode/unicode.xml" /> +</directory> <directory name="user32"> <xi:include href="user32/user32.xml" /> </directory> @@ -79,6 +94,9 @@ <directory name="winmm"> <xi:include href="winmm/winmm.xml" /> </directory> +<directory name="winspool"> + <xi:include href="winspool/winspool.xml" /> +</directory> <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.xml" /> </directory> _____ Added: branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml --- branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/lib/oleaut32/oleaut32.xml 2005-01-21 21:06:40 UTC (rev 13193) @@ -0,0 +1,45 @@ +<module name="oleaut32" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="oleaut32.spec.def" /> + <include base="oleaut32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <define name="_OLEAUT32_" /> + <define name="COM_NO_WINDOWS_H" /> + <library>wine</library> + <library>wine_unicode</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>rpcrt4</library> + <library>ole32</library> + <library>comctl32</library> + <file>connpt.c</file> + <file>dispatch.c</file> + <file>hash.c</file> + <file>oaidl_p.c</file> + <file>oleaut.c</file> + <file>olefont.c</file> + <file>olepicture.c</file> + <file>regsvr.c</file> + <file>safearray.c</file> + <file>stubs.c</file> + <file>tmarshal.c</file> + <file>typelib.c</file> + <file>typelib2.c</file> + <file>usrmarshal.c</file> + <file>varformat.c</file> + <file>variant.c</file> + <file>vartype.c</file> + <file>oleaut32.spec</file> +</module> Property changes on: branches/xmlbuildsystem/reactos/lib/shell32 ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros authors.c *.spec.def *.stubs.c *.ico *.bmp *.cur + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros authors.c *.spec.def *.stubs.c _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/cdrom.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/cdrom.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/desktop.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/desktop.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/document.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/document.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/drive.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/drive.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/floppy.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/floppy.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/folder.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/folder.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/folder_open.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/folder_open.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/mycomputer.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/mycomputer.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/netdrive.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/netdrive.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/netdrive2.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/netdrive2.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/ramdisk.ico (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/shell32/ramdisk.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml --- branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/lib/shell32/shell32.xml 2005-01-21 21:06:40 UTC (rev 13193) @@ -0,0 +1,66 @@ +<module name="shell32" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="shell32.spec.def" /> + <include base="shell32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SHELL32_" /> + <define name="COM_NO_WINDOWS_H" /> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>comctl32</library> + <library>shlwapi</library> + <library>ole32</library> + <file>authors.c</file> + <file>autocomplete.c</file> + <file>brsfolder.c</file> + <file>changenotify.c</file> + <file>classes.c</file> + <file>clipboard.c</file> + <file>control.c</file> + <file>cpanelfolder.c</file> + <file>dataobject.c</file> + <file>debughlp.c</file> + <file>dialogs.c</file> + <file>dragdrophelper.c</file> + <file>enumidlist.c</file> + <file>folders.c</file> + <file>iconcache.c</file> + <file>memorystream.c</file> + <file>pidl.c</file> + <file>regsvr.c</file> + <file>shell32_main.c</file> + <file>shelllink.c</file> + <file>shellole.c</file> + <file>shellord.c</file> + <file>shellpath.c</file> + <file>shellreg.c</file> + <file>shellstring.c</file> + <file>shfldr_desktop.c</file> + <file>shfldr_fs.c</file> + <file>shfldr_mycomp.c</file> + <file>shlexec.c</file> + <file>shlfileop.c</file> + <file>shlfolder.c</file> + <file>shlfsbind.c</file> + <file>shlmenu.c</file> + <file>shlview.c</file> + <file>shpolicy.c</file> + <file>shv_bg_cmenu.c</file> + <file>shv_item_cmenu.c</file> + <file>ros-systray.c</file> + <file>shres.rc</file> + <file>shell32.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml --- branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/lib/shlwapi/shlwapi.xml 2005-01-21 21:06:40 UTC (rev 13193) @@ -0,0 +1,43 @@ +<module name="shlwapi" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="shlwapi.spec.def" /> + <include base="shlwapi">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_SHLWAPI_"/> + <define name="WINSHLWAPI">""</define> + <linkerflag>-nostdlib</linkerflag> + <linkerflag>-lgcc</linkerflag> + <library>wine</library> + <library>wine_unicode</library> + <library>uuid</library> + <library>msvcrt</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>ole32</library> + <library>oleaut32</library> + <file>assoc.c</file> + <file>clist.c</file> + <file>istream.c</file> + <file>msgbox.c</file> + <file>ordinal.c</file> + <file>path.c</file> + <file>reg.c</file> + <file>regstream.c</file> + <file>shlwapi_main.c</file> + <file>stopwatch.c</file> + <file>string.c</file> + <file>thread.c</file> + <file>url.c</file> + <file>wsprintf.c</file> + <file>shlwapi.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/unicode/unicode.xml --- branches/xmlbuildsystem/reactos/lib/unicode/unicode.xml 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/lib/unicode/unicode.xml 2005-01-21 21:06:40 UTC (rev 13193) @@ -0,0 +1,87 @@ +<module name="wine_unicode" type="win32dll"> + <importlibrary definition="wine_unicode.def" /> + <include base="wine_unicode">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="__WINESRC__" /> + <define name="NO_LIBWINE_PORT" /> + <define name="WINE_UNICODE_API">""</define> + <define name="WCHAR">wchar_t</define> + <file>c_037.c</file> + <file>c_424.c</file> + <file>c_437.c</file> + <file>c_500.c</file> + <file>c_737.c</file> + <file>c_775.c</file> + <file>c_850.c</file> + <file>c_852.c</file> + <file>c_855.c</file> + <file>c_856.c</file> + <file>c_857.c</file> + <file>c_860.c</file> + <file>c_861.c</file> + <file>c_862.c</file> + <file>c_863.c</file> + <file>c_864.c</file> + <file>c_865.c</file> + <file>c_866.c</file> + <file>c_869.c</file> + <file>c_874.c</file> + <file>c_875.c</file> + <file>c_878.c</file> + <file>c_932.c</file> + <file>c_936.c</file> + <file>c_949.c</file> + <file>c_950.c</file> + <file>c_1006.c</file> + <file>c_1026.c</file> + <file>c_1250.c</file> + <file>c_1251.c</file> + <file>c_1252.c</file> + <file>c_1253.c</file> + <file>c_1254.c</file> + <file>c_1255.c</file> + <file>c_1256.c</file> + <file>c_1257.c</file> + <file>c_1258.c</file> + <file>c_10000.c</file> + <file>c_10006.c</file> + <file>c_10007.c</file> + <file>c_10029.c</file> + <file>c_10079.c</file> + <file>c_10081.c</file> + <file>c_20866.c</file> + <file>c_20932.c</file> + <file>c_28591.c</file> + <file>c_28592.c</file> + <file>c_28593.c</file> + <file>c_28594.c</file> + <file>c_28595.c</file> + <file>c_28596.c</file> + <file>c_28597.c</file> + <file>c_28598.c</file> + <file>c_28599.c</file> + <file>c_28600.c</file> + <file>c_28603.c</file> + <file>c_28604.c</file> + <file>c_28605.c</file> + <file>c_28606.c</file> + <file>casemap.c</file> + <file>collation.c</file> + <file>compose.c</file> + <file>cptable.c</file> + <file>fold.c</file> + <file>mbtowc.c</file> + <file>sortkey.c</file> + <file>string.c</file> + <file>utf8.c</file> + <file>wctomb.c</file> + <file>wctype.c</file> + <file>wine_unicode.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/unicode/wine_unicode.rc --- branches/xmlbuildsystem/reactos/lib/unicode/wine_unicode.rc 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/lib/unicode/wine_unicode.rc 2005-01-21 21:06:40 UTC (rev 13193) @@ -0,0 +1,8 @@ +#include <defines.h> +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WINE Unicode Support Library\0" +#define REACTOS_STR_INTERNAL_NAME "wine_unicode\0" +#define REACTOS_STR_ORIGINAL_FILENAME "wine_unicode.dll\0" +#include <reactos/version.rc> _____ Added: branches/xmlbuildsystem/reactos/lib/winspool/winspool.xml --- branches/xmlbuildsystem/reactos/lib/winspool/winspool.xml 2005-01-21 20:31:24 UTC (rev 13192) +++ branches/xmlbuildsystem/reactos/lib/winspool/winspool.xml 2005-01-21 21:06:40 UTC (rev 13193) @@ -0,0 +1,13 @@ +<module name="winspool" type="win32dll" extension=".drv"> + <importlibrary definition="winspool.def" /> + <include base="winspool">.</include> + <define name="_DISABLE_TIDENTS" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <library>ntdll</library> + <library>kernel32</library> + <file>info.c</file> + <file>stubs.c</file> + <file>winspool.rc</file> +</module>

1 0

[weiden] 13192: properly set the access token in CreateProcessAsUser()
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

properly set the access token in CreateProcessAsUser() Modified: trunk/reactos/lib/advapi32/misc/logon.c _____ Modified: trunk/reactos/lib/advapi32/misc/logon.c --- trunk/reactos/lib/advapi32/misc/logon.c 2005-01-21 18:15:10 UTC (rev 13191) +++ trunk/reactos/lib/advapi32/misc/logon.c 2005-01-21 20:31:24 UTC (rev 13192) @@ -30,6 +30,7 @@ LPSTARTUPINFOA lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation) { + PROCESS_ACCESS_TOKEN AccessToken; NTSTATUS Status; /* Create the process with a suspended main thread */ @@ -47,11 +48,14 @@ return FALSE; } + AccessToken.Token = hToken; + AccessToken.Thread = NULL; + /* Set the new process token */ Status = NtSetInformationProcess (lpProcessInformation->hProcess, ProcessAccessToken, - (PVOID)&hToken, - sizeof (HANDLE)); + (PVOID)&AccessToken, + sizeof (AccessToken)); if (!NT_SUCCESS (Status)) { SetLastError (RtlNtStatusToDosError (Status)); @@ -84,6 +88,7 @@ LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation) { + PROCESS_ACCESS_TOKEN AccessToken; NTSTATUS Status; /* Create the process with a suspended main thread */ @@ -101,11 +106,14 @@ return FALSE; } + AccessToken.Token = hToken; + AccessToken.Thread = NULL; + /* Set the new process token */ Status = NtSetInformationProcess (lpProcessInformation->hProcess, ProcessAccessToken, - (PVOID)&hToken, - sizeof (HANDLE)); + (PVOID)&AccessToken, + sizeof (AccessToken)); if (!NT_SUCCESS (Status)) { SetLastError (RtlNtStatusToDosError (Status));

1 0

[royce] 13191: attribute 'first' of <file> must be 'true' or 'false'
by royce＠svn.reactos.com 21 Jan '05

21 Jan '05

attribute 'first' of <file> must be 'true' or 'false' remove an obsolete comment Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-21 18:09:02 UTC (rev 13190) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-21 18:15:10 UTC (rev 13191) @@ -29,7 +29,7 @@ <directory name="ke"> <if property="ARCH" value="i386"> <directory name="i386"> - <file first="1">multiboot.S</file> + <file first="true">multiboot.S</file> <file>bios.c</file> <file>brkpoint.c</file> <file>bthread.S</file> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-21 18:09:02 UTC (rev 13190) +++ branches/xmlbuildsystem/reactos/tools/rbuild/XML.cpp 2005-01-21 18:15:10 UTC (rev 13191) @@ -628,7 +628,6 @@ XMLElement* XMLLoadInclude ( XMLElement* e, const Path& path, XMLIncludes& includes ) { - // TODO FIXME XMLAttribute* att; att = e->GetAttribute("href",true); assert(att); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-21 18:09:02 UTC (rev 13190) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-21 18:15:10 UTC (rev 13191) @@ -111,9 +111,18 @@ string subpath ( path ); if ( e.name == "file" && e.value.size () > 0 ) { + bool first = false; const XMLAttribute* att = e.GetAttribute ( "first", false ); - File* pFile = new File ( FixSeparator ( path + CSEP + e.value ), - att && atoi(att->value.c_str()) != 0 ); + if ( att ) + { + if ( !stricmp ( att->value.c_str(), "true" ) ) + first = true; + else if ( stricmp ( att->value.c_str(), "false" ) ) + throw InvalidBuildFileException ( + e.location, + "attribute 'first' of <file> element can only be 'true' or 'false'" ); + } + File* pFile = new File ( FixSeparator ( path + CSEP + e.value ), first ); if ( pIf ) pIf->files.push_back ( pFile ); else

1 0

[chorns] 13190: Build cabinet, advpack, rpcrt4, ole32, version, cards, and uuid
by chorns＠svn.reactos.com 21 Jan '05

21 Jan '05

Build cabinet, advpack, rpcrt4, ole32, version, cards, and uuid Added: branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml Added: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.coff Added: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml Added: branches/xmlbuildsystem/reactos/lib/cards/cards.xml Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml Modified: branches/xmlbuildsystem/reactos/lib/directory.xml Added: branches/xmlbuildsystem/reactos/lib/ole32/drag_copy.cur Added: branches/xmlbuildsystem/reactos/lib/ole32/drag_link.cur Added: branches/xmlbuildsystem/reactos/lib/ole32/drag_move.cur Added: branches/xmlbuildsystem/reactos/lib/ole32/nodrop.cur Added: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml Added: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.rc Added: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml Added: branches/xmlbuildsystem/reactos/lib/uuid/uuid.xml Added: branches/xmlbuildsystem/reactos/lib/version/version.xml Property changes on: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf ___________________________________________________________________ Name: svn:ignore - *.coff *.sym *.o *.a *.dll *.map *.tmp .*.d + *.coff *.sym *.o *.a *.dll *.map *.tmp .*.d *.sys _____ Added: branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml --- branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/advpack/advpack.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -0,0 +1,20 @@ +<module name="advpack" type="win32dll"> + <importlibrary definition="advpack.def" /> + <include base="advpack">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>advapi32</library> + <library>ole32</library> + <library>version</library> + <file>advpack.c</file> + <file>stubs.c</file> + <file>advpack.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.coff (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.coff ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml --- branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/cabinet/cabinet.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -0,0 +1,24 @@ +<module name="cabinet" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="cabinet.spec.def" /> + <include base="cabinet">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>iphlpapi</library> + <file>cabextract.c</file> + <file>cabinet_main.c</file> + <file>fci.c</file> + <file>fdi.c</file> + <file>cabinet.rc</file> + <file>cabinet.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/cards/cards.xml --- branches/xmlbuildsystem/reactos/lib/cards/cards.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/cards/cards.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -0,0 +1,13 @@ +<module name="cards" type="win32dll"> + <importlibrary definition="cards.def" /> + <include base="cards">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__USE_W32API" /> + <library>ntdll</library> + <library>kernel32</library> + <library>gdi32</library> + <library>user32</library> + <file>cards.c</file> + <file>cards.rc</file> +</module> _____ Modified: branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml --- branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/comctl32/comctl32.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -1,5 +1,4 @@ <module name="comctl32" type="win32dll"> - <dependency>bin2res</dependency> <dependency>winebuild</dependency> <importlibrary definition="comctl32.spec.def" /> <include base="comctl32">.</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/directory.xml --- branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/directory.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -10,6 +10,15 @@ <directory name="advapi32"> <xi:include href="advapi32/advapi32.xml" /> </directory> +<directory name="advpack"> + <xi:include href="advpack/advpack.xml" /> +</directory> +<directory name="cabinet"> + <xi:include href="cabinet/cabinet.xml" /> +</directory> +<directory name="cards"> + <xi:include href="cards/cards.xml" /> +</directory> <directory name="comctl32"> <xi:include href="comctl32/comctl32.xml" /> </directory> @@ -40,12 +49,18 @@ <directory name="ntdll"> <xi:include href="ntdll/ntdll.xml" /> </directory> +<directory name="ole32"> + <xi:include href="ole32/ole32.xml" /> +</directory> <directory name="pseh"> <xi:include href="pseh/pseh.xml" /> </directory> <directory name="rosrtl"> <xi:include href="rosrtl/rosrtl.xml" /> </directory> +<directory name="rpcrt4"> + <xi:include href="rpcrt4/rpcrt4.xml" /> +</directory> <directory name="rtl"> <xi:include href="rtl/rtl.xml" /> </directory> @@ -55,6 +70,12 @@ <directory name="user32"> <xi:include href="user32/user32.xml" /> </directory> +<directory name="uuid"> + <xi:include href="uuid/uuid.xml" /> +</directory> +<directory name="version"> + <xi:include href="version/version.xml" /> +</directory> <directory name="winmm"> <xi:include href="winmm/winmm.xml" /> </directory> Property changes on: branches/xmlbuildsystem/reactos/lib/ole32 ___________________________________________________________________ Name: svn:ignore - *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c *.ico *.bmp *.cur + *.coff *.dll *.d *.a *.o *.sym *.map *.tmp Makefile.ros *.spec.def *.stubs.c _____ Added: branches/xmlbuildsystem/reactos/lib/ole32/drag_copy.cur (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/ole32/drag_copy.cur ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/ole32/drag_link.cur (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/ole32/drag_link.cur ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/ole32/drag_move.cur (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/ole32/drag_move.cur ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/ole32/nodrop.cur (Binary files differ) Property changes on: branches/xmlbuildsystem/reactos/lib/ole32/nodrop.cur ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml --- branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/ole32/ole32.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -0,0 +1,51 @@ +<module name="ole32" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="ole32.spec.def" /> + <include base="ole32">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>gdi32</library> + <library>user32</library> + <library>rpcrt4</library> + <file>antimoniker.c</file> + <file>bindctx.c</file> + <file>clipboard.c</file> + <file>compobj.c</file> + <file>compositemoniker.c</file> + <file>datacache.c</file> + <file>defaulthandler.c</file> + <file>errorinfo.c</file> + <file>filemoniker.c</file> + <file>ftmarshal.c</file> + <file>git.c</file> + <file>hglobalstream.c</file> + <file>ifs.c</file> + <file>itemmoniker.c</file> + <file>marshal.c</file> + <file>memlockbytes.c</file> + <file>moniker.c</file> + <file>ole2.c</file> + <file>ole2stubs.c</file> + <file>ole2impl.c</file> + <file>ole32_main.c</file> + <file>oleobj.c</file> + <file>oleproxy.c</file> + <file>regsvr.c</file> + <file>rpc.c</file> + <file>stg_bigblockfile.c</file> + <file>stg_stream.c</file> + <file>storage32.c</file> + <file>ole32res.rc</file> + <file>ole32.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.rc --- branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.rc 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.rc 2005-01-21 18:09:02 UTC (rev 13190) @@ -0,0 +1,7 @@ +#include <defines.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS RPC server API\0" +#define REACTOS_STR_INTERNAL_NAME "rpcrt4\0" +#define REACTOS_STR_ORIGINAL_FILENAME "rpcrt4.dll\0" +#include <reactos/version.rc> _____ Added: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml --- branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -0,0 +1,38 @@ +<module name="rpcrt4" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="rpcrt4.spec.def" /> + <include base="rpcrt4">.</include> + <include base="ReactOS">include/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <define name="_STDDEF_H" /> + <define name="_RPCRT4_" /> + <define name="COM_NO_WINDOWS_H" /> + <define name="MSWMSG" /> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>advapi32</library> + <library>iphlpapi</library> + <file>cproxy.c</file> + <file>cpsf.c</file> + <file>cstub.c</file> + <file>ndr_marshall.c</file> + <file>ndr_midl.c</file> + <file>ndr_ole.c</file> + <file>ndr_stubless.c</file> + <file>rpc_binding.c</file> + <file>rpc_epmap.c</file> + <file>rpc_message.c</file> + <file>rpc_server.c</file> + <file>rpcrt4_main.c</file> + <file>rpcss_np_client.c</file> + <file>rpcrt4.rc</file> + <file>rpcrt4.spec</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/uuid/uuid.xml --- branches/xmlbuildsystem/reactos/lib/uuid/uuid.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/uuid/uuid.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -0,0 +1,6 @@ +<module name="uuid" type="staticlibrary"> + <include base="ReactOS">include/wine</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> + <file>uuid.c</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/lib/version/version.xml --- branches/xmlbuildsystem/reactos/lib/version/version.xml 2005-01-21 17:24:34 UTC (rev 13189) +++ branches/xmlbuildsystem/reactos/lib/version/version.xml 2005-01-21 18:09:02 UTC (rev 13190) @@ -0,0 +1,22 @@ +<module name="version" type="win32dll"> + <dependency>winebuild</dependency> + <importlibrary definition="version.def" /> + <include base="ReactOS">include/wine</include> + <define name="_DISABLE_TIDENTS" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ntdll</library> + <library>kernel32</library> + <directory name="misc"> + <file>libmain.c</file> + <file>stubs.c</file> + </directory> + <file>info.c</file> + <file>install.c</file> + <file>resource.c</file> + <file>version.rc</file> +</module>

1 0

[blight] 13189: Fix compiler warning.
by blight＠svn.reactos.com 21 Jan '05

21 Jan '05

Fix compiler warning. Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-01-21 17:17:13 UTC (rev 13188) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-01-21 17:24:34 UTC (rev 13189) @@ -51,7 +51,7 @@ NTSTATUS Status = STATUS_SUCCESS; /* at least one output parameter must be != NULL! */ - ASSERT((ULONG_PTR)CapturedObjectAttributes ^ (ULONG_PTR)ObjectName != 0); + ASSERT(((ULONG_PTR)CapturedObjectAttributes ^ (ULONG_PTR)ObjectName) != 0); if(ObjectAttributes == NULL) {

1 0

[weiden] 13188: fixed ASSERT statement, thanks to blight for pointing it out
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

fixed ASSERT statement, thanks to blight for pointing it out Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-01-21 16:50:11 UTC (rev 13187) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-01-21 17:17:13 UTC (rev 13188) @@ -51,7 +51,7 @@ NTSTATUS Status = STATUS_SUCCESS; /* at least one output parameter must be != NULL! */ - ASSERT((ULONG_PTR)SecureObjectInformation ^ (ULONG_PTR)ObjectName != 0); + ASSERT((ULONG_PTR)CapturedObjectAttributes ^ (ULONG_PTR)ObjectName != 0); if(ObjectAttributes == NULL) {

1 0

[gvg] 13187: Merge back commit from winehq
by gvg＠svn.reactos.com 21 Jan '05

21 Jan '05

Merge back commit from winehq Modified: trunk/reactos/lib/comctl32/status.c _____ Modified: trunk/reactos/lib/comctl32/status.c --- trunk/reactos/lib/comctl32/status.c 2005-01-21 14:52:53 UTC (rev 13186) +++ trunk/reactos/lib/comctl32/status.c 2005-01-21 16:50:11 UTC (rev 13187) @@ -650,7 +650,7 @@ { STATUSWINDOWPART *part=NULL; BOOL changed = FALSE; - WORD oldStyle; + INT oldStyle; if (style & SBT_OWNERDRAW) { TRACE("part %d, text %p\n",nPart,text); @@ -675,9 +675,12 @@ oldStyle = part->style; part->style = style; if (style & SBT_OWNERDRAW) { - if (part->text == text) - return TRUE; - part->text = (LPWSTR)text; + if (!(oldStyle & SBT_OWNERDRAW)) { + if (part->text) + Free (part->text); + } else if (part->text == text) + return TRUE; + part->text = (LPWSTR)text; } else { LPWSTR ntext;

1 0

[weiden] 13186: partial implementation of NtTerminateJobObject()
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

partial implementation of NtTerminateJobObject() Modified: trunk/reactos/ntoskrnl/ps/job.c _____ Modified: trunk/reactos/ntoskrnl/ps/job.c --- trunk/reactos/ntoskrnl/ps/job.c 2005-01-21 14:40:06 UTC (rev 13185) +++ trunk/reactos/ntoskrnl/ps/job.c 2005-01-21 14:52:53 UTC (rev 13186) @@ -90,7 +90,16 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +PspTerminateJobObject(PEJOB Job, + KPROCESSOR_MODE AccessMode, + NTSTATUS ExitStatus) +{ + DPRINT("PspTerminateJobObject() is unimplemented!\n"); + return STATUS_NOT_IMPLEMENTED; +} + /* * @unimplemented */ @@ -434,8 +443,27 @@ NtTerminateJobObject(HANDLE JobHandle, NTSTATUS ExitStatus) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + PEJOB Job; + NTSTATUS Status; + + PreviousMode = ExGetPreviousMode(); + + Status = ObReferenceObjectByHandle(JobHandle, + JOB_OBJECT_TERMINATE, + PsJobType, + PreviousMode, + (PVOID*)&Job, + NULL); + if(NT_SUCCESS(Status)) + { + Status = PspTerminateJobObject(Job, + PreviousMode, + ExitStatus); + ObDereferenceObject(Job); + } + + return Status; }

1 0

[weiden] 13185: implemented NtOpenJobObject()
by weiden＠svn.reactos.com 21 Jan '05

21 Jan '05

implemented NtOpenJobObject() Modified: trunk/reactos/ntoskrnl/ps/job.c _____ Modified: trunk/reactos/ntoskrnl/ps/job.c --- trunk/reactos/ntoskrnl/ps/job.c 2005-01-21 14:12:03 UTC (rev 13184) +++ trunk/reactos/ntoskrnl/ps/job.c 2005-01-21 14:40:06 UTC (rev 13185) @@ -337,7 +337,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS STDCALL @@ -345,8 +345,53 @@ ACCESS_MASK DesiredAccess, POBJECT_ATTRIBUTES ObjectAttributes) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + HANDLE hJob; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + /* check for valid buffers */ + if(PreviousMode == UserMode) + { + _SEH_TRY + { + /* probe with 32bit alignment */ + ProbeForWrite(JobHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + if(NT_SUCCESS(Status)) + { + Status = ObOpenObjectByName(ObjectAttributes, + PsJobType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hJob); + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *JobHandle = hJob; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + + return Status; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs