Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[tkreuzer] 51709: Remove svn:mergeinfo property
by tkreuzer＠svn.reactos.org 13 May '11

13 May '11

Author: tkreuzer Date: Fri May 13 20:01:51 2011 New Revision: 51709 URL: http://svn.reactos.org/svn/reactos?rev=51709&view=rev Log: Remove svn:mergeinfo property Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc (props changed) Propchange: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo (removed) @@ -1,5 +1,0 @@ -/branches/header-work/dll/win32/browseui/lang/Bg-bg.rc:45691-47721 -/branches/reactos-yarotows/dll/win32/browseui/lang/Bg-bg.rc:45219-46371,46373-48025,48027-49273 -/branches/reactx/reactos/dll/win32/browseui/lang/Bg-bg.rc:49994-49995 -/branches/ros-amd64-bringup/dll/win32/browseui/lang/Bg-bg.rc:36852 -/branches/ros-amd64-bringup/reactos/dll/win32/browseui/lang/Bg-bg.rc:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882

1 0

[tkreuzer] 51708: [FREELDR/HAL/NTOSKRNL] Merge asm changes from cmake branch. No code change, only MSVC compatibility fixes
by tkreuzer＠svn.reactos.org 13 May '11

13 May '11

Author: tkreuzer Date: Fri May 13 19:51:09 2011 New Revision: 51708 URL: http://svn.reactos.org/svn/reactos?rev=51708&view=rev Log: [FREELDR/HAL/NTOSKRNL] Merge asm changes from cmake branch. No code change, only MSVC compatibility fixes Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h trunk/reactos/boot/freeldr/freeldr/include/multiboot.h trunk/reactos/boot/freeldr/freeldr/include/ver.h trunk/reactos/hal/halx86/mp/i386/mps.S trunk/reactos/ntoskrnl/ex/zw.S trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch.h [iso-8859-1] Fri May 13 19:51:09 2011 @@ -17,7 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef __ASM__ #pragma once +#endif + +#ifndef HEX +#define HEX(y) 0x##y +#endif #ifdef _M_AMD64 #include <arch/amd64/amd64.h> @@ -25,18 +31,18 @@ #if defined (_M_IX86) /* Defines needed for switching between real and protected mode */ -#define NULL_DESC 0x00 /* NULL descriptor */ -#define PMODE_CS 0x08 /* PMode code selector, base 0 limit 4g */ -#define PMODE_DS 0x10 /* PMode data selector, base 0 limit 4g */ -#define RMODE_CS 0x18 /* RMode code selector, base 0 limit 64k */ -#define RMODE_DS 0x20 /* RMode data selector, base 0 limit 64k */ +#define NULL_DESC HEX(00) /* NULL descriptor */ +#define PMODE_CS HEX(08) /* PMode code selector, base 0 limit 4g */ +#define PMODE_DS HEX(10) /* PMode data selector, base 0 limit 4g */ +#define RMODE_CS HEX(18) /* RMode code selector, base 0 limit 64k */ +#define RMODE_DS HEX(20) /* RMode data selector, base 0 limit 64k */ #endif -#define CR0_PE_SET 0x00000001 /* OR this value with CR0 to enable pmode */ -#define CR0_PE_CLR 0xFFFFFFFE /* AND this value with CR0 to disable pmode */ +#define CR0_PE_SET HEX(00000001) /* OR this value with CR0 to enable pmode */ +#define CR0_PE_CLR HEX(FFFFFFFE) /* AND this value with CR0 to disable pmode */ -#define STACK16ADDR 0x7000 /* The 16-bit stack top will be at 0000:7000 */ -#define STACK32ADDR 0x78000 /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ +#define STACK16ADDR HEX(7000) /* The 16-bit stack top will be at 0000:7000 */ +#define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ #if defined (_M_IX86) || defined (_M_AMD64) #define BIOSCALLBUFFER 0x78000 /* Buffer to store temporary data for any Int386() call */ @@ -59,21 +65,21 @@ // Flag Masks -#define I386FLAG_CF 0x0001 // Carry Flag -#define I386FLAG_RESV1 0x0002 // Reserved - Must be 1 -#define I386FLAG_PF 0x0004 // Parity Flag -#define I386FLAG_RESV2 0x0008 // Reserved - Must be 0 -#define I386FLAG_AF 0x0010 // Auxiliary Flag -#define I386FLAG_RESV3 0x0020 // Reserved - Must be 0 -#define I386FLAG_ZF 0x0040 // Zero Flag -#define I386FLAG_SF 0x0080 // Sign Flag -#define I386FLAG_TF 0x0100 // Trap Flag (Single Step) -#define I386FLAG_IF 0x0200 // Interrupt Flag -#define I386FLAG_DF 0x0400 // Direction Flag -#define I386FLAG_OF 0x0800 // Overflow Flag +#define I386FLAG_CF HEX(0001) // Carry Flag +#define I386FLAG_RESV1 HEX(0002) // Reserved - Must be 1 +#define I386FLAG_PF HEX(0004) // Parity Flag +#define I386FLAG_RESV2 HEX(0008) // Reserved - Must be 0 +#define I386FLAG_AF HEX(0010) // Auxiliary Flag +#define I386FLAG_RESV3 HEX(0020) // Reserved - Must be 0 +#define I386FLAG_ZF HEX(0040) // Zero Flag +#define I386FLAG_SF HEX(0080) // Sign Flag +#define I386FLAG_TF HEX(0100) // Trap Flag (Single Step) +#define I386FLAG_IF HEX(0200) // Interrupt Flag +#define I386FLAG_DF HEX(0400) // Direction Flag +#define I386FLAG_OF HEX(0800) // Overflow Flag -#ifndef ASM +#ifndef __ASM__ #include <pshpack1.h> typedef struct @@ -172,4 +178,4 @@ VOID DetectHardware(VOID); // Implemented in hardware.c -#endif /* ! ASM */ +#endif /* ! __ASM__ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/multiboot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/multiboot.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/multiboot.h [iso-8859-1] Fri May 13 19:51:09 2011 @@ -16,18 +16,20 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef __ASM__ #pragma once +#endif /* Macros. */ /* The magic number for the Multiboot header. */ -#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 +#define MULTIBOOT_HEADER_MAGIC HEX(1BADB002) /* The flags for the Multiboot header. */ -#define MULTIBOOT_HEADER_FLAGS 0x00010003 +#define MULTIBOOT_HEADER_FLAGS HEX(00010003) /* The magic number passed by a Multiboot-compliant boot loader. */ -#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 +#define MULTIBOOT_BOOTLOADER_MAGIC HEX(2BADB002) /* The size of our stack (16KB). */ #define STACK_SIZE 0x4000 @@ -39,20 +41,20 @@ # define EXT_C(sym) sym #endif -#define MB_INFO_FLAG_MEM_SIZE 0x00000001 -#define MB_INFO_FLAG_BOOT_DEVICE 0x00000002 -#define MB_INFO_FLAG_COMMAND_LINE 0x00000004 -#define MB_INFO_FLAG_MODULES 0x00000008 -#define MB_INFO_FLAG_AOUT_SYMS 0x00000010 -#define MB_INFO_FLAG_ELF_SYMS 0x00000020 -#define MB_INFO_FLAG_MEMORY_MAP 0x00000040 -#define MB_INFO_FLAG_DRIVES 0x00000080 -#define MB_INFO_FLAG_CONFIG_TABLE 0x00000100 -#define MB_INFO_FLAG_BOOT_LOADER_NAME 0x00000200 -#define MB_INFO_FLAG_APM_TABLE 0x00000400 -#define MB_INFO_FLAG_GRAPHICS_TABLE 0x00000800 +#define MB_INFO_FLAG_MEM_SIZE HEX(00000001) +#define MB_INFO_FLAG_BOOT_DEVICE HEX(00000002) +#define MB_INFO_FLAG_COMMAND_LINE HEX(00000004) +#define MB_INFO_FLAG_MODULES HEX(00000008) +#define MB_INFO_FLAG_AOUT_SYMS HEX(00000010) +#define MB_INFO_FLAG_ELF_SYMS HEX(00000020) +#define MB_INFO_FLAG_MEMORY_MAP HEX(00000040) +#define MB_INFO_FLAG_DRIVES HEX(00000080) +#define MB_INFO_FLAG_CONFIG_TABLE HEX(00000100) +#define MB_INFO_FLAG_BOOT_LOADER_NAME HEX(00000200) +#define MB_INFO_FLAG_APM_TABLE HEX(00000400) +#define MB_INFO_FLAG_GRAPHICS_TABLE HEX(00000800) -#ifndef ASM +#ifndef __ASM__ /* Do not include here in boot.S. */ /* Types. */ @@ -101,4 +103,4 @@ unsigned long reserved; } memory_map_t; -#endif /* ! ASM */ +#endif /* ! __ASM__ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ver.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ver.h [iso-8859-1] Fri May 13 19:51:09 2011 @@ -17,7 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef __ASM__ #pragma once +#endif /* just some stuff */ #define VERSION "FreeLoader v3.0" @@ -37,8 +39,8 @@ #define FREELOADER_PATCH_VERSION 0 -#ifndef ASM +#ifndef __ASM__ PCHAR GetFreeLoaderVersionString(VOID); -#endif // ASM +#endif // __ASM__ Modified: trunk/reactos/hal/halx86/mp/i386/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/i386/mps.S?r… ============================================================================== --- trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/i386/mps.S [iso-8859-1] Fri May 13 19:51:09 2011 @@ -11,7 +11,9 @@ /* INCLUDES ******************************************************************/ -#include <ndk/asm.h> +#include <asm.inc> + +#include <ks386.inc> /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/ntoskrnl/ex/zw.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/zw.S?rev=51708… ============================================================================== --- trunk/reactos/ntoskrnl/ex/zw.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/zw.S [iso-8859-1] Fri May 13 19:51:09 2011 @@ -1,6 +1,12 @@ #include <asm.inc> #include <syscalls.inc> + +#ifdef _M_IX86 +EXTERN _KiSystemService:PROC +#elif defined(_M_AMD64) +EXTERN KiSystemService:PROC +#endif .code Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Fri May 13 19:51:09 2011 @@ -6,7 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ - + // Arguments for idt #define INT_32_DPL0 HEX(08E00) #define INT_32_DPL3 HEX(0EE00) @@ -43,7 +43,7 @@ #else #define LOCK #define ACQUIRE_SPINLOCK(x, y) -#define RELEASE_SPINLOCK(x) +#define RELEASE_SPINLOCK(x) #endif // @@ -138,7 +138,7 @@ if (Flags AND KI_DONT_SAVE_SEGS) /* Initialize TrapFrame segment registers with sane values */ - mov eax, 0x23 + mov eax, KGDT_R3_DATA OR 3 mov ecx, fs mov [esp + KTRAP_FRAME_DS], eax mov [esp + KTRAP_FRAME_ES], eax Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Fri May 13 19:51:09 2011 @@ -15,6 +15,8 @@ EXTERN _MmGrowKernelStack@4:PROC EXTERN _KeUserCallbackDispatcher:PROC EXTERN @KiServiceExit@8:PROC +EXTERN _KeGetCurrentIrql@0:PROC +EXTERN _KeBugCheckEx@20:PROC /* FUNCTIONS ****************************************************************/ .code @@ -30,7 +32,7 @@ /*++ - * @name KiCallUserMode + * @name KiCallUserMode * * The KiSwitchToUserMode routine sets up a Trap Frame and a Callback stack * for the purpose of switching to user mode. The actual final jump is done @@ -406,7 +408,7 @@ ret 12 /*++ - * @name KeSwitchKernelStack + * @name KeSwitchKernelStack * * The KeSwitchKernelStack routine switches from the current thread's stack * to the new specified base and limit. @@ -419,7 +421,7 @@ * * @return The previous Stack Base of the thread. * - * @remark This routine should typically only be used when converting from a + * @remark This routine should typically only be used when converting from a * non-GUI to a GUI Thread. The caller is responsible for freeing the * previous stack. The new stack values MUST be valid before calling * this routine.

1 0

[tkreuzer] 51707: [CRT] Merge r50693 from cmake banch: _CxxThrowException is stdcall, not cdecl.
by tkreuzer＠svn.reactos.org 13 May '11

13 May '11

Author: tkreuzer Date: Fri May 13 19:37:49 2011 New Revision: 51707 URL: http://svn.reactos.org/svn/reactos?rev=51707&view=rev Log: [CRT] Merge r50693 from cmake banch: _CxxThrowException is stdcall, not cdecl. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec trunk/reactos/lib/sdk/crt/except/cppexcept.c trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Fri May 13 19:37:49 2011 @@ -99,7 +99,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ cdecl _CxxThrowException(long long) +@ stdcall _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt2… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] Fri May 13 19:37:49 2011 @@ -453,7 +453,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt4… ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] Fri May 13 19:37:49 2011 @@ -497,7 +497,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexce… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Fri May 13 19:37:49 2011 @@ -490,7 +490,7 @@ /********************************************************************* * _CxxThrowException (MSVCRT.@) */ -void CDECL _CxxThrowException( exception *object, const cxx_exception_type *type ) +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) { ULONG_PTR args[3]; Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Fri May 13 19:37:49 2011 @@ -150,7 +150,7 @@ const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS);

1 0

[tkreuzer] 51706: [GENINC] Merge geninc tool from cmake branch
by tkreuzer＠svn.reactos.org 13 May '11

13 May '11

Author: tkreuzer Date: Fri May 13 19:19:05 2011 New Revision: 51706 URL: http://svn.reactos.org/svn/reactos?rev=51706&view=rev Log: [GENINC] Merge geninc tool from cmake branch Modified: trunk/reactos/tools/geninc/geninc.c Modified: trunk/reactos/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/geninc/geninc.c?rev=… ============================================================================== --- trunk/reactos/tools/geninc/geninc.c [iso-8859-1] (original) +++ trunk/reactos/tools/geninc/geninc.c [iso-8859-1] Fri May 13 19:19:05 2011 @@ -4,8 +4,210 @@ #include <stdlib.h> #include <string.h> - +#ifdef _WIN32 +#define PRIx64 "I64x" +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; +#else +#include <stdint.h> +#define PRIx64 "llx" +#define _stricmp strcasecmp +#endif + +typedef struct +{ + char Type; + char Name[55]; + uint64_t Value; +} ASMGENDATA; + +#define TYPE_END 0 +#define TYPE_RAW 1 +#define TYPE_CONSTANT 2 +#define TYPE_HEADER 3 int main(int argc, char* argv[]) { + FILE *input, *output; + ASMGENDATA data; + int i, result = -1; + int ms_format = 0; + char header[20]; + uint32_t e_lfanew, signature; + uint16_t Machine, NumberOfSections, SizeOfOptionalHeader; + typedef struct + { + char Name[8]; + uint32_t VirtualSize; + uint32_t VirtualAddress; + uint32_t RawSize; + uint32_t RawAddress; + uint32_t RelocAddress; + uint32_t LineNumbers; + uint16_t RelocationsNumber; + uint16_t LineNumbersNumber; + uint32_t Characteristics; + } SECTION; + SECTION section; + + if (argc >= 4 && _stricmp(argv[3], "-ms") == 0) ms_format = 1; + + /* Open the input file */ + input = fopen(argv[1], "rb"); + if (!input) + { + fprintf(stderr, "Could not open input file '%s'\n", argv[1]); + return -1; + } + + /* Open the output file */ + output = fopen(argv[2], "w"); + if (!output) + { + fprintf(stderr, "Could not open output file '%s'\n", argv[2]); + return -1; + } + + /* Read the DOS header */ + if (fread(&header, 1, 2, input) != 2) + { + fprintf(stderr, "Error reading header.\n"); + goto quit; + } + + if (header[0] != 0x4d || header[1] != 0x5a) + { + fprintf(stderr, "Not a PE file.\n"); + goto quit; + } + + fseek(input, 0x3C, SEEK_SET); + if (fread(&e_lfanew, 1, 4, input) != 4) + { + fprintf(stderr, "Could not read e_lfanew.\n"); + goto quit; + } + + fseek(input, e_lfanew, SEEK_SET); + if (fread(&signature, 1, 4, input) != 4) + { + fprintf(stderr, "Could not read signature.\n"); + goto quit; + } + + /* Verify the PE signature */ + if (signature != 0x4550) + { + fprintf(stderr, "Invalid signature: 0x%lx.\n", signature); + goto quit; + } + + /* Read Machine */ + fseek(input, e_lfanew + 4, SEEK_SET); + if (fread(&Machine, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read ExportDirectoryRVA.\n"); + goto quit; + } + + if (Machine != 0x14c && Machine != 0x8664) + { + fprintf(stderr, "Invalid Machine: 0x%x.\n", Machine); + goto quit; + } + + /* Read NumberOfSections */ + if (fread(&NumberOfSections, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read NumberOfSections.\n"); + goto quit; + } + + fseek(input, e_lfanew + 0x14, SEEK_SET); + if (fread(&SizeOfOptionalHeader, 1, 2, input) != 2) + { + fprintf(stderr, "Could not read SizeOfOptionalHeader.\n"); + goto quit; + } + + /* Read the section table */ + fseek(input, e_lfanew + 0x18 + SizeOfOptionalHeader, SEEK_SET); + + /* Search for the .asmdef section */ + for (i = 0; i < NumberOfSections; i++) + { + if (fread(&section, 1, sizeof(SECTION), input) != sizeof(SECTION)) + { + fprintf(stderr, "Could not read section.\n"); + goto quit; + } + + if (strcmp(section.Name, ".asmdef") == 0) + { + break; + } + } + + if (i == NumberOfSections) + { + fprintf(stderr, "Could not find section.\n"); + goto quit; + } + + /* Read the section table */ + fseek(input, section.RawAddress, SEEK_SET); + + while (1) + { + /* Read one entry */ + if (fread(&data, 1, sizeof(data), input) != sizeof(data)) + { + fprintf(stderr, "Error reading input file.\n"); + goto quit; + } + + switch(data.Type) + { + case TYPE_END: + break; + + case TYPE_RAW: + fprintf(output, "%s\n", data.Name); + continue; + + case TYPE_CONSTANT: + if (ms_format) + { + fprintf(output, "%s equ 0%"PRIx64"h\n", data.Name, data.Value); + } + else + { + fprintf(output, "%s = 0x%"PRIx64"\n", data.Name, data.Value); + } + continue; + + case TYPE_HEADER: + if (ms_format) + { + fprintf(output, "\n; %s\n", data.Name); + } + else + { + fprintf(output, "\n/* %s */\n", data.Name); + } + continue; + } + + break; + } + + result = 0; + +quit: + /* Close files */ + fclose(input); + fclose(output); + + return result; }

1 0

[tkreuzer] 51705: [CMAKE] revert changes to the kernel's linker script, its not used in cmake branch
by tkreuzer＠svn.reactos.org 13 May '11

13 May '11

Author: tkreuzer Date: Fri May 13 19:17:10 2011 New Revision: 51705 URL: http://svn.reactos.org/svn/reactos?rev=51705&view=rev Log: [CMAKE] revert changes to the kernel's linker script, its not used in cmake branch Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl_i386.lnk Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl_i386.lnk URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ntoskrnl… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ntoskrnl_i386.lnk [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ntoskrnl_i386.lnk [iso-8859-1] Fri May 13 19:17:10 2011 @@ -44,6 +44,13 @@ { *(.edata) } + /DISCARD/ : + { + *(.debug$S) + *(.debug$T) + *(.debug$F) + *(.drectve) + } .idata BLOCK(__section_alignment__) : { @@ -80,41 +87,13 @@ /* These zeroes mark the end of the reloc section. */ LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); } - .debug_aranges BLOCK(__section_alignment__) : + .stab BLOCK(__section_alignment__) (NOLOAD) : { - *(.debug_aranges) + [ .stab ] } - .debug_abbrev BLOCK(__section_alignment__) : + .stabstr BLOCK(__section_alignment__) (NOLOAD) : { - *(.debug_abbrev) - } - .debug_frame BLOCK(__section_alignment__) : - { - *(.debug_frame) - } - .debug_info BLOCK(__section_alignment__) : - { - *(.debug_info) - } - .debug_line BLOCK(__section_alignment__) : - { - *(.debug_line) - } - .debug_loc BLOCK(__section_alignment__) : - { - *(.debug_loc) - } - .debug_pubnames BLOCK(__section_alignment__) : - { - *(.debug_pubnames) - } - .debug_ranges BLOCK(__section_alignment__) : - { - *(.debug_ranges) - } - .debug_str BLOCK(__section_alignment__) : - { - *(.debug_str) + [ .stabstr ] } INIT BLOCK(__section_alignment__) : {

1 0

[tkreuzer] 51704: [WIDL] Update widl_ros.diff The change was done in r49282 in cmake branch and mysteriously made it into trunk in r50063, which is a wine sync, but wine doesn't have that code.
by tkreuzer＠svn.reactos.org 13 May '11

13 May '11

Author: tkreuzer Date: Fri May 13 19:13:53 2011 New Revision: 51704 URL: http://svn.reactos.org/svn/reactos?rev=51704&view=rev Log: [WIDL] Update widl_ros.diff The change was done in r49282 in cmake branch and mysteriously made it into trunk in r50063, which is a wine sync, but wine doesn't have that code. Modified: trunk/reactos/tools/widl/widl_ros.diff Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] (original) +++ trunk/reactos/tools/widl/widl_ros.diff [iso-8859-1] Fri May 13 19:13:53 2011 @@ -12,6 +12,25 @@ #include "widltypes.h" #include "hash.h" +diff -u wine-1.3.4/tools/widl/header.c tools/widl/header.c +--- wine-1.3.4/tools/widl/header.c 2010-09-19 17:48:47.640625000 +0200 ++++ tools/widl/header.c 2010-10-26 18:30:19.000000000 +0200 +@@ -1081,15 +1081,7 @@ + { + unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); + const char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); +- static int allocate_written = 0; + +- if (!allocate_written) +- { +- allocate_written = 1; +- fprintf(header, "void * __RPC_USER MIDL_user_allocate(SIZE_T);\n"); +- fprintf(header, "void __RPC_USER MIDL_user_free(void *);\n\n"); +- } +- + fprintf(header, "/*****************************************************************************\n"); + fprintf(header, " * %s interface (v%d.%d)\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); + fprintf(header, " */\n"); diff -u wine-1.3.4/tools/widl/parser.y tools/widl/parser.y --- wine-1.3.4/tools/widl/parser.y 2010-09-19 17:49:40.578125000 +0200 +++ tools/widl/parser.y 2010-10-03 16:44:18.781250000 +0200

1 0

[akhaldi] 51703: [CMAKE] * Partially revert r50224 as the current resource handling doesn't suffer from the iconv issue on unix.
by akhaldi＠svn.reactos.org 13 May '11

13 May '11

Author: akhaldi Date: Fri May 13 17:53:03 2011 New Revision: 51703 URL: http://svn.reactos.org/svn/reactos?rev=51703&view=rev Log: [CMAKE] * Partially revert r50224 as the current resource handling doesn't suffer from the iconv issue on unix. Modified: branches/cmake-bringup/base/applications/calc/resource.rc branches/cmake-bringup/base/applications/dxdiag/rsrc.rc branches/cmake-bringup/base/applications/mplay32/rsrc.rc branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc branches/cmake-bringup/base/applications/mstsc/rsrc.rc branches/cmake-bringup/base/applications/notepad/rsrc.rc branches/cmake-bringup/base/applications/rapps/rsrc.rc branches/cmake-bringup/base/applications/regedit/rsrc.rc branches/cmake-bringup/base/applications/screensavers/logon/logon.rc branches/cmake-bringup/base/setup/vmwinst/rsrc.rc branches/cmake-bringup/base/setup/welcome/rsrc.rc branches/cmake-bringup/base/system/winlogon/rsrc.rc branches/cmake-bringup/dll/cpl/desk/rsrc.rc branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc branches/cmake-bringup/dll/win32/netid/rsrc.rc branches/cmake-bringup/dll/win32/netshell/netshell.rc branches/cmake-bringup/dll/win32/shell32/shell32.rc branches/cmake-bringup/dll/win32/syssetup/syssetup.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc Modified: branches/cmake-bringup/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/resource.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/resource.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -52,7 +52,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/dxdiag/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -10,7 +10,7 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/mplay32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mplay32/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mplay32/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -8,7 +8,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -// #include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -20,7 +20,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" @@ -30,4 +30,3 @@ #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" - Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -16,10 +16,10 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" -//#include "lang/pl-PL.rc" FIXME: iconv issue +#include "lang/pl-PL.rc" #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Modified: branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -28,7 +28,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mstsc/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mstsc/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -20,7 +20,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/notepad/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -48,7 +48,7 @@ #include "lang/hy-AM.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -5,7 +5,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Modified: branches/cmake-bringup/base/applications/regedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedit/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedit/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -38,7 +38,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/screensavers/logon/logon.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -20,7 +20,7 @@ #include "lang/es-ES.rc" #include "lang/eu-ES.rc" #include "lang/fr-FR.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" Modified: branches/cmake-bringup/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… ============================================================================== --- branches/cmake-bringup/base/setup/vmwinst/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/vmwinst/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -23,7 +23,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom… ============================================================================== --- branches/cmake-bringup/base/setup/welcome/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/welcome/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -51,7 +51,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" Modified: branches/cmake-bringup/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo… ============================================================================== --- branches/cmake-bringup/base/system/winlogon/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/winlogon/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -15,7 +15,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" Modified: branches/cmake-bringup/dll/cpl/desk/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/rsrc… ============================================================================== --- branches/cmake-bringup/dll/cpl/desk/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/desk/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -11,7 +11,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/powercfg/… ============================================================================== --- branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -10,7 +10,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/sysdm/rsr… ============================================================================== --- branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -10,7 +10,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: branches/cmake-bringup/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/r… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -9,7 +9,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/id-ID.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/it-IT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/dll/win32/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netshel… ============================================================================== --- branches/cmake-bringup/dll/win32/netshell/netshell.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netshell/netshell.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -33,7 +33,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/shell32.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/shell32.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -60,7 +60,7 @@ #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/ko-KR.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" Modified: branches/cmake-bringup/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu… ============================================================================== --- branches/cmake-bringup/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/syssetup/syssetup.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -63,7 +63,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011 @@ -13,7 +13,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -//#include "lang/ja-JP.rc" FIXME: iconv issue +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

1 0

[akhaldi] 51702: * Reduce difference to the cmake branch, MSVC fixes.
by akhaldi＠svn.reactos.org 13 May '11

13 May '11

Author: akhaldi Date: Fri May 13 17:16:08 2011 New Revision: 51702 URL: http://svn.reactos.org/svn/reactos?rev=51702&view=rev Log: * Reduce difference to the cmake branch, MSVC fixes. Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/applications/sndrec32/sndrec32.cpp trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/dll/win32/glu32/libutil/mipmap.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/drivers/base/nmidebug/nmidebug.c trunk/reactos/drivers/bus/acpi/osl.c trunk/reactos/drivers/usb/usbehci/pdo.c trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -10,7 +10,7 @@ LPWSTR pszExeName = L"cmd.exe"; /* Function pointers */ -typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); +typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName); typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName); typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName); @@ -142,7 +142,7 @@ return; } - while ( fgetws(line, MAX_PATH, fp) != NULL) + while ( fgetws(line, MAX_PATH, fp) != NULL) { /* Remove newline character */ WCHAR *end = &line[wcslen(line) - 1]; @@ -191,13 +191,16 @@ int wmain(VOID) { - setlocale(LC_ALL, ""); + WCHAR *pArgStart; + WCHAR *pArgEnd; + HMODULE hKernel32; + + setlocale(LC_ALL, ""); /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ - WCHAR *pArgStart; - WCHAR *pArgEnd = GetCommandLine(); - HMODULE hKernel32 = LoadLibraryW(L"kernel32.dll"); + pArgEnd = GetCommandLine(); + hKernel32 = LoadLibraryW(L"kernel32.dll"); /* Get function pointers */ pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryW"); Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/sndrec32.cpp [iso-8859-1] Fri May 13 17:16:08 2011 @@ -462,7 +462,7 @@ x = ( i * samples ) / WAVEBAR_CX; - line_h = ( abs(AUD_OUT->nsample( x )) * max_h ) / AUD_OUT->samplevalue_max(); + line_h = ( AUD_OUT->nsample( x ) * max_h ) / AUD_OUT->samplevalue_max(); if ( line_h ) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -54,6 +54,17 @@ RunLoader(); } +#ifdef _MSC_VER +long _ftol2(double f) +{ + return _ftol(f); +} +long _ftol2_sse(double f) +{ + return _ftol(f); +} +#endif + // We need to emulate these, because the original ones don't work in freeldr int __cdecl wctomb(char *mbchar, wchar_t wchar) { Modified: trunk/reactos/dll/win32/glu32/libutil/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/libutil/mi… ============================================================================== --- trunk/reactos/dll/win32/glu32/libutil/mipmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/libutil/mipmap.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -6577,7 +6577,7 @@ * Contributed by Gerk Huisma <gerk(a)five-d.demon.nl>. */ -typedef WINAPI void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level, +typedef void (GLAPIENTRY *TexImage3Dproc)( GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -88,7 +88,10 @@ ITextImpl->lpVtbl = &textservices_Vtbl; ITextImpl->editor = ME_MakeEditor(pITextHost, FALSE); ITextImpl->editor->exStyleFlags = 0; - ITextImpl->editor->rcFormat = (RECT){0,0,0,0}; + ITextImpl->editor->rcFormat.left = 0; + ITextImpl->editor->rcFormat.top = 0; + ITextImpl->editor->rcFormat.right = 0; + ITextImpl->editor->rcFormat.bottom = 0; ME_HandleMessage(ITextImpl->editor, WM_CREATE, 0, 0, TRUE, &hres); if (pUnkOuter) Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -187,9 +187,13 @@ /* strdup on the process heap */ static LPWSTR __inline HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) { + INT len; + LPWSTR p; + assert(str); - INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); + + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len ); Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -21,7 +21,14 @@ { ((PCHAR)&KiBugCheckData[4])[0] -= (NmiBegin[3] | NmiBegin[7]); ((PCHAR)&KiBugCheckData[4])[3] |= 1; +#ifdef _MSC_VER + __asm + { + rcr KiBugCheckData[4], 8 + } +#else __asm__("rcrl %b[shift], %k[retval]" : [retval] "=rm" (KiBugCheckData[4]) : "[retval]" (KiBugCheckData[4]), [shift] "Nc" (8)); +#endif } BOOLEAN Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -67,6 +67,8 @@ ACPI_STATUS AcpiOsInitialize (void) { + UINT32 i; + DPRINT("AcpiOsInitialize called\n"); #ifndef NDEBUG @@ -74,8 +76,6 @@ AcpiDbgLevel = 0x00FFFFFF; AcpiDbgLayer = 0xFFFFFFFF; #endif - - UINT32 i; for (i = 0; i < NUM_SEMAPHORES; i++) { @@ -209,10 +209,11 @@ AcpiOsAcquireObject ( ACPI_CACHE_T *Cache) { + void* ptr; PNPAGED_LOOKASIDE_LIST List = (PNPAGED_LOOKASIDE_LIST)Cache; + DPRINT("AcpiOsAcquireObject from %p\n", Cache); - void* ptr = - ExAllocateFromNPagedLookasideList(List); + ptr = ExAllocateFromNPagedLookasideList(List); ASSERT(ptr); RtlZeroMemory(ptr,List->L.Size); @@ -692,8 +693,10 @@ UINT64 AcpiOsGetTimer (void) { + LARGE_INTEGER Timer; + DPRINT("AcpiOsGetTimer\n"); - LARGE_INTEGER Timer; + KeQueryTickCount(&Timer); return Timer.QuadPart; @@ -758,9 +761,10 @@ AcpiOsGetRootPointer ( void) { + ACPI_PHYSICAL_ADDRESS pa = 0; + DPRINT("AcpiOsGetRootPointer\n"); - ACPI_PHYSICAL_ADDRESS pa = 0; - + AcpiFindRootPointer(&pa); return pa; } Modified: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -368,6 +368,8 @@ PIO_STACK_LOCATION Stack; ULONG_PTR Information = Irp->IoStatus.Information; NTSTATUS Status = Irp->IoStatus.Status; + PDEVICE_CAPABILITIES DeviceCapabilities; + ULONG i; Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; @@ -513,8 +515,6 @@ case IRP_MN_QUERY_CAPABILITIES: { DPRINT("Ehci: PDO Query Capabilities\n"); - PDEVICE_CAPABILITIES DeviceCapabilities; - ULONG i; DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/defaults.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -194,7 +194,11 @@ return RtlCompareMemory(b1, b2, len); } +#ifndef _MSC_VER + int memcmp(const void *b1, const void *b2, size_t len) { return RtlCompareMemory(b1, b2, len); } + +#endif Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Fri May 13 17:16:08 2011 @@ -129,9 +129,10 @@ int proto ) { struct socket *so; - - OSKLock(); - int error = socreate(domain, &so, type, proto); + int error ; + + OSKLock(); + error = socreate(domain, &so, type, proto); if( !error ) { so->so_connection = context; InitializeSocketFlags(so);

1 0

[akhaldi] 51701: * Reduce difference to the cmake branch.
by akhaldi＠svn.reactos.org 13 May '11

13 May '11

Author: akhaldi Date: Fri May 13 16:29:09 2011 New Revision: 51701 URL: http://svn.reactos.org/svn/reactos?rev=51701&view=rev Log: * Reduce difference to the cmake branch. Modified: trunk/reactos/dll/cpl/mmsys/mmsys.spec trunk/reactos/dll/directx/ksproxy/ksproxy.spec trunk/reactos/dll/shellext/deskadp/deskadp.spec trunk/reactos/dll/shellext/deskmon/deskmon.spec trunk/reactos/dll/shellext/fontext/fontext.spec trunk/reactos/dll/shellext/slayer/slayer.spec trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/dll/win32/credui/credui.spec trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec trunk/reactos/dll/win32/cryptui/cryptui.spec trunk/reactos/dll/win32/devmgr/devmgr.spec trunk/reactos/dll/win32/initpki/initpki.spec trunk/reactos/dll/win32/inseng/inseng.spec trunk/reactos/dll/win32/itircl/itircl.spec trunk/reactos/dll/win32/itss/itss.spec trunk/reactos/dll/win32/mpr/mpr.spec trunk/reactos/dll/win32/msisip/msisip.spec trunk/reactos/dll/win32/mssign32/mssign32.spec trunk/reactos/dll/win32/netcfgx/netcfgx.spec trunk/reactos/dll/win32/netshell/netshell.spec trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/printui/printui.spec trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shimgvw/shimgvw.spec trunk/reactos/dll/win32/url/url.spec trunk/reactos/dll/win32/userenv/userenv.spec trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec Modified: trunk/reactos/dll/cpl/mmsys/mmsys.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.spec?r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -4,8 +4,8 @@ @ stdcall mmseRunOnceA(ptr ptr str long) @ stdcall ShowMMCPLPropertySheet(ptr str str str) @ stdcall ShowAudioPropertySheet(ptr ptr str long) -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall ShowDriverSettingsAfterFork(ptr ptr str long) @ stdcall ShowDriverSettingsAfterForkW(ptr ptr wstr long) @ stdcall ShowDriverSettingsAfterForkA(ptr ptr str long) Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,7 +1,7 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(ptr ptr ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stdcall KsGetMediaType(long ptr ptr long) @ stdcall KsGetMediaTypeCount(ptr long ptr) @ stdcall KsGetMultiplePinFactoryItems(ptr long long ptr) Modified: trunk/reactos/dll/shellext/deskadp/deskadp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska… ============================================================================== --- trunk/reactos/dll/shellext/deskadp/deskadp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskadp/deskadp.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ # deskadp.dll exports - 1 stdcall DllCanUnloadNow() - 2 stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) Modified: trunk/reactos/dll/shellext/deskmon/deskmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm… ============================================================================== --- trunk/reactos/dll/shellext/deskmon/deskmon.spec [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/deskmon/deskmon.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ # deskmon.dll exports - 1 stdcall DllCanUnloadNow() - 2 stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) Modified: trunk/reactos/dll/shellext/fontext/fontext.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/fonte… ============================================================================== --- trunk/reactos/dll/shellext/fontext/fontext.spec [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/fontext/fontext.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(long long ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(long long ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/shellext/slayer/slayer.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… ============================================================================== --- trunk/reactos/dll/shellext/slayer/slayer.spec [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/slayer.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ -@ stdcall DllCanUnloadNow() -@ stdcall DllGetClassObject(long long ptr) -@ stdcall DllRegisterServer() -@ stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(long long ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,7 +1,7 @@ -1 stdcall -private DllCanUnloadNow() -2 stdcall -private DllGetClassObject(ptr ptr ptr) -3 stdcall -private DllRegisterServer() -4 stdcall -private DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 10 stdcall AtlAdvise(ptr ptr ptr ptr) 11 stdcall AtlUnadvise(ptr ptr long) 12 stdcall AtlFreeMarshalStream(ptr) Modified: trunk/reactos/dll/win32/credui/credui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.sp… ============================================================================== --- trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/credui/credui.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -11,7 +11,7 @@ @ stdcall CredUIReadSSOCredW(wstr ptr) @ stdcall CredUIStoreSSOCredA(str str str long) @ stdcall CredUIStoreSSOCredW(wstr wstr wstr long) -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer Modified: trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -15,7 +15,7 @@ 15 stub CertSelectCertificateW 16 stdcall CertViewPropertiesA(ptr) 17 stdcall CertViewPropertiesW(ptr) -18 stdcall -private DllRegisterServer() -19 stdcall -private DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 20 stdcall GetFriendlyNameOfCertA(ptr ptr long) 21 stdcall GetFriendlyNameOfCertW(ptr ptr long) Modified: trunk/reactos/dll/win32/cryptui/cryptui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -37,8 +37,8 @@ 37 stdcall CryptUIWizImport(long ptr wstr ptr ptr) 38 stub CryptUIWizQueryCertRequestNoDS 39 stub CryptUIWizSubmitCertRequestNoDS -40 stub DllRegisterServer -41 stub DllUnregisterServer +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer 42 stub EnrollmentCOMObjectFactory_getInstance 43 stub I_CryptUIProtect 44 stub I_CryptUIProtectFailure Modified: trunk/reactos/dll/win32/devmgr/devmgr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.sp… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -21,7 +21,7 @@ 23 stdcall DeviceProblenWizard_RunDLLA(ptr ptr str long) DeviceProblemWizard_RunDLLA 24 stdcall DeviceProblenWizard_RunDLLW(ptr ptr wstr long) DeviceProblemWizard_RunDLLW -25 stub DllCanUnloadNow -26 stub DllGetClassObject -27 stub DllRegisterServer -28 stub DllUnregisterServer +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer Modified: trunk/reactos/dll/win32/initpki/initpki.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/initpki/initpki.… ============================================================================== --- trunk/reactos/dll/win32/initpki/initpki.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/initpki/initpki.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ -@ stub DllInstall +@ stub -private DllInstall @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub InitializePKI Modified: trunk/reactos/dll/win32/inseng/inseng.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.sp… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -3,7 +3,7 @@ @ stdcall CheckTrustEx(ptr ptr ptr ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllInstall +@ stub -private DllInstall @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub DownloadFile Modified: trunk/reactos/dll/win32/itircl/itircl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/itircl.sp… ============================================================================== --- trunk/reactos/dll/win32/itircl/itircl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itircl/itircl.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,4 +1,4 @@ @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stub -private DllGetClassObject @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/itss/itss.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/itss.spec?r… ============================================================================== --- trunk/reactos/dll/win32/itss/itss.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/itss.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,6 +1,6 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllInstall +@ stub -private DllInstall @ stdcall -private DllMain(long long ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -24,7 +24,7 @@ 25 stdcall @(ptr long) _MPR_25 @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stub -private DllGetClassObject @ stdcall MultinetGetConnectionPerformanceA(ptr ptr) @ stdcall MultinetGetConnectionPerformanceW(ptr ptr) @ stdcall MultinetGetErrorTextA(long ptr long) Modified: trunk/reactos/dll/win32/msisip/msisip.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/msisip.sp… ============================================================================== --- trunk/reactos/dll/win32/msisip/msisip.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msisip/msisip.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -4,5 +4,5 @@ 8 stub MsiSIPRemoveSignedDataMsg 9 stub MsiSIPCreateIndirectData 10 stub MsiSIPVerifyIndirectData -11 stdcall DllRegisterServer() -12 stdcall DllUnregisterServer() +11 stdcall -private DllRegisterServer() +12 stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/mssign32/mssign32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign3… ============================================================================== --- trunk/reactos/dll/win32/mssign32/mssign32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mssign32/mssign32.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,5 +1,5 @@ -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer @ stub FreeCryptProvFromCert @ stub GetCryptProvFromCert @ stub PvkFreeCryptProv Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,7 +1,7 @@ -2 stdcall DllCanUnloadNow() -3 stdcall DllGetClassObject(ptr ptr ptr) -4 stdcall DllRegisterServer() -5 stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 6 stub HrDiAddComponentToINetCfg 7 stub LanaCfgFromCommandArgs 8 stub ModemClassCoInstaller Modified: trunk/reactos/dll/win32/netshell/netshell.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,9 +1,9 @@ 1 stub DoInitialCleanup -2 stdcall DllCanUnloadNow() -3 stdcall DllGetClassObject(ptr ptr ptr) -4 stdcall DllRegisterServer() -5 stdcall DllUnregisterServer() +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 6 stub HrCreateDesktopIcon 7 stub HrGetAnswerFileParametersForNetCard 8 stub HrGetExtendedStatusFromNCS Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -98,7 +98,7 @@ @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall -private DllGetClassObject (ptr ptr ptr) +@ stdcall DllGetClassObject (ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/printui/printui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/printui.… ============================================================================== --- trunk/reactos/dll/win32/printui/printui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/printui/printui.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,8 +1,8 @@ @ stub ConnectToPrinterDlg @ stub ConnectToPrinterPropertyPage @ stub ConstructPrinterFriendlyName -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject @ stub DocumentPropertiesWrap @ stub PnPInterface @ stub PrintNotifyTray_Exit Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -113,16 +113,16 @@ 113 stdcall Control_RunDLLA(ptr ptr str long) 114 stdcall Control_RunDLLAsUserW(ptr ptr wstr long) 115 stdcall Control_RunDLLW(ptr ptr wstr long) -116 stdcall DllCanUnloadNow() -117 stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) 118 stdcall DllGetVersion(ptr) 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW -120 stdcall DllInstall(long wstr) +@ stdcall -private DllInstall(long wstr) 121 stdcall SHFlushClipboard() 122 stdcall -noname RunDLL_CallEntry16(long long long str long) # Fixme #name wrong? 123 stdcall -noname SHFreeUnusedLibraries() -124 stdcall DllRegisterServer() -125 stdcall DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) # Fixme 127 stdcall -noname SHWinHelp(long long long long) 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -7,8 +7,8 @@ @ stdcall ImageView_PrintToW(ptr ptr wstr long) @ stdcall imageview_fullscreenW(ptr ptr wstr long) ImageView_FullscreenW @ stub ConvertDIBSECTIONToThumbnail -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllInstall -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject +@ stub -private DllInstall +@ stub -private DllRegisterServer +@ stub -private DllUnregisterServer Modified: trunk/reactos/dll/win32/url/url.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/url.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/url/url.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/url/url.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,7 +1,7 @@ @ stdcall AddMIMEFileTypesPS(ptr ptr) @ stub AutodialHookCallback -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stub -private DllCanUnloadNow +@ stub -private DllGetClassObject @ stub DummyEntryPoint @ stub DummyEntryPointA @ stdcall FileProtocolHandler(long ptr str long) FileProtocolHandlerA Modified: trunk/reactos/dll/win32/userenv/userenv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/userenv.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -2,11 +2,11 @@ 133 stdcall DeleteProfileA(str str str) 134 stdcall DeleteProfileW(wstr wstr wstr) 176 stdcall DestroyEnvironmentBlock(ptr) -177 stub DllCanUnloadNow #stdcall DllCanUnloadNow() -178 stub DllGetClassObject #stdcall DllGetClassObject(ptr ptr ptr) -179 stub DllInstall #stdcall DllInstall(long wstr) -180 stub DllRegisterServer #stdcall DllRegisterServer() -181 stub DllUnregisterServer #stdcall DllUnregisterServer() +@ stub -private DllCanUnloadNow #stdcall DllCanUnloadNow() +@ stub -private DllGetClassObject #stdcall DllGetClassObject(ptr ptr ptr) +@ stub -private DllInstall #stdcall DllInstall(long wstr) +@ stub -private DllRegisterServer #stdcall DllRegisterServer() +@ stub -private DllUnregisterServer #stdcall DllUnregisterServer() 182 stdcall EnterCriticalPolicySection(long) 183 stdcall ExpandEnvironmentStringsForUserA(ptr str str long) 184 stdcall ExpandEnvironmentStringsForUserW(ptr wstr wstr long) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec [iso-8859-1] Fri May 13 16:29:09 2011 @@ -1,5 +1,5 @@ -@ stdcall DllInitialize(long) -@ stdcall DllUnload() +@ stdcall -private DllInitialize(long) +@ stdcall -private DllUnload() ; Adapters (adapter.c) @ stdcall PcAddAdapterDevice(ptr ptr ptr long long)

1 0

[ekohl] 51700: [UMPNPMGR] Implement parts of PNP_CreateDevInst.
by ekohl＠svn.reactos.org 13 May '11

13 May '11

Author: ekohl Date: Fri May 13 15:56:50 2011 New Revision: 51700 URL: http://svn.reactos.org/svn/reactos?rev=51700&view=rev Log: [UMPNPMGR] Implement parts of PNP_CreateDevInst. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri May 13 15:56:50 2011 @@ -187,8 +187,7 @@ handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + return CR_SUCCESS; } @@ -197,8 +196,7 @@ handle_t hBinding) { UNREFERENCED_PARAMETER(hBinding); - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + return CR_SUCCESS; } @@ -1107,6 +1105,157 @@ } +static VOID +SplitDeviceInstanceID(IN LPWSTR pszDeviceInstanceID, + OUT LPWSTR pszEnumerator, + OUT LPWSTR pszDevice, + OUT LPWSTR pszInstance) +{ + WCHAR szLocalDeviceInstanceID[MAX_DEVICE_ID_LEN]; + LPWSTR lpEnumerator = NULL; + LPWSTR lpDevice = NULL; + LPWSTR lpInstance = NULL; + LPWSTR ptr; + + wcscpy(szLocalDeviceInstanceID, pszDeviceInstanceID); + + *pszEnumerator = 0; + *pszDevice = 0; + *pszInstance = 0; + + lpEnumerator = szLocalDeviceInstanceID; + + ptr = wcschr(lpEnumerator, L'\\'); + if (ptr != NULL) + { + *ptr = 0; + lpDevice = ++ptr; + + ptr = wcschr(lpDevice, L'\\'); + if (ptr != NULL) + { + *ptr = 0; + lpInstance = ++ptr; + } + } + + if (lpEnumerator != NULL) + wcscpy(pszEnumerator, lpEnumerator); + + if (lpDevice != NULL) + wcscpy(pszDevice, lpDevice); + + if (lpInstance != NULL) + wcscpy(pszInstance, lpInstance); +} + + +static CONFIGRET +CreateDeviceInstance(LPWSTR pszDeviceID) +{ + WCHAR szEnumerator[MAX_DEVICE_ID_LEN]; + WCHAR szDevice[MAX_DEVICE_ID_LEN]; + WCHAR szInstance[MAX_DEVICE_ID_LEN]; + HKEY hKeyEnumerator; + HKEY hKeyDevice; + HKEY hKeyInstance; + HKEY hKeyControl; + LONG lError; + + /* Split the instance ID */ + SplitDeviceInstanceID(pszDeviceID, + szEnumerator, + szDevice, + szInstance); + + /* Open or create the enumerator key */ + lError = RegCreateKeyExW(hEnumKey, + szEnumerator, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKeyEnumerator, + NULL); + if (lError != ERROR_SUCCESS) + { + return CR_REGISTRY_ERROR; + } + + /* Open or create the device key */ + lError = RegCreateKeyExW(hKeyEnumerator, + szDevice, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKeyDevice, + NULL); + + /* Close the enumerator key */ + RegCloseKey(hKeyEnumerator); + + if (lError != ERROR_SUCCESS) + { + return CR_REGISTRY_ERROR; + } + + /* Try to open the instance key and fail if it exists */ + lError = RegOpenKeyExW(hKeyDevice, + szInstance, + 0, + KEY_SET_VALUE, + &hKeyInstance); + if (lError == ERROR_SUCCESS) + { + DPRINT1("Instance %S already exists!\n", szInstance); + RegCloseKey(hKeyInstance); + RegCloseKey(hKeyDevice); + return CR_ALREADY_SUCH_DEVINST; + } + + /* Create a new instance key */ + lError = RegCreateKeyExW(hKeyDevice, + szInstance, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKeyInstance, + NULL); + + /* Close the device key */ + RegCloseKey(hKeyDevice); + + if (lError != ERROR_SUCCESS) + { + return CR_REGISTRY_ERROR; + } + + /* Create the 'Control' sub key */ + lError = RegCreateKeyExW(hKeyInstance, + L"Control", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKeyControl, + NULL); + if (lError == ERROR_SUCCESS) + { + RegCloseKey(hKeyControl); + } + + RegCloseKey(hKeyInstance); + + return (lError == ERROR_SUCCESS) ? CR_SUCCESS : CR_REGISTRY_ERROR; +} + + /* Function 28 */ DWORD PNP_CreateDevInst( handle_t hBinding, @@ -1115,8 +1264,25 @@ PNP_RPC_STRING_LEN ulLength, DWORD ulFlags) { - UNIMPLEMENTED; - return CR_CALL_NOT_IMPLEMENTED; + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_CreateDevInst: %S\n", pszDeviceID); + + if (ulFlags & CM_CREATE_DEVNODE_GENERATE_ID) + { + /* FIXME */ + DPRINT1("CM_CREATE_DEVNODE_GENERATE_ID support not implemented yet!\n", ret); + ret = CR_CALL_NOT_IMPLEMENTED; + goto done; + } + + /* Create the device instance */ + ret = CreateDeviceInstance(pszDeviceID); + +done:; + DPRINT("PNP_CreateDevInst() done (returns %lx)\n", ret); + + return ret; } @@ -1886,7 +2052,6 @@ handle_t hBinding, DWORD ulFlags) { - UNIMPLEMENTED; return CR_CALL_NOT_IMPLEMENTED; }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011