Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[sserapion] 38424: More heap fixes, ported from WINE
by sserapion＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: sserapion Date: Sun Dec 28 08:24:49 2008 New Revision: 38424 URL: http://svn.reactos.org/svn/reactos?rev=38424&view=rev Log: More heap fixes, ported from WINE Modified: branches/ros-amd64-bringup/reactos/lib/rtl/heap.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/heap.c [iso-8859-1] Sun Dec 28 08:24:49 2008 @@ -100,14 +100,15 @@ #else #define ALIGNMENT 16 #endif - -#define ROUND_SIZE(size) (((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) +#define ARENA_OFFSET (ALIGNMENT - sizeof(ARENA_INUSE)) + +#define ROUND_SIZE(size) (((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) + ARENA_OFFSET #define QUIET 1 /* Suppress messages */ #define NOISY 0 /* Report all errors */ /* minimum data size (without arenas) of an allocated block */ -#define HEAP_MIN_DATA_SIZE 16 +#define HEAP_MIN_DATA_SIZE ROUND_SIZE(2 * sizeof(struct list)) /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) @@ -119,9 +120,10 @@ 0x20, 0x80, 0x200, ~0UL }; -typedef struct +typedef union { ARENA_FREE arena; + void *alignment[4]; } FREE_LIST_ENTRY; struct tagHEAP; @@ -151,7 +153,7 @@ SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ RTL_CRITICAL_SECTION critSection; /* Critical section for serialization */ - FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; /* Free lists */ + FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS] DECLSPEC_ALIGN(8); /* Free lists */ DWORD flags; /* Heap flags */ DWORD magic; /* Magic number */ PRTL_HEAP_COMMIT_ROUTINE commitRoutine; @@ -776,6 +778,7 @@ totalSize = (totalSize + 0xffff) & 0xffff0000; commitSize = (commitSize + 0xffff) & 0xffff0000; if (!commitSize) commitSize = 0x10000; + totalSize = min(totalSize, 0xffff0000); /* don't allow a heap larger than 4Gb */ if (totalSize < commitSize) totalSize = commitSize; if (!address) @@ -884,7 +887,7 @@ char *heapEnd = (char *)subheap + subheap->size; /* Check for unaligned pointers */ - if ( (ULONG_PTR)pArena % ALIGNMENT != 0 ) + if ( (ULONG_PTR)pArena % ALIGNMENT != ARENA_OFFSET ) { ERR("Heap %p: unaligned arena pointer %p\n", subheap->heap, pArena ); return FALSE; @@ -974,7 +977,7 @@ const char *heapEnd = (const char *)subheap + subheap->size; /* Check for unaligned pointers */ - if ( (ULONG_PTR)pArena % ALIGNMENT != 0 ) + if ( (ULONG_PTR)pArena % ALIGNMENT != ARENA_OFFSET) { if ( quiet == NOISY ) { @@ -1179,6 +1182,7 @@ { processHeap = subheap->heap; /* assume the first heap we create is the process main heap */ list_init( &processHeap->entry ); + ASSERT( (ULONG_PTR) processHeap->freeList % ALIGNMENT == ARENA_OFFSET ); } } @@ -1243,7 +1247,7 @@ PVOID NTAPI RtlAllocateHeap(HANDLE heap, /* [in] Handle of private heap block */ ULONG flags, /* [in] Heap allocation control flags */ - ULONG size) /* [in] Number of bytes to allocate */ + SIZE_T size) /* [in] Number of bytes to allocate */ { ARENA_FREE *pArena; ARENA_INUSE *pInUse; @@ -1568,14 +1572,14 @@ * * @implemented */ -ULONG NTAPI +SIZE_T NTAPI RtlSizeHeap( HANDLE heap, ULONG flags, PVOID ptr ) { - SIZE_T ret; + SIZE_T ret; HEAP *heapPtr = HEAP_GetPtr( heap ); if (!heapPtr) @@ -1860,7 +1864,7 @@ RtlExtendHeap(IN HANDLE Heap, IN ULONG Flags, IN PVOID P, - IN ULONG Size) + IN SIZE_T Size) { /* TODO */ UNIMPLEMENTED;

1 0

[sserapion] 38423: Fix RtlAllocateHeap, RtlExtendHeap, RtlSizeHeap definitions.
by sserapion＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: sserapion Date: Sun Dec 28 08:20:37 2008 New Revision: 38423 URL: http://svn.reactos.org/svn/reactos?rev=38423&view=rev Log: Fix RtlAllocateHeap, RtlExtendHeap,RtlSizeHeap definitions. Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h branches/ros-amd64-bringup/reactos/include/ndk/rtlfuncs.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h [iso-8859-1] Sun Dec 28 08:20:37 2008 @@ -4754,7 +4754,7 @@ RtlAllocateHeap ( IN HANDLE HeapHandle, IN ULONG Flags, - IN ULONG Size + IN SIZE_T Size ); NTSYSAPI Modified: branches/ros-amd64-bringup/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Dec 28 08:20:37 2008 @@ -481,7 +481,7 @@ RtlAllocateHeap( IN HANDLE HeapHandle, IN ULONG Flags, - IN ULONG Size + IN SIZE_T Size ); NTSYSAPI @@ -539,7 +539,7 @@ IN HANDLE Heap, IN ULONG Flags, IN PVOID P, - IN ULONG Size + IN SIZE_T Size ); NTSYSAPI @@ -646,7 +646,7 @@ ); NTSYSAPI -ULONG +SIZE_T NTAPI RtlSizeHeap( IN PVOID HeapHandle,

1 0

[dchapyshev] 38422: - Fix build ;)
by dchapyshev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dchapyshev Date: Sun Dec 28 07:48:52 2008 New Revision: 38422 URL: http://svn.reactos.org/svn/reactos?rev=38422&view=rev Log: - Fix build ;) Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Sun Dec 28 07:48:52 2008 @@ -472,24 +472,6 @@ GetNumaProcessorNode( UCHAR Processor, PUCHAR NodeNumber - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -UINT -WINAPI -GetWriteWatch( - DWORD dwFlags, - PVOID lpBaseAddress, - SIZE_T dwRegionSize, - PVOID *lpAddresses, - PULONG_PTR lpdwCount, - PULONG lpdwGranularity ) { STUB;

1 0

[dchapyshev] 38421: - Add check of params for VirtualAllocEx and VirtualFreeEx - Implement GetWriteWatch (based on Wine) - Fix VirtualQueryEx
by dchapyshev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dchapyshev Date: Sun Dec 28 07:03:05 2008 New Revision: 38421 URL: http://svn.reactos.org/svn/reactos?rev=38421&view=rev Log: - Add check of params for VirtualAllocEx and VirtualFreeEx - Implement GetWriteWatch (based on Wine) - Fix VirtualQueryEx Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c Modified: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/virtual.c [iso-8859-1] Sun Dec 28 07:03:05 2008 @@ -27,6 +27,12 @@ IN DWORD flProtect) { NTSTATUS Status; + + if (lpAddress != NULL) + { + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return NULL; + } /* Allocate the memory */ Status = NtAllocateVirtualMemory(hProcess, @@ -76,20 +82,26 @@ { NTSTATUS Status; - /* Free the memory */ - Status = NtFreeVirtualMemory(hProcess, - (PVOID *)&lpAddress, - (PULONG)&dwSize, - dwFreeType); - if (!NT_SUCCESS(Status)) - { - /* We failed */ - SetLastErrorByStatus(Status); - return FALSE; - } - - /* Return success */ - return TRUE; + if (dwSize == 0 || !(dwFreeType & MEM_RELEASE)) + { + /* Free the memory */ + Status = NtFreeVirtualMemory(hProcess, + (PVOID *)&lpAddress, + (PULONG)&dwSize, + dwFreeType); + if (!NT_SUCCESS(Status)) + { + /* We failed */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Return success */ + return TRUE; + } + + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return FALSE; } /* @@ -217,7 +229,7 @@ (LPVOID)lpAddress, MemoryBasicInformation, lpBuffer, - sizeof(MEMORY_BASIC_INFORMATION), + dwLength, &ResultLength); if (!NT_SUCCESS(Status)) { @@ -257,4 +269,37 @@ return TRUE; } +/* + * @implemented + */ +UINT +WINAPI +GetWriteWatch( + DWORD dwFlags, + PVOID lpBaseAddress, + SIZE_T dwRegionSize, + PVOID *lpAddresses, + PULONG_PTR lpdwCount, + PULONG lpdwGranularity + ) +{ + NTSTATUS Status; + + Status = NtGetWriteWatch(GetCurrentProcess(), + dwFlags, + lpBaseAddress, + dwRegionSize, + lpAddresses, + lpdwCount, + lpdwGranularity); + + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return -1; + } + + return 0; +} + /* EOF */

1 0

[fireball] 38420: - Fix a patching problem, which put MmInitSectionImplementation2() call to a wrong place. - Handle situation when *ViewSize is 0, which equals old behaviour of ViewSize being NULL. - Fix debug macro. - These changes get CC rewrite branch back into working stage.
by fireball＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: fireball Date: Sun Dec 28 07:01:13 2008 New Revision: 38420 URL: http://svn.reactos.org/svn/reactos?rev=38420&view=rev Log: - Fix a patching problem, which put MmInitSectionImplementation2() call to a wrong place. - Handle situation when *ViewSize is 0, which equals old behaviour of ViewSize being NULL. - Fix debug macro. - These changes get CC rewrite branch back into working stage. Modified: branches/cache_manager_rewrite/mm.patch Modified: branches/cache_manager_rewrite/mm.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm.patch?… ============================================================================== --- branches/cache_manager_rewrite/mm.patch [iso-8859-1] (original) +++ branches/cache_manager_rewrite/mm.patch [iso-8859-1] Sun Dec 28 07:01:13 2008 @@ -53,13 +53,15 @@ /* PRIVATE FUNCTIONS *********************************************************/ VOID -@@ -509,6 +512,7 @@ +@@ -506,6 +509,9 @@ + /* Initialize the balance set manager */ + MmInitBsmThread(); + ++ /* Initialize section implementation, phase 2 */ ++ MmInitSectionImplementation2(); ++ /* FIXME: Read parameters from memory */ } - -+ MmInitSectionImplementation2(); - return TRUE; - } Index: mpw.c =================================================================== @@ -2746,7 +2748,7 @@ - DPRINT("MmpCloseSection(OB %x, HC %d)\n", - Object, ProcessHandleCount); + DPRINT("MmpCloseSection(OB %x, HC %d) RC %d\n", -+ Object, ProcessHandleCount, ObGetObjectPointerCount(Object)); ++ Object, ProcessHandleCount, OBJECT_TO_OBJECT_HEADER(Object)->PointerCount); } NTSTATUS @@ -2960,7 +2962,7 @@ + * FIXME: Revise this once a locking order for file size changes is + * decided + */ -+ if (UMaximumSize != NULL) ++ if (UMaximumSize && (UMaximumSize->QuadPart != 0)) { - /* FIXME: handle this situation */ - ObDereferenceObject(Section); @@ -3672,7 +3674,17 @@ } /* -@@ -4944,9 +6110,12 @@ +@@ -4797,7 +5963,8 @@ + } + else if ((*ViewSize) > Section->MaximumSize.u.LowPart) + { +- (*ViewSize) = Section->MaximumSize.u.LowPart; ++ DPRINT1("Out of bounds view size passed: 0x%x!\n", *ViewSize); ++ (*ViewSize) = Section->MaximumSize.u.LowPart; + } + + MmLockSectionSegment(Section->Segment); +@@ -4944,9 +6111,12 @@ IN ULONG SectionPageProtection, IN ULONG AllocationAttributes, IN HANDLE FileHandle OPTIONAL, @@ -3686,7 +3698,7 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* -@@ -4965,37 +6134,557 @@ +@@ -4965,37 +6135,558 @@ return STATUS_INVALID_PAGE_PROTECTION; } @@ -3962,6 +3974,7 @@ + + MmInitializeMdl(Mdl, NULL, ((PPAGE_IO_CONTEXT)Context)->PageCount * PAGE_SIZE); + MmBuildMdlFromPages(Mdl, Pfn); ++ Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_WRITE_OPERATION); + + FileOffset.u.HighPart = 0; + FileOffset.u.LowPart = ((PPAGE_IO_CONTEXT)Context)->Offset;

1 0

[dgorbachev] 38419: Fix bug #3984.
by dgorbachev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dgorbachev Date: Sun Dec 28 06:53:08 2008 New Revision: 38419 URL: http://svn.reactos.org/svn/reactos?rev=38419&view=rev Log: Fix bug #3984. Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] Sun Dec 28 06:53:08 2008 @@ -1,4 +1,4 @@ -ï»¿/* +/* * Notepad (Armenian resources) */ @@ -28,51 +28,51 @@ BEGIN POPUP "&ÕÕ¡ÕµÕ¬" BEGIN - MENUITEM "&ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬\tCtrl+N", CMD_NEW - MENUITEM "&Ô²Õ¡ÖÕ¥Õ¬...\tCtrl+O", CMD_OPEN - MENUITEM "&ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬\tCtrl+S", CMD_SAVE - MENUITEM "ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ &Õ«Õ¶Õ¹ÕºÕ¥Õ½...", CMD_SAVE_AS + MENUITEM "&ÕÕ¿Õ¥Õ²Õ®Õ¥Õ¬\tCtrl+N", CMD_NEW + MENUITEM "&Ô²Õ¡ÖÕ¥Õ¬...\tCtrl+O", CMD_OPEN + MENUITEM "&ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬\tCtrl+S", CMD_SAVE + MENUITEM "ÕÕ¡Õ°ÕºÕ¡Õ¶Õ¥Õ¬ &Õ«Õ¶Õ¹ÕºÕ¥Õ½...", CMD_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Ô·Õ»Õ«& ÕºÕ¡ÖÕ¡Õ´Õ¥Õ¿ÖÕ¥ÖÕ¨...", CMD_PAGE_SETUP - MENUITEM "&ÕÕºÕ¥Õ¬\tCtrl+P", CMD_PRINT - MENUITEM "&ÕÕºÕ«Õ¹Õ« Õ¯Õ¡ÖÕ£Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´...", CMD_PRINTER_SETUP + MENUITEM "Ô·Õ»Õ«& ÕºÕ¡ÖÕ¡Õ´Õ¥Õ¿ÖÕ¥ÖÕ¨...", CMD_PAGE_SETUP + MENUITEM "&ÕÕºÕ¥Õ¬\tCtrl+P", CMD_PRINT + MENUITEM "&ÕÕºÕ«Õ¹Õ« Õ¯Õ¡ÖÕ£Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´...", CMD_PRINTER_SETUP MENUITEM SEPARATOR - MENUITEM "Ôµ&Õ¬Ö", CMD_EXIT + MENUITEM "Ôµ&Õ¬Ö", CMD_EXIT END POPUP "&Ô½Õ´Õ¢Õ¡Õ£ÖÕ¥Õ¬" BEGIN - MENUITEM "&ÕÕ¥ÖÕªÕ¥Õ¬\tCtrl+Z", CMD_UNDO + MENUITEM "&ÕÕ¥ÖÕªÕ¥Õ¬\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR - MENUITEM "&Ô¿Õ¿ÖÕ¥Õ¬\tCtrl+X", CMD_CUT - MENUITEM "&ÕÕ¡Õ¿Õ¹Õ³Õ¥Õ¶Õ¡Õ°Õ¡Õ¶Õ¥Õ¬\tCtrl+C", CMD_COPY - MENUITEM "ÕÕ¥Õ²Õ¡&Õ¤ÖÕ¥Õ¬\tCtrl+V", CMD_PASTE - MENUITEM "&ÕÕ¶Õ»Õ¥Õ¬\tDel", CMD_DELETE + MENUITEM "&Ô¿Õ¿ÖÕ¥Õ¬\tCtrl+X", CMD_CUT + MENUITEM "&ÕÕ¡Õ¿Õ¹Õ³Õ¥Õ¶Õ¡Õ°Õ¡Õ¶Õ¥Õ¬\tCtrl+C", CMD_COPY + MENUITEM "ÕÕ¥Õ²Õ¡&Õ¤ÖÕ¥Õ¬\tCtrl+V", CMD_PASTE + MENUITEM "&ÕÕ¶Õ»Õ¥Õ¬\tDel", CMD_DELETE MENUITEM SEPARATOR - MENUITEM "&Ô³Õ¿Õ¶Õ¥Õ¬", CMD_SEARCH - MENUITEM "Ô³Õ¿Õ¶Õ¥Õ¬ &Õ°Õ¡Õ»Õ¸ÖÕ¤Õ¨\tF3", CMD_SEARCH_NEXT - MENUITEM "ÕÕ¸ÕÕ¡ÖÕ«Õ¶Õ¥Õ¬\tCtrl+H", CMD_REPLACE - MENUITEM "ÕÕ¥Õ²Õ¡ÖÕ¸ÕÕ¾Õ¥Õ¬...\tCtrl+G", CMD_GOTO + MENUITEM "&Ô³Õ¿Õ¶Õ¥Õ¬", CMD_SEARCH + MENUITEM "Ô³Õ¿Õ¶Õ¥Õ¬ &Õ°Õ¡Õ»Õ¸ÖÕ¤Õ¨\tF3", CMD_SEARCH_NEXT + MENUITEM "ÕÕ¸ÕÕ¡ÖÕ«Õ¶Õ¥Õ¬\tCtrl+H", CMD_REPLACE + MENUITEM "ÕÕ¥Õ²Õ¡ÖÕ¸ÕÕ¾Õ¥Õ¬...\tCtrl+G", CMD_GOTO MENUITEM SEPARATOR - MENUITEM "ÕÕ·Õ¥Õ¬ Õ¢Õ¥Õ¬Õ¥ÖÕ¨", CMD_SELECT_ALL - MENUITEM "ÔºÕ¡Õ´Õ¨& Ö Õ¡Õ´Õ½Õ¡Õ©Õ«Õ¾Õ¨\tF5", CMD_TIME_DATE + MENUITEM "ÕÕ·Õ¥Õ¬ Õ¢Õ¥Õ¬Õ¥ÖÕ¨", CMD_SELECT_ALL + MENUITEM "ÔºÕ¡Õ´Õ¨& Ö Õ¡Õ´Õ½Õ¡Õ©Õ«Õ¾Õ¨\tF5", CMD_TIME_DATE END POPUP "ÕÕ¸Ö&Õ´Õ¡Õ¿Õ¡Õ¾Õ¸ÖÕ¸ÖÕ´" BEGIN - MENUITEM "&ÕÕ¸Õ²Õ¡Õ¤Õ¡ÖÕ± Õ¢Õ¡Õ¼Õ¥ÖÕ¸Õ¾", CMD_WRAP - MENUITEM "&ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯...", CMD_FONT + MENUITEM "&ÕÕ¸Õ²Õ¡Õ¤Õ¡ÖÕ± Õ¢Õ¡Õ¼Õ¥ÖÕ¸Õ¾", CMD_WRAP + MENUITEM "&ÕÕ¡Õ¼Õ¡Õ¿Õ¥Õ½Õ¡Õ¯...", CMD_FONT END POPUP "&ÕÕ¥Õ½Ö" BEGIN - MENUITEM "ÕÕ«Õ³Õ¡Õ¯Õ« &Õ¿Õ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_STATUSBAR + MENUITEM "ÕÕ«Õ³Õ¡Õ¯Õ« &Õ¿Õ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_STATUSBAR END POPUP "ÕÕ¥Õ²Õ¥&Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶" BEGIN - MENUITEM "&Ô²Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_HELP_CONTENTS - MENUITEM "&ÕÕ¶Õ¿ÖÕ¥Õ¬...", CMD_HELP_SEARCH - MENUITEM "&ÕÕ£Õ¶Õ¸ÖÕ©ÕµÕ¸Õ¶ ÖÕ£Õ¿Õ¡Õ£Õ¸ÖÕ®Õ¸ÖÕ´", CMD_HELP_ON_HELP + MENUITEM "&Ô²Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", CMD_HELP_CONTENTS + MENUITEM "&ÕÕ¶Õ¿ÖÕ¥Õ¬...", CMD_HELP_SEARCH + MENUITEM "&ÕÕ£Õ¶Õ¸ÖÕ©ÕµÕ¸Õ¶ ÖÕ£Õ¿Õ¡Õ£Õ¸ÖÕ®Õ¸ÖÕ´", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&Ô¾ÖÕ¡Õ£ÖÕ« Õ´Õ¡Õ½Õ«Õ¶" CMD_ABOUT - MENUITEM "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶...", CMD_ABOUT_WINE + MENUITEM "&Ô¾ÖÕ¡Õ£ÖÕ« Õ´Õ¡Õ½Õ«Õ¶" CMD_ABOUT + MENUITEM "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶...", CMD_ABOUT_WINE END END @@ -98,9 +98,9 @@ LTEXT "&ÕÕ¥ÖÖÖÕ«:", 0x14E, 100, 73, 30, 10, WS_CHILD EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP -DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP -PUSHBUTTON "ÕÕ¶Õ¤Õ¸ÖÕ¶Õ¥Õ¬", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP -PUSHBUTTON "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", IDHELP, 180, 39, 40, 15, WS_TABSTOP +DEFPUSHBUTTON "OK", IDOK, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "ÕÕ¶Õ¤Õ¸ÖÕ¶Õ¥Õ¬", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&ÕÕ¥Õ²Õ¥Õ¯Õ¸ÖÕ©ÕµÕ¸ÖÕ¶", IDHELP, 180, 39, 40, 15, WS_TABSTOP END /* Dialog `Encoding' */

1 0

[dgorbachev] 38418: Fix bug #3975.
by dgorbachev＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: dgorbachev Date: Sun Dec 28 06:32:20 2008 New Revision: 38418 URL: http://svn.reactos.org/svn/reactos?rev=38418&view=rev Log: Fix bug #3975. Modified: trunk/reactos/dll/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sun Dec 28 06:32:20 2008 @@ -27,6 +27,8 @@ static RTL_CRITICAL_SECTION LoaderLock; static RTL_BITMAP TlsBitMap; static RTL_BITMAP TlsExpansionBitMap; +static volatile BOOLEAN LdrpInitialized = FALSE; +static LONG LdrpInitLock = 0; #define VALUE_BUFFER_SIZE 256 @@ -250,11 +252,11 @@ return FALSE; } +static VOID -NTAPI -LdrpInit(PCONTEXT Context, - PVOID SystemArgument1, - PVOID SystemArgument2) +LdrpInit2(PCONTEXT Context, + PVOID SystemArgument1, + PVOID SystemArgument2) { PIMAGE_NT_HEADERS NTHeaders; PEPFUNC EntryPoint; @@ -273,8 +275,6 @@ ImageBase = Peb->ImageBaseAddress; DPRINT("ImageBase %p\n", ImageBase); - if (NtCurrentPeb()->Ldr == NULL) - { if (ImageBase <= (PVOID) 0x1000) { DPRINT("ImageBase is null\n"); @@ -432,10 +432,7 @@ LdrpLoadUserModuleSymbols(NtModule); #endif /* DBG || KDBG */ - } - - if (NtCurrentPeb()->Ldr->Initialized == FALSE) - { + /* add entry for executable (becomes first list entry) */ ExeModule = (PLDR_DATA_TABLE_ENTRY) RtlAllocateHeap(Peb->ProcessHeap, @@ -500,7 +497,32 @@ /* Break into debugger */ if (Peb->BeingDebugged) DbgBreakPoint(); - } +} + +VOID +NTAPI +LdrpInit(PCONTEXT Context, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + if (!LdrpInitialized) + { + if (!_InterlockedExchange(&LdrpInitLock, 1)) + { + LdrpInit2(Context, SystemArgument1, SystemArgument2); + LdrpInitialized = TRUE; + } + else + { + LARGE_INTEGER Interval = {{-200000, -1}}; + + do + { + NtDelayExecution(FALSE, &Interval); + } + while (!LdrpInitialized); + } + } /* attach the thread */ RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);

1 0

[cwittich] 38417: sync browseui winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 05:31:26 2008 New Revision: 38417 URL: http://svn.reactos.org/svn/reactos?rev=38417&view=rev Log: sync browseui winetest to wine 1.1.11 Modified: trunk/rostests/winetests/browseui/autocomplete.c Modified: trunk/rostests/winetests/browseui/autocomplete.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/browseui/autoco… ============================================================================== --- trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] (original) +++ trunk/rostests/winetests/browseui/autocomplete.c [iso-8859-1] Sun Dec 28 05:31:26 2008 @@ -20,9 +20,11 @@ #include <assert.h> #include <stdarg.h> +#include <initguid.h> #include <windows.h> #include <shlobj.h> #include <shlwapi.h> +#include <shlguid.h> #include "wine/test.h"

1 0

[cwittich] 38416: sync usp10 winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 05:28:48 2008 New Revision: 38416 URL: http://svn.reactos.org/svn/reactos?rev=38416&view=rev Log: sync usp10 winetest to wine 1.1.11 Modified: trunk/rostests/winetests/usp10/usp10.c Modified: trunk/rostests/winetests/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/usp10/usp10.c?r… ============================================================================== --- trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] (original) +++ trunk/rostests/winetests/usp10/usp10.c [iso-8859-1] Sun Dec 28 05:28:48 2008 @@ -61,12 +61,21 @@ hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, NULL); ok(hr == E_INVALIDARG, "ScriptShape should return E_INVALIDARG not %08x\n", hr); + hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); + ok(hr == E_PENDING, "ScriptShape should return E_PENDING not %08x\n", hr); + hr = ScriptShape(hdc, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); ok(items[0].a.fNoGlyphIndex == FALSE, "fNoGlyphIndex TRUE\n"); + hr = ScriptShape(NULL, &sc, test1, 4, 4, &items[0].a, glyphs, NULL, attrs, &nb); + ok(!hr, "ScriptShape should return S_OK not %08x\n", hr); + hr = ScriptPlace(hdc, &sc, glyphs, 4, NULL, &items[0].a, widths, NULL, NULL); ok(hr == E_INVALIDARG, "ScriptPlace should return E_INVALIDARG not %08x\n", hr); + + hr = ScriptPlace(NULL, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, NULL); + ok(hr == E_PENDING, "ScriptPlace should return E_PENDING not %08x\n", hr); hr = ScriptPlace(hdc, &sc, glyphs, 4, attrs, &items[0].a, widths, NULL, NULL); ok(!hr, "ScriptPlace should return S_OK not %08x\n", hr); @@ -615,22 +624,26 @@ * This routine tests the ScriptXtoCP and ScriptCPtoX functions using static variables * ****************************************************************************************/ { + static const WCHAR test[] = {'t', 'e', 's', 't',0}; + SCRIPT_ITEM items[2]; int iX, iCP; int cChars; int cGlyphs; WORD pwLogClust[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; SCRIPT_VISATTR psva[10]; int piAdvance[10] = {200, 190, 210, 180, 170, 204, 189, 195, 212, 203}; - SCRIPT_ANALYSIS psa; int piCP, piX; int piTrailing; BOOL fTrailing; HRESULT hr; + hr = ScriptItemize(test, lstrlenW(test), sizeof(items)/sizeof(items[0]), NULL, NULL, items, NULL); + ok(!hr, "ScriptItemize should return S_OK not %08x\n", hr); + iX = -1; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); if (piTrailing) ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); @@ -640,7 +653,7 @@ iX = 1954; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); if (piTrailing) /* win2k3 */ ok(piCP == -1, "Negative iX should return piCP=-1 not %d\n", piCP); @@ -650,7 +663,7 @@ iX = 779; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 3 || piCP == -1, /* win2k3 */ @@ -660,7 +673,7 @@ iX = 780; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 3 || piCP == -1, /* win2k3 */ @@ -670,7 +683,7 @@ iX = 868; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 4 || piCP == -1, /* win2k3 */ @@ -679,7 +692,7 @@ iX = 0; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 0 || piCP == 10, /* win2k3 */ @@ -688,14 +701,14 @@ iX = 195; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 0, "iX=%d should return piCP=0 not %d\n", iX, piCP); iX = 196; cChars = 10; cGlyphs = 10; - hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piCP, &piTrailing); + hr = ScriptXtoCP(iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piCP, &piTrailing); ok(hr == S_OK, "ScriptXtoCP should return S_OK not %08x\n", hr); ok(piCP == 1 || piCP == 0, /* win2k3 */ @@ -705,7 +718,7 @@ fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 976 || piX == 100, /* win2k3 */ @@ -715,7 +728,7 @@ fTrailing = TRUE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1171 || piX == 80, /* win2k3 */ @@ -725,7 +738,7 @@ fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1171 || piX == 80, /* win2k3 */ @@ -735,7 +748,7 @@ fTrailing = FALSE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1953 || piX == 0, /* win2k3 */ @@ -745,7 +758,7 @@ fTrailing = TRUE; cChars = 10; cGlyphs = 10; - hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &psa, &piX); + hr = ScriptCPtoX(iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, &items[0].a, &piX); ok(hr == S_OK, "ScriptCPtoX should return S_OK not %08x\n", hr); ok(piX == 1953 || piX == 0, /* win2k3 */ @@ -1339,7 +1352,7 @@ if (!pEnumLanguageGroupLocalesA) { - trace("EnumLanguageGroupLocalesA not available on this platform\n"); + win_skip("EnumLanguageGroupLocalesA not available on this platform\n"); return; } @@ -1390,7 +1403,7 @@ ok( hdc != NULL, "HDC failed to be created %p\n", hdc); memset(&lf, 0, sizeof(LOGFONTA)); - lstrcpyA(lf.lfFaceName, "Symbol"); + lstrcpyA(lf.lfFaceName, "Tahoma"); lf.lfHeight = 10; lf.lfWeight = 3; lf.lfWidth = 10;

1 0

[cwittich] 38415: sync version winetest to wine 1.1.11
by cwittich＠svn.reactos.org 28 Dec '08

28 Dec '08

Author: cwittich Date: Sun Dec 28 05:27:26 2008 New Revision: 38415 URL: http://svn.reactos.org/svn/reactos?rev=38415&view=rev Log: sync version winetest to wine 1.1.11 Modified: trunk/rostests/winetests/version/info.c trunk/rostests/winetests/version/install.c Modified: trunk/rostests/winetests/version/info.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/info.c?… ============================================================================== --- trunk/rostests/winetests/version/info.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/info.c [iso-8859-1] Sun Dec 28 05:27:26 2008 @@ -167,7 +167,7 @@ } } else - trace("skipping GetModuleFileNameA(NULL,..) failed\n"); + trace("skipping GetSystemDirectoryA(mypath,..) failed\n"); create_file("test.txt"); @@ -247,6 +247,13 @@ ok (boolret, "GetFileVersionInfoA failed: GetLastError = %u\n", GetLastError()); if (!boolret) goto cleanup; + + boolret = VerQueryValueA( pVersionInfo, NULL, (LPVOID *)&pFixedVersionInfo, &uiLength ); + ok (boolret || GetLastError() == NO_ERROR /* Win98 */, + "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); + + boolret = VerQueryValueA( pVersionInfo, "", (LPVOID *)&pFixedVersionInfo, &uiLength ); + ok (boolret, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); boolret = VerQueryValueA( pVersionInfo, backslash, (LPVOID *)&pFixedVersionInfo, &uiLength ); ok (boolret, "VerQueryValueA failed: GetLastError = %u\n", GetLastError()); @@ -286,6 +293,7 @@ WCHAR mypathW[MAX_PATH]; char rootA[] = "\\"; WCHAR rootW[] = { '\\', 0 }; + WCHAR emptyW[] = { 0 }; char varfileinfoA[] = "\\VarFileInfo\\Translation"; WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; @@ -324,7 +332,7 @@ GetModuleFileNameW(NULL, mypathW, MAX_PATH); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("GetModuleFileNameW not existing on this platform, skipping comparison between A- and W-calls\n"); + win_skip("GetModuleFileNameW not existing on this platform, skipping comparison between A- and W-calls\n"); is_unicode_enabled = FALSE; } @@ -392,6 +400,15 @@ if (is_unicode_enabled) { + if(0) + { /* This causes Vista and w2k8 to crash */ + retW = VerQueryValueW( pVersionInfoW, NULL, (LPVOID *)&pBufW, &uiLengthW ); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); + } + + retW = VerQueryValueW( pVersionInfoW, emptyW, (LPVOID *)&pBufW, &uiLengthW ); + ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); + retW = VerQueryValueW( pVersionInfoW, rootW, (LPVOID *)&pBufW, &uiLengthW ); ok (retW, "VerQueryValueW failed: GetLastError = %u\n", GetLastError()); ok ( uiLengthA == sizeof(VS_FIXEDFILEINFO), "Size (%d) doesn't match the size of the VS_FIXEDFILEINFO struct\n", uiLengthA); Modified: trunk/rostests/winetests/version/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/version/install… ============================================================================== --- trunk/rostests/winetests/version/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/version/install.c [iso-8859-1] Sun Dec 28 05:27:26 2008 @@ -165,7 +165,48 @@ } } +static void test_install_file(void) +{ + CHAR tmpname[MAX_PATH]; + UINT size = MAX_PATH; + DWORD rc; + static const CHAR szSrcFileName[] = "nofile.txt"; + static const CHAR szDestFileName[] = "nofile2.txt"; + static const CHAR szSrcDir[] = "D:\\oes\\not\\exist"; + static const CHAR szDestDir[] = "D:\\oes\\not\\exist\\either"; + static const CHAR szCurDir[] = "C:\\"; + + /* testing Invalid Parameters */ + memset(tmpname,0,sizeof(tmpname)); + rc = VerInstallFileA(0x0, NULL, NULL, NULL, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, NULL, NULL, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, NULL, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, NULL, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + + /* Source file does not exist*/ + + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, szDestDir, NULL, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); + memset(tmpname,0,sizeof(tmpname)); + size = MAX_PATH; + rc = VerInstallFileA(0x0, szSrcFileName, szDestFileName, szSrcDir, szDestDir, szCurDir, tmpname, &size); + ok (rc == 0x10000 && tmpname[0]==0," expected return 0x10000 and no tempname, got %08x/\'%s\'\n",rc,tmpname); +} + START_TEST(install) { test_find_file(); + test_install_file(); }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
71
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 December 2008