Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 41007: get rid of libcoldname in rbuild
by tkreuzer＠svn.reactos.org 20 May '09

20 May '09

Author: tkreuzer Date: Wed May 20 05:55:15 2009 New Revision: 41007 URL: http://svn.reactos.org/svn/reactos?rev=41007&view=rev Log: get rid of libcoldname in rbuild Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Wed May 20 05:55:15 2009 @@ -544,7 +544,7 @@ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); - fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)' '$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'\n" ); + fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" ); /* hack to get libgcc_eh.a, should check mingw version or something */ if (Environment::GetArch() == "amd64") {

1 0

[tkreuzer] 41006: Add initial version of RtlInterlockedPopEntrySList and stubs for RtlInterlockedPushEntrySList and RtlInterlockedFlushSList
by tkreuzer＠svn.reactos.org 20 May '09

20 May '09

Author: tkreuzer Date: Wed May 20 05:32:48 2009 New Revision: 41006 URL: http://svn.reactos.org/svn/reactos?rev=41006&view=rev Log: Add initial version of RtlInterlockedPopEntrySList and stubs for RtlInterlockedPushEntrySList and RtlInterlockedFlushSList Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S (with props) Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild Added: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S (added) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S [iso-8859-1] Wed May 20 05:32:48 2009 @@ -1,0 +1,188 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/amd64/interlck.S + * PURPOSE: Rtl Interlocked Functions for amd64 + * PROGRAMMERS: Timo Kreuzer + */ + +#include <ndk/asm.h> +#include <ndk/amd64/asmmacro.S> +.intel_syntax noprefix + + +#define SLIST8A_DEPTH_MASK 0x000000000000FFFF +#define SLIST8A_DEPTH_INC 0x0000000000000001 +#define SLIST8A_SEQUENCE_MASK 0x0000000001FF0000 +#define SLIST8A_SEQUENCE_INC 0x0000000000010000 +#define SLIST8A_NEXTENTRY_MASK 0xFFFFFFFFFE000000 +#define SLIST8A_NEXTENTRY_SHIFT 21 +#define SLIST8B_HEADERTYPE_MASK 0x0000000000000001 +#define SLIST8B_INIT_MASK 0x0000000000000002 +#define SLIST8B_REGION_MASK 0xE000000000000000 + +#define SLIST16A_DEPTH_MASK 0x000000000000FFFF +#define SLIST16A_DEPTH_INC 0x0000000000000001 +#define SLIST16A_SEQUENCE_MASK 0xFFFFFFFFFFFF0000 +#define SLIST16B_HEADERTYPE_MASK 0x0000000000000001 +#define SLIST16B_INIT_MASK 0x0000000000000002 +#define SLIST16B_NEXTENTY_MASK 0xFFFFFFFFFFFFFFF0 + + +POINTER_MASK: .quad 0x000007FFFFFFFFF0 + +SLIST16_POINTER_MASK: .quad 0xFFFFFFFFFFFFFFF0 + + +/* FUNCTIONS ****************************************************************/ + + +/* PSLIST_ENTRY + * NTAPI + * RtlInterlockedPopEntrySList( + * IN PSLIST_HEADER ListHead); + */ +.proc RtlInterlockedPopEntrySList + + /* Save registers */ + push rbx + push rbp + + /* Load ListHead->Region into rax */ + mov rax, [rcx + 8] + + /* Check what kind of header this is */ + test rax, SLIST8B_HEADERTYPE_MASK + jnz 3f + + /* We have an 8 byte header */ + + /* Load ListHead->Alignment into rax */ + mov rax, [rcx] + + /* Check if ListHead->NextEntry is NULL */ + and rax, SLIST8A_NEXTENTRY_MASK + jz 2f + + /* Copy rcx to rbp, as we need ecx for the exchange */ + mov rbp, rcx + + /* Copy the low 32 bits to eax */ + mov eax, [rbp] + + /* Copy the high 32 bits to edx */ + mov edx, [rbp + 4] + +1: + /* Use rbp as pointer template in rbx*/ + mov rbx, rbp + and rbx, POINTER_MASK + + /* Extract the NextEntry pointer */ + mov rcx, [rbp] + and rcx, SLIST8A_NEXTENTRY_MASK + shr rcx, SLIST8A_NEXTENTRY_SHIFT + + /* Combine to new pointer in rcx */ + or rcx, rbx + + /* Load the next NextEntry pointer to rcx */ + mov rcx, [rcx] + + /* Copy Depth and Sequence number and adjust Depth */ + lea rbx, [rax - SLIST8A_DEPTH_INC] + + /* Shift bits in place */ + shl rcx, SLIST8A_NEXTENTRY_SHIFT + + /* Combine into rbx */ + and rbx, SLIST8A_SEQUENCE_INC | SLIST8A_DEPTH_MASK + or rbx, rcx + + /* Copy higher 32 bits into ecx */ + mov rcx, rbx + shr rcx, 32 + + /* If [rbp] equals edx:eax, exchange it with ecx:ebx */ + lock cmpxchg8b [rbp] + + /* If not equal, retry with edx:eax, being the content of [rbp] now */ + jnz 1b + + /* Move result from edx:eax to rax */ + shl rdx, 32 + or rax, rdx + + /* Use rbp as pointer template */ + and rbp, POINTER_MASK + + and rax, SLIST8A_NEXTENTRY_MASK + shr rax, SLIST8A_NEXTENTRY_SHIFT + or rax, rbp + +2: + /* Restore registers and return */ + pop rbp + pop rbx + ret + +3: /* This is a 16 byte header */ + + /* Copy rcx to rbp, as we need rcx for the exchange */ + mov rbp, rcx + + +4: + /* Check if ListHead->NextEntry is NULL */ + mov rcx, rdx + and rcx, SLIST16_POINTER_MASK + jz 5f + + /* Copy Depth and Sequence number and adjust Depth */ + lea rbx, [rax - SLIST16A_DEPTH_INC] + + /* Get next pointer */ + mov rcx, [rcx] + + /* Set ListHead->HeaderType = 1 */ + or rcx, 1 + + /* If [rbp] equals rdx:rax, exchange it with rcx:rbx */ + lock cmpxchg16b [rbp] + + /* If not equal, retry with rdx:rax, being the content of [rbp] now */ + jnz 4b + +5: + + + /* Restore registers and return */ + pop rbp + pop rbx + ret +.endproc + + +/* PSLIST_ENTRY + * NTAPI + * RtlInterlockedPushEntrySList( + * IN PSLIST_HEADER ListHead, + * IN PSLIST_ENTRY ListEntry); + */ +.proc RtlInterlockedPushEntrySList + + + ret +.endproc + + +/* PSLIST_ENTRY + * NTAPI + * RtlInterlockedFlushSList( + * IN PSINGLE_LIST_ENTRY ListHead); + */ +.proc RtlInterlockedFlushSList + + + ret +.endproc Propchange: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/interlck.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Wed May 20 05:32:48 2009 @@ -41,6 +41,7 @@ <directory name="amd64"> <file>debug_asm.S</file> <file>except_asm.S</file> + <file>interlck.S</file> <file>unwind.c</file> <file>stubs.c</file> </directory>

1 0

[tkreuzer] 41005: update main rbuild file
by tkreuzer＠svn.reactos.org 20 May '09

20 May '09

Author: tkreuzer Date: Wed May 20 05:30:20 2009 New Revision: 41005 URL: http://svn.reactos.org/svn/reactos?rev=41005&view=rev Log: update main rbuild file Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Wed May 20 05:30:20 2009 @@ -45,6 +45,8 @@ <compilerflag>-fno-strict-aliasing</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wno-multichar</compilerflag> +  <linkerflag>-disable-stdcall-fixup</linkerflag> <linkerflag>-static</linkerflag> <linkerflag>--unique=.eh_frame</linkerflag> @@ -144,16 +146,21 @@ </directory> <directory name="drivers"> + <directory name="base"> + <xi:include href="drivers/base/directory.rbuild" /> + </directory> <directory name="bus"> - <directory name="pci"> - <xi:include href="drivers/bus/pci/pci.rbuild" /> - </directory> - </directory> - -  - + </directory> + <directory name="filesystems"> + <xi:include href="drivers/filesystems/directory.rbuild" /> + </directory> + <directory name="input"> + <xi:include href="drivers/input/directory.rbuild" /> + </directory> <directory name="ksfilter"> <xi:include href="drivers/ksfilter/directory.rbuild" /> </directory> @@ -162,71 +169,32 @@ <xi:include href="drivers/multimedia/directory.rbuild" /> </directory --> + <directory name="network"> + <xi:include href="drivers/network/directory.rbuild" /> + </directory> <directory name="parallel"> <xi:include href="drivers/parallel/directory.rbuild" /> </directory> - <directory name="serial"> <xi:include href="drivers/serial/directory.rbuild" /> </directory> - -  - -  - - <directory name="wdm"> + </directory> + <directory name="wdm"> <xi:include href="drivers/wdm/wdm.rbuild" /> </directory> - <directory name="wmi"> <xi:include href="drivers/wmi/wmilib.rbuild" /> - </directory> - - <directory name="base"> - <xi:include href="drivers/base/directory.rbuild" /> - </directory> - <directory name="filesystems"> - <xi:include href="drivers/filesystems/directory.rbuild" /> - </directory> - <directory name="input"> - <xi:include href="drivers/input/directory.rbuild" /> - </directory> - <directory name="network"> - <xi:include href="drivers/network/directory.rbuild" /> - </directory> - <directory name="setup"> - <xi:include href="drivers/setup/directory.rbuild" /> - </directory> - <directory name="storage"> - <directory name="class"> - <directory name="cdrom"> - <xi:include href="drivers/storage/class/cdrom/cdrom.rbuild" /> - </directory> - <directory name="class2"> - <xi:include href="drivers/storage/class/class2/class2.rbuild" /> - </directory> - <directory name="disk"> - <xi:include href="drivers/storage/class/disk/disk.rbuild" /> - </directory> - </directory> - <directory name="floppy"> - <xi:include href="drivers/storage/floppy/floppy.rbuild" /> - </directory> - <directory name="ide"> - <directory name="atapi"> - <xi:include href="drivers/storage/ide/atapi/atapi.rbuild" /> - </directory> - </directory> - <directory name="port"> - <xi:include href="drivers/storage/port/directory.rbuild" /> - </directory> - <directory name="scsiport"> - <xi:include href="drivers/storage/scsiport/scsiport.rbuild" /> - </directory> </directory> </directory> @@ -248,6 +216,9 @@ </directory> <directory name="expat"> <xi:include href="lib/3rdparty/expat/expat.rbuild" /> + </directory> + <directory name="freetype"> + <xi:include href="lib/3rdparty/freetype/freetype.rbuild" /> </directory> <directory name="icu4ros"> <xi:include href="lib/3rdparty/icu4ros/icu4ros.rbuild" /> @@ -329,9 +300,9 @@ <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> </directory> -  + </directory> <directory name="tools"> <xi:include href="tools/tools.rbuild" />

1 0

[tkreuzer] 41004: add crt to gdiplus libraries in x64 builds
by tkreuzer＠svn.reactos.org 20 May '09

20 May '09

Author: tkreuzer Date: Wed May 20 05:28:15 2009 New Revision: 41004 URL: http://svn.reactos.org/svn/reactos?rev=41004&view=rev Log: add crt to gdiplus libraries in x64 builds Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.rbuild [iso-8859-1] Wed May 20 05:28:15 2009 @@ -28,5 +28,8 @@ <library>gdi32</library> <library>kernel32</library> <library>ntdll</library> + <if property="ARCH" value="amd64"> + <library>crt</library> + </if> </module> </group>

1 0

[tkreuzer] 41003: build ntvdm only on x86
by tkreuzer＠svn.reactos.org 20 May '09

20 May '09

Author: tkreuzer Date: Wed May 20 05:18:32 2009 New Revision: 41003 URL: http://svn.reactos.org/svn/reactos?rev=41003&view=rev Log: build ntvdm only on x86 Modified: branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild Modified: branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild [iso-8859-1] Wed May 20 05:18:32 2009 @@ -1,9 +1,11 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="ntvdm"> - <xi:include href="ntvdm/ntvdm.rbuild" /> -</directory> +<if property="ARCH" value="i386"> + <directory name="ntvdm"> + <xi:include href="ntvdm/ntvdm.rbuild" /> + </directory> +</if> <directory name="win32"> <xi:include href="win32/win32.rbuild" /> </directory>

1 0

[jimtabor] 41002: - Time to kill this one. We setup with ParentWindowHandle already set.
by jimtabor＠svn.reactos.org 19 May '09

19 May '09

Author: jimtabor Date: Wed May 20 03:34:40 2009 New Revision: 41002 URL: http://svn.reactos.org/svn/reactos?rev=41002&view=rev Log: - Time to kill this one. We setup with ParentWindowHandle already set. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed May 20 03:34:40 2009 @@ -1585,7 +1585,7 @@ * native ole32.OleInitialize uses HWND_MESSAGE to create the * message window (style: WS_POPUP|WS_DISABLED) */ - DPRINT1("FIXME - Parent is HWND_MESSAGE\n"); + DPRINT("FIXME - Parent is HWND_MESSAGE\n"); // ParentWindowHandle set already. } else if (hWndParent)

1 0

[tkreuzer] 41001: netshell: don't cast the 1st parameter of InterlockedExchange to volatile void **, but to void **
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 02:10:47 2009 New Revision: 41001 URL: http://svn.reactos.org/svn/reactos?rev=41001&view=rev Log: netshell: don't cast the 1st parameter of InterlockedExchange to volatile void **, but to void ** Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lanstatusui.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Wed May 20 02:10:47 2009 @@ -1198,7 +1198,7 @@ This->lpNetMan = NULL; This->pHead = NULL; - if (InterlockedCompareExchangePointer((volatile void **)&cached_This, This, NULL) != NULL) + if (InterlockedCompareExchangePointer((void **)&cached_This, This, NULL) != NULL) { CoTaskMemFree(This); }

1 0

[tkreuzer] 41000: mswsock: convert to spec, taken from wine
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 01:59:10 2009 New Revision: 41000 URL: http://svn.reactos.org/svn/reactos?rev=41000&view=rev Log: mswsock: convert to spec, taken from wine Added: branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.spec (with props) Modified: branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.rbuild [iso-8859-1] Wed May 20 01:59:10 2009 @@ -1,5 +1,5 @@ <module name="mswsock" type="win32dll" baseaddress="${BASEADDRESS_MSWSOCK}" installbase="system32" installname="mswsock.dll" unicode="yes"> - <importlibrary definition="mswsock.def" /> + <importlibrary definition="mswsock.spec" /> <define name="LE" /> <library>kernel32</library> <library>ws2_32</library> Added: branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.spec (added) +++ branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.spec [iso-8859-1] Wed May 20 01:59:10 2009 @@ -1,0 +1,32 @@ +@ stdcall AcceptEx(long long ptr long long long ptr ptr) +@ stdcall EnumProtocolsA(ptr ptr ptr) ws2_32.WSAEnumProtocolsA +@ stdcall EnumProtocolsW(ptr ptr ptr) ws2_32.WSAEnumProtocolsW +@ stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) +@ stub GetAddressByNameA +@ stub GetAddressByNameW +@ stub GetNameByTypeA +@ stub GetNameByTypeW +@ stub GetServiceA +@ stub GetServiceW +@ stub GetTypeByNameA +@ stub GetTypeByNameW +@ stub MigrateWinsockConfiguration +@ stub NPLoadNameSpaces +@ stub NSPStartup +@ stub ServiceMain +@ stub SetServiceA +@ stub SetServiceW +@ stub StartWsdpService +@ stub StopWsdpService +@ stub SvchostPushServiceGlobals +@ stdcall TransmitFile(long long long long ptr ptr long) +@ stdcall WSARecvEx(long ptr long ptr) +@ stub WSPStartup +@ stub dn_expand +@ stub getnetbyname +@ stub inet_network +@ stub rcmd +@ stub rexec +@ stub rresvport +@ stub s_perror +@ stub sethostname Propchange: branches/ros-amd64-bringup/reactos/dll/win32/mswsock/mswsock.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 40999: msiexec: silence format warnings
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Wed May 20 01:54:47 2009 New Revision: 40999 URL: http://svn.reactos.org/svn/reactos?rev=40999&view=rev Log: msiexec: silence format warnings Modified: branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild Modified: branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/msiexec/msiexec.rbuild [iso-8859-1] Wed May 20 01:54:47 2009 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="msiexec" type="win32gui" installbase="system32" installname="msiexec.exe"> + <compilerflag>-Wno-format</compilerflag> <include base="msiexec">.</include> <include base="ReactOS">include/wine</include> <define name="__WINESRC__" />

1 0

[jimtabor] 40998: - Fix for wine tests. Added wine QS flag.
by jimtabor＠svn.reactos.org 19 May '09

19 May '09

Author: jimtabor Date: Wed May 20 01:53:13 2009 New Revision: 40998 URL: http://svn.reactos.org/svn/reactos?rev=40998&view=rev Log: - Fix for wine tests. Added wine QS flag. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Wed May 20 01:53:13 2009 @@ -2204,6 +2204,11 @@ WINAPI RealGetQueueStatus(UINT flags) { + if (flags & ~(QS_SMRESULT|QS_ALLPOSTMESSAGE|QS_ALLINPUT)) + { + SetLastError( ERROR_INVALID_FLAGS ); + return 0; + } return NtUserCallOneParam(flags, ONEPARAM_ROUTINE_GETQUEUESTATUS); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed May 20 01:53:13 2009 @@ -500,6 +500,11 @@ // #define DCX_USESTYLE 0x00010000 #define DCX_KEEPCLIPRGN 0x00040000 + +// +// Non SDK Queue message types. +// +#define QS_SMRESULT 0x8000 DWORD NTAPI

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