Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[akhaldi] 68424: [ATL100_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:09:22 2015 New Revision: 68424 URL: http://svn.reactos.org/svn/reactos?rev=68424&view=rev Log: [ATL100_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/atl100/atl.c Modified: trunk/rostests/winetests/atl100/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/atl100/atl.c?re… ============================================================================== --- trunk/rostests/winetests/atl100/atl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/atl100/atl.c [iso-8859-1] Sun Jul 19 13:09:22 2015 @@ -924,6 +924,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -934,6 +936,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -944,6 +948,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = NULL; @@ -954,6 +960,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); container = (IUnknown *)0xdeadbeef; @@ -984,6 +992,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); /* test file:// scheme */ @@ -997,6 +1007,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); /* test file:// scheme on non-existent file. */ @@ -1010,6 +1022,8 @@ ok(hr == S_OK, "got 0x%08x\n", hr); ok(container != NULL, "returned %p!\n", container); ok(control != NULL, "returned %p\n", control); + IUnknown_Release(container); + IUnknown_Release(control); DestroyWindow(hwnd); }

9 years, 5 months

[akhaldi] 68423: [ATL][ATL80][ATL100] Sync with Wine Staging 1.7.47. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:08:46 2015 New Revision: 68423 URL: http://svn.reactos.org/svn/reactos?rev=68423&view=rev Log: [ATL][ATL80][ATL100] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/atl/atl.c trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/dll/win32/atl/atl30.c trunk/reactos/dll/win32/atl100/atl100.spec trunk/reactos/dll/win32/atl80/atl80.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/atl/atl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.c?rev=68… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.c [iso-8859-1] Sun Jul 19 13:08:46 2015 @@ -281,6 +281,18 @@ } /*********************************************************************** + * AtlIPersistPropertyBag_Save [atl100.@] + */ +HRESULT WINAPI AtlIPersistPropertyBag_Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty, + BOOL fSaveAll, ATL_PROPMAP_ENTRY *pMap, + void *pThis, IUnknown *pUnk) +{ + FIXME("(%p, %d, %d, %p, %p, %p)\n", pPropBag, fClearDirty, fSaveAll, pMap, pThis, pUnk); + + return S_OK; +} + +/*********************************************************************** * AtlModuleAddTermFunc [atl100.@] */ HRESULT WINAPI AtlModuleAddTermFunc(_ATL_MODULE *pM, _ATL_TERMFUNC *pFunc, DWORD_PTR dw) 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] Sun Jul 19 13:08:46 2015 @@ -44,7 +44,7 @@ 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) -53 stub AtlIPersistPropertyBag_Save +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) Modified: trunk/reactos/dll/win32/atl/atl30.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl30.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/atl/atl30.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl30.c [iso-8859-1] Sun Jul 19 13:08:46 2015 @@ -576,8 +576,12 @@ */ HRESULT WINAPI DllRegisterServer(void) { +#ifdef __REACTOS__ /* Note: we can't use __wine_register_server here because it uses CLSID_Registrar which isn't registred yet */ return do_register_server(TRUE); +#else + return __wine_register_resources( atl_instance ); +#endif } /*********************************************************************** @@ -585,7 +589,11 @@ */ HRESULT WINAPI DllUnregisterServer(void) { +#ifdef __REACTOS__ return do_register_server(FALSE); +#else + return __wine_unregister_resources( atl_instance ); +#endif } /*********************************************************************** Modified: trunk/reactos/dll/win32/atl100/atl100.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl100/atl100.sp… ============================================================================== --- trunk/reactos/dll/win32/atl100/atl100.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl100/atl100.spec [iso-8859-1] Sun Jul 19 13:08:46 2015 @@ -36,7 +36,7 @@ 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) -53 stub AtlIPersistPropertyBag_Save +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) Modified: trunk/reactos/dll/win32/atl80/atl80.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl80/atl80.spec… ============================================================================== --- trunk/reactos/dll/win32/atl80/atl80.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl80/atl80.spec [iso-8859-1] Sun Jul 19 13:08:46 2015 @@ -38,7 +38,7 @@ 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) -53 stub AtlIPersistPropertyBag_Save +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) 54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) 55 stub AtlUnRegisterTypeLib 56 stdcall AtlLoadTypeLib(long wstr ptr ptr) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 19 13:08:46 2015 @@ -46,9 +46,9 @@ reactos/dll/win32/activeds # Synced to WineStaging-1.7.37 reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.37 reactos/dll/win32/advpack # Synced to WineStaging-1.7.37 -reactos/dll/win32/atl # Synced to WineStaging-1.7.37 -reactos/dll/win32/atl80 # Synced to WineStaging-1.7.37 -reactos/dll/win32/atl100 # Synced to WineStaging-1.7.37 +reactos/dll/win32/atl # Synced to WineStaging-1.7.47 +reactos/dll/win32/atl80 # Synced to WineStaging-1.7.47 +reactos/dll/win32/atl100 # Synced to WineStaging-1.7.47 reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.37 reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.37 reactos/dll/win32/browseui # Out of sync

9 years, 5 months

[akhaldi] 68422: [PSDK] Update cvconst.h. CORE-9924

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jul 19 13:06:07 2015 New Revision: 68422 URL: http://svn.reactos.org/svn/reactos?rev=68422&view=rev Log: [PSDK] Update cvconst.h. CORE-9924 Modified: trunk/reactos/include/psdk/cvconst.h Modified: trunk/reactos/include/psdk/cvconst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cvconst.h?rev… ============================================================================== --- trunk/reactos/include/psdk/cvconst.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/cvconst.h [iso-8859-1] Sun Jul 19 13:06:07 2015 @@ -457,6 +457,25 @@ CV_ARM_ND0 = 300, /* this includes ND1 to ND31 */ CV_ARM_NQ0 = 400, /* this includes NQ1 to NQ15 */ + /* ARM64 CPU */ + CV_ARM64_NOREG = CV_REG_NONE, + CV_ARM64_W0 = 10, /* this includes W0 to W30 */ + CV_ARM64_WZR = 41, + CV_ARM64_PC = 42, /* Wine extension */ + CV_ARM64_PSTATE = 43, /* Wine extension */ + CV_ARM64_X0 = 50, /* this includes X0 to X28 */ + CV_ARM64_IP0 = 66, /* Same as X16 */ + CV_ARM64_IP1 = 67, /* Same as X17 */ + CV_ARM64_FP = 79, + CV_ARM64_LR = 80, + CV_ARM64_SP = 81, + CV_ARM64_ZR = 82, + CV_ARM64_NZCV = 90, + CV_ARM64_S0 = 100, /* this includes S0 to S31 */ + CV_ARM64_D0 = 140, /* this includes D0 to D31 */ + CV_ARM64_Q0 = 180, /* this includes Q0 to Q31 */ + CV_ARM64_FPSR = 220, + /* Intel IA64 CPU */ CV_IA64_NOREG = CV_REG_NONE, CV_IA64_Br0 = 512, /* this includes Br1 to Br7 */ @@ -664,13 +683,6 @@ CV_AMD64_R13 = 341, CV_AMD64_R14 = 342, CV_AMD64_R15 = 343, - - /* Wine extension */ - CV_ARM64_NOREG = CV_REG_NONE, - CV_ARM64_X0 = 10, /* this includes X0 to X30 */ - CV_ARM64_SP = 41, - CV_ARM64_PC = 42, - CV_ARM64_PSTATE = 43, }; typedef enum

9 years, 5 months

[tfaber] 68421: [NTOS:MM] - Simplify MiInitSystemMemoryAreas by introducing a helper, MiCreateArm3StaticMemoryArea. Patch by Mike Nordell

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 19 08:29:58 2015 New Revision: 68421 URL: http://svn.reactos.org/svn/reactos?rev=68421&view=rev Log: [NTOS:MM] - Simplify MiInitSystemMemoryAreas by introducing a helper, MiCreateArm3StaticMemoryArea. Patch by Mike Nordell Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Jul 19 08:29:58 2015 @@ -38,198 +38,83 @@ /* PRIVATE FUNCTIONS *********************************************************/ +// +// Helper function to create initial memory areas. +// The created area is always read/write. +// VOID INIT_FUNCTION NTAPI -MiInitSystemMemoryAreas() -{ - PVOID BaseAddress; +MiCreateArm3StaticMemoryArea(PVOID BaseAddress, ULONG Size, BOOLEAN Executable) +{ + const ULONG Protection = Executable ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; + PVOID pBaseAddress = BaseAddress; PMEMORY_AREA MArea; NTSTATUS Status; - // - // Create the memory area to define the loader mappings - // - BaseAddress = (PVOID)KSEG0_BASE; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - MmBootImageSize, - PAGE_EXECUTE_READWRITE, + &pBaseAddress, + Size, + Protection, &MArea, 0, PAGE_SIZE); ASSERT(Status == STATUS_SUCCESS); - - // - // Create the memory area to define the PTE base - // - BaseAddress = (PVOID)PTE_BASE; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - PTE_TOP - PTE_BASE + 1, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); - - // - // Create the memory area to define Hyperspace - // - BaseAddress = (PVOID)HYPER_SPACE; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - HYPER_SPACE_END - HYPER_SPACE + 1, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); - - // + // TODO: Perhaps it would be prudent to bugcheck here, not only assert? +} + +VOID +INIT_FUNCTION +NTAPI +MiInitSystemMemoryAreas() +{ + // + // Create all the static memory areas. + // + + // The loader mappings. The only Executable area. + MiCreateArm3StaticMemoryArea((PVOID)KSEG0_BASE, MmBootImageSize, TRUE); + + // The PTE base + MiCreateArm3StaticMemoryArea((PVOID)PTE_BASE, PTE_TOP - PTE_BASE + 1, FALSE); + + // Hyperspace + MiCreateArm3StaticMemoryArea((PVOID)HYPER_SPACE, HYPER_SPACE_END - HYPER_SPACE + 1, FALSE); + // Protect the PFN database - // - BaseAddress = MmPfnDatabase; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - (MxPfnAllocation << PAGE_SHIFT), - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); - - // + MiCreateArm3StaticMemoryArea(MmPfnDatabase, (MxPfnAllocation << PAGE_SHIFT), FALSE); + // ReactOS requires a memory area to keep the initial NP area off-bounds - // - BaseAddress = MmNonPagedPoolStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - MmSizeOfNonPagedPoolInBytes, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); - - // - // And we need one more for the system NP - // - BaseAddress = MmNonPagedSystemStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - MiNonPagedSystemSize, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); - - // - // We also need one for system view space - // - BaseAddress = MiSystemViewStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - MmSystemViewSize, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); - - // - // And another for session space - // - BaseAddress = MmSessionBase; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - (ULONG_PTR)MiSessionSpaceEnd - - (ULONG_PTR)MmSessionBase, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); - - // - // One more for ARM paged pool - // - BaseAddress = MmPagedPoolStart; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - MmSizeOfPagedPoolInBytes, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); + MiCreateArm3StaticMemoryArea(MmNonPagedPoolStart, MmSizeOfNonPagedPoolInBytes, FALSE); + + // System NP + MiCreateArm3StaticMemoryArea(MmNonPagedSystemStart, MiNonPagedSystemSize, FALSE); + + // System view space + MiCreateArm3StaticMemoryArea(MiSystemViewStart, MmSystemViewSize, FALSE); + + // Session space + MiCreateArm3StaticMemoryArea(MmSessionBase, (ULONG_PTR)MiSessionSpaceEnd - (ULONG_PTR)MmSessionBase, FALSE); + + // Paged pool + MiCreateArm3StaticMemoryArea(MmPagedPoolStart, MmSizeOfPagedPoolInBytes, FALSE); + #ifndef _M_AMD64 - // - // Next, the KPCR - // - BaseAddress = (PVOID)PCR; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - PAGE_SIZE * KeNumberProcessors, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); + // KPCR, one page per CPU. Only for 32-bit kernel. + MiCreateArm3StaticMemoryArea(PCR, PAGE_SIZE * KeNumberProcessors, FALSE); #endif - // - // Now the KUSER_SHARED_DATA - // - BaseAddress = (PVOID)KI_USER_SHARED_DATA; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - PAGE_SIZE, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); - - // - // And the debugger mapping - // - BaseAddress = MI_DEBUG_MAPPING; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - PAGE_SIZE, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); + + // KUSER_SHARED_DATA + MiCreateArm3StaticMemoryArea((PVOID)KI_USER_SHARED_DATA, PAGE_SIZE, FALSE); + + // Debugger mapping + MiCreateArm3StaticMemoryArea(MI_DEBUG_MAPPING, PAGE_SIZE, FALSE); #if defined(_X86_) - // - // Finally, reserve the 2 pages we currently make use of for HAL mappings - // - BaseAddress = (PVOID)0xFFC00000; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, - &BaseAddress, - PAGE_SIZE * 2, - PAGE_READWRITE, - &MArea, - 0, - PAGE_SIZE); - ASSERT(Status == STATUS_SUCCESS); + // Reserve the 2 pages we currently make use of for HAL mappings. + // TODO: Remove hard-coded constant and replace with a define. + MiCreateArm3StaticMemoryArea((PVOID)0xFFC00000, PAGE_SIZE * 2, FALSE); #endif }

9 years, 5 months

[tfaber] 68420: [CMD] - Remove an unused but set variable. Fixes compilation with FEATURE_UNIX_FILENAME_COMPLETION defined. Patch by Lee Schroeder. CORE-9913 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 19 08:21:58 2015 New Revision: 68420 URL: http://svn.reactos.org/svn/reactos?rev=68420&view=rev Log: [CMD] - Remove an unused but set variable. Fixes compilation with FEATURE_UNIX_FILENAME_COMPLETION defined. Patch by Lee Schroeder. CORE-9913 #resolve Modified: trunk/reactos/base/shell/cmd/filecomp.c Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Sun Jul 19 08:21:58 2015 @@ -203,7 +203,6 @@ HANDLE hFile; BOOL found_dot = FALSE; INT curplace = 0; - INT start; INT count; TCHAR path[MAX_PATH]; TCHAR fname[MAX_PATH]; @@ -232,10 +231,8 @@ if (str[count] == _T(' ')) count++; - start = count; - if (str[count] == _T('"')) - count++; /* don't increment start */ + count++; /* extract directory from word */ _tcscpy (directory, &str[count]);

9 years, 5 months

[hbelusca] 68419: [NTVDM]: Add a write-protect ROM helper and use it when possible external ROMs are loaded.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 18 23:46:22 2015 New Revision: 68419 URL: http://svn.reactos.org/svn/reactos?rev=68419&view=rev Log: [NTVDM]: Add a write-protect ROM helper and use it when possible external ROMs are loaded. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] Sat Jul 18 23:46:22 2015 @@ -12,7 +12,6 @@ #include "ntvdm.h" #include "emulator.h" -#include "memory.h" #include "cpu/callback.h" #include "cpu/bop.h" @@ -41,12 +40,6 @@ PBIOS_CONFIG_TABLE Bct; /* PRIVATE FUNCTIONS **********************************************************/ - -static BOOLEAN FASTCALL BiosRomWrite(ULONG Address, PVOID Buffer, ULONG Size) -{ - /* Prevent writing to ROM */ - return FALSE; -} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -81,11 +74,6 @@ // /* Register the BIOS support BOPs */ // RegisterBop(BOP_EQUIPLIST , BiosEquipmentService); // RegisterBop(BOP_GETMEMSIZE, BiosGetMemorySize); - - MemInstallFastMemoryHook((PVOID)ROM_AREA_START, - ROM_AREA_END - ROM_AREA_START + 1, - NULL, - BiosRomWrite); if (BiosFileName && BiosFileName[0] != '\0') { @@ -138,6 +126,9 @@ } else { + WriteProtectRom((PVOID)ROM_AREA_START, + ROM_AREA_END - ROM_AREA_START + 1); + Success = Bios32Loaded = Bios32Initialize(); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] Sat Jul 18 23:46:22 2015 @@ -12,12 +12,19 @@ #include "ntvdm.h" #include "emulator.h" +#include "memory.h" #include "cpu/callback.h" #include "rom.h" #include "utils.h" /* PRIVATE FUNCTIONS **********************************************************/ + +static BOOLEAN FASTCALL ShadowRomWrite(ULONG Address, PVOID Buffer, ULONG Size) +{ + /* Prevent writing to ROM */ + return FALSE; +} static HANDLE OpenRomFile(IN PCSTR RomFileName, @@ -96,7 +103,7 @@ IN ULONG End, IN ULONG Increment) { - ULONG Address, AddressBoot; + ULONG Address, EntryPoint; ULONG RomSize; UCHAR Checksum; @@ -120,26 +127,34 @@ Checksum = ComputeChecksum(Address, RomSize); if (Checksum == 0x00) { - AddressBoot = Address + 3; - DPRINT1("Going to run @ address 0x%p\n", AddressBoot); - - AddressBoot = MAKELONG((AddressBoot & 0xFFFF), (AddressBoot & 0xF0000) >> 4); + EntryPoint = Address + 3; + DPRINT1("Going to run @ address 0x%p\n", EntryPoint); + + EntryPoint = MAKELONG((EntryPoint & 0xFFFF), (EntryPoint & 0xF0000) >> 4); // setDS((Address & 0xF0000) >> 4); setDS((Address & 0xFF000) >> 4); - RunCallback16(Context, AddressBoot); - // Call16((AddressBoot & 0xF0000) >> 4, (AddressBoot & 0xFFFF)); - - DPRINT1("Rom @ address 0x%p initialized\n", Address); + RunCallback16(Context, EntryPoint); + // Call16((EntryPoint & 0xF0000) >> 4, (EntryPoint & 0xFFFF)); + + DPRINT1("ROM @ address 0x%p initialized\n", Address); } else { - DPRINT1("Rom @ address 0x%p has invalid checksum of 0x%02x\n", Address, Checksum); + DPRINT1("ROM @ address 0x%p has invalid checksum of 0x%02x\n", Address, Checksum); } } } } /* PUBLIC FUNCTIONS ***********************************************************/ + +BOOLEAN +WriteProtectRom(IN PVOID RomLocation, + IN ULONG RomSize) +{ + return MemInstallFastMemoryHook(RomLocation, RomSize, + NULL, ShadowRomWrite); +} BOOLEAN LoadBios(IN PCSTR BiosFileName, @@ -171,9 +186,14 @@ /* Close the BIOS image file */ FileClose(hBiosFile); - /* In case of success, return BIOS location and size if needed */ + /* + * In case of success, write-protect the BIOS location + * and return the BIOS location and its size if needed. + */ if (Success) { + WriteProtectRom(pBiosLocation, ulBiosSize); + if (BiosLocation) *BiosLocation = pBiosLocation; if (BiosSize) *BiosSize = ulBiosSize; } @@ -206,9 +226,13 @@ /* Close the ROM image file and return */ FileClose(hRomFile); - /* In case of success, return ROM size if needed */ + /* + * In case of success, write-protect the ROM location + * and return the ROM size if needed. + */ if (Success) { + WriteProtectRom(RomLocation, ulRomSize); if (RomSize) *RomSize = ulRomSize; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h [iso-8859-1] Sat Jul 18 23:46:22 2015 @@ -19,6 +19,10 @@ /* FUNCTIONS ******************************************************************/ BOOLEAN +WriteProtectRom(IN PVOID RomLocation, + IN ULONG RomSize); + +BOOLEAN LoadBios(IN PCSTR BiosFileName, OUT PVOID* BiosLocation OPTIONAL, OUT PULONG BiosSize OPTIONAL);

9 years, 5 months

[hbelusca] 68418: [NTVDM] - Move some #defines into their correct headers. - Fix some DPRINTs. - Add missing DOS SYSVars values (memory-related), confirmed by DOS undocumented & FreeDOS. - Implemen...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 18 19:45:37 2015 New Revision: 68418 URL: http://svn.reactos.org/svn/reactos?rev=68418&view=rev Log: [NTVDM] - Move some #defines into their correct headers. - Fix some DPRINTs. - Add missing DOS SYSVars values (memory-related), confirmed by DOS undocumented & FreeDOS. - Implement INT 21h, AX=5700h and 5701h "Get/Set File last-written date & time". - Implement INT 2Fh, AH=13h "Set Disk Interrupt Handler" chain support, which is an obscure functionality (to make story short: allows inserting disk filter drivers): see the comments inside the code (dos.c/dos.h) for more information. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Jul 18 19:45:37 2015 @@ -785,10 +785,10 @@ break; } - default: - { - DPRINT1("INT 21h, AH = 33h, subfunction AL = %Xh NOT IMPLEMENTED\n", - getAL()); + default: // goto Default; + { + DPRINT1("INT 21h, AH = %02Xh, subfunction AL = %02Xh NOT IMPLEMENTED\n", + getAH(), getAL()); } } @@ -1512,6 +1512,110 @@ break; } + /* File Attributes */ + case 0x57: + { + switch (getAL()) + { + /* Get File's last-written Date and Time */ + case 0x00: + { + PDOS_FILE_DESCRIPTOR Descriptor = DosGetHandleFileDescriptor(getBX()); + FILETIME LastWriteTime; + WORD FileDate, FileTime; + + if (Descriptor == NULL) + { + /* Invalid handle */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + // Sda->LastErrorCode = ERROR_INVALID_HANDLE; + setAX(ERROR_INVALID_HANDLE); + break; + } + + if (Descriptor->DeviceInfo & FILE_INFO_DEVICE) + { + /* Invalid for devices */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + // setAX(ERROR_INVALID_FUNCTION); + setAX(ERROR_INVALID_HANDLE); + break; + } + + /* + * Retrieve the last-written Win32 date and time, + * and convert it to DOS format. + */ + if (!GetFileTime(Descriptor->Win32Handle, + NULL, NULL, &LastWriteTime) || + !FileTimeToDosDateTime(&LastWriteTime, + &FileDate, &FileTime)) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(GetLastError()); + break; + } + + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + setCX(FileTime); + setDX(FileDate); + break; + } + + /* Set File's last-written Date and Time */ + case 0x01: + { + PDOS_FILE_DESCRIPTOR Descriptor = DosGetHandleFileDescriptor(getBX()); + FILETIME LastWriteTime; + WORD FileDate = getDX(); + WORD FileTime = getCX(); + + if (Descriptor == NULL) + { + /* Invalid handle */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + // Sda->LastErrorCode = ERROR_INVALID_HANDLE; + setAX(ERROR_INVALID_HANDLE); + break; + } + + if (Descriptor->DeviceInfo & FILE_INFO_DEVICE) + { + /* Invalid for devices */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + // setAX(ERROR_INVALID_FUNCTION); + setAX(ERROR_INVALID_HANDLE); + break; + } + + /* + * Convert the new last-written DOS date and time + * to Win32 format and set it. + */ + if (!DosDateTimeToFileTime(FileDate, FileTime, + &LastWriteTime) || + !SetFileTime(Descriptor->Win32Handle, + NULL, NULL, &LastWriteTime)) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(GetLastError()); + break; + } + + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + break; + } + + default: // goto Default; + { + DPRINT1("INT 21h, AH = %02Xh, subfunction AL = %02Xh NOT IMPLEMENTED\n", + getAH(), getAL()); + } + } + + break; + } + /* Get/Set Memory Management Options */ case 0x58: { @@ -1748,10 +1852,10 @@ break; } - default: - { - DPRINT1("INT 21h, AH = 5Dh, subfunction AL = %Xh NOT IMPLEMENTED\n", - getAL()); + default: // goto Default; + { + DPRINT1("INT 21h, AH = %02Xh, subfunction AL = %02Xh NOT IMPLEMENTED\n", + getAH(), getAL()); } } @@ -1833,10 +1937,10 @@ break; } - default: - { - DPRINT1("INT 21h, AH = 65h, subfunction AL = %Xh NOT IMPLEMENTED\n", - getAL()); + default: // goto Default; + { + DPRINT1("INT 21h, AH = %02Xh, subfunction AL = %02Xh NOT IMPLEMENTED\n", + getAH(), getAL()); } } @@ -1926,9 +2030,9 @@ } /* Unsupported */ - default: - { - DPRINT1("DOS Function INT 0x21, AH = %xh, AL = %xh NOT IMPLEMENTED!\n", + default: // Default: + { + DPRINT1("DOS Function INT 21h, AH = %02Xh, AL = %02Xh NOT IMPLEMENTED!\n", getAH(), getAL()); setAL(0); // Some functions expect AL to be 0 when it's not supported. @@ -2091,6 +2195,28 @@ break; } + /* Set Disk Interrupt Handler */ + case 0x13: + { + /* Save the old values of PrevInt13 and RomBiosInt13 */ + ULONG OldInt13 = DosData->PrevInt13; + ULONG OldBiosInt13 = DosData->RomBiosInt13; + + /* Set PrevInt13 and RomBiosInt13 to their new values */ + DosData->PrevInt13 = MAKELONG(getDX(), getDS()); + DosData->RomBiosInt13 = MAKELONG(getBX(), getES()); + + /* Return in DS:DX the old value of PrevInt13 */ + setDS(HIWORD(OldInt13)); + setDX(LOWORD(OldInt13)); + + /* Return in DS:DX the old value of RomBiosInt13 */ + setES(HIWORD(OldBiosInt13)); + setBX(LOWORD(OldBiosInt13)); + + break; + } + /* Mostly Windows 2.x/3.x/9x support */ case 0x16: { @@ -2127,7 +2253,7 @@ } default: - DPRINT1("Unknown DOS XMS Function: INT 0x2F, AH = 43h, AL = %xh\n", getAL()); + DPRINT1("Unknown DOS XMS Function: INT 2Fh, AH = 43h, AL = %02Xh\n", getAL()); break; } @@ -2136,7 +2262,7 @@ default: Default: { - DPRINT1("DOS Internal System Function INT 0x2F, AH = %xh, AL = %xh NOT IMPLEMENTED!\n", + DPRINT1("DOS Internal System Function INT 2Fh, AH = %02Xh, AL = %02Xh NOT IMPLEMENTED!\n", getAH(), getAL()); Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } @@ -2315,11 +2441,36 @@ /* Unimplemented DOS interrupts */ RegisterDosInt32(0x2A, DosInt2Ah); // DOS Critical Sections / Network // RegisterDosInt32(0x2E, NULL); // COMMAND.COM "Reload Transient" +// COMMAND.COM adds support for INT 2Fh, AX=AE00h and AE01h "Installable Command - Installation Check & Execute" +// COMMAND.COM adds support for INT 2Fh, AX=5500h "COMMAND.COM Interface" /* Reserved DOS interrupts */ RegisterDosInt32(0x2B, NULL); RegisterDosInt32(0x2C, NULL); RegisterDosInt32(0x2D, NULL); + + /* + * Initialize the INT 13h (BIOS Disk Services) handler chain support. + * + * The INT 13h handler chain is some functionality that allows DOS + * to insert disk filter drivers in between the (hooked) INT 13h handler + * and its original handler. + * Typically, those are: + * - filter for detecting disk changes (for floppy disks), + * - filter for tracking formatting calls and correcting DMA boundary errors, + * - a possible filter to work around a bug in a particular version of PC-AT's + * IBM's ROM BIOS (on systems with model byte FCh and BIOS date "01/10/84" only) + * (see http://www.ctyme.com/intr/rb-4453.htm for more details). + * + * This functionality is known to be used by some legitimate programs, + * by Windows 3.x, as well as some illegitimate ones (aka. virii). + * + * See extra information about this support in dos.h + */ + // FIXME: Should be done by the DOS BIOS + DosData->RomBiosInt13 = ((PULONG)BaseAddress)[0x13]; + DosData->PrevInt13 = DosData->RomBiosInt13; +// RegisterDosInt32(0x13, DosInt13h); // Unused at the moment! /* Initialize country data */ DosCountryInitialize(); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Sat Jul 18 19:45:37 2015 @@ -26,8 +26,7 @@ #define DOS_CONFIG_PATH L"%SystemRoot%\\system32\\CONFIG.NT" #define DOS_COMMAND_INTERPRETER L"%SystemRoot%\\system32\\COMMAND.COM /k %SystemRoot%\\system32\\AUTOEXEC.NT" -#define FIRST_MCB_SEGMENT 0x1000 -#define USER_MEMORY_SIZE (0x9FFE - FIRST_MCB_SEGMENT) + #define SYSTEM_PSP 0x08 #define SYSTEM_ENV_BLOCK 0x800 #define DOS_CODE_SEGMENT 0x70 @@ -41,16 +40,9 @@ #define DOS_ERROR_HANDLE 2 #define DOS_SFT_SIZE 255 -#define UMB_START_SEGMENT 0xC000 -#define UMB_END_SEGMENT 0xDFFF -#define DOS_ALLOC_HIGH 0x40 -#define DOS_ALLOC_HIGH_LOW 0x80 #define DOS_DIR_LENGTH 64 #define NUM_DRIVES ('Z' - 'A' + 1) #define DOS_CHAR_ATTRIBUTE 0x07 - -/* 16 MB of EMS memory */ -#define EMS_TOTAL_PAGES 1024 #pragma pack(push, 1) @@ -99,6 +91,11 @@ BYTE BootDrive; // 0x43 BYTE UseDwordMoves; // 0x44 WORD ExtMemSize; // 0x45 + BYTE Reserved4[0x1C]; // 0x47 + BYTE ChainUMB; // 0x63 - 0/1: UMB chain (un)linked to MCB chain + WORD Reserved5; // 0x64 + WORD UMBChainStart; // 0x66 - Segment of the first UMB MCB + WORD MemAllocScanStart; // 0x68 - Segment where allocation scan starts } DOS_SYSVARS, *PDOS_SYSVARS; typedef struct _DOS_CLOCK_TRANSFER_RECORD @@ -235,6 +232,33 @@ typedef struct _DOS_DATA { +/* + * INT 13h (BIOS Disk Services) handler chain support. + * + * RomBiosInt13: The original INT 13h vector (normally from ROM BIOS). + * PrevInt13 : The previous INT 13h vector in the handler chain (initially + * initialized with the RomBiosInt13 value; each time some + * program calls INT 2Fh, AH=13h, PrevInt13 is updated). + * + * DOS hooks INT 13h with its own code, then (in normal circumstances) calls + * PrevInt13, so that when a program calls INT 13h, the DOS hook is first called, + * followed by the previous INT 13h (be it the original or some other hooked one). + * DOS may call PrevInt13 directly in some internal operations too. + * RomBiosInt13 is intended to be the original INT 13h vector that existed + * before DOS was loaded. A particular version of PC-AT's IBM's ROM BIOS + * (on systems with model byte FCh and BIOS date "01/10/84" only, see + * http://www.ctyme.com/intr/rb-4453.htm for more details) had a bug on disk + * reads so that it was patched by DOS, and therefore PrevInt13 was the fixed + * INT 13 interrupt (for the other cases, a direct call to RomBiosInt13 is done). + * + * NOTE: For compatibility with some programs (including virii), PrevInt13 should + * be at 0070:00B4, see for more details: + * http://repo.hackerzvoice.net/depot_madchat/vxdevl/vdat/tuvd0001.htm + * http://vxheaven.org/lib/vsm01.html + */ + DWORD RomBiosInt13; + DWORD PrevInt13; // FIXME: Put it at 0070:00B4 + DOS_SYSVARS SysVars; BYTE NullDriverRoutine[7]; WORD DosVersion; // DOS version to report to programs (can be different from the true one) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] Sat Jul 18 19:45:37 2015 @@ -18,6 +18,9 @@ #define EMS_PAGE_BITS 14 #define EMS_PAGE_SIZE (1 << EMS_PAGE_BITS) #define EMS_PHYSICAL_PAGES 4 + +/* 16 MB of EMS memory */ +#define EMS_TOTAL_PAGES 1024 #define EMS_STATUS_OK 0x00 #define EMS_STATUS_INTERNAL_ERROR 0x80 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Sat Jul 18 19:45:37 2015 @@ -12,6 +12,15 @@ /* TYPEDEFS *******************************************************************/ #define SEGMENT_TO_MCB(seg) ((PDOS_MCB)SEG_OFF_TO_PTR((seg), 0)) + +#define FIRST_MCB_SEGMENT 0x1000 +#define USER_MEMORY_SIZE (0x9FFE - FIRST_MCB_SEGMENT) + +#define UMB_START_SEGMENT 0xC000 +#define UMB_END_SEGMENT 0xDFFF + +#define DOS_ALLOC_HIGH 0x40 +#define DOS_ALLOC_HIGH_LOW 0x80 enum DOS_ALLOC_STRATEGY {

9 years, 5 months

[cfinck] 68417: [WINSPOOL] Bugfix: winspool.drv shall only do local connections for now. Even if wszName may include a computer name that needs to be extracted in the future, it must in no way be d...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Jul 18 14:31:20 2015 New Revision: 68417 URL: http://svn.reactos.org/svn/reactos?rev=68417&view=rev Log: [WINSPOOL] Bugfix: winspool.drv shall only do local connections for now. Even if wszName may include a computer name that needs to be extracted in the future, it must in no way be directly passed as the NetworkAddr parameter. Fixes problems when using the spooler components with the "ncacn_np" protocol or with Windows' rpcrt4.dll. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/winspool/main.c [iso-8859-1] Sat Jul 18 14:31:20 2015 @@ -19,7 +19,7 @@ RPC_STATUS Status; // Get us a string binding handle from the supplied connection information - Status = RpcStringBindingComposeW(NULL, L"ncalrpc", wszName, L"spoolss", NULL, &wszStringBinding); + Status = RpcStringBindingComposeW(NULL, L"ncalrpc", NULL, L"spoolss", NULL, &wszStringBinding); if (Status != RPC_S_OK) { ERR("RpcStringBindingComposeW failed with status %ld!\n", Status);

9 years, 5 months

[cfinck] 68416: Merge r68232 to get Windows' rpcrt4.dll to work under ReactOS.

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Jul 18 12:29:25 2015 New Revision: 68416 URL: http://svn.reactos.org/svn/reactos?rev=68416&view=rev Log: Merge r68232 to get Windows' rpcrt4.dll to work under ReactOS. Added: branches/colins-printing-for-freedom/reactos/lib/rtl/appverifier.c - copied unchanged from r68232, trunk/reactos/lib/rtl/appverifier.c Modified: branches/colins-printing-for-freedom/ (props changed) branches/colins-printing-for-freedom/reactos/ (props changed) branches/colins-printing-for-freedom/reactos/dll/ntdll/def/ntdll.spec branches/colins-printing-for-freedom/reactos/lib/rtl/CMakeLists.txt branches/colins-printing-for-freedom/reactos/lib/rtl/memstream.c Propchange: branches/colins-printing-for-freedom/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jul 18 12:29:25 2015 @@ -1 +1 @@ -/trunk:67713,67936 +/trunk:67713,67936,68232 Propchange: branches/colins-printing-for-freedom/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jul 18 12:29:25 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:67713,67936 +/trunk/reactos:67713,67936,68232 Modified: branches/colins-printing-for-freedom/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Jul 18 12:29:25 2015 @@ -467,7 +467,7 @@ @ stdcall RtlAppendStringToString(ptr ptr) @ stdcall RtlAppendUnicodeStringToString(ptr ptr) @ stdcall RtlAppendUnicodeToString(ptr wstr) -;@ stdcall RtlApplicationVerifierStop +@ stdcall RtlApplicationVerifierStop(ptr str ptr str ptr str ptr str ptr str) @ stdcall RtlApplyRXact(ptr) @ stdcall RtlApplyRXactNoFlush(ptr) @ stdcall RtlAreAllAccessesGranted(long long) @@ -506,7 +506,7 @@ @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) -;@ stdcall RtlCopyMappedMemory +@ stdcall RtlCopyMappedMemory(ptr ptr long) @ stdcall RtlCopyMemoryStreamTo(ptr ptr int64 ptr ptr) @ stdcall RtlCopyOutOfProcessMemoryStreamTo(ptr ptr int64 ptr ptr) RtlCopyMemoryStreamTo @ stdcall RtlCopySecurityDescriptor(ptr ptr) Modified: branches/colins-printing-for-freedom/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Sat Jul 18 12:29:25 2015 @@ -9,6 +9,7 @@ access.c acl.c actctx.c + appverifier.c assert.c atom.c avltable.c Modified: branches/colins-printing-for-freedom/reactos/lib/rtl/memstream.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/rtl/memstream.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/rtl/memstream.c [iso-8859-1] Sat Jul 18 12:29:25 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/rtl/mem.c + * FILE: lib/rtl/memstream.c * PURPOSE: MemoryStream functions * PROGRAMMER: David Quintana (gigaherz(a)gmail.com) */ @@ -465,3 +465,17 @@ return E_NOTIMPL; } + +/* + * @implemented + */ +VOID +NTAPI +RtlCopyMappedMemory( + _Out_ PVOID Destination, + _In_ const VOID *Source, + _In_ SIZE_T Size) +{ + /* FIXME: This is supposed to handle STATUS_IN_PAGE_ERROR exceptions */ + RtlCopyMemory(Destination, Source, Size); +}

9 years, 5 months

[hbelusca] 68415: [NTVDM] We don't support any PS/2 keyboard command for now. Just return ACKnowledge. This unblocks some programs that want to initialize the keyboard by sending keyboard commands ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 18 00:48:38 2015 New Revision: 68415 URL: http://svn.reactos.org/svn/reactos?rev=68415&view=rev Log: [NTVDM] We don't support any PS/2 keyboard command for now. Just return ACKnowledge. This unblocks some programs that want to initialize the keyboard by sending keyboard commands and then performing polling on the port until "valid" data comes out. (unblocks e.g. DOS Mugen game, amongst others...). Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] Sat Jul 18 00:48:38 2015 @@ -22,7 +22,13 @@ static VOID WINAPI KeyboardCommand(LPVOID Param, BYTE Command) { - UNIMPLEMENTED; + // FIXME: UNIMPLEMENTED; just return ACKnowledge. + // This unblocks some programs that want to initialize + // the keyboard by sending keyboard commands and then + // performing polling on the port until "valid" data + // comes out. + DPRINT1("KeyboardCommand(0x%02X) NOT IMPLEMENTED\n", Command); + PS2QueuePush(PS2Port, 0xFA); } /* PUBLIC FUNCTIONS ***********************************************************/

9 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015