Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 45463: [RTL] Prevent RtlLargeInteger functions to be "occupied" by inline functions.
by tkreuzer＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: tkreuzer Date: Sat Feb 6 20:12:02 2010 New Revision: 45463 URL: http://svn.reactos.org/svn/reactos?rev=45463&view=rev Log: [RTL] Prevent RtlLargeInteger functions to be "occupied" by inline functions. Modified: branches/ros-amd64-bringup/reactos/lib/rtl/largeint.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/largeint.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/largeint.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/largeint.c [iso-8859-1] Sat Feb 6 20:12:02 2010 @@ -7,6 +7,12 @@ /* INCLUDES *****************************************************************/ +/* Prevent that inline function with the same names are created */ +#define RtlConvertLongToLargeInteger RtlConvertLongToLargeInteger_inline +#define RtlEnlargedIntegerMultiply RtlEnlargedIntegerMultiply_inline +#define RtlEnlargedUnsignedDivide RtlEnlargedUnsignedDivide_inline +#define RtlEnlargedUnsignedMultiply RtlEnlargedUnsignedMultiply_inline + #include <rtl.h> #define NDEBUG @@ -17,6 +23,7 @@ /* * @implemented */ +#undef RtlConvertLongToLargeInteger LARGE_INTEGER NTAPI RtlConvertLongToLargeInteger ( @@ -49,6 +56,7 @@ /* * @implemented */ +#undef RtlEnlargedIntegerMultiply LARGE_INTEGER NTAPI RtlEnlargedIntegerMultiply ( @@ -66,6 +74,7 @@ /* * @implemented */ +#undef RtlEnlargedUnsignedDivide ULONG NTAPI RtlEnlargedUnsignedDivide ( @@ -83,6 +92,7 @@ /* * @implemented */ +#undef RtlEnlargedUnsignedMultiply LARGE_INTEGER NTAPI RtlEnlargedUnsignedMultiply (

1 0

[sir_richard] 45462: [NTOS]: Combine all exit trap stubs into a single function with flags (same thing we did for the entry stub). Now there are only 15 lines of ASM instead of 60.
by sir_richard＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: sir_richard Date: Sat Feb 6 15:58:23 2010 New Revision: 45462 URL: http://svn.reactos.org/svn/reactos?rev=45462&view=rev Log: [NTOS]: Combine all exit trap stubs into a single function with flags (same thing we did for the entry stub). Now there are only 15 lines of ASM instead of 60. Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sat Feb 6 15:58:23 2010 @@ -186,216 +186,6 @@ } // -// Assembly exit stubs -// -VOID -FORCEINLINE -/* Do not mark this as DECLSPEC_NORETURN because possibly executing code follows it! */ -KiSystemCallReturn(IN PKTRAP_FRAME TrapFrame) -{ - /* Restore nonvolatiles, EAX, and do a "jump" back to the kernel caller */ - __asm__ __volatile__ - ( - "movl %0, %%esp\n" - "movl %c[b](%%esp), %%ebx\n" - "movl %c[s](%%esp), %%esi\n" - "movl %c[i](%%esp), %%edi\n" - "movl %c[p](%%esp), %%ebp\n" - "movl %c[a](%%esp), %%eax\n" - "movl %c[e](%%esp), %%edx\n" - "addl $%c[v],%%esp\n" /* A WHOLE *KERNEL* frame since we're not IRET'ing */ - "jmp *%%edx\n" - ".globl _KiSystemCallExit2\n_KiSystemCallExit2:\n" - : - : "r"(TrapFrame), - [b] "i"(KTRAP_FRAME_EBX), - [s] "i"(KTRAP_FRAME_ESI), - [i] "i"(KTRAP_FRAME_EDI), - [p] "i"(KTRAP_FRAME_EBP), - [a] "i"(KTRAP_FRAME_EAX), - [e] "i"(KTRAP_FRAME_EIP), - [v] "i"(KTRAP_FRAME_ESP) - : "%esp" - ); -} - -VOID -FORCEINLINE -DECLSPEC_NORETURN -KiSystemCallTrapReturn(IN PKTRAP_FRAME TrapFrame) -{ - /* Regular interrupt exit, but we only restore EAX as a volatile */ - __asm__ __volatile__ - ( - ".globl _KiSystemCallExit\n_KiSystemCallExit:\n" - "movl %0, %%esp\n" - "movl %c[b](%%esp), %%ebx\n" - "movl %c[s](%%esp), %%esi\n" - "movl %c[i](%%esp), %%edi\n" - "movl %c[p](%%esp), %%ebp\n" - "movl %c[a](%%esp), %%eax\n" - "addl $%c[e],%%esp\n" - "iret\n" - : - : "r"(TrapFrame), - [b] "i"(KTRAP_FRAME_EBX), - [s] "i"(KTRAP_FRAME_ESI), - [i] "i"(KTRAP_FRAME_EDI), - [p] "i"(KTRAP_FRAME_EBP), - [a] "i"(KTRAP_FRAME_EAX), - [e] "i"(KTRAP_FRAME_EIP) - : "%esp" - ); - UNREACHABLE; -} - -VOID -FORCEINLINE -DECLSPEC_NORETURN -KiSystemCallSysExitReturn(IN PKTRAP_FRAME TrapFrame) -{ - /* Restore nonvolatiles, EAX, and do a SYSEXIT back to the user caller */ - __asm__ __volatile__ - ( - "movl %0, %%esp\n" - "movl %c[s](%%esp), %%esi\n" - "movl %c[b](%%esp), %%ebx\n" - "movl %c[i](%%esp), %%edi\n" - "movl %c[p](%%esp), %%ebp\n" - "movl %c[a](%%esp), %%eax\n" - "movl %c[e](%%esp), %%edx\n" /* SYSEXIT says EIP in EDX */ - "movl %c[x](%%esp), %%ecx\n" /* SYSEXIT says ESP in ECX */ - "addl $%c[v],%%esp\n" /* A WHOLE *USER* frame since we're not IRET'ing */ - "sti\nsysexit\n" - : - : "r"(TrapFrame), - [b] "i"(KTRAP_FRAME_EBX), - [s] "i"(KTRAP_FRAME_ESI), - [i] "i"(KTRAP_FRAME_EDI), - [p] "i"(KTRAP_FRAME_EBP), - [a] "i"(KTRAP_FRAME_EAX), - [e] "i"(KTRAP_FRAME_EIP), - [x] "i"(KTRAP_FRAME_ESP), - [v] "i"(KTRAP_FRAME_V86_ES) - : "%esp" - ); - UNREACHABLE; -} - -VOID -FORCEINLINE -DECLSPEC_NORETURN -KiTrapReturn(IN PKTRAP_FRAME TrapFrame) -{ - /* Regular interrupt exit */ - __asm__ __volatile__ - ( - "movl %0, %%esp\n" - "movl %c[a](%%esp), %%eax\n" - "movl %c[b](%%esp), %%ebx\n" - "movl %c[c](%%esp), %%ecx\n" - "movl %c[d](%%esp), %%edx\n" - "movl %c[s](%%esp), %%esi\n" - "movl %c[i](%%esp), %%edi\n" - "movl %c[p](%%esp), %%ebp\n" - "addl $%c[e],%%esp\n" - "iret\n" - : - : "r"(TrapFrame), - [a] "i"(KTRAP_FRAME_EAX), - [b] "i"(KTRAP_FRAME_EBX), - [c] "i"(KTRAP_FRAME_ECX), - [d] "i"(KTRAP_FRAME_EDX), - [s] "i"(KTRAP_FRAME_ESI), - [i] "i"(KTRAP_FRAME_EDI), - [p] "i"(KTRAP_FRAME_EBP), - [e] "i"(KTRAP_FRAME_EIP) - : "%esp" - ); - UNREACHABLE; -} - -VOID -FORCEINLINE -DECLSPEC_NORETURN -KiDirectTrapReturn(IN PKTRAP_FRAME TrapFrame) -{ - /* Regular interrupt exit but we're not restoring any registers */ - __asm__ __volatile__ - ( - "movl %0, %%esp\n" - "addl $%c[e],%%esp\n" - "iret\n" - : - : "r"(TrapFrame), - [e] "i"(KTRAP_FRAME_EIP) - : "%esp" - ); - UNREACHABLE; -} - -VOID -FORCEINLINE -DECLSPEC_NORETURN -KiCallReturn(IN PKTRAP_FRAME TrapFrame) -{ - /* Pops a trap frame out of the stack but returns with RET instead of IRET */ - __asm__ __volatile__ - ( - "movl %0, %%esp\n" - "movl %c[b](%%esp), %%ebx\n" - "movl %c[s](%%esp), %%esi\n" - "movl %c[i](%%esp), %%edi\n" - "movl %c[p](%%esp), %%ebp\n" - "addl $%c[e],%%esp\n" - "ret\n" - : - : "r"(TrapFrame), - [b] "i"(KTRAP_FRAME_EBX), - [s] "i"(KTRAP_FRAME_ESI), - [i] "i"(KTRAP_FRAME_EDI), - [p] "i"(KTRAP_FRAME_EBP), - [e] "i"(KTRAP_FRAME_EIP) - : "%esp" - ); - UNREACHABLE; -} - -VOID -FORCEINLINE -DECLSPEC_NORETURN -KiEditedTrapReturn(IN PKTRAP_FRAME TrapFrame) -{ - /* Regular interrupt exit */ - __asm__ __volatile__ - ( - "movl %0, %%esp\n" - "movl %c[a](%%esp), %%eax\n" - "movl %c[b](%%esp), %%ebx\n" - "movl %c[c](%%esp), %%ecx\n" - "movl %c[d](%%esp), %%edx\n" - "movl %c[s](%%esp), %%esi\n" - "movl %c[i](%%esp), %%edi\n" - "movl %c[p](%%esp), %%ebp\n" - "addl $%c[e],%%esp\n" - "movl (%%esp), %%esp\n" - "iret\n" - : - : "r"(TrapFrame), - [a] "i"(KTRAP_FRAME_EAX), - [b] "i"(KTRAP_FRAME_EBX), - [c] "i"(KTRAP_FRAME_ECX), - [d] "i"(KTRAP_FRAME_EDX), - [s] "i"(KTRAP_FRAME_ESI), - [i] "i"(KTRAP_FRAME_EDI), - [p] "i"(KTRAP_FRAME_EBP), - [e] "i"(KTRAP_FRAME_ERROR_CODE) /* We *WANT* the error code since ESP is there! */ - : "%esp" - ); - UNREACHABLE; -} - -// // "BOP" code used by VDM and V8086 Mode // VOID @@ -514,6 +304,162 @@ TrapFrame->SegDs = Ds; TrapFrame->SegEs = Es; } + +// +// Generates an Exit Epilog Stub for the given name +// +#define KI_FUNCTION_CALL 0x1 +#define KI_EDITED_FRAME 0x2 +#define KI_DIRECT_EXIT 0x4 +#define KI_FAST_SYSTEM_CALL_EXIT 0x8 +#define KI_SYSTEM_CALL_EXIT 0x10 +#define KI_SYSTEM_CALL_JUMP 0x20 +#define KiTrapExitStub(x, y) VOID FORCEINLINE DECLSPEC_NORETURN x(IN PKTRAP_FRAME TrapFrame) { KiTrapExit(TrapFrame, y); UNREACHABLE; } +#define KiTrapExitStub2(x, y) VOID FORCEINLINE x(IN PKTRAP_FRAME TrapFrame) { KiTrapExit(TrapFrame, y); } + +// +// How volatiles will be restored +// +#define KI_EAX_NO_VOLATILES 0x0 +#define KI_EAX_ONLY 0x1 +#define KI_ALL_VOLATILES 0x2 + +// +// Exit mechanism to use +// +#define KI_EXIT_IRET 0x0 +#define KI_EXIT_SYSEXIT 0x1 +#define KI_EXIT_JMP 0x2 +#define KI_EXIT_RET 0x3 + +// +// Master Trap Epilog +// +VOID +FORCEINLINE +KiTrapExit(IN PKTRAP_FRAME TrapFrame, + IN ULONG Flags) +{ + ULONG FrameSize = FIELD_OFFSET(KTRAP_FRAME, Eip); + ULONG ExitMechanism = KI_EXIT_IRET, Volatiles = KI_ALL_VOLATILES, NonVolatiles = TRUE; + ULONG EcxField = FIELD_OFFSET(KTRAP_FRAME, Ecx), EdxField = FIELD_OFFSET(KTRAP_FRAME, Edx); + + /* System call exit needs a special label */ + if (Flags & KI_SYSTEM_CALL_EXIT) __asm__ __volatile__ + ( + ".globl _KiSystemCallExit\n_KiSystemCallExit:\n" + ); + + /* Start by making the trap frame equal to the stack */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + : + : "r"(TrapFrame) + : "%esp" + ); + + /* Check what kind of trap frame this trap requires */ + if (Flags & KI_FUNCTION_CALL) + { + /* These calls have an EIP on the stack they need */ + ExitMechanism = KI_EXIT_RET; + Volatiles = FALSE; + } + else if (Flags & KI_EDITED_FRAME) + { + /* Edited frames store a new ESP in the error code field */ + FrameSize = FIELD_OFFSET(KTRAP_FRAME, ErrCode); + } + else if (Flags & KI_DIRECT_EXIT) + { + /* Exits directly without restoring anything, interrupt frame on stack */ + NonVolatiles = Volatiles = FALSE; + } + else if (Flags & KI_FAST_SYSTEM_CALL_EXIT) + { + /* We have a fake interrupt stack with a ring transition */ + FrameSize = FIELD_OFFSET(KTRAP_FRAME, V86Es); + ExitMechanism = KI_EXIT_SYSEXIT; + + /* SYSEXIT wants EIP in EDX and ESP in ECX */ + EcxField = FIELD_OFFSET(KTRAP_FRAME, HardwareEsp); + EdxField = FIELD_OFFSET(KTRAP_FRAME, Eip); + } + else if (Flags & KI_SYSTEM_CALL_EXIT) + { + /* Only restore EAX */ + NonVolatiles = KI_EAX_ONLY; + } + else if (Flags & KI_SYSTEM_CALL_JUMP) + { + /* We have a fake interrupt stack with no ring transition */ + FrameSize = FIELD_OFFSET(KTRAP_FRAME, HardwareEsp); + NonVolatiles = KI_EAX_ONLY; + ExitMechanism = KI_EXIT_JMP; + } + + /* Restore the non volatiles */ + if (NonVolatiles) __asm__ __volatile__ + ( + "movl %c[b](%%esp), %%ebx\n" + "movl %c[s](%%esp), %%esi\n" + "movl %c[i](%%esp), %%edi\n" + "movl %c[p](%%esp), %%ebp\n" + : + : [b] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebx)), + [s] "i"(FIELD_OFFSET(KTRAP_FRAME, Esi)), + [i] "i"(FIELD_OFFSET(KTRAP_FRAME, Edi)), + [p] "i"(FIELD_OFFSET(KTRAP_FRAME, Ebp)) + : "%esp" + ); + + /* Restore EAX if volatiles must be restored */ + if (Volatiles) __asm__ __volatile__ + ( + "movl %c[a](%%esp), %%eax\n":: [a] "i"(FIELD_OFFSET(KTRAP_FRAME, Eax)) : "%esp" + ); + + /* Restore the other volatiles if needed */ + if (Volatiles == KI_ALL_VOLATILES) __asm__ __volatile__ + ( + "movl %c[c](%%esp), %%ecx\n" + "movl %c[d](%%esp), %%edx\n" + : + : [c] "i"(EcxField), + [d] "i"(EdxField) + : "%esp" + ); + + /* Ring 0 system calls jump back to EDX */ + if (Flags & KI_SYSTEM_CALL_JUMP) __asm__ __volatile__ + ( + "movl %c[d](%%esp), %%edx\n":: [d] "i"(FIELD_OFFSET(KTRAP_FRAME, Eip)) : "%esp" + ); + + /* Now destroy the trap frame on the stack */ + __asm__ __volatile__ ("addl $%c[e],%%esp\n":: [e] "i"(FrameSize) : "%esp"); + + /* Edited traps need to change to a new ESP */ + if (Flags & KI_EDITED_FRAME) __asm__ __volatile__ ("movl (%%esp), %%esp\n":::"%esp"); + + /* Check the exit mechanism and apply it */ + if (ExitMechanism == KI_EXIT_RET) __asm__ __volatile__("ret\n"::: "%esp"); + else if (ExitMechanism == KI_EXIT_IRET) __asm__ __volatile__("iret\n"::: "%esp"); + else if (ExitMechanism == KI_EXIT_JMP) __asm__ __volatile__("jmp *%%edx\n.globl _KiSystemCallExit2\n_KiSystemCallExit2:\n"::: "%esp"); + else if (ExitMechanism == KI_EXIT_SYSEXIT) __asm__ __volatile__("sti\nsysexit\n"::: "%esp"); +} + +// +// All the specific trap epilog stubs +// +KiTrapExitStub (KiTrapReturn, 0); +KiTrapExitStub (KiDirectTrapReturn, KI_DIRECT_EXIT); +KiTrapExitStub (KiCallReturn, KI_FUNCTION_CALL); +KiTrapExitStub (KiEditedTrapReturn, KI_EDITED_FRAME); +KiTrapExitStub2(KiSystemCallReturn, KI_SYSTEM_CALL_JUMP); +KiTrapExitStub (KiSystemCallSysExitReturn, KI_FAST_SYSTEM_CALL_EXIT); +KiTrapExitStub (KiSystemCallTrapReturn, KI_SYSTEM_CALL_EXIT); // // Generic Exit Routine

1 0

[cgutman] 45461: - Forgot this file (sorry) - mswsock.dll compiles and links now :)
by cgutman＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: cgutman Date: Sat Feb 6 15:29:09 2010 New Revision: 45461 URL: http://svn.reactos.org/svn/reactos?rev=45461&view=rev Log: - Forgot this file (sorry) - mswsock.dll compiles and links now :) Added: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/precomp.h (with props) Added: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/dns/inc/precomp.h (added) +++ branches/aicom-network-branch/dll/win32/mswsock/dns/inc/precomp.h [iso-8859-1] Sat Feb 6 15:29:09 2010 @@ -1,0 +1,24 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DNS Shared Library + * FILE: lib/dnslib/precomp.h + * PURPOSE: DNSLIB Precompiled Header + */ + +#define _CRT_SECURE_NO_DEPRECATE +#define _WIN32_WINNT 0x502 +#define WIN32_NO_STATUS + +/* PSDK Headers */ +#include <winsock2.h> +#include <ws2tcpip.h> +#include <windns.h> + +/* DNSLIB and DNSAPI Headers */ +#include <dnslib.h> +#include <windnsp.h> + +/* NDK */ +#include <rtlfuncs.h> + +/* EOF */ Propchange: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 45460: - Build fixes - For some reason when I applied the patch from my other WC to this one, I ended up with 2-3 copies of the same code in each file
by cgutman＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: cgutman Date: Sat Feb 6 15:24:55 2010 New Revision: 45460 URL: http://svn.reactos.org/svn/reactos?rev=45460&view=rev Log: - Build fixes - For some reason when I applied the patch from my other WC to this one, I ended up with 2-3 copies of the same code in each file Removed: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/dnslibp.h Modified: branches/aicom-network-branch/dll/win32/dnsapi/dnsapi/memory.c branches/aicom-network-branch/dll/win32/mswsock/dns/addr.c branches/aicom-network-branch/dll/win32/mswsock/dns/debug.c branches/aicom-network-branch/dll/win32/mswsock/dns/dnsaddr.c branches/aicom-network-branch/dll/win32/mswsock/dns/dnsutil.c branches/aicom-network-branch/dll/win32/mswsock/dns/flatbuf.c branches/aicom-network-branch/dll/win32/mswsock/dns/hostent.c branches/aicom-network-branch/dll/win32/mswsock/dns/inc/dnslib.h branches/aicom-network-branch/dll/win32/mswsock/dns/inc/windnsp.h branches/aicom-network-branch/dll/win32/mswsock/dns/ip6.c branches/aicom-network-branch/dll/win32/mswsock/dns/memory.c branches/aicom-network-branch/dll/win32/mswsock/dns/name.c branches/aicom-network-branch/dll/win32/mswsock/dns/print.c branches/aicom-network-branch/dll/win32/mswsock/dns/record.c branches/aicom-network-branch/dll/win32/mswsock/dns/rrprint.c branches/aicom-network-branch/dll/win32/mswsock/dns/sablob.c branches/aicom-network-branch/dll/win32/mswsock/dns/straddr.c branches/aicom-network-branch/dll/win32/mswsock/dns/string.c branches/aicom-network-branch/dll/win32/mswsock/dns/table.c branches/aicom-network-branch/dll/win32/mswsock/dns/utf8.c branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c branches/aicom-network-branch/dll/win32/mswsock/msafd/addrconv.c branches/aicom-network-branch/dll/win32/mswsock/msafd/afdsan.c branches/aicom-network-branch/dll/win32/mswsock/msafd/async.c branches/aicom-network-branch/dll/win32/mswsock/msafd/bind.c branches/aicom-network-branch/dll/win32/mswsock/msafd/connect.c branches/aicom-network-branch/dll/win32/mswsock/msafd/eventsel.c branches/aicom-network-branch/dll/win32/mswsock/msafd/getname.c branches/aicom-network-branch/dll/win32/mswsock/msafd/helper.c branches/aicom-network-branch/dll/win32/mswsock/msafd/listen.c branches/aicom-network-branch/dll/win32/mswsock/msafd/nspeprot.c branches/aicom-network-branch/dll/win32/mswsock/msafd/proc.c branches/aicom-network-branch/dll/win32/mswsock/msafd/recv.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanaccpt.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanconn.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanflow.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanlistn.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanprov.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanrdma.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanrecv.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sansend.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanshutd.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sansock.c branches/aicom-network-branch/dll/win32/mswsock/msafd/santf.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sanutil.c branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c branches/aicom-network-branch/dll/win32/mswsock/msafd/send.c branches/aicom-network-branch/dll/win32/mswsock/msafd/shutdown.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sockerr.c branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c branches/aicom-network-branch/dll/win32/mswsock/msafd/spi.c branches/aicom-network-branch/dll/win32/mswsock/msafd/tpackets.c branches/aicom-network-branch/dll/win32/mswsock/msafd/tranfile.c branches/aicom-network-branch/dll/win32/mswsock/msafd/wspmisc.c branches/aicom-network-branch/dll/win32/mswsock/mswsock.rbuild branches/aicom-network-branch/dll/win32/mswsock/mswsock/init.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/msext.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspgaddr.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspmisc.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspsvc.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/nsptcpip.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/nsputil.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/proc.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/recvex.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/setup.c branches/aicom-network-branch/dll/win32/mswsock/mswsock/stubs.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/context.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/getserv.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/init.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/logit.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/lookup.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/nbt.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/nsp.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/oldutil.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/proc.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/r_comp.c branches/aicom-network-branch/dll/win32/mswsock/rnr20/util.c branches/aicom-network-branch/dll/win32/mswsock/wsmobile/lpc.c branches/aicom-network-branch/dll/win32/mswsock/wsmobile/nsp.c branches/aicom-network-branch/dll/win32/mswsock/wsmobile/service.c branches/aicom-network-branch/dll/win32/mswsock/wsmobile/update.c branches/aicom-network-branch/include/reactos/winsock/msafd.h branches/aicom-network-branch/include/reactos/winsock/msafdlib.h branches/aicom-network-branch/include/reactos/winsock/mswinsock.h branches/aicom-network-branch/include/reactos/winsock/rnr20lib.h branches/aicom-network-branch/include/reactos/winsock/wsmobile.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/aicom-network-branch/dll/win32/dnsapi/dnsapi/memory.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/addr.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/debug.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/dnsaddr.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/dnsutil.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/flatbuf.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/hostent.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/dnslib.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Removed: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/dnslibp.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/inc/windnsp.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/ip6.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/memory.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/name.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/print.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/record.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/rrprint.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/sablob.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/straddr.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/string.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/table.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/dns/utf8.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/addrconv.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/afdsan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/async.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/eventsel.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/getname.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/helper.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/nspeprot.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/proc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/recv.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanaccpt.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanconn.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanflow.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanlistn.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanprov.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanrdma.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanrecv.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sansend.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanshutd.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sansock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/santf.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sanutil.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/send.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockerr.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/sockopt.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/spi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/tpackets.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/tranfile.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/wspmisc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/init.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/msext.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspgaddr.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspmisc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nspsvc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nsptcpip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/nsputil.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/proc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/recvex.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/setup.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/mswsock/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/context.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/getserv.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/init.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/logit.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/lookup.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/nbt.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/nsp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/oldutil.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/proc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/r_comp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/rnr20/util.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/wsmobile/lpc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/wsmobile/nsp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/wsmobile/service.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/dll/win32/mswsock/wsmobile/update.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… Modified: branches/aicom-network-branch/include/reactos/winsock/msafd.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re… Modified: branches/aicom-network-branch/include/reactos/winsock/msafdlib.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re… Modified: branches/aicom-network-branch/include/reactos/winsock/mswinsock.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re… Modified: branches/aicom-network-branch/include/reactos/winsock/rnr20lib.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re… Modified: branches/aicom-network-branch/include/reactos/winsock/wsmobile.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/include/re…

1 0

[ekohl] 45459: Convert offset to pointers when enumeration functions return ERROR_SUCCESS or ERROR_MORE_DATA because there is something to convert in both cases.
by ekohl＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: ekohl Date: Sat Feb 6 15:10:18 2010 New Revision: 45459 URL: http://svn.reactos.org/svn/reactos?rev=45459&view=rev Log: Convert offset to pointers when enumeration functions return ERROR_SUCCESS or ERROR_MORE_DATA because there is something to convert in both cases. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sat Feb 6 15:10:18 2010 @@ -820,25 +820,28 @@ } RpcEndExcept; + if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) + { + lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + } + if (dwError != ERROR_SUCCESS) { ERR("REnumDependentServicesA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; - } - - lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; - for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) - { - if (lpStatusPtr->lpServiceName) - lpStatusPtr->lpServiceName = - (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); - - if (lpStatusPtr->lpDisplayName) - lpStatusPtr->lpDisplayName = - (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); - - lpStatusPtr++; } TRACE("EnumDependentServicesA() done\n"); @@ -881,25 +884,28 @@ } RpcEndExcept; + if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) + { + lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + } + if (dwError != ERROR_SUCCESS) { ERR("REnumDependentServicesW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; - } - - lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; - for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) - { - if (lpStatusPtr->lpServiceName) - lpStatusPtr->lpServiceName = - (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); - - if (lpStatusPtr->lpDisplayName) - lpStatusPtr->lpDisplayName = - (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); - - lpStatusPtr++; } TRACE("EnumDependentServicesW() done\n"); @@ -1012,25 +1018,28 @@ } RpcEndExcept; + if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) + { + lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + } + if (dwError != ERROR_SUCCESS) { ERR("REnumServicesStatusA() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; - } - - lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; - for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) - { - if (lpStatusPtr->lpServiceName) - lpStatusPtr->lpServiceName = - (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); - - if (lpStatusPtr->lpDisplayName) - lpStatusPtr->lpDisplayName = - (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); - - lpStatusPtr++; } TRACE("EnumServicesStatusA() done\n"); @@ -1083,25 +1092,28 @@ } RpcEndExcept; + if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) + { + lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + } + if (dwError != ERROR_SUCCESS) { ERR("REnumServicesStatusW() failed (Error %lu)\n", dwError); SetLastError(dwError); return FALSE; - } - - lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; - for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) - { - if (lpStatusPtr->lpServiceName) - lpStatusPtr->lpServiceName = - (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); - - if (lpStatusPtr->lpDisplayName) - lpStatusPtr->lpDisplayName = - (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); - - lpStatusPtr++; } TRACE("EnumServicesStatusW() done\n"); @@ -1145,7 +1157,6 @@ return FALSE; } - RpcTryExcept { dwError = REnumServicesStatusExA((SC_RPC_HANDLE)hSCManager, @@ -1165,13 +1176,7 @@ } RpcEndExcept; - if (dwError == ERROR_MORE_DATA) - { - WARN("Required buffer size %ul\n", *pcbBytesNeeded); - SetLastError(dwError); - return FALSE; - } - else if (dwError == ERROR_SUCCESS) + if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) { lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSA)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -1187,7 +1192,8 @@ lpStatusPtr++; } } - else + + if (dwError != ERROR_SUCCESS) { ERR("REnumServicesStatusExA() failed (Error %lu)\n", dwError); SetLastError(dwError); @@ -1242,13 +1248,7 @@ } RpcEndExcept; - if (dwError == ERROR_MORE_DATA) - { - WARN("Required buffer size %ul\n", *pcbBytesNeeded); - SetLastError(dwError); - return FALSE; - } - else if (dwError == ERROR_SUCCESS) + if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) { lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpServices; for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) @@ -1264,7 +1264,8 @@ lpStatusPtr++; } } - else + + if (dwError != ERROR_SUCCESS) { ERR("REnumServicesStatusExW() failed (Error %lu)\n", dwError); SetLastError(dwError);

1 0

[fireball] 45458: - Merge 45418, 45419 (expand sync from Wine). Part 2/2.
by fireball＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: fireball Date: Sat Feb 6 14:37:41 2010 New Revision: 45458 URL: http://svn.reactos.org/svn/reactos?rev=45458&view=rev Log: - Merge 45418, 45419 (expand sync from Wine). Part 2/2. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/ (props changed) branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/arwinss/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec (props changed) branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/include/ndk/amd64/ (props changed) branches/arwinss/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/arwinss/reactos/include/psdk/ (props changed) branches/arwinss/reactos/lib/sdk/crt/time/ (props changed) branches/arwinss/reactos/media/doc/README.WINE branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/ (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/request.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/include/user.h (props changed) branches/arwinss/reactos/subsystems/win32/win32k/wine/ (props changed) branches/arwinss/reactos/tools/rsym/log2lines.c (props changed) branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos:42000-44999,45097-45099,45319 +/trunk/reactos:42000-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/directx/d3d8/d3d8.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36930,36936,36992,38148-38151,38264-38265,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45097-45099,45319 +/trunk/reactos/dll/directx/d3d8/d3d8.spec:43127-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new:43669-44421,45319 +/trunk/reactos/dll/directx/dsound_new:43669-44421,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/classfactory.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 /branches/ros-amd64-bringup/reactos/dll/win32/netshell/classfactory.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 -/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45319 +/trunk/reactos/dll/directx/dsound_new/classfactory.c:43925-44999,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/dsound.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/dsound.spec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45319 +/trunk/reactos/dll/directx/dsound_new/dsound.spec:43925-44999,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/directx/dsound_new/regsvr.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/directx/dsound/regsvr.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41030,41050,41052,41082-41086,41499,41549,43080,43426,43454,43677,43682 /branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36502-36503,36505,36936,36992,38149-38150,38264,38355,39639,40122-40123,40125,40155,40247,40324,40753,40986-40987,40989,40993,40995-40996,41001,41029,41044-41045,41047-41049,41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857,43860,43905,43907,43969,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45319 +/trunk/reactos/dll/directx/dsound_new/regsvr.c:43925-44999,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/shellext/devcpux/devcpux.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45097-45099,45319 +/trunk/reactos/dll/shellext/devcpux/devcpux.spec:43127-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/shellext/slayer/slayer.spec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41029,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,41549,43080,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45097-45099,45319 +/trunk/reactos/dll/shellext/slayer/slayer.spec:43127-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/gdi32:42000-44999,45097-45099,45319 +/trunk/reactos/dll/win32/gdi32:42000-44999,45097-45099,45319,45418-45419 /vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455 Propchange: branches/arwinss/reactos/dll/win32/kernel32/kernel32.pspec ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45097-45099,45319 +/trunk/reactos/dll/win32/kernel32/kernel32.pspec:42000-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/user32:42000-44999,45097-45099,45319 +/trunk/reactos/dll/win32/user32:42000-44999,45097-45099,45319,45418-45419 /vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455 Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/dll/win32/winex11.drv:42000-44999,45097-45099,45319 +/trunk/reactos/dll/win32/winex11.drv:42000-44999,45097-45099,45319,45418-45419 /vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455 Propchange: branches/arwinss/reactos/include/ndk/amd64/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64:34780-34782,34908-34909,34925,34965,34967,34970,35323-35324,35347-35348,35361,35436,35509,35588,35683,35739,35762,35777,35805,35823,35827,35952,35966,36172,36360,36445,36502-36503,36505,36899,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631 -/trunk/reactos/include/ndk/amd64:43125-44999,45097-45099,45319 +/trunk/reactos/include/ndk/amd64:43125-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/include/ndk/amd64/asmmacro.S ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37475,37536,37820-37821,37868-37869,37990,38013-38014,38149-38150,38264,38355,39338,39347,39639,40088,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41029-41030,41044-41045,41047-41049,41071,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43426,43447,43454,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43777,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44178,44205,44218,44238,44294,44338,44389,44391,44426,44460,44491,44500,44530,44540,44601,44623,44631 -/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45097-45099,45319 +/trunk/reactos/include/ndk/amd64/asmmacro.S:43669-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/include/psdk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/include/psdk:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/include/psdk:42000-44999,45097-45099,45319 +/trunk/reactos/include/psdk:42000-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/lib/sdk/crt/time/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,4 +1,4 @@ /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 /branches/ros-amd64-bringup/reactos/lib/sdk/crt/time_new:42414 -/trunk/reactos/lib/sdk/crt/time:42678-44999,45097-45099,45319 +/trunk/reactos/lib/sdk/crt/time:42678-44999,45097-45099,45319,45418-45419 /trunk/reactos/lib/sdk/crt/time_new:39350-42241,42401-42678 Modified: branches/arwinss/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/media/doc/READM… ============================================================================== --- branches/arwinss/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ branches/arwinss/reactos/media/doc/README.WINE [iso-8859-1] Sat Feb 6 14:37:41 2010 @@ -193,7 +193,7 @@ reactos/base/applications/winhlp32 # Autosync reactos/base/applications/wordpad # Autosync reactos/base/services/rpcss # Synced to Wine-20081105 -reactos/base/system/expand # Out of sync +reactos/base/system/expand # Synced to Wine-1_1_37 reactos/base/system/msiexec # Synced to Wine-1_1_23 reactos/modules/rosapps/winfile # Autosync Propchange: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45097-45099,45319 +/trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c:42000-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 -/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45097-45099,45319 +/trunk/reactos/subsystems/win32/win32k/include:42000-44999,45097-45099,45319,45418-45419 /vendor/wine/server/current:45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/request.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/request.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45097-45099,45319 +/trunk/reactos/subsystems/win32/win32k/include/request.h:42000-44999,45097-45099,45319,45418-45419 /vendor/wine/server/current/request.h:43136,43398,43708,45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/user.h:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45097-45099,45319 +/trunk/reactos/subsystems/win32/win32k/include/user.h:42000-43126,43669-44999,45097-45099,45319,45418-45419 /vendor/wine/server/current/user.h:43708,45044 Propchange: branches/arwinss/reactos/subsystems/win32/win32k/wine/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/wine:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 -/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45097-45099,45319 +/trunk/reactos/subsystems/win32/win32k/wine:42000-43126,43669-44999,45097-45099,45319,45418-45419 /vendor/wine/server/current:43708,44715,45044,45206 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45097-45099,45319 +/trunk/reactos/tools/rsym/log2lines.c:43125-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/log2lines.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,38149-38150,38264,38268,38355,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45097-45099,45319 +/trunk/reactos/tools/rsym/log2lines.mak:43125-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.c:42000-44999,45097-45099,45319 +/trunk/reactos/tools/rsym/rsym.c:42000-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.h:42000-44999,45097-45099,45319 +/trunk/reactos/tools/rsym/rsym.h:42000-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45097-45099,45319 +/trunk/reactos/tools/rsym/rsym.mak:42000-44999,45097-45099,45319,45418-45419 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 14:37:41 2010 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:34780-34782,34908-34909,34965,35683,35762,35777,35805,35827,36172,36445,36502-36503,36505,36899,36936,36992,37291,37302,37305,37320,37329,37462,37895,38129,38149-38150,38264,38268,38330-38331,38341,38355,38947,38973,39072,39114,39121,39639,40122-40123,40125,40128,40155,40247,40324,40605,40753,40928,40986-40987,40989,40993,40995-40996,41001,41028-41029,41044-41045,41047-41049,41097-41098,41101,41449,41479,41484-41485,41531,41536,41540,41546-41547,43506,43566,43574,43598,43600-43602,43604-43605,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 -/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45097-45099,45319 +/trunk/reactos/tools/rsym/rsym_common.c:42000-44999,45097-45099,45319,45418-45419

1 0

[fireball] 45457: - Merge 45418, 45419 (expand sync from Wine). Part 1/2.
by fireball＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: fireball Date: Sat Feb 6 14:36:35 2010 New Revision: 45457 URL: http://svn.reactos.org/svn/reactos?rev=45457&view=rev Log: - Merge 45418, 45419 (expand sync from Wine). Part 1/2. Removed: branches/arwinss/reactos/base/system/expand/lang/ branches/arwinss/reactos/base/system/expand/resource.h branches/arwinss/reactos/base/system/expand/rsrc.rc Modified: branches/arwinss/reactos/base/system/expand/expand.c branches/arwinss/reactos/base/system/expand/expand.rbuild branches/arwinss/reactos/base/system/expand/expand.rc Modified: branches/arwinss/reactos/base/system/expand/expand.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/exp… ============================================================================== --- branches/arwinss/reactos/base/system/expand/expand.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/system/expand/expand.c [iso-8859-1] Sat Feb 6 14:36:35 2010 @@ -1,6 +1,7 @@ /* * Copyright 1997 Victor Schneider * Copyright 2002 Alexandre Julliard + * Copyright 2007 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -14,44 +15,178 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdlib.h> +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include <string.h> #include <windows.h> #include <lzexpand.h> -#include <tchar.h> +#include <setupapi.h> -#include "resource.h" +static UINT CALLBACK set_outfile( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) +{ + FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1; + char buffer[MAX_PATH]; + char* basename; -int _tmain(int argc, TCHAR *argv[]) + switch (notification) + { + case SPFILENOTIFY_FILEINCABINET: + { + LPSTR outfile = context; + if (outfile[0] != 0) + { + SetLastError( ERROR_NOT_SUPPORTED ); + return FILEOP_ABORT; + } + GetFullPathNameA( info->NameInCabinet, sizeof(buffer), buffer, &basename ); + strcpy( outfile, basename ); + return FILEOP_SKIP; + } + default: return NO_ERROR; + } +} + +static UINT CALLBACK extract_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) { - OFSTRUCT SourceOpenStruct1, SourceOpenStruct2; - LONG ret; - HFILE hSourceFile, hDestFile; - TCHAR szMsg[RC_STRING_MAX_SIZE]; + FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1; - if (argc < 2) - { - LoadString( GetModuleHandle(NULL), IDS_Copy, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - _ftprintf( stderr, szMsg, argv[0] ); - return 1; - } - hSourceFile = LZOpenFile(argv[1], &SourceOpenStruct1, OF_READ); - if (argv[2]) - hDestFile = LZOpenFile(argv[2], &SourceOpenStruct2, OF_CREATE | OF_WRITE); - else - { - TCHAR OriginalName[MAX_PATH]; - GetExpandedName(argv[1], OriginalName); - hDestFile = LZOpenFile(OriginalName, &SourceOpenStruct2, OF_CREATE | OF_WRITE); - } - ret = LZCopy(hSourceFile, hDestFile); - LZClose(hSourceFile); - LZClose(hDestFile); - LoadString( GetModuleHandle(NULL), IDS_FAILS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); - if (ret <= 0) _ftprintf(stderr,szMsg,ret); - return (ret <= 0); + switch (notification) + { + case SPFILENOTIFY_FILEINCABINET: + { + LPCSTR targetname = context; + + strcpy( info->FullTargetName, targetname ); + return FILEOP_DOIT; + } + default: return NO_ERROR; + } } + +static BOOL option_equal(LPCSTR str1, LPCSTR str2) +{ + if (str1[0] != '/' && str1[0] != '-') + return FALSE; + return !lstrcmpA( str1 + 1, str2 ); +} + +int main(int argc, char *argv[]) +{ + int ret = 0; + char infile[MAX_PATH], outfile[MAX_PATH], actual_name[MAX_PATH]; + char outfile_basename[MAX_PATH], *basename_index; + UINT comp; + + if (argc < 3) + { + fprintf( stderr, "Usage:\n" ); + fprintf( stderr, "\t%s infile outfile\n", argv[0] ); + fprintf( stderr, "\t%s /r infile\n", argv[0] ); + return 1; + } + + if (argc == 3 && (option_equal(argv[1], "R") || option_equal(argv[1], "r"))) + GetFullPathNameA( argv[2], sizeof(infile), infile, NULL ); + else + GetFullPathNameA( argv[1], sizeof(infile), infile, NULL ); + + if (!SetupGetFileCompressionInfoExA( infile, actual_name, sizeof(actual_name), NULL, NULL, NULL, &comp )) + { + fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + return 1; + } + + if (argc == 3 && (option_equal(argv[1], "R") || option_equal(argv[1], "r"))) + { + switch (comp) + { + case FILE_COMPRESSION_MSZIP: + { + outfile_basename[0] = 0; + if (!SetupIterateCabinetA( infile, 0, set_outfile, outfile_basename )) + { + fprintf( stderr, "%s: can't determine original name\n", argv[0] ); + return 1; + } + GetFullPathNameA( infile, sizeof(outfile), outfile, &basename_index ); + *basename_index = 0; + strcat( outfile, outfile_basename ); + break; + } + case FILE_COMPRESSION_WINLZA: + { + GetExpandedNameA( infile, outfile_basename ); + break; + } + default: + { + fprintf( stderr, "%s: can't determine original\n", argv[0] ); + return 1; + } + } + } + else + GetFullPathNameA( argv[2], sizeof(outfile), outfile, NULL ); + + if (!lstrcmpiA( infile, outfile )) + { + fprintf( stderr, "%s: can't expand file to itself\n", argv[0] ); + return 1; + } + + switch (comp) + { + case FILE_COMPRESSION_MSZIP: + { + if (!SetupIterateCabinetA( infile, 0, extract_callback, outfile )) + { + fprintf( stderr, "%s: cabinet extraction failed\n", argv[0] ); + return 1; + } + break; + } + case FILE_COMPRESSION_WINLZA: + { + INT hin, hout; + OFSTRUCT ofin, ofout; + LONG error; + + if ((hin = LZOpenFileA( infile, &ofin, OF_READ )) < 0) + { + fprintf( stderr, "%s: can't open input file %s\n", argv[0], infile ); + return 1; + } + if ((hout = LZOpenFileA( outfile, &ofout, OF_CREATE | OF_WRITE )) < 0) + { + LZClose( hin ); + fprintf( stderr, "%s: can't open output file %s\n", argv[0], outfile ); + return 1; + } + error = LZCopy( hin, hout ); + + LZClose( hin ); + LZClose( hout ); + + if (error < 0) + { + fprintf( stderr, "%s: LZCopy failed, error is %ld\n", argv[0], error ); + return 1; + } + break; + } + default: + { + if (!CopyFileA( infile, outfile, FALSE )) + { + fprintf( stderr, "%s: CopyFileA failed\n", argv[0] ); + return 1; + } + break; + } + } + return ret; +} Modified: branches/arwinss/reactos/base/system/expand/expand.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/exp… ============================================================================== --- branches/arwinss/reactos/base/system/expand/expand.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/base/system/expand/expand.rbuild [iso-8859-1] Sat Feb 6 14:36:35 2010 @@ -3,8 +3,8 @@ <module name="expand" type="win32cui" installbase="system32" installname="expand.exe" > <include base="ReactOS">include/reactos/wine</include> <include base="expand">.</include> - <define name="ANONYMOUSUNIONS" /> <library>lz32</library> + <library>setupapi</library> <library>user32</library> <file>expand.c</file> <file>expand.rc</file> Modified: branches/arwinss/reactos/base/system/expand/expand.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/exp… ============================================================================== --- branches/arwinss/reactos/base/system/expand/expand.rc [iso-8859-1] (original) +++ branches/arwinss/reactos/base/system/expand/expand.rc [iso-8859-1] Sat Feb 6 14:36:35 2010 @@ -3,5 +3,3 @@ #define REACTOS_STR_INTERNAL_NAME "expand\0" #define REACTOS_STR_ORIGINAL_FILENAME "expand.exe\0" #include <reactos/version.rc> - -#include "rsrc.rc" Removed: branches/arwinss/reactos/base/system/expand/resource.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/exp… ============================================================================== --- branches/arwinss/reactos/base/system/expand/resource.h [iso-8859-1] (original) +++ branches/arwinss/reactos/base/system/expand/resource.h (removed) @@ -1,10 +1,0 @@ -#ifndef RESOURCE_H__ -#define RESOURCE_H__ - -#define RC_STRING_MAX_SIZE 4096 -#define IDS_Copy 100 -#define IDS_FAILS 101 - -#endif - -/* EOF */ Removed: branches/arwinss/reactos/base/system/expand/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/exp… ============================================================================== --- branches/arwinss/reactos/base/system/expand/rsrc.rc [iso-8859-1] (original) +++ branches/arwinss/reactos/base/system/expand/rsrc.rc (removed) @@ -1,24 +1,0 @@ -#include <windows.h> -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/lt-LT.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/pt-BR.rc" -#include "lang/ru-RU.rc" -#include "lang/sv-SE.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc"

1 0

[fireball] 45456: - Sync up to Wine-1.1.38.
by fireball＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: fireball Date: Sat Feb 6 11:18:44 2010 New Revision: 45456 URL: http://svn.reactos.org/svn/reactos?rev=45456&view=rev Log: - Sync up to Wine-1.1.38. Modified: branches/arwinss/reactos/dll/win32/gdi32/ (props changed) branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c branches/arwinss/reactos/dll/win32/user32/ (props changed) branches/arwinss/reactos/dll/win32/user32/class.c branches/arwinss/reactos/dll/win32/user32/combo.c branches/arwinss/reactos/dll/win32/user32/controls.h branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/defwnd.c branches/arwinss/reactos/dll/win32/user32/dialog.c branches/arwinss/reactos/dll/win32/user32/hook.c branches/arwinss/reactos/dll/win32/user32/message.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/msgbox.c branches/arwinss/reactos/dll/win32/user32/property.c branches/arwinss/reactos/dll/win32/user32/resource.c branches/arwinss/reactos/dll/win32/user32/win.c branches/arwinss/reactos/dll/win32/user32/winproc.c branches/arwinss/reactos/dll/win32/winex11.drv/ (props changed) branches/arwinss/reactos/dll/win32/winex11.drv/window.c Propchange: branches/arwinss/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 11:18:44 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/gdi32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/gdi32:42000-44999,45097-45099,45319 -/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206 +/vendor/wine/dlls/gdi32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455 Modified: branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -319,7 +319,7 @@ @ stdcall GdiGetSpoolMessage(ptr long ptr long) @ stdcall GdiGradientFill(long ptr long ptr long long) @ stdcall GdiInitSpool() -@ stub GdiInitializeLanguagePack +@ stdcall GdiInitializeLanguagePack(long) @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) @ stdcall GdiIsPlayMetafileDC(long) Modified: branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/gdiobj.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -1167,6 +1167,14 @@ /* Nothing to do */ } +/*********************************************************************** + * GdiInitializeLanguagePack (GDI32.@) + */ +DWORD WINAPI GdiInitializeLanguagePack( DWORD arg ) +{ + FIXME("stub\n"); + return 0; +} /*********************************************************************** * GdiFlush (GDI32.@) @@ -1202,7 +1210,7 @@ */ BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca) { - FIXME("GetColorAdjustment, stub\n"); + FIXME("stub\n"); return 0; } @@ -1231,6 +1239,6 @@ */ BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca) { - FIXME("SetColorAdjustment, stub\n"); + FIXME("stub\n"); return 0; } Modified: branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/mfdrv/objects.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -365,6 +365,7 @@ char buffer[sizeof(METARECORD) - 2 + sizeof(LOGFONT16)]; METARECORD *mr = (METARECORD *)&buffer; LOGFONT16 *font16; + INT written; mr->rdSize = (sizeof(METARECORD) + sizeof(LOGFONT16) - 2) / 2; mr->rdFunction = META_CREATEFONTINDIRECT; @@ -383,8 +384,9 @@ font16->lfClipPrecision = logfont->lfClipPrecision; font16->lfQuality = logfont->lfQuality; font16->lfPitchAndFamily = logfont->lfPitchAndFamily; - WideCharToMultiByte( CP_ACP, 0, logfont->lfFaceName, -1, font16->lfFaceName, LF_FACESIZE, NULL, NULL ); - font16->lfFaceName[LF_FACESIZE-1] = 0; + written = WideCharToMultiByte( CP_ACP, 0, logfont->lfFaceName, -1, font16->lfFaceName, LF_FACESIZE - 1, NULL, NULL ); + /* Zero pad the facename buffer, so that we don't write uninitialized data to disk */ + memset(font16->lfFaceName + written, 0, LF_FACESIZE - written); if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) return 0; Propchange: branches/arwinss/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 11:18:44 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/user32:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/user32:42000-44999,45097-45099,45319 -/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206 +/vendor/wine/dlls/user32/current:43136,43149,43398,43708,44151,44715,45044,45206,45455 Modified: branches/arwinss/reactos/dll/win32/user32/class.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/class.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/class.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -176,7 +176,7 @@ */ static inline LPSTR CLASS_GetMenuNameA( CLASS *classPtr ) { - if (!HIWORD(classPtr->menuName)) return (LPSTR)classPtr->menuName; + if (IS_INTRESOURCE(classPtr->menuName)) return (LPSTR)classPtr->menuName; return (LPSTR)(classPtr->menuName + strlenW(classPtr->menuName) + 1); } @@ -199,8 +199,8 @@ */ static void CLASS_SetMenuNameA( CLASS *classPtr, LPCSTR name ) { - if (HIWORD(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); - if (HIWORD(name)) + if (!IS_INTRESOURCE(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); + if (!IS_INTRESOURCE(name)) { DWORD lenA = strlen(name) + 1; DWORD lenW = MultiByteToWideChar( CP_ACP, 0, name, lenA, NULL, 0 ); @@ -219,8 +219,8 @@ */ static void CLASS_SetMenuNameW( CLASS *classPtr, LPCWSTR name ) { - if (HIWORD(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); - if (HIWORD(name)) + if (!IS_INTRESOURCE(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); + if (!IS_INTRESOURCE(name)) { DWORD lenW = strlenW(name) + 1; DWORD lenA = WideCharToMultiByte( CP_ACP, 0, name, lenW, NULL, 0, NULL, NULL ); Modified: branches/arwinss/reactos/dll/win32/user32/combo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/combo.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/combo.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -1910,8 +1910,14 @@ case WM_GETFONT: return (LRESULT)lphc->hFont; case WM_SETFOCUS: - if( lphc->wState & CBF_EDIT ) - SetFocus( lphc->hWndEdit ); + if( lphc->wState & CBF_EDIT ) { + SetFocus( lphc->hWndEdit ); + /* The first time focus is received, select all the text */ + if( !(lphc->wState & CBF_BEENFOCUSED) ) { + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + lphc->wState |= CBF_BEENFOCUSED; + } + } else COMBO_SetFocus( lphc ); return TRUE; Modified: branches/arwinss/reactos/dll/win32/user32/controls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/controls.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/controls.h [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -199,6 +199,7 @@ #define CBF_SELCHANGE 0x0400 #define CBF_NOEDITNOTIFY 0x1000 #define CBF_NOLBSELECT 0x2000 /* do not change current selection */ +#define CBF_BEENFOCUSED 0x4000 /* has it ever had focus */ #define CBF_EUI 0x8000 /* combo state struct */ Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -2467,7 +2467,7 @@ HANDLE res; LPWSTR u_name; - if (!HIWORD(name)) + if (IS_INTRESOURCE(name)) return LoadImageW(hinst, (LPCWSTR)name, type, desiredx, desiredy, loadflags); __TRY { Modified: branches/arwinss/reactos/dll/win32/user32/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/defwnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/defwnd.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -563,7 +563,7 @@ else if( wParam == VK_F10 ) { if (GetKeyState(VK_SHIFT) & 0x8000) - SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) ); + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, -1 ); iF10Key = 1; } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) @@ -835,7 +835,7 @@ CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam; /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) * may have child window IDs instead of window name */ - if (HIWORD(cs->lpszName)) + if (!IS_INTRESOURCE(cs->lpszName)) DEFWND_SetTextA( hwnd, cs->lpszName ); result = 1; } @@ -982,7 +982,7 @@ CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) * may have child window IDs instead of window name */ - if (HIWORD(cs->lpszName)) + if (!IS_INTRESOURCE(cs->lpszName)) DEFWND_SetTextW( hwnd, cs->lpszName ); result = 1; } Modified: branches/arwinss/reactos/dll/win32/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -287,14 +287,14 @@ LPSTR class_tmp = NULL; LPSTR caption_tmp = NULL; - if (HIWORD(class)) + if (!IS_INTRESOURCE(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.className, -1, NULL, 0, NULL, NULL ); class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); WideCharToMultiByte( CP_ACP, 0, info.className, -1, class_tmp, len, NULL, NULL ); class = class_tmp; } - if (HIWORD(caption)) + if (!IS_INTRESOURCE(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, NULL, 0, NULL, NULL ); caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); @@ -633,14 +633,14 @@ LPSTR class_tmp = NULL; LPSTR caption_tmp = NULL; - if (HIWORD(class)) + if (!IS_INTRESOURCE(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.className, -1, NULL, 0, NULL, NULL ); class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); WideCharToMultiByte( CP_ACP, 0, template.className, -1, class_tmp, len, NULL, NULL ); class = class_tmp; } - if (HIWORD(caption)) + if (!IS_INTRESOURCE(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.caption, -1, NULL, 0, NULL, NULL ); caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); Modified: branches/arwinss/reactos/dll/win32/user32/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/hook.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -222,12 +222,12 @@ cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter; csW = *(CREATESTRUCTW *)cbtcwA->lpcs; - if (HIWORD(cbtcwA->lpcs->lpszName)) + if (!IS_INTRESOURCE(cbtcwA->lpcs->lpszName)) { RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszName); csW.lpszName = nameW = usBuffer.Buffer; } - if (HIWORD(cbtcwA->lpcs->lpszClass)) + if (!IS_INTRESOURCE(cbtcwA->lpcs->lpszClass)) { RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); csW.lpszClass = classW = usBuffer.Buffer; @@ -262,14 +262,14 @@ cbtcwA.hwndInsertAfter = cbtcwW->hwndInsertAfter; csA = *(CREATESTRUCTA *)cbtcwW->lpcs; - if (HIWORD(cbtcwW->lpcs->lpszName)) { + if (!IS_INTRESOURCE(cbtcwW->lpcs->lpszName)) { len = WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, NULL, 0, NULL, NULL ); nameA = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, nameA, len, NULL, NULL ); csA.lpszName = nameA; } - if (HIWORD(cbtcwW->lpcs->lpszClass)) { + if (!IS_INTRESOURCE(cbtcwW->lpcs->lpszClass)) { len = WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszClass, -1, NULL, 0, NULL, NULL ); classA = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszClass, -1, classA, len, NULL, NULL ); Modified: branches/arwinss/reactos/dll/win32/user32/message.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/message.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -546,8 +546,8 @@ { CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; push_data( data, cs, sizeof(*cs) ); - if (HIWORD(cs->lpszName)) push_string( data, cs->lpszName ); - if (HIWORD(cs->lpszClass)) push_string( data, cs->lpszClass ); + if (!IS_INTRESOURCE(cs->lpszName)) push_string( data, cs->lpszName ); + if (!IS_INTRESOURCE(cs->lpszClass)) push_string( data, cs->lpszClass ); return sizeof(*cs); } case WM_GETTEXT: @@ -690,8 +690,8 @@ { MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)lparam; push_data( data, cs, sizeof(*cs) ); - if (HIWORD(cs->szTitle)) push_string( data, cs->szTitle ); - if (HIWORD(cs->szClass)) push_string( data, cs->szClass ); + if (!IS_INTRESOURCE(cs->szTitle)) push_string( data, cs->szTitle ); + if (!IS_INTRESOURCE(cs->szClass)) push_string( data, cs->szClass ); return sizeof(*cs); } case WM_MDIGETACTIVE: @@ -785,14 +785,14 @@ WCHAR *str = (WCHAR *)(cs + 1); if (size < sizeof(*cs)) return FALSE; size -= sizeof(*cs); - if (HIWORD(cs->lpszName)) + if (!IS_INTRESOURCE(cs->lpszName)) { if (!check_string( str, size )) return FALSE; cs->lpszName = str; size -= (strlenW(str) + 1) * sizeof(WCHAR); str += strlenW(str) + 1; } - if (HIWORD(cs->lpszClass)) + if (!IS_INTRESOURCE(cs->lpszClass)) { if (!check_string( str, size )) return FALSE; cs->lpszClass = str; @@ -957,14 +957,14 @@ WCHAR *str = (WCHAR *)(cs + 1); if (size < sizeof(*cs)) return FALSE; size -= sizeof(*cs); - if (HIWORD(cs->szTitle)) + if (!IS_INTRESOURCE(cs->szTitle)) { if (!check_string( str, size )) return FALSE; cs->szTitle = str; size -= (strlenW(str) + 1) * sizeof(WCHAR); str += strlenW(str) + 1; } - if (HIWORD(cs->szClass)) + if (!IS_INTRESOURCE(cs->szClass)) { if (!check_string( str, size )) return FALSE; cs->szClass = str; Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -259,6 +259,8 @@ static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', 'S','y','s','t','e','m',0}; +static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0',0}; /*********************************************************************** * EnumDisplayDevicesA (USER32.@) @@ -313,7 +315,7 @@ DISPLAY_DEVICE_VGA_COMPATIBLE; if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - lpDisplayDevice->DeviceID[0] = 0; + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) lpDisplayDevice->DeviceKey[0] = 0; Modified: branches/arwinss/reactos/dll/win32/user32/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/msgbox.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/msgbox.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -92,7 +92,7 @@ /* set text font */ SendDlgItemMessageW (hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)hFont, 0); - if (HIWORD(lpmb->lpszCaption)) { + if (!IS_INTRESOURCE(lpmb->lpszCaption)) { SetWindowTextW(hwnd, lpmb->lpszCaption); } else { UINT len = LoadStringW( lpmb->hInstance, LOWORD(lpmb->lpszCaption), (LPWSTR)&ptr, 0 ); @@ -107,9 +107,7 @@ buffer = NULL; } } - if (HIWORD(lpmb->lpszText)) { - lpszText = lpmb->lpszText; - } else { + if (IS_INTRESOURCE(lpmb->lpszText)) { UINT len = LoadStringW( lpmb->hInstance, LOWORD(lpmb->lpszText), (LPWSTR)&ptr, 0 ); lpszText = buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); if (buffer) @@ -117,6 +115,8 @@ memcpy( buffer, ptr, len * sizeof(WCHAR) ); buffer[len] = 0; } + } else { + lpszText = lpmb->lpszText; } TRACE_(msgbox)("%s\n", debugstr_w(lpszText)); @@ -460,21 +460,21 @@ UNICODE_STRING textW, captionW, iconW; int ret; - if (HIWORD(msgbox->lpszText)) + if (IS_INTRESOURCE(msgbox->lpszText)) + textW.Buffer = (LPWSTR)msgbox->lpszText; + else RtlCreateUnicodeStringFromAsciiz(&textW, msgbox->lpszText); + if (IS_INTRESOURCE(msgbox->lpszCaption)) + captionW.Buffer = (LPWSTR)msgbox->lpszCaption; else - textW.Buffer = (LPWSTR)msgbox->lpszText; - if (HIWORD(msgbox->lpszCaption)) RtlCreateUnicodeStringFromAsciiz(&captionW, msgbox->lpszCaption); - else - captionW.Buffer = (LPWSTR)msgbox->lpszCaption; if (msgbox->dwStyle & MB_USERICON) { - if (HIWORD(msgbox->lpszIcon)) + if (IS_INTRESOURCE(msgbox->lpszIcon)) + iconW.Buffer = (LPWSTR)msgbox->lpszIcon; + else RtlCreateUnicodeStringFromAsciiz(&iconW, msgbox->lpszIcon); - else - iconW.Buffer = (LPWSTR)msgbox->lpszIcon; } else iconW.Buffer = NULL; @@ -492,9 +492,9 @@ ret = MessageBoxIndirectW(&msgboxW); - if (HIWORD(textW.Buffer)) RtlFreeUnicodeString(&textW); - if (HIWORD(captionW.Buffer)) RtlFreeUnicodeString(&captionW); - if (HIWORD(iconW.Buffer)) RtlFreeUnicodeString(&iconW); + if (!IS_INTRESOURCE(textW.Buffer)) RtlFreeUnicodeString(&textW); + if (!IS_INTRESOURCE(captionW.Buffer)) RtlFreeUnicodeString(&captionW); + if (!IS_INTRESOURCE(iconW.Buffer)) RtlFreeUnicodeString(&iconW); return ret; } Modified: branches/arwinss/reactos/dll/win32/user32/property.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -119,7 +119,7 @@ { WCHAR buffer[ATOM_BUFFER_SIZE]; - if (!HIWORD(str)) return GetPropW( hwnd, (LPCWSTR)str ); + if (IS_INTRESOURCE(str)) return GetPropW( hwnd, (LPCWSTR)str ); if (!MultiByteToWideChar( CP_ACP, 0, str, -1, buffer, ATOM_BUFFER_SIZE )) return 0; return GetPropW( hwnd, buffer ); } @@ -135,7 +135,7 @@ SERVER_START_REQ( get_window_property ) { req->window = wine_server_user_handle( hwnd ); - if (!HIWORD(str)) req->atom = LOWORD(str); + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); else wine_server_add_data( req, str, strlenW(str) * sizeof(WCHAR) ); if (!wine_server_call_err( req )) ret = reply->data; } @@ -151,7 +151,7 @@ { WCHAR buffer[ATOM_BUFFER_SIZE]; - if (!HIWORD(str)) return SetPropW( hwnd, (LPCWSTR)str, handle ); + if (IS_INTRESOURCE(str)) return SetPropW( hwnd, (LPCWSTR)str, handle ); if (!MultiByteToWideChar( CP_ACP, 0, str, -1, buffer, ATOM_BUFFER_SIZE )) return FALSE; return SetPropW( hwnd, buffer, handle ); } @@ -168,7 +168,7 @@ { req->window = wine_server_user_handle( hwnd ); req->data = (ULONG_PTR)handle; - if (!HIWORD(str)) req->atom = LOWORD(str); + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); else wine_server_add_data( req, str, strlenW(str) * sizeof(WCHAR) ); ret = !wine_server_call_err( req ); } @@ -184,7 +184,7 @@ { WCHAR buffer[ATOM_BUFFER_SIZE]; - if (!HIWORD(str)) return RemovePropW( hwnd, (LPCWSTR)str ); + if (IS_INTRESOURCE(str)) return RemovePropW( hwnd, (LPCWSTR)str ); if (!MultiByteToWideChar( CP_ACP, 0, str, -1, buffer, ATOM_BUFFER_SIZE )) return 0; return RemovePropW( hwnd, buffer ); } @@ -200,7 +200,7 @@ SERVER_START_REQ( remove_window_property ) { req->window = wine_server_user_handle( hwnd ); - if (!HIWORD(str)) req->atom = LOWORD(str); + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); else wine_server_add_data( req, str, strlenW(str) * sizeof(WCHAR) ); if (!wine_server_call_err( req )) ret = reply->data; } Modified: branches/arwinss/reactos/dll/win32/user32/resource.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/resource.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/resource.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -83,7 +83,7 @@ LPWSTR uni; HACCEL result = 0; - if (!HIWORD(lpTableName)) return LoadAcceleratorsW( instance, (LPCWSTR)lpTableName ); + if (IS_INTRESOURCE(lpTableName)) return LoadAcceleratorsW( instance, (LPCWSTR)lpTableName ); len = MultiByteToWideChar( CP_ACP, 0, lpTableName, -1, NULL, 0 ); if ((uni = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) Modified: branches/arwinss/reactos/dll/win32/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/win.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -144,6 +144,7 @@ */ void release_user_handle_ptr( void *ptr ) { + assert( ptr && ptr != OBJ_OTHER_PROCESS ); USER_Unlock(); } @@ -2701,6 +2702,12 @@ if (!(full_handle = WIN_IsCurrentThread( hwnd ))) return (HWND)SendMessageW( hwnd, WM_WINE_SETPARENT, (WPARAM)parent, 0 ); + if (full_handle == parent) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + /* Windows hides the window first, then shows it again * including the WM_SHOWWINDOW messages and all */ was_visible = ShowWindow( hwnd, SW_HIDE ); @@ -3310,25 +3317,7 @@ */ BOOL WINAPI SwitchDesktop( HDESK hDesktop) { - HWND hWnd; - - hWnd = GetDesktopWindow(/*hDesktop*/); - - FIXME("SwitchDesktop(hDesktop %p, desk window %x) stub!\n", hDesktop, hWnd); -#if 0 - /* Set foreground window */ - SetForegroundWindow(hWnd); - - /* Bring it to top */ - SetWindowPos(hWnd, - NULL, 0, 0, - 0, - 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); - UpdateWindow(hWnd); - - RedrawWindow(NULL, NULL, 0, RDW_INVALIDATE | RDW_FRAME | RDW_ERASENOW | RDW_ALLCHILDREN); -#endif + FIXME("(hwnd %p) stub!\n", hDesktop); return TRUE; } Modified: branches/arwinss/reactos/dll/win32/user32/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/winproc.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -172,7 +172,6 @@ } #ifdef __i386__ -#define __ASM_CFI(str) "" /* Some window procedures modify register they shouldn't, or are not * properly declared stdcall; so we need a small assembly wrapper to * call them. */ Propchange: branches/arwinss/reactos/dll/win32/winex11.drv/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 6 11:18:44 2010 @@ -1,3 +1,3 @@ /branches/ros-amd64-bringup/reactos/dll/win32/winex11.drv:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 /trunk/reactos/dll/win32/winex11.drv:42000-44999,45097-45099,45319 -/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206 +/vendor/wine/dlls/winex11.drv/current:43149,43398,43708,44151,44715,45044,45206,45455 Modified: branches/arwinss/reactos/dll/win32/winex11.drv/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winex… ============================================================================== --- branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winex11.drv/window.c [iso-8859-1] Sat Feb 6 11:18:44 2010 @@ -1327,6 +1327,15 @@ data->configure_serial = NextRequest( display ); XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); +#ifdef HAVE_LIBXSHAPE + if (data->shaped) + { + int x_offset = old_whole_rect->left - data->whole_rect.left; + int y_offset = old_whole_rect->top - data->whole_rect.top; + if (x_offset || y_offset) + XShapeOffsetShape( display, data->whole_window, ShapeBounding, x_offset, y_offset ); + } +#endif wine_tsx11_unlock(); TRACE( "win %p/%lx pos %d,%d,%dx%d after %lx changes=%x serial=%lu\n", @@ -1445,6 +1454,7 @@ COLORREF key; BYTE alpha; DWORD layered_flags; + HRGN win_rgn; if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) { @@ -1452,6 +1462,14 @@ data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); } + + if ((win_rgn = CreateRectRgn( 0, 0, 0, 0 )) && + GetWindowRgn( data->hwnd, win_rgn ) == ERROR) + { + DeleteObject( win_rgn ); + win_rgn = 0; + } + data->shaped = (win_rgn != 0); mask = get_window_attributes( display, data, &attr ); @@ -1472,7 +1490,7 @@ if (data->whole_window) XSaveContext( display, data->whole_window, winContext, (char *)data->hwnd ); wine_tsx11_unlock(); - if (!data->whole_window) return 0; + if (!data->whole_window) goto done; if (!create_client_window( display, data, NULL )) { @@ -1481,7 +1499,7 @@ XDestroyWindow( display, data->whole_window ); data->whole_window = 0; wine_tsx11_unlock(); - return 0; + goto done; } set_initial_wm_hints( display, data ); @@ -1494,7 +1512,7 @@ sync_window_text( display, data->whole_window, text ); /* set the window region */ - sync_window_region( display, data, (HRGN)1 ); + if (win_rgn) sync_window_region( display, data, win_rgn ); /* set the window opacity */ if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; @@ -1503,6 +1521,8 @@ wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); +done: + if (win_rgn) DeleteObject( win_rgn ); return data->whole_window; }

1 0

[fireball] 45455: [vendor/wine] - Import Wine-1.1.38 gdi32, user32, winex11.drv, wineserver.
by fireball＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: fireball Date: Sat Feb 6 11:06:43 2010 New Revision: 45455 URL: http://svn.reactos.org/svn/reactos?rev=45455&view=rev Log: [vendor/wine] - Import Wine-1.1.38 gdi32, user32, winex11.drv, wineserver. Modified: vendor/wine/dlls/gdi32/current/gdi32.spec vendor/wine/dlls/gdi32/current/gdiobj.c vendor/wine/dlls/gdi32/current/mfdrv/objects.c vendor/wine/dlls/user32/current/class.c vendor/wine/dlls/user32/current/combo.c vendor/wine/dlls/user32/current/controls.h vendor/wine/dlls/user32/current/cursoricon.c vendor/wine/dlls/user32/current/defwnd.c vendor/wine/dlls/user32/current/dialog.c vendor/wine/dlls/user32/current/hook.c vendor/wine/dlls/user32/current/message.c vendor/wine/dlls/user32/current/misc.c vendor/wine/dlls/user32/current/msgbox.c vendor/wine/dlls/user32/current/property.c vendor/wine/dlls/user32/current/resource.c vendor/wine/dlls/user32/current/tests/combo.c vendor/wine/dlls/user32/current/tests/edit.c vendor/wine/dlls/user32/current/tests/msg.c vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/user32/current/win.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/server/current/process.c vendor/wine/server/current/thread.c vendor/wine/server/current/thread.h Modified: vendor/wine/dlls/gdi32/current/gdi32.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdi32.spe… ============================================================================== --- vendor/wine/dlls/gdi32/current/gdi32.spec [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/gdi32.spec [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -193,7 +193,7 @@ @ stdcall GdiGetSpoolMessage(ptr long ptr long) @ stdcall GdiGradientFill(long ptr long ptr long long) @ stdcall GdiInitSpool() -# @ stub GdiInitializeLanguagePack +@ stdcall GdiInitializeLanguagePack(long) @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) @ stdcall GdiIsPlayMetafileDC(long) Modified: vendor/wine/dlls/gdi32/current/gdiobj.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/gdiobj.c?… ============================================================================== --- vendor/wine/dlls/gdi32/current/gdiobj.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/gdiobj.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -1164,6 +1164,14 @@ /* Nothing to do */ } +/*********************************************************************** + * GdiInitializeLanguagePack (GDI32.@) + */ +DWORD WINAPI GdiInitializeLanguagePack( DWORD arg ) +{ + FIXME("stub\n"); + return 0; +} /*********************************************************************** * GdiFlush (GDI32.@) @@ -1199,7 +1207,7 @@ */ BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca) { - FIXME("GetColorAdjustment, stub\n"); + FIXME("stub\n"); return 0; } @@ -1228,6 +1236,6 @@ */ BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca) { - FIXME("SetColorAdjustment, stub\n"); + FIXME("stub\n"); return 0; } Modified: vendor/wine/dlls/gdi32/current/mfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/mfdrv/obj… ============================================================================== --- vendor/wine/dlls/gdi32/current/mfdrv/objects.c [iso-8859-1] (original) +++ vendor/wine/dlls/gdi32/current/mfdrv/objects.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -365,6 +365,7 @@ char buffer[sizeof(METARECORD) - 2 + sizeof(LOGFONT16)]; METARECORD *mr = (METARECORD *)&buffer; LOGFONT16 *font16; + INT written; mr->rdSize = (sizeof(METARECORD) + sizeof(LOGFONT16) - 2) / 2; mr->rdFunction = META_CREATEFONTINDIRECT; @@ -383,8 +384,9 @@ font16->lfClipPrecision = logfont->lfClipPrecision; font16->lfQuality = logfont->lfQuality; font16->lfPitchAndFamily = logfont->lfPitchAndFamily; - WideCharToMultiByte( CP_ACP, 0, logfont->lfFaceName, -1, font16->lfFaceName, LF_FACESIZE, NULL, NULL ); - font16->lfFaceName[LF_FACESIZE-1] = 0; + written = WideCharToMultiByte( CP_ACP, 0, logfont->lfFaceName, -1, font16->lfFaceName, LF_FACESIZE - 1, NULL, NULL ); + /* Zero pad the facename buffer, so that we don't write uninitialized data to disk */ + memset(font16->lfFaceName + written, 0, LF_FACESIZE - written); if (!(MFDRV_WriteRecord( dev, mr, mr->rdSize * 2))) return 0; Modified: vendor/wine/dlls/user32/current/class.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/class.c?… ============================================================================== --- vendor/wine/dlls/user32/current/class.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/class.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -176,7 +176,7 @@ */ static inline LPSTR CLASS_GetMenuNameA( CLASS *classPtr ) { - if (!HIWORD(classPtr->menuName)) return (LPSTR)classPtr->menuName; + if (IS_INTRESOURCE(classPtr->menuName)) return (LPSTR)classPtr->menuName; return (LPSTR)(classPtr->menuName + strlenW(classPtr->menuName) + 1); } @@ -199,8 +199,8 @@ */ static void CLASS_SetMenuNameA( CLASS *classPtr, LPCSTR name ) { - if (HIWORD(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); - if (HIWORD(name)) + if (!IS_INTRESOURCE(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); + if (!IS_INTRESOURCE(name)) { DWORD lenA = strlen(name) + 1; DWORD lenW = MultiByteToWideChar( CP_ACP, 0, name, lenA, NULL, 0 ); @@ -219,8 +219,8 @@ */ static void CLASS_SetMenuNameW( CLASS *classPtr, LPCWSTR name ) { - if (HIWORD(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); - if (HIWORD(name)) + if (!IS_INTRESOURCE(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); + if (!IS_INTRESOURCE(name)) { DWORD lenW = strlenW(name) + 1; DWORD lenA = WideCharToMultiByte( CP_ACP, 0, name, lenW, NULL, 0, NULL, NULL ); Modified: vendor/wine/dlls/user32/current/combo.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/combo.c?… ============================================================================== --- vendor/wine/dlls/user32/current/combo.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/combo.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -1910,8 +1910,14 @@ case WM_GETFONT: return (LRESULT)lphc->hFont; case WM_SETFOCUS: - if( lphc->wState & CBF_EDIT ) - SetFocus( lphc->hWndEdit ); + if( lphc->wState & CBF_EDIT ) { + SetFocus( lphc->hWndEdit ); + /* The first time focus is received, select all the text */ + if( !(lphc->wState & CBF_BEENFOCUSED) ) { + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + lphc->wState |= CBF_BEENFOCUSED; + } + } else COMBO_SetFocus( lphc ); return TRUE; Modified: vendor/wine/dlls/user32/current/controls.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/controls… ============================================================================== --- vendor/wine/dlls/user32/current/controls.h [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/controls.h [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -199,6 +199,7 @@ #define CBF_SELCHANGE 0x0400 #define CBF_NOEDITNOTIFY 0x1000 #define CBF_NOLBSELECT 0x2000 /* do not change current selection */ +#define CBF_BEENFOCUSED 0x4000 /* has it ever had focus */ #define CBF_EUI 0x8000 /* combo state struct */ Modified: vendor/wine/dlls/user32/current/cursoricon.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/cursoric… ============================================================================== --- vendor/wine/dlls/user32/current/cursoricon.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/cursoricon.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -2467,7 +2467,7 @@ HANDLE res; LPWSTR u_name; - if (!HIWORD(name)) + if (IS_INTRESOURCE(name)) return LoadImageW(hinst, (LPCWSTR)name, type, desiredx, desiredy, loadflags); __TRY { Modified: vendor/wine/dlls/user32/current/defwnd.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/defwnd.c… ============================================================================== --- vendor/wine/dlls/user32/current/defwnd.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/defwnd.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -563,7 +563,7 @@ else if( wParam == VK_F10 ) { if (GetKeyState(VK_SHIFT) & 0x8000) - SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) ); + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, -1 ); iF10Key = 1; } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) @@ -835,7 +835,7 @@ CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam; /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) * may have child window IDs instead of window name */ - if (HIWORD(cs->lpszName)) + if (!IS_INTRESOURCE(cs->lpszName)) DEFWND_SetTextA( hwnd, cs->lpszName ); result = 1; } @@ -982,7 +982,7 @@ CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) * may have child window IDs instead of window name */ - if (HIWORD(cs->lpszName)) + if (!IS_INTRESOURCE(cs->lpszName)) DEFWND_SetTextW( hwnd, cs->lpszName ); result = 1; } Modified: vendor/wine/dlls/user32/current/dialog.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/dialog.c… ============================================================================== --- vendor/wine/dlls/user32/current/dialog.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/dialog.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -288,14 +288,14 @@ LPSTR class_tmp = NULL; LPSTR caption_tmp = NULL; - if (HIWORD(class)) + if (!IS_INTRESOURCE(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.className, -1, NULL, 0, NULL, NULL ); class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); WideCharToMultiByte( CP_ACP, 0, info.className, -1, class_tmp, len, NULL, NULL ); class = class_tmp; } - if (HIWORD(caption)) + if (!IS_INTRESOURCE(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, info.windowName, -1, NULL, 0, NULL, NULL ); caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); @@ -634,14 +634,14 @@ LPSTR class_tmp = NULL; LPSTR caption_tmp = NULL; - if (HIWORD(class)) + if (!IS_INTRESOURCE(class)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.className, -1, NULL, 0, NULL, NULL ); class_tmp = HeapAlloc( GetProcessHeap(), 0, len ); WideCharToMultiByte( CP_ACP, 0, template.className, -1, class_tmp, len, NULL, NULL ); class = class_tmp; } - if (HIWORD(caption)) + if (!IS_INTRESOURCE(caption)) { DWORD len = WideCharToMultiByte( CP_ACP, 0, template.caption, -1, NULL, 0, NULL, NULL ); caption_tmp = HeapAlloc( GetProcessHeap(), 0, len ); Modified: vendor/wine/dlls/user32/current/hook.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/hook.c?r… ============================================================================== --- vendor/wine/dlls/user32/current/hook.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/hook.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -222,12 +222,12 @@ cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter; csW = *(CREATESTRUCTW *)cbtcwA->lpcs; - if (HIWORD(cbtcwA->lpcs->lpszName)) + if (!IS_INTRESOURCE(cbtcwA->lpcs->lpszName)) { RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszName); csW.lpszName = nameW = usBuffer.Buffer; } - if (HIWORD(cbtcwA->lpcs->lpszClass)) + if (!IS_INTRESOURCE(cbtcwA->lpcs->lpszClass)) { RtlCreateUnicodeStringFromAsciiz(&usBuffer,cbtcwA->lpcs->lpszClass); csW.lpszClass = classW = usBuffer.Buffer; @@ -262,14 +262,14 @@ cbtcwA.hwndInsertAfter = cbtcwW->hwndInsertAfter; csA = *(CREATESTRUCTA *)cbtcwW->lpcs; - if (HIWORD(cbtcwW->lpcs->lpszName)) { + if (!IS_INTRESOURCE(cbtcwW->lpcs->lpszName)) { len = WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, NULL, 0, NULL, NULL ); nameA = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszName, -1, nameA, len, NULL, NULL ); csA.lpszName = nameA; } - if (HIWORD(cbtcwW->lpcs->lpszClass)) { + if (!IS_INTRESOURCE(cbtcwW->lpcs->lpszClass)) { len = WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszClass, -1, NULL, 0, NULL, NULL ); classA = HeapAlloc( GetProcessHeap(), 0, len*sizeof(CHAR) ); WideCharToMultiByte( CP_ACP, 0, cbtcwW->lpcs->lpszClass, -1, classA, len, NULL, NULL ); Modified: vendor/wine/dlls/user32/current/message.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/message.… ============================================================================== --- vendor/wine/dlls/user32/current/message.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/message.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -545,8 +545,8 @@ { CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; push_data( data, cs, sizeof(*cs) ); - if (HIWORD(cs->lpszName)) push_string( data, cs->lpszName ); - if (HIWORD(cs->lpszClass)) push_string( data, cs->lpszClass ); + if (!IS_INTRESOURCE(cs->lpszName)) push_string( data, cs->lpszName ); + if (!IS_INTRESOURCE(cs->lpszClass)) push_string( data, cs->lpszClass ); return sizeof(*cs); } case WM_GETTEXT: @@ -689,8 +689,8 @@ { MDICREATESTRUCTW *cs = (MDICREATESTRUCTW *)lparam; push_data( data, cs, sizeof(*cs) ); - if (HIWORD(cs->szTitle)) push_string( data, cs->szTitle ); - if (HIWORD(cs->szClass)) push_string( data, cs->szClass ); + if (!IS_INTRESOURCE(cs->szTitle)) push_string( data, cs->szTitle ); + if (!IS_INTRESOURCE(cs->szClass)) push_string( data, cs->szClass ); return sizeof(*cs); } case WM_MDIGETACTIVE: @@ -784,14 +784,14 @@ WCHAR *str = (WCHAR *)(cs + 1); if (size < sizeof(*cs)) return FALSE; size -= sizeof(*cs); - if (HIWORD(cs->lpszName)) + if (!IS_INTRESOURCE(cs->lpszName)) { if (!check_string( str, size )) return FALSE; cs->lpszName = str; size -= (strlenW(str) + 1) * sizeof(WCHAR); str += strlenW(str) + 1; } - if (HIWORD(cs->lpszClass)) + if (!IS_INTRESOURCE(cs->lpszClass)) { if (!check_string( str, size )) return FALSE; cs->lpszClass = str; @@ -956,14 +956,14 @@ WCHAR *str = (WCHAR *)(cs + 1); if (size < sizeof(*cs)) return FALSE; size -= sizeof(*cs); - if (HIWORD(cs->szTitle)) + if (!IS_INTRESOURCE(cs->szTitle)) { if (!check_string( str, size )) return FALSE; cs->szTitle = str; size -= (strlenW(str) + 1) * sizeof(WCHAR); str += strlenW(str) + 1; } - if (HIWORD(cs->szClass)) + if (!IS_INTRESOURCE(cs->szClass)) { if (!check_string( str, size )) return FALSE; cs->szClass = str; Modified: vendor/wine/dlls/user32/current/misc.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/misc.c?r… ============================================================================== --- vendor/wine/dlls/user32/current/misc.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/misc.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -277,6 +277,8 @@ static const WCHAR primary_device_name[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; static const WCHAR primary_device_string[] = {'X','1','1',' ','W','i','n','d','o','w','i','n','g',' ', 'S','y','s','t','e','m',0}; +static const WCHAR primary_device_deviceid[] = {'P','C','I','\\','V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0',0}; /*********************************************************************** * EnumDisplayDevicesA (USER32.@) @@ -331,7 +333,7 @@ DISPLAY_DEVICE_VGA_COMPATIBLE; if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceID) + sizeof(lpDisplayDevice->DeviceID)) - lpDisplayDevice->DeviceID[0] = 0; + memcpy(lpDisplayDevice->DeviceID, primary_device_deviceid, sizeof(primary_device_deviceid)); if(lpDisplayDevice->cb >= offsetof(DISPLAY_DEVICEW, DeviceKey) + sizeof(lpDisplayDevice->DeviceKey)) lpDisplayDevice->DeviceKey[0] = 0; Modified: vendor/wine/dlls/user32/current/msgbox.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/msgbox.c… ============================================================================== --- vendor/wine/dlls/user32/current/msgbox.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/msgbox.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -92,7 +92,7 @@ /* set text font */ SendDlgItemMessageW (hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)hFont, 0); - if (HIWORD(lpmb->lpszCaption)) { + if (!IS_INTRESOURCE(lpmb->lpszCaption)) { SetWindowTextW(hwnd, lpmb->lpszCaption); } else { UINT len = LoadStringW( lpmb->hInstance, LOWORD(lpmb->lpszCaption), (LPWSTR)&ptr, 0 ); @@ -107,9 +107,7 @@ buffer = NULL; } } - if (HIWORD(lpmb->lpszText)) { - lpszText = lpmb->lpszText; - } else { + if (IS_INTRESOURCE(lpmb->lpszText)) { UINT len = LoadStringW( lpmb->hInstance, LOWORD(lpmb->lpszText), (LPWSTR)&ptr, 0 ); lpszText = buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); if (buffer) @@ -117,6 +115,8 @@ memcpy( buffer, ptr, len * sizeof(WCHAR) ); buffer[len] = 0; } + } else { + lpszText = lpmb->lpszText; } TRACE_(msgbox)("%s\n", debugstr_w(lpszText)); @@ -460,21 +460,21 @@ UNICODE_STRING textW, captionW, iconW; int ret; - if (HIWORD(msgbox->lpszText)) + if (IS_INTRESOURCE(msgbox->lpszText)) + textW.Buffer = (LPWSTR)msgbox->lpszText; + else RtlCreateUnicodeStringFromAsciiz(&textW, msgbox->lpszText); + if (IS_INTRESOURCE(msgbox->lpszCaption)) + captionW.Buffer = (LPWSTR)msgbox->lpszCaption; else - textW.Buffer = (LPWSTR)msgbox->lpszText; - if (HIWORD(msgbox->lpszCaption)) RtlCreateUnicodeStringFromAsciiz(&captionW, msgbox->lpszCaption); - else - captionW.Buffer = (LPWSTR)msgbox->lpszCaption; if (msgbox->dwStyle & MB_USERICON) { - if (HIWORD(msgbox->lpszIcon)) + if (IS_INTRESOURCE(msgbox->lpszIcon)) + iconW.Buffer = (LPWSTR)msgbox->lpszIcon; + else RtlCreateUnicodeStringFromAsciiz(&iconW, msgbox->lpszIcon); - else - iconW.Buffer = (LPWSTR)msgbox->lpszIcon; } else iconW.Buffer = NULL; @@ -492,9 +492,9 @@ ret = MessageBoxIndirectW(&msgboxW); - if (HIWORD(textW.Buffer)) RtlFreeUnicodeString(&textW); - if (HIWORD(captionW.Buffer)) RtlFreeUnicodeString(&captionW); - if (HIWORD(iconW.Buffer)) RtlFreeUnicodeString(&iconW); + if (!IS_INTRESOURCE(textW.Buffer)) RtlFreeUnicodeString(&textW); + if (!IS_INTRESOURCE(captionW.Buffer)) RtlFreeUnicodeString(&captionW); + if (!IS_INTRESOURCE(iconW.Buffer)) RtlFreeUnicodeString(&iconW); return ret; } Modified: vendor/wine/dlls/user32/current/property.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/property… ============================================================================== --- vendor/wine/dlls/user32/current/property.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/property.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -118,7 +118,7 @@ { WCHAR buffer[ATOM_BUFFER_SIZE]; - if (!HIWORD(str)) return GetPropW( hwnd, (LPCWSTR)str ); + if (IS_INTRESOURCE(str)) return GetPropW( hwnd, (LPCWSTR)str ); if (!MultiByteToWideChar( CP_ACP, 0, str, -1, buffer, ATOM_BUFFER_SIZE )) return 0; return GetPropW( hwnd, buffer ); } @@ -134,7 +134,7 @@ SERVER_START_REQ( get_window_property ) { req->window = wine_server_user_handle( hwnd ); - if (!HIWORD(str)) req->atom = LOWORD(str); + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); else wine_server_add_data( req, str, strlenW(str) * sizeof(WCHAR) ); if (!wine_server_call_err( req )) ret = reply->data; } @@ -150,7 +150,7 @@ { WCHAR buffer[ATOM_BUFFER_SIZE]; - if (!HIWORD(str)) return SetPropW( hwnd, (LPCWSTR)str, handle ); + if (IS_INTRESOURCE(str)) return SetPropW( hwnd, (LPCWSTR)str, handle ); if (!MultiByteToWideChar( CP_ACP, 0, str, -1, buffer, ATOM_BUFFER_SIZE )) return FALSE; return SetPropW( hwnd, buffer, handle ); } @@ -167,7 +167,7 @@ { req->window = wine_server_user_handle( hwnd ); req->data = (ULONG_PTR)handle; - if (!HIWORD(str)) req->atom = LOWORD(str); + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); else wine_server_add_data( req, str, strlenW(str) * sizeof(WCHAR) ); ret = !wine_server_call_err( req ); } @@ -183,7 +183,7 @@ { WCHAR buffer[ATOM_BUFFER_SIZE]; - if (!HIWORD(str)) return RemovePropW( hwnd, (LPCWSTR)str ); + if (IS_INTRESOURCE(str)) return RemovePropW( hwnd, (LPCWSTR)str ); if (!MultiByteToWideChar( CP_ACP, 0, str, -1, buffer, ATOM_BUFFER_SIZE )) return 0; return RemovePropW( hwnd, buffer ); } @@ -199,7 +199,7 @@ SERVER_START_REQ( remove_window_property ) { req->window = wine_server_user_handle( hwnd ); - if (!HIWORD(str)) req->atom = LOWORD(str); + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); else wine_server_add_data( req, str, strlenW(str) * sizeof(WCHAR) ); if (!wine_server_call_err( req )) ret = reply->data; } Modified: vendor/wine/dlls/user32/current/resource.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… ============================================================================== --- vendor/wine/dlls/user32/current/resource.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/resource.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -83,7 +83,7 @@ LPWSTR uni; HACCEL result = 0; - if (!HIWORD(lpTableName)) return LoadAcceleratorsW( instance, (LPCWSTR)lpTableName ); + if (IS_INTRESOURCE(lpTableName)) return LoadAcceleratorsW( instance, (LPCWSTR)lpTableName ); len = MultiByteToWideChar( CP_ACP, 0, lpTableName, -1, NULL, 0 ); if ((uni = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) Modified: vendor/wine/dlls/user32/current/tests/combo.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/co… ============================================================================== --- vendor/wine/dlls/user32/current/tests/combo.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/combo.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -401,6 +401,106 @@ DestroyWindow(hCombo); } +static void test_editselection(void) +{ + HWND hCombo; + INT start,end; + HWND hEdit; + COMBOBOXINFO cbInfo; + BOOL ret; + DWORD len; + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + char edit[20]; + + pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo){ + win_skip("GetComboBoxInfo is not available\n"); + return; + } + + /* Build a combo */ + hCombo = build_combo(CBS_SIMPLE); + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get combobox info structure. LastError=%d\n", + GetLastError()); + hEdit = cbInfo.hwndItem; + + /* Initially combo selection is empty*/ + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Set some text, and press a key to replace it */ + edit[0] = 0x00; + SendMessage(hCombo, WM_SETTEXT, 0, (LPARAM)"Jason1"); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason1")==0, "Unexpected text retrieved %s\n", edit); + + /* Now what is the selection - still empty */ + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Give it focus, and it gets selected */ + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now emulate a key press */ + edit[0] = 0x00; + SendMessage(hCombo, WM_CHAR, 'A', 0x1c0001); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "A")==0, "Unexpected text retrieved %s\n", edit); + + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now what happens when it gets more focus a second time - it doesnt reselect */ + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==1, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==1, "Unexpected end position for selection %d\n", HIWORD(len)); + DestroyWindow(hCombo); + + /* Start again - Build a combo */ + hCombo = build_combo(CBS_SIMPLE); + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get combobox info structure. LastError=%d\n", + GetLastError()); + hEdit = cbInfo.hwndItem; + + /* Set some text and give focus so it gets selected */ + edit[0] = 0x00; + SendMessage(hCombo, WM_SETTEXT, 0, (LPARAM)"Jason2"); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason2")==0, "Unexpected text retrieved %s\n", edit); + + SendMessage(hCombo, WM_SETFOCUS, 0, (LPARAM)hEdit); + + /* Now what is the selection */ + SendMessage(hCombo, CB_GETEDITSEL, (WPARAM)&start, (WPARAM)&end); + len = SendMessage(hCombo, CB_GETEDITSEL, 0,0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==6, "Unexpected end position for selection %d\n", HIWORD(len)); + + /* Now change the selection to the apparently invalid start -1, end -1 and + show it means no selection (ie start -1) but cursor at end */ + SendMessage(hCombo, CB_SETEDITSEL, 0, -1); + edit[0] = 0x00; + SendMessage(hCombo, WM_CHAR, 'A', 0x1c0001); + SendMessage(hCombo, WM_GETTEXT, sizeof(edit), (LPARAM)edit); + ok(strcmp(edit, "Jason2A")==0, "Unexpected text retrieved %s\n", edit); + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindow("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -414,6 +514,7 @@ test_WM_LBUTTONDOWN(); test_changesize(CBS_DROPDOWN); test_changesize(CBS_DROPDOWNLIST); + test_editselection(); DestroyWindow(hMainWnd); } Modified: vendor/wine/dlls/user32/current/tests/edit.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ed… ============================================================================== --- vendor/wine/dlls/user32/current/tests/edit.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/edit.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -868,6 +868,14 @@ len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); test_notify(1, 0, 1); + + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); + SendMessage(hParent, WM_SETFOCUS, 0, (LPARAM)hWnd); + len = SendMessageA(hWnd, EM_GETSEL, 0, 0); + ok(LOWORD(len)==0, "Unexpected start position for selection %d\n", LOWORD(len)); + ok(HIWORD(len)==0, "Unexpected end position for selection %d\n", HIWORD(len)); SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); Modified: vendor/wine/dlls/user32/current/tests/msg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ms… ============================================================================== --- vendor/wine/dlls/user32/current/tests/msg.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/msg.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -6910,7 +6910,7 @@ { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, - { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, MAKELPARAM(-1, -1) }, + { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, -1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… ============================================================================== --- vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/tests/win.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -444,6 +444,12 @@ ret = SetParent( test, child ); ok( ret == desktop, "SetParent return value %p expected %p\n", ret, desktop ); + check_parents( test, child, child, 0, 0, hwndMain, test ); + + ShowWindow( test, SW_SHOW ); + ret = SetParent( test, test ); + ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); + ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); check_parents( test, child, child, 0, 0, hwndMain, test ); DestroyWindow( test ); @@ -2720,11 +2726,17 @@ /* check that re-setting the capture for the menu fails */ set_cap_wnd = SetCapture(cap_wnd); - ok(!set_cap_wnd, "SetCapture should have failed!\n"); + ok(!set_cap_wnd || broken(set_cap_wnd == cap_wnd), /* nt4 */ + "SetCapture should have failed!\n"); + if (set_cap_wnd) + { + DestroyWindow(hWnd); + break; + } /* check that SetCapture fails for another window and that it does not touch the error code */ set_cap_wnd = SetCapture(hWnd); - ok(!set_cap_wnd, "ReleaseCapture should have failed!\n"); + ok(!set_cap_wnd, "SetCapture should have failed!\n"); /* check that ReleaseCapture fails and does not touch the error code */ status = ReleaseCapture(); @@ -2764,8 +2776,10 @@ HINSTANCE hInstance = GetModuleHandleA( NULL ); if (!pGetGUIThreadInfo) + { win_skip("GetGUIThreadInfo is not available\n"); - + return; + } wclass.lpszClassName = "TestCapture4Class"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = test_capture_4_proc; @@ -2980,6 +2994,7 @@ if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); + DispatchMessage(&msg); } ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); Modified: vendor/wine/dlls/user32/current/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/win.c?re… ============================================================================== --- vendor/wine/dlls/user32/current/win.c [iso-8859-1] (original) +++ vendor/wine/dlls/user32/current/win.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -143,6 +143,7 @@ */ void release_user_handle_ptr( void *ptr ) { + assert( ptr && ptr != OBJ_OTHER_PROCESS ); USER_Unlock(); } @@ -2700,6 +2701,12 @@ if (!(full_handle = WIN_IsCurrentThread( hwnd ))) return (HWND)SendMessageW( hwnd, WM_WINE_SETPARENT, (WPARAM)parent, 0 ); + if (full_handle == parent) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + /* Windows hides the window first, then shows it again * including the WM_SHOWWINDOW messages and all */ was_visible = ShowWindow( hwnd, SW_HIDE ); @@ -3309,7 +3316,7 @@ */ BOOL WINAPI SwitchDesktop( HDESK hDesktop) { - FIXME("SwitchDesktop(hwnd %p) stub!\n", hDesktop); + FIXME("(hwnd %p) stub!\n", hDesktop); return TRUE; } Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… ============================================================================== --- vendor/wine/dlls/winex11.drv/current/window.c [iso-8859-1] (original) +++ vendor/wine/dlls/winex11.drv/current/window.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -1326,6 +1326,15 @@ data->configure_serial = NextRequest( display ); XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); +#ifdef HAVE_LIBXSHAPE + if (data->shaped) + { + int x_offset = old_whole_rect->left - data->whole_rect.left; + int y_offset = old_whole_rect->top - data->whole_rect.top; + if (x_offset || y_offset) + XShapeOffsetShape( display, data->whole_window, ShapeBounding, x_offset, y_offset ); + } +#endif wine_tsx11_unlock(); TRACE( "win %p/%lx pos %d,%d,%dx%d after %lx changes=%x serial=%lu\n", @@ -1444,6 +1453,7 @@ COLORREF key; BYTE alpha; DWORD layered_flags; + HRGN win_rgn; if (!data->managed && is_window_managed( data->hwnd, SWP_NOACTIVATE, &data->window_rect )) { @@ -1451,6 +1461,14 @@ data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); } + + if ((win_rgn = CreateRectRgn( 0, 0, 0, 0 )) && + GetWindowRgn( data->hwnd, win_rgn ) == ERROR) + { + DeleteObject( win_rgn ); + win_rgn = 0; + } + data->shaped = (win_rgn != 0); mask = get_window_attributes( display, data, &attr ); @@ -1471,7 +1489,7 @@ if (data->whole_window) XSaveContext( display, data->whole_window, winContext, (char *)data->hwnd ); wine_tsx11_unlock(); - if (!data->whole_window) return 0; + if (!data->whole_window) goto done; if (!create_client_window( display, data, NULL )) { @@ -1480,7 +1498,7 @@ XDestroyWindow( display, data->whole_window ); data->whole_window = 0; wine_tsx11_unlock(); - return 0; + goto done; } set_initial_wm_hints( display, data ); @@ -1493,7 +1511,7 @@ sync_window_text( display, data->whole_window, text ); /* set the window region */ - sync_window_region( display, data, (HRGN)1 ); + if (win_rgn) sync_window_region( display, data, win_rgn ); /* set the window opacity */ if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0; @@ -1502,6 +1520,8 @@ wine_tsx11_lock(); XFlush( display ); /* make sure the window exists before we start painting to it */ wine_tsx11_unlock(); +done: + if (win_rgn) DeleteObject( win_rgn ); return data->whole_window; } Modified: vendor/wine/server/current/process.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/process.c?rev… ============================================================================== --- vendor/wine/server/current/process.c [iso-8859-1] (original) +++ vendor/wine/server/current/process.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -562,23 +562,17 @@ /* terminate a process with the given exit code */ static void terminate_process( struct process *process, struct thread *skip, int exit_code ) { - struct list *ptr; - - if (skip && skip->process == process) /* move it to the end of the list */ - { - assert( skip->state != TERMINATED ); - list_remove( &skip->proc_entry ); - list_add_tail( &process->thread_list, &skip->proc_entry ); - } + struct thread *thread; grab_object( process ); /* make sure it doesn't get freed when threads die */ - while ((ptr = list_head( &process->thread_list ))) - { - struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); - +restart: + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + { if (exit_code) thread->exit_code = exit_code; - if (thread == skip) break; + if (thread == skip) continue; + if (thread->state == TERMINATED) continue; kill_thread( thread, 1 ); + goto restart; } release_object( process ); } Modified: vendor/wine/server/current/thread.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/thread.c?rev=… ============================================================================== --- vendor/wine/server/current/thread.c [iso-8859-1] (original) +++ vendor/wine/server/current/thread.c [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -222,6 +222,7 @@ thread->process = (struct process *)grab_object( process ); thread->desktop = process->desktop; + thread->affinity = process->affinity; if (!current) current = thread; list_add_head( &thread_list, &thread->entry ); @@ -407,13 +408,9 @@ return NULL; } -void set_thread_affinity( struct thread *thread, affinity_t affinity ) -{ - if ((affinity & thread->process->affinity) != affinity) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } +int set_thread_affinity( struct thread *thread, affinity_t affinity ) +{ + int ret = 0; #ifdef HAVE_SCHED_SETAFFINITY if (thread->unix_tid != -1) { @@ -425,15 +422,11 @@ for (i = 0, mask = 1; mask; i++, mask <<= 1) if (affinity & mask) CPU_SET( i, &set ); - if (!sched_setaffinity( thread->unix_tid, sizeof(set), &set )) - thread->affinity = affinity; - else - file_set_error(); - } - else set_error( STATUS_ACCESS_DENIED ); -#else - thread->affinity = affinity; + ret = sched_setaffinity( thread->unix_tid, sizeof(set), &set ); + } #endif + if (!ret) thread->affinity = affinity; + return ret; } #define THREAD_PRIORITY_REALTIME_HIGHEST 6 @@ -460,7 +453,14 @@ set_error( STATUS_INVALID_PARAMETER ); } if (req->mask & SET_THREAD_INFO_AFFINITY) - set_thread_affinity( thread, req->affinity ); + { + if ((req->affinity & thread->process->affinity) != req->affinity) + set_error( STATUS_INVALID_PARAMETER ); + else if (thread->state == TERMINATED) + set_error( STATUS_ACCESS_DENIED ); + else if (set_thread_affinity( thread, req->affinity )) + file_set_error(); + } if (req->mask & SET_THREAD_INFO_TOKEN) security_set_thread_token( thread, req->token ); } @@ -1158,6 +1158,7 @@ generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); } debug_level = max( debug_level, req->debug_level ); + set_thread_affinity( current, current->affinity ); reply->pid = get_process_id( process ); reply->tid = get_thread_id( current ); Modified: vendor/wine/server/current/thread.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/thread.h?rev=… ============================================================================== --- vendor/wine/server/current/thread.h [iso-8859-1] (original) +++ vendor/wine/server/current/thread.h [iso-8859-1] Sat Feb 6 11:06:43 2010 @@ -118,7 +118,7 @@ extern int thread_get_inflight_fd( struct thread *thread, int client ); extern struct thread_snapshot *thread_snap( int *count ); extern struct token *thread_get_impersonation_token( struct thread *thread ); -extern void set_thread_affinity( struct thread *thread, affinity_t affinity ); +extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); /* ptrace functions */

1 0

[cgutman] 45454: - Forgot this file
by cgutman＠svn.reactos.org 06 Feb '10

06 Feb '10

Author: cgutman Date: Sat Feb 6 04:10:25 2010 New Revision: 45454 URL: http://svn.reactos.org/svn/reactos?rev=45454&view=rev Log: - Forgot this file Modified: branches/aicom-network-branch/dll/win32/win32.rbuild Modified: branches/aicom-network-branch/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/win32.rbuild [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/win32.rbuild [iso-8859-1] Sat Feb 6 04:10:25 2010 @@ -625,9 +625,6 @@ <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.rbuild" /> </directory> -<directory name="ws2_32_new"> - <xi:include href="ws2_32_new/ws2_32.rbuild" /> -</directory> <directory name="ws2help"> <xi:include href="ws2help/ws2help.rbuild" /> </directory>

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