Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[peterw] 28598: - Fix a warning reported by Gregor Brunmar.
by peterw＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: peterw Date: Mon Aug 27 15:57:02 2007 New Revision: 28598 URL: http://svn.reactos.org/svn/reactos?rev=28598&view=rev Log: - Fix a warning reported by Gregor Brunmar. Modified: trunk/reactos/drivers/bus/acpi/namespace/nsobject.c Modified: trunk/reactos/drivers/bus/acpi/namespace/nsobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/namespace… ============================================================================== --- trunk/reactos/drivers/bus/acpi/namespace/nsobject.c (original) +++ trunk/reactos/drivers/bus/acpi/namespace/nsobject.c Mon Aug 27 15:57:02 2007 @@ -179,7 +179,7 @@ /* Check for a recognized Opcode */ - switch ((u8) opcode) { + switch (opcode) { case AML_OP_PREFIX:

1 0

[hpoussin] 28597: Link to wine library if we are using Wine-style debug macros
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 15:43:50 2007 New Revision: 28597 URL: http://svn.reactos.org/svn/reactos?rev=28597&view=rev Log: Link to wine library if we are using Wine-style debug macros Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild Mon Aug 27 15:43:50 2007 @@ -13,6 +13,7 @@ <define name="USE_WIN32_OPENGL" /> <library>uuid</library> + <library>wine</library> <library>user32 </library> <library>opengl32 </library> <library>gdi32 </library> @@ -20,24 +21,24 @@ <library>kernel32</library> <library>wined3d</library> - <file>basetexture.c</file> - <file>cubetexture.c</file> - <file>d3d8_main.c</file> - <file>device.c</file> - <file>directx.c</file> - <file>indexbuffer.c</file> - <file>pixelshader.c</file> - <file>resource.c</file> - <file>stateblock.c</file> - <file>surface.c</file> - <file>swapchain.c</file> - <file>texture.c</file> - <file>vertexbuffer.c</file> - <file>vertexdeclaration.c</file> - <file>vertexshader.c</file> - <file>volume.c</file> - <file>volumetexture.c</file> - <file>version.rc</file> + <file>basetexture.c</file> + <file>cubetexture.c</file> + <file>d3d8_main.c</file> + <file>device.c</file> + <file>directx.c</file> + <file>indexbuffer.c</file> + <file>pixelshader.c</file> + <file>resource.c</file> + <file>stateblock.c</file> + <file>surface.c</file> + <file>swapchain.c</file> + <file>texture.c</file> + <file>vertexbuffer.c</file> + <file>vertexdeclaration.c</file> + <file>vertexshader.c</file> + <file>volume.c</file> + <file>volumetexture.c</file> + <file>version.rc</file> <file>d3d8.spec</file> </module> Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.rb… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.rbuild Mon Aug 27 15:43:50 2007 @@ -1,14 +1,14 @@ <module name="ws2_32" type="win32dll" baseaddress="${BASEADDRESS_WS2_32}" installbase="system32" installname="ws2_32.dll"> <importlibrary definition="ws2_32.def" /> <include base="ws2_32">include</include> - <include base="ReactOS">include/reactos</include> - <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS">include/reactos/wine</include> <define name="_DISABLE_TIDENTS" /> <define name="UNICODE" /> <define name="LE" /> <define name="__USE_W32API" /> - <define name="__REACTOS__" /> + <define name="__REACTOS__" /> <define name="_WIN32_WINNT">0x0500</define> + <library>wine</library> <library>ntdll</library> <library>kernel32</library> <library>user32</library> @@ -27,7 +27,7 @@ <file>sndrcv.c</file> <file>stubs.c</file> <file>upcall.c</file> - <file>async.c</file> + <file>async.c</file> </directory> <file>ws2_32.rc</file> </module>

1 0

[hpoussin] 28596: Rely only on host headers (+ target ntstatus.h) to build mkhive
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 13:32:52 2007 New Revision: 28596 URL: http://svn.reactos.org/svn/reactos?rev=28596&view=rev Log: Rely only on host headers (+ target ntstatus.h) to build mkhive Added: trunk/reactos/include/reactos/typedefs_host.h (with props) Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/tools/mkhive/mkhive.h trunk/reactos/tools/mkhive/mkhive.mak trunk/reactos/tools/mkhive/rtl.c Added: trunk/reactos/include/reactos/typedefs_host.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/typedefs_h… ============================================================================== --- trunk/reactos/include/reactos/typedefs_host.h (added) +++ trunk/reactos/include/reactos/typedefs_host.h Mon Aug 27 13:32:52 2007 @@ -1,0 +1,105 @@ +/* + PROJECT: ReactOS + LICENSE: GPL v2 or any later version + FILE: include/reactos/typedefs_host.h + PURPOSE: Type definitions and useful macros for host tools + COPYRIGHT: Copyright 2007 Hervé Poussineau +*/ + +#ifndef _TYPEDEFS_HOST_H +#define _TYPEDEFS_HOST_H + +#include <limits.h> + +#define UNIMPLEMENTED { printf("%s unimplemented\n", __FUNCTION__); exit(1); } +#define ASSERT(x) { if (!(x)) { printf("ASSERT at %s:%d failed\n", __FILE__, __LINE__); exit(1); } } + +#define NTAPI __stdcall +#define WINAPI __stdcall + +#define IN +#define OUT +#define OPTIONAL + +#define FALSE 0 +#define TRUE (!(FALSE)) + +typedef void VOID, *PVOID, *HANDLE; +typedef HANDLE HKEY, *PHKEY; +typedef size_t SIZE_T, *PSIZE_T; +typedef unsigned char UCHAR, *PUCHAR, BYTE, *LPBYTE; +typedef char CHAR, *PCHAR, *PSTR; +typedef const char CCHAR; +typedef const char *PCSTR, *LPCSTR; +typedef short SHORT; +typedef unsigned short USHORT; +typedef unsigned int LONG, *PLONG; +typedef unsigned int ULONG, *PULONG, DWORD; +typedef long long LONGLONG; +typedef unsigned long long ULONGLONG; +typedef UCHAR BOOLEAN, *PBOOLEAN; +typedef int BOOL; +typedef int LONG_PTR, *PLONG_PTR; +typedef unsigned int ULONG_PTR, *PULONG_PTR; +typedef wchar_t WCHAR, *PWCHAR, *PWSTR, *LPWSTR; +typedef const wchar_t *PCWSTR, *LPCWSTR; +typedef int NTSTATUS; +typedef int POOL_TYPE; + +#define MAXUSHORT USHRT_MAX + +typedef struct _RTL_BITMAP +{ + ULONG SizeOfBitMap; + PULONG Buffer; +} RTL_BITMAP, *PRTL_BITMAP; + +typedef struct _RTL_BITMAP_RUN +{ + ULONG StartingIndex; + ULONG NumberOfBits; +} RTL_BITMAP_RUN, *PRTL_BITMAP_RUN; + +typedef union _LARGE_INTEGER +{ + struct + { + DWORD LowPart; + LONG HighPart; + } u; + LONGLONG QuadPart; +} LARGE_INTEGER, *PLARGE_INTEGER; + +typedef struct _LIST_ENTRY +{ + struct _LIST_ENTRY *Flink; + struct _LIST_ENTRY *Blink; +} LIST_ENTRY,*PLIST_ENTRY; + +typedef struct _ANSI_STRING +{ + USHORT Length; + USHORT MaximumLength; + PSTR Buffer; +} ANSI_STRING, *PANSI_STRING; + +typedef struct _UNICODE_STRING +{ + USHORT Length; + USHORT MaximumLength; + PWSTR Buffer; +} UNICODE_STRING, *PUNICODE_STRING; +typedef const UNICODE_STRING *PCUNICODE_STRING; + +#define NT_SUCCESS(x) ((x)>=0) +#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } +#define RtlZeroMemory(Destination, Length) memset(Destination, 0, Length) +#define RtlCopyMemory(Destination, Source, Length) memcpy(Destination, Source, Length) +#define RtlMoveMemory(Destination, Source, Length) memmove(Destination, Source, Length) + +/* Prevent inclusion of some other headers */ +#define __INTERNAL_DEBUG +#define RTL_H +#define _TYPEDEFS64_H + +#endif Propchange: trunk/reactos/include/reactos/typedefs_host.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2859… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Mon Aug 27 13:32:52 2007 @@ -8,12 +8,17 @@ #ifndef CMLIB_H #define CMLIB_H -//#define WIN32_NO_STATUS -#ifdef CMLIB_HOST -#include <typedefs64.h> +#ifdef _TYPEDEFS_HOST_H +#define REG_OPTION_VOLATILE 1 +#define OBJ_CASE_INSENSITIVE 0x00000040L +#define USHORT_MAX USHRT_MAX +#else + #ifdef CMLIB_HOST + #include <typedefs64.h> + #endif + #include <ntddk.h> #endif -#include <ntddk.h> #include <wchar.h> #include "hivedata.h" #include "cmdata.h" Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h (original) +++ trunk/reactos/tools/mkhive/mkhive.h Mon Aug 27 13:32:52 2007 @@ -30,19 +30,30 @@ #include <stdio.h> #include <stdlib.h> -/* We have to do this because psdk/windef.h will _always_ define _WIN32... */ -#if defined(_WIN32) || defined(_WIN64) -#define WINDOWS_HOST -#endif +#include <typedefs_host.h> +#include <ntstatus.h> -#define NTOS_MODE_USER -#define WIN32_NO_STATUS +VOID NTAPI +KeQuerySystemTime( + OUT PLARGE_INTEGER CurrentTime); +NTSTATUS NTAPI +RtlAnsiStringToUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PANSI_STRING AnsiSource, + IN BOOLEAN AllocateDestinationString); +VOID NTAPI +RtlInitAnsiString( + IN OUT PANSI_STRING DestinationString, + IN PCSTR SourceString); +VOID NTAPI +RtlInitUnicodeString( + IN OUT PUNICODE_STRING DestinationString, + IN PCWSTR SourceString); +WCHAR NTAPI +RtlUpcaseUnicodeChar( + IN WCHAR Source); -#ifdef MKHIVE_HOST -#include <typedefs64.h> -#endif - -#include <ntddk.h> +#define CMLIB_HOST #include <cmlib.h> #include <infhost.h> #include "reginf.h" Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Mon Aug 27 13:32:52 2007 @@ -31,8 +31,7 @@ $(addprefix $(INTERMEDIATE_), $(MKHIVE_SOURCES:.c=.o)) MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ - -D_NTOSKRNL_ -D_NTSYSTEM_ -DMKHIVE_HOST \ - -Iinclude/reactos -Iinclude/ddk -Iinclude/psdk -g3 + -DMKHIVE_HOST -Iinclude/reactos -Iinclude/psdk -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3 Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=285… ============================================================================== --- trunk/reactos/tools/mkhive/rtl.c (original) +++ trunk/reactos/tools/mkhive/rtl.c Mon Aug 27 13:32:52 2007 @@ -6,11 +6,7 @@ #include <stdlib.h> -#define RTL_H - -#define NTOS_MODE_USER -#define WIN32_NO_STATUS -#include <ntddk.h> +#include "mkhive.h" #include <bitmap.c> SIZE_T xwcslen( PCWSTR String ) {

1 0

[hpoussin] 28595: Use host crt when building mkhive tool
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 11:36:25 2007 New Revision: 28595 URL: http://svn.reactos.org/svn/reactos?rev=28595&view=rev Log: Use host crt when building mkhive tool Modified: trunk/reactos/tools/mkhive/mkhive.mak Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Mon Aug 27 11:36:25 2007 @@ -32,7 +32,7 @@ MKHIVE_HOST_CFLAGS = -fshort-wchar $(xTOOLS_CFLAGS) -I$(INFLIB_BASE) -I$(CMLIB_BASE) \ -D_NTOSKRNL_ -D_NTSYSTEM_ -DMKHIVE_HOST \ - -Iinclude/reactos -Iinclude/ddk -Iinclude/ndk -Iinclude/psdk -Iinclude -Iinclude/crt -g3 + -Iinclude/reactos -Iinclude/ddk -Iinclude/psdk -g3 MKHIVE_HOST_LFLAGS = $(xTOOLS_LFLAGS) -g3

1 0

[hpoussin] 28594: Rename CFLAGS to HOST_FLAGS, CPPFLAGS to HOST_CPPFLAGS, LFLAGS to HOST_LFLAGS
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 11:21:26 2007 New Revision: 28594 URL: http://svn.reactos.org/svn/reactos?rev=28594&view=rev Log: Rename CFLAGS to HOST_FLAGS, CPPFLAGS to HOST_CPPFLAGS, LFLAGS to HOST_LFLAGS Modified: trunk/reactos/Makefile trunk/reactos/tools/tools.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28594&r1=2859… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Mon Aug 27 11:21:26 2007 @@ -161,15 +161,15 @@ ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) export OSTYPE = msys HOST=mingw32-linux -CFLAGS+=-fshort-wchar -CPPFLAGS+=-fshort-wchar +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar else HOST=mingw32-windows endif else HOST=mingw32-linux -CFLAGS+=-fshort-wchar -CPPFLAGS+=-fshort-wchar +HOST_CFLAGS+=-fshort-wchar +HOST_CPPFLAGS+=-fshort-wchar endif endif Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=28594&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Mon Aug 27 11:21:26 2007 @@ -5,9 +5,9 @@ TOOLS_OUT = $(OUTPUT_)$(TOOLS_BASE) TOOLS_OUT_ = $(TOOLS_OUT)$(SEP) -TOOLS_CFLAGS = $(CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing -TOOLS_CPPFLAGS = $(CPPFLAGS) -Wall -Wpointer-arith -TOOLS_LFLAGS = $(LFLAGS) +TOOLS_CFLAGS = $(HOST_CFLAGS) -Wall -Wpointer-arith -Wno-strict-aliasing +TOOLS_CPPFLAGS = $(HOST_CPPFLAGS) -Wall -Wpointer-arith +TOOLS_LFLAGS = $(HOST_LFLAGS) $(TOOLS_INT): | $(INTERMEDIATE) $(ECHO_MKDIR)

1 0

[hpoussin] 28593: Update shell32 tests
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 11:03:32 2007 New Revision: 28593 URL: http://svn.reactos.org/svn/reactos?rev=28593&view=rev Log: Update shell32 tests Added: trunk/rostests/winetests/shell32/systray.c (with props) Modified: trunk/rostests/winetests/shell32/generated.c trunk/rostests/winetests/shell32/shell32.rbuild trunk/rostests/winetests/shell32/shell32_test.h trunk/rostests/winetests/shell32/shelllink.c trunk/rostests/winetests/shell32/shlexec.c trunk/rostests/winetests/shell32/shlfileop.c trunk/rostests/winetests/shell32/shlfolder.c trunk/rostests/winetests/shell32/string.c trunk/rostests/winetests/shell32/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/shell32/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/generat… Modified: trunk/rostests/winetests/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shell32… Modified: trunk/rostests/winetests/shell32/shell32_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shell32… Modified: trunk/rostests/winetests/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shellli… Modified: trunk/rostests/winetests/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlexec… Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… Modified: trunk/rostests/winetests/shell32/string.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/string.… Added: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… Modified: trunk/rostests/winetests/shell32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/testlis…

1 0

[jimtabor] 28592: Add new gdi object type. Discovered and documented by Timo Kreuzer.
by jimtabor＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: jimtabor Date: Mon Aug 27 10:57:46 2007 New Revision: 28592 URL: http://svn.reactos.org/svn/reactos?rev=28592&view=rev Log: Add new gdi object type. Discovered and documented by Timo Kreuzer. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Mon Aug 27 10:57:46 2007 @@ -53,6 +53,7 @@ #define GDI_OBJECT_TYPE_METADC 0x00660000 #define GDI_OBJECT_TYPE_METAFILE 0x00260000 #define GDI_OBJECT_TYPE_ENHMETAFILE 0x00460000 +#define GDI_OBJECT_TYPE_ENUMFONT 0x00160000 /* Following object types made up for ROS */ #define GDI_OBJECT_TYPE_DONTCARE 0x007f0000 /** Not really an object type. Forces GDI_FreeObj to be silent. */

1 0

[hpoussin] 28591: Add some missing definitions Fix wrong structure alignment
by hpoussin＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: hpoussin Date: Mon Aug 27 10:56:39 2007 New Revision: 28591 URL: http://svn.reactos.org/svn/reactos?rev=28591&view=rev Log: Add some missing definitions Fix wrong structure alignment Modified: trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h (original) +++ trunk/reactos/include/psdk/shellapi.h Mon Aug 27 10:56:39 2007 @@ -124,7 +124,7 @@ typedef WORD FILEOP_FLAGS; typedef WORD PRINTEROP_FLAGS; -#include <pshpack2.h> +#include <pshpack1.h> typedef struct _AppBarData { DWORD cbSize; HWND hWnd; @@ -186,6 +186,28 @@ GUID guidItem; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW; + +#define NOTIFYICONDATAA_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAA, szTip[64]) +#define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64]) +#define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem) +#define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem) + +#if WINVER >= 0x400 +typedef struct _DRAGINFOA { + UINT uSize; + POINT pt; + BOOL fNC; + LPSTR lpFileList; + DWORD grfKeyState; +} DRAGINFOA,*LPDRAGINFOA; +typedef struct _DRAGINFOW { + UINT uSize; + POINT pt; + BOOL fNC; + LPWSTR lpFileList; + DWORD grfKeyState; +} DRAGINFOW,*LPDRAGINFOW; +#endif typedef struct _SHELLEXECUTEINFOA { DWORD cbSize; @@ -310,7 +332,10 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD); #ifdef UNICODE +#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAW_V1_SIZE +#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAW_V2_SIZE typedef NOTIFYICONDATAW NOTIFYICONDATA,*PNOTIFYICONDATA; +typedef DRAGINFOW DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOW SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; typedef SHFILEOPSTRUCTW SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT; typedef SHFILEINFOW SHFILEINFO; @@ -332,7 +357,10 @@ #define SHEmptyRecycleBin SHEmptyRecycleBinW #else +#define NOTIFYICONDATA_V1_SIZE NOTIFYICONDATAA_V1_SIZE +#define NOTIFYICONDATA_V2_SIZE NOTIFYICONDATAA_V2_SIZE typedef NOTIFYICONDATAA NOTIFYICONDATA,*PNOTIFYICONDATA; +typedef DRAGINFOA DRAGINFO,*LPDRAGINFO; typedef SHELLEXECUTEINFOA SHELLEXECUTEINFO,*LPSHELLEXECUTEINFO; typedef SHFILEOPSTRUCTA SHFILEOPSTRUCT,*LPSHFILEOPSTRUCT; typedef SHFILEINFOA SHFILEINFO;

1 0

[jimtabor] 28590: Update ENUMFONTDATAW structure based on returned data.
by jimtabor＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: jimtabor Date: Mon Aug 27 10:38:51 2007 New Revision: 28590 URL: http://svn.reactos.org/svn/reactos?rev=28590&view=rev Log: Update ENUMFONTDATAW structure based on returned data. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Mon Aug 27 10:38:51 2007 @@ -120,18 +120,36 @@ TMDIFF Diff; } TMW_INTERNAL, *PTMW_INTERNAL; -typedef struct _ENUMFONTDATAW +typedef struct _DESIGNVECTORINT { + DWORD dvReserved; + DWORD dvNumAxes; + LONG dvValues[0]; +} DESIGNVECTORINT, *PDESIGNVECTORINT; + +typedef struct _ENUMFONTDATAINT { - DWORD cbSize; // Size of ENUMFONTDATAW + (size of ENUMTEXTMETRIC + ENUMLOGFONTEXDV) - PENUMTEXTMETRIC lpentm; // Ptr with in this structure. ^^^ if Win2k + ^^^ - DWORD FontType; - PENUMLOGFONTEXDV lpelfedv; // Prt with in this structure. - // The rest of the structure is variable in size. - // Based on iEnumType and Win32Compat flags,, - // if w2k+ {ENUMTEXTMETRIC else NEWTEXTMETRICS} or TEXTMETRIC - // if w2k+ {ENUMLOGFONTEXDV else ENUMLOGFONT} or LOGFONT + DWORD dwReserved; + DWORD dwReserved1; + ENUMTEXTMETRICW etmTm; +} ENUMFONTDATAINT, *PENUMFONTDATAINT; + +typedef struct _ENUMFONTDATAW +{ + DWORD dwSize; // Full size of this structure. + ULONG ulOffsetTM; // Offset to enfdi in this structure. + DWORD dwFontType; // If sign set scale enum. + ENUMLOGFONTEXW elfex; +/* + * Yuam 14.5: + * DESIGNVECTOR is a variable-size data structure that specifies the number of + * axes and a value for each axis. + * So it maybe smaller than MM_MAX_NUMAXES. + */ + DESIGNVECTORINT DesignVectori; + ENUMFONTDATAINT enfdi; } ENUMFONTDATAW, *PENUMFONTDATAW; - + + /* Number Representation */ typedef struct _EFLOAT_S {

1 0

[arty] 28589: Slight improvement: When terminating the process, kill sibling threads first. We'll need this for synchronization at process termination among other things. Thanks alex for pointing out that we didn't do this.
by arty＠svn.reactos.org 27 Aug '07

27 Aug '07

Author: arty Date: Mon Aug 27 09:00:03 2007 New Revision: 28589 URL: http://svn.reactos.org/svn/reactos?rev=28589&view=rev Log: Slight improvement: When terminating the process, kill sibling threads first. We'll need this for synchronization at process termination among other things. Thanks alex for pointing out that we didn't do this. Modified: trunk/reactos/dll/win32/kernel32/process/proc.c Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c Mon Aug 27 09:00:03 2007 @@ -567,6 +567,9 @@ ULONG Request; NTSTATUS Status; + /* kill sibling threads ... we want to be alone at this point */ + NtTerminateProcess (NULL, 0); + /* unload all dll's */ LdrShutdownProcess ();

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2007