Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[amunger] 20477: Revert 20343, which puts the implementation of QueryServiceConfigW back into place. (20255)

by amunger＠svn.reactos.org

Revert 20343, which puts the implementation of QueryServiceConfigW back into place. (20255) Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-12-31 00:03:19 UTC (rev 20476) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-12-31 01:38:59 UTC (rev 20477) @@ -504,7 +504,7 @@ DWORD dwLength; LPWSTR lpStr; - DPRINT("CreateServiceW() called\n"); + DPRINT1("CreateServiceW() called\n"); /* Calculate the Dependencies length*/ if (lpDependencies != NULL) @@ -543,7 +543,7 @@ (unsigned int *)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrCreateServiceW(%S) failed (Error %lu)\n", lpServiceName, dwError); + DPRINT1("ScmrCreateServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1132,7 +1132,7 @@ (unsigned int*)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrOpenServiceA(%s) failed (Error %lu)\n", lpServiceName, dwError); + DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1169,7 +1169,7 @@ (unsigned int*)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT("ScmrOpenServiceW(%S) failed (Error %lu)\n", lpServiceName, dwError); + DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1254,7 +1254,6 @@ DWORD cbBufSize, LPDWORD pcbBytesNeeded) { -#if 0 DWORD dwError; DPRINT("QueryServiceConfigW(%p, %p, %lu, %p)\n", @@ -1263,13 +1262,11 @@ HandleBind(); /* Call to services.exe using RPC */ - CHECKPOINT1; dwError = ScmrQueryServiceConfigW(BindingHandle, (unsigned int)hService, (unsigned char *)lpServiceConfig, cbBufSize, pcbBytesNeeded); - CHECKPOINT1; if (dwError != ERROR_SUCCESS) { DPRINT("ScmrQueryServiceConfigW() failed (Error %lu)\n", dwError); @@ -1306,20 +1303,6 @@ DPRINT("QueryServiceConfigW() done\n"); return TRUE; -#else - DPRINT1("QueryServiceConfigW is unimplemented\n"); - if (lpServiceConfig && cbBufSize >= sizeof(QUERY_SERVICE_CONFIGW)) - { - memset(lpServiceConfig, 0, *pcbBytesNeeded); - return TRUE; - } - else - { - *pcbBytesNeeded = sizeof(QUERY_SERVICE_CONFIGW); - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } -#endif }

18 years, 8 months

[ion] 20476: - Cleanup assembly files and create a header for the macros added and new ones that will be added later for syscall.S & friends.

by ion＠svn.reactos.org

- Cleanup assembly files and create a header for the macros added and new ones that will be added later for syscall.S & friends. Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S Added: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S _____ Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S 2005-12-30 23:56:27 UTC (rev 20475) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S 2005-12-31 00:03:19 UTC (rev 20476) @@ -8,28 +8,9 @@ /* INCLUDES ******************************************************************/ #include <ndk/asm.h> +#include <internal/i386/asmmacro.S> .intel_syntax noprefix -//#define CONFIG_SMP - -#ifdef CONFIG_SMP -#define LOCK lock -#define ACQUIRE_SPINLOCK(x, y) \ - lock bts dword ptr [x], 0; \ - jb y -#define RELEASE_SPINLOCK(x) mov byte ptr [x], 0 -#define SPIN_ON_LOCK(x, y) \ -1: \ - test dword ptr [x], 1; \ - jz y; \ - pause; \ - jmp 1b -#else -#define LOCK -#define ACQUIRE_SPINLOCK(x, y) -#define RELEASE_SPINLOCK(x) -#endif - /* FUNCTIONS ****************************************************************/ /* _____ Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S 2005-12-30 23:56:27 UTC (rev 20475) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S 2005-12-31 00:03:19 UTC (rev 20476) @@ -8,28 +8,9 @@ /* INCLUDES ******************************************************************/ #include <ndk/asm.h> +#include <internal/i386/asmmacro.S> .intel_syntax noprefix -//#define CONFIG_SMP - -#ifdef CONFIG_SMP -#define LOCK lock -#define ACQUIRE_SPINLOCK(x, y) \ - lock bts dword ptr [x], 0; \ - jb y -#define RELEASE_SPINLOCK(x) mov byte ptr [x], 0 -#define SPIN_ON_LOCK(x, y) \ -1: \ - test dword ptr [x], 1; \ - jz y; \ - pause; \ - jmp 1b -#else -#define LOCK -#define ACQUIRE_SPINLOCK(x, y) -#define RELEASE_SPINLOCK(x) -#endif - /* FUNCTIONS ****************************************************************/ /* _____ Added: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2005-12-30 23:56:27 UTC (rev 20475) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2005-12-31 00:03:19 UTC (rev 20476) @@ -0,0 +1,52 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnlinclude/i386/asmmacro.S + * PURPOSE: Assembly Macros for Spinlocks and common Trap Code (TODO) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ +#include <ndk/asm.h> +.intel_syntax noprefix + +// +// These macros are inlined equivalents of KiAcquire/ReleaseSpinlock, that is, +// they will not be compiled into non-SMP builds. Usage is as follows: +// +// .BeginYourFunction +// mov reg, lockaddr +// ACQUIRE_SPINLOCK(reg, .spin) +// <thread-safe code here> +// RELEASE_SPINLOCK(reg) +// <misc code here> +// retn +// #IFDEF CONFIG_SMP +// .spin +// <any necessary steps to be able to jump back safely> +/ SPIN_ON_LOCK(reg, .BeginYourFunction) +// #ENDIF +// +#ifdef CONFIG_SMP +#define LOCK lock +#define ACQUIRE_SPINLOCK(x, y) \ + lock bts dword ptr [x], 0; \ + jb y +#define RELEASE_SPINLOCK(x) mov byte ptr [x], 0 +#define SPIN_ON_LOCK(x, y) \ +1: \ + test dword ptr [x], 1; \ + jz y; \ + pause; \ + jmp 1b +#else +#define LOCK +#define ACQUIRE_SPINLOCK(x, y) +#define RELEASE_SPINLOCK(x) +#endif + +// +// These macros control common execution paths for Traps and System Call Code +// TODO +// +

18 years, 8 months

[greatlrd] 20475: solv the issue with mouse poiter is hide, do not show the mousepointer when you are moving the mouse. tested in winquake

by greatlrd＠svn.reactos.org

solv the issue with mouse poiter is hide, do not show the mousepointer when you are moving the mouse. tested in winquake Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/include/dc.h Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-12-30 23:53:13 UTC (rev 20474) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-12-30 23:56:27 UTC (rev 20475) @@ -153,10 +153,13 @@ return; } + + pgp->Enabled = FALSE; pt.x = pgp->Pos.x - pgp->HotSpot.x; pt.y = pgp->Pos.y - pgp->HotSpot.y; + if (pgp->SaveSurface != NULL) { @@ -207,7 +210,13 @@ { return; } + + if (pgp->ShowPointer == 1) + { + return ; + } + pgp->Enabled = TRUE; pt.x = pgp->Pos.x - pgp->HotSpot.x; _____ Modified: trunk/reactos/subsys/win32k/include/dc.h --- trunk/reactos/subsys/win32k/include/dc.h 2005-12-30 23:53:13 UTC (rev 20474) +++ trunk/reactos/subsys/win32k/include/dc.h 2005-12-30 23:56:27 UTC (rev 20475) @@ -134,6 +134,7 @@ HSURF ColorSurface; HSURF MaskSurface; HSURF SaveSurface; + BOOL ShowPointer; /* public pointer information */ RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-12-30 23:53:13 UTC (rev 20474) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-12-30 23:56:27 UTC (rev 20475) @@ -237,8 +237,9 @@ { if (CurInfo->ShowingCursor != 0) { - ppdev->SafetyRemoveCount = 1; - ppdev->SafetyRemoveLevel = 1; + pgp->ShowPointer = 1; + //ppdev->SafetyRemoveCount = 1; + //ppdev->SafetyRemoveLevel = 1; EngMovePointer(SurfObj,-1,-1,NULL); CurInfo->ShowingCursor = 0; } @@ -247,8 +248,9 @@ else { /* Show Cursor */ - ppdev->SafetyRemoveCount = 0; - ppdev->SafetyRemoveLevel = 0; + pgp->ShowPointer = 0; + //ppdev->SafetyRemoveCount = 0; + //ppdev->SafetyRemoveLevel = 0; EngMovePointer(SurfObj,-1,-1,NULL); CurInfo->ShowingCursor = CURSOR_SHOWING; }

18 years, 8 months

[ion] 20474: - Rewrite Executive Interlocked Functions to actually work as supposed and also immensly increase their speed, most notably on non-SMP machines:

by ion＠svn.reactos.org

- Rewrite Executive Interlocked Functions to actually work as supposed and also immensly increase their speed, most notably on non-SMP machines: * The functions now disable interrupts as they should. This is a core functionality of the ExInterlocked functions which we did not do. * The functions now preserve EFLAGS as they should. This is another core functionality and point of ExInterlocked functions, which we did not do. * Use KiAcquire/ReleaseSpinlock equivalents instead of going through HAL. Also make them macros which can be later used in other assembly files. * Write optimized versions for non-SMP machines. Namely, the spinlock macros are coded to be no-ops on UP machines, since they are not needed. * Write all functions in assembly, so we can cleanly optimize them and properly restore/save EFLAGS and use CLI. - Use the right interlocked macro in guarded mutex implementation. - Fix export of Exi386InterlockedExchangeUlong - Use documented EFLAGS definition instead of hard-coded value in some interlocked functions. Modified: trunk/reactos/include/ndk/asm.h Added: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S Deleted: trunk/reactos/ntoskrnl/ex/interlck.c Deleted: trunk/reactos/ntoskrnl/ex/list.c Deleted: trunk/reactos/ntoskrnl/ex/synch.c Modified: trunk/reactos/ntoskrnl/ke/gmutex.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2005-12-30 23:50:05 UTC (rev 20473) +++ trunk/reactos/include/ndk/asm.h 2005-12-30 23:53:13 UTC (rev 20474) @@ -289,6 +289,9 @@ #define EFLAGS_ALIGN_CHECK 0x40000 #define EFLAGS_VIF 0x80000 #define EFLAGS_VIP 0x100000 +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 +#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) // // CR0 _____ Added: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S 2005-12-30 23:50:05 UTC (rev 20473) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S 2005-12-30 23:53:13 UTC (rev 20474) @@ -0,0 +1,701 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/ex/i386/fastinterlck_asm.S + * PURPOSE: FASTCALL Interlocked Functions + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ +#include <ndk/asm.h> +.intel_syntax noprefix + +//#define CONFIG_SMP + +#ifdef CONFIG_SMP +#define LOCK lock +#define ACQUIRE_SPINLOCK(x, y) \ + lock bts dword ptr [x], 0; \ + jb y +#define RELEASE_SPINLOCK(x) mov byte ptr [x], 0 +#define SPIN_ON_LOCK(x, y) \ +1: \ + test dword ptr [x], 1; \ + jz y; \ + pause; \ + jmp 1b +#else +#define LOCK +#define ACQUIRE_SPINLOCK(x, y) +#define RELEASE_SPINLOCK(x) +#endif + +/* FUNCTIONS ****************************************************************/ + +/* + * NOTE: These functions must obey the following rules: + * - Acquire locks only on MP systems. + * - Be safe at HIGH_LEVEL (no paged access). + * - Preserve flags. + * - Disable interrups. + */ + +/*VOID + *FASTCALL + *ExInterlockedAddLargeStatistic(IN PLARGE_INTEGER Addend, + * IN ULONG Increment) + */ +.global @ExInterlockedAddLargeStatistic@8 +@ExInterlockedAddLargeStatistic@8: + +#ifdef CONFIG_SMP + /* Do the addition */ + lock add [ecx], edx + + /* Check for carry bit and return */ + jb 1f + ret + +1: + /* Add carry */ + lock adc dword ptr [ecx+4], 0 +#else + /* Do the addition and add the carry */ + add dword ptr [ecx], edx + adc dword ptr [ecx+4], 0 +#endif + /* Return */ + ret + +/*ULONG + *FASTCALL + *ExfInterlockedAddUlong(IN PULONG Addend, + * IN ULONG Increment, + * IN PKSPIN_LOCK Lock) + */ +.global @ExfInterlockedAddUlong@12 +@ExfInterlockedAddUlong@12: + + /* Save flags */ + pushfd + +#ifdef CONFIG_SMP + /* Get lock address */ + mov eax, [esp+8] +.start1: +#endif + /* Disable interrupts */ + cli + + /* Acquire lock */ + ACQUIRE_SPINLOCK(eax, .spin1) + + /* Do the add */ + mov eax, [ecx] + add [ecx], edx + +#ifdef CONFIG_SMP + /* Get spinlock address and release it */ + mov edx, [esp+8] + RELEASE_SPINLOCK(edx) +#endif + + /* Restore flags and return */ + popfd + ret 4 + +#ifdef CONFIG_SMP +.spin1: + /* Restore flags and spin */ + popfd + pushfd + SPIN_ON_LOCK(eax, .start1) +#endif + +/*PLIST_ENTRY + *FASTCALL + *ExfInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, + * IN PLIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global @ExfInterlockedInsertHeadList@12 +@ExfInterlockedInsertHeadList@12: + +#ifdef CONFIG_SMP + /* Save lock address */ + push esi + mov esi, [esp+8] +#endif + + /* Save flags and disable interrupts */ + pushfd +.start2: + cli + + /* Acquire lock */ + ACQUIRE_SPINLOCK(esi, .spin2) + + /* Get list pointer */ + mov eax, [ecx] + + /* Do the insert */ + mov [edx], eax + mov [edx+4], ecx + mov [ecx], edx + mov [eax+4], edx + + /* Release lock and restore flags */ + RELEASE_SPINLOCK(esi) + popfd + +#ifdef CONFIG_SMP + pop esi +#endif + + /* Check if list was empty */ + xor eax, ecx + jz 2f + + /* Return list pointer */ + xor eax, ecx +2: + ret 4 + +#ifdef CONFIG_SMP +.spin2: + popfd + pushfd + SPIN_ON_LOCK(esi, .start2) +#endif + +/*PLIST_ENTRY + *NTAPI + *ExfInterlockedInsertTailList(IN PLIST_ENTRY ListHead, + * IN PLIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global @ExfInterlockedInsertTailList@12 +@ExfInterlockedInsertTailList@12: + +#ifdef CONFIG_SMP + /* Save lock address */ + push esi + mov esi, [esp+8] +#endif + + /* Save flags and disable interrupts */ + pushfd +.start3: + cli + + /* Acquire lock */ + ACQUIRE_SPINLOCK(esi, .spin3) + + /* Get list pointer */ + mov eax, [ecx+4] + + /* Do the insert */ + mov [edx], ecx + mov [edx+4], eax + mov [ecx+4], edx + mov [eax], edx + + /* Release lock and restore flags */ + RELEASE_SPINLOCK(esi) + popfd + +#ifdef CONFIG_SMP + pop esi +#endif + + /* Check if list was empty */ + xor eax, ecx + jz 2f + + /* Return list pointer */ + xor eax, ecx +2: + ret 4 + +#ifdef CONFIG_SMP +.spin3: + popfd + pushfd + SPIN_ON_LOCK(esi, .start3) +#endif + +/*PLIST_ENTRY + *FASTCALL + *ExfInterlockedRemoveHeadList(IN PLIST_ENTRY ListHead, + * IN PKSPIN_LOCK Lock) + */ +.global @ExfInterlockedRemoveHeadList@8 +@ExfInterlockedRemoveHeadList@8: + + /* Save flags and disable interrupts */ +.start4: + pushfd + cli + ACQUIRE_SPINLOCK(edx, .spin4) + + /* Get list pointer */ + mov eax, [ecx] + + /* Check if it's empty */ + cmp eax, ecx + je 2f + + /* Get the next entry and do the deletion*/ +#ifdef CONFIG_SMP + push ebx + mov ebx, [eax] + mov [ecx], ebx + mov [ebx+4], ecx +#else + mov edx, [eax] + mov [ecx], edx + mov [edx+4], ecx +#endif + + /* Release lock */ +#ifdef CONFIG_SMP + RELEASE_SPINLOCK(edx) + pop ebx +#endif + + /* Restore flags */ + popfd + + /* Return */ + ret + +2: + /* Release lock */ + RELEASE_SPINLOCK(edx) + + /* Restore flags */ + popfd + + /* Return empty list */ + xor eax, eax + ret + +#ifdef CONFIG_SMP +.spin4: + popfd + SPIN_ON_LOCK(edx, .start4) +#endif + +/*PSINGLE_LIST_ENTRY + *FASTCALL + *ExfInterlockedPopEntryList(IN PSINGLE_LIST_ENTRY ListHead, + * IN PKSPIN_LOCK Lock) + */ +.global @ExfInterlockedPopEntryList@8 +@ExfInterlockedPopEntryList@8: + + /* Save flags and disable interrupts */ +.start5: + pushfd + cli + ACQUIRE_SPINLOCK(edx, .spin5) + + /* Get list pointer */ + mov eax, [ecx] + + /* Check if it's empty */ + or eax, eax + je 3f + + /* Get next entry and do deletion */ +#ifdef CONFIG_SMP + push edx +#endif + mov edx, [eax] + mov [ecx], edx +#ifdef CONFIG_SMP + pop edx +#endif + +2: + /* Release lock */ + RELEASE_SPINLOCK(edx) + + /* Restore flags */ + popfd + + /* Return */ + ret + +3: + /* Return empty list */ + xor eax, eax + jmp 2b + +#ifdef CONFIG_SMP +.spin5: + popfd + SPIN_ON_LOCK(edx, .start5) +#endif + +/*PSINGLE_LIST_ENTRY + *NTAPI + *ExfInterlockedPushEntryList(IN PSINGLE_LIST_ENTRY ListHead, + * IN PSINGLE_LIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global @ExfInterlockedPushEntryList@12 +@ExfInterlockedPushEntryList@12: + + /* Save flags */ + pushfd + + /* Save lock pointer */ +#ifdef CONFIG_SMP + push edx + mov edx, [esp+12] +#endif + + /* Disable interrupts */ +.start6: + cli +#ifdef CONFIG_SMP + ACQUIRE_SPINLOCK(edx, .spin6) + pop edx +#endif + + /* Get list pointer */ + mov eax, [ecx] + + /* Do push */ + mov [edx], eax + mov [ecx], edx + + /* Release lock */ +#ifdef CONFIG_SMP + mov edx, [esp+8] + RELEASE_SPINLOCK(edx) +#endif + + /* Restore flags */ + popfd + + /* Return */ + ret 4 + +#ifdef CONFIG_SMP +.spin6: + pop edx + popfd + pushfd + push edx + mov edx, [esp+12] + SPIN_ON_LOCK(edx, .start6) +#endif + +/*PSINGLE_LIST_ENTRY + *NTAPI + *ExInterlockedPopEntrySList(IN PSINGLE_LIST_ENTRY ListHead, + * IN PKSPIN_LOCK Lock) + */ +.global @ExInterlockedPopEntrySList@8 +.global @InterlockedPopEntrySList@4 +@ExInterlockedPopEntrySList@8: +@InterlockedPopEntrySList@4: + + /* Save registers */ + push ebx + push ebp + + /* Pointer to list */ + mov ebp, ecx + + /* Get sequence number and link pointer */ + mov edx, [ebp+4] + mov eax, [ebp] + +1: + /* Check if the list is empty */ + or eax, eax + jz 2f + + /* Copy sequence number and adjust it */ + lea ecx, [edx-1] + + /* Get next pointer and do the exchange */ + mov ebx, [eax] + LOCK cmpxchg8b qword ptr [ebp] + jnz 1b + + /* Restore registers and return */ +2: + pop ebp + pop ebx + ret + +/*PSINGLE_LIST_ENTRY + *NTAPI + *ExInterlockedPushEntrySList(IN PSINGLE_LIST_ENTRY ListHead, + * IN PSINGLE_LIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global @ExInterlockedPushEntrySList@12 +@ExInterlockedPushEntrySList@12: + + /* So we can fall through below */ + pop [esp] + +.global @InterlockedPushEntrySList@8 +@InterlockedPushEntrySList@8: + + /* Save registers */ + push ebx + push ebp + + /* Pointer to list */ + mov ebp, ecx + mov ebx, edx + + /* Get sequence number and link pointer */ + mov edx, [ebp+4] + mov eax, [ebp] + +1: + /* Set link pointer */ + mov [ebx], eax + + /* Copy sequence number and adjust it */ + lea ecx, [edx+0x10001] + + /* Do the exchange */ + LOCK cmpxchg8b qword ptr [ebp] + jnz 1b + + /* Restore registers and return */ +2: + pop ebp + pop ebx + ret + +/*PSINGLE_LIST_ENTRY + *NTAPI + *ExInterlockedFlushSList(IN PSINGLE_LIST_ENTRY ListHead) + */ +.global @ExInterlockedFlushSList@4 +@ExInterlockedFlushSList@4: + + /* Save registers */ + push ebx + push ebp + + /* Clear ebx */ + xor ebx, ebx + + /* Pointer to list */ + mov ebp, ecx + + /* Get sequence number and link pointer */ + mov edx, [ebp+4] + mov eax, [ebp] + +1: + /* Check if the list is empty */ + or eax, eax + jz 2f + + /* Clear sequence and pointer */ + mov ecx, edx + mov cx, bx + + /* Do the exchange */ + LOCK cmpxchg8b qword ptr [ebp] + jnz 1b + + /* Restore registers and return */ +2: + pop ebp + pop ebx + ret + +/*INTERLOCKED_RESULT + *FASTCALL + *Exfi386InterlockedIncrementLong(IN PLONG Addend) + */ +.global @Exfi386InterlockedIncrementLong@4 +@Exfi386InterlockedIncrementLong@4: + + /* Do the op */ + LOCK add dword ptr [ecx], 1 + + /* Return */ + lahf + and eax, EFLAG_SELECT + ret + +/*INTERLOCKED_RESULT + *FASTCALL + *Exfi386InterlockedDecrementLong(IN PLONG Addend) + */ +.global @Exfi386InterlockedDecrementLong@4 +@Exfi386InterlockedDecrementLong@4: + + /* Do the op */ + LOCK sub dword ptr [ecx], 1 + + /* Return */ + lahf + and eax, EFLAG_SELECT + ret + +/*ULONG + *FASTCALL + *Exfi386InterlockedExchangeUlong(IN PULONG Taget, + * IN ULONG Value) + */ +.global @Exfi386InterlockedExchangeUlong@8 +.global @InterlockedExchange@8 +@InterlockedExchange@8: +@Exfi386InterlockedExchangeUlong@8: + +#ifdef CONFIG_SMP + /* On MP, do the exchange */ + xchg [ecx], edx + mov eax, edx +#else + /* On UP, use cmpxchg */ + mov eax, [ecx] +1: + cmpxchg [ecx], edx + jnz 1b +#endif + + /* Return */ + ret + +/*ULONG + *FASTCALL + *InterlockedIncrement(IN PLONG Addend) + */ +.global @InterlockedIncrement@4 +@InterlockedIncrement@4: + + /* Do the op */ + mov eax, 1 + LOCK xadd dword ptr [ecx], eax + + /* Return */ + inc eax + ret + +/*ULONG + *FASTCALL + *InterlockedDecrement(IN PLONG Addend) + */ +.global @InterlockedDecrement@4 +@InterlockedDecrement@4: + + /* Do the op */ + mov eax, -1 + LOCK xadd dword ptr [ecx], eax + + /* Return */ + dec eax + ret + +/*PVOID + *FASTCALL + *InterlockedCompareExchange(IN OUT PVOID *Destination, + * IN PVOID Exchange, + * IN PVOID Comperand) + */ +.global @InterlockedCompareExchange@12 +@InterlockedCompareExchange@12: + + /* Get comperand */ + mov eax, [esp+4] + + /* Do the op */ + LOCK cmpxchg dword ptr [ecx], edx + + /* Return */ + ret + +/*PVOID + *FASTCALL + *ExfInterlockedCompareExchange64(IN PLONGLONG Destination, + * IN PLONGLONG Exchange, + * IN PLONGLONG Comperand) + */ +.global @ExfInterlockedCompareExchange64@12 +@ExfInterlockedCompareExchange64@12: + + /* Save registers */ + push ebp + push ebp + + /* Get desination pointer, exchange value and comperand value/address */ + mov ebp, ecx + mov ebx, [edx] + mov ecx, [edx+4] + mov edx, [esp+12] + mov eax, [edx] + mov edx, [edx+4] + + /* Do the op */ + LOCK cmpxchg8b qword ptr [ebp] + + /* Restore volatiles */ + pop ebp + pop ebx + + /* Return */ + ret 4 + +/*PVOID + *FASTCALL + *ExfInterlockedCompareExchange64(IN PLONGLONG Destination, + * IN PLONGLONG Exchange, + * IN PLONGLONG Comperand, + * IN PKSPIN_LOCK Lock) + */ +.global @ExInterlockedCompareExchange64@16 +@ExInterlockedCompareExchange64@16: + + /* Save registers */ + push ebp + push ebp + + /* Get desination pointer, exchange value and comperand value/address */ + mov ebp, ecx + mov ebx, [edx] + mov ecx, [edx+4] + mov edx, [esp+12] + mov eax, [edx] + mov edx, [edx+4] + + /* Do the op */ + LOCK cmpxchg8b qword ptr [ebp] + + /* Restore volatiles */ + pop ebp + pop ebx + + /* Return */ + ret 8 + +/*PVOID + *FASTCALL + *InterlockedExchangeAdd(IN OUT PLONG Addend, + * IN LONG Increment) + */ +.global @InterlockedExchangeAdd@8 +@InterlockedExchangeAdd@8: + + /* Do the op */ + LOCK xadd dword ptr [ecx], edx + + /* Return */ + mov eax, edx + ret + +/* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S 2005-12-30 23:50:05 UTC (rev 20473) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S 2005-12-30 23:53:13 UTC (rev 20474) @@ -1,112 +1,583 @@ -/* $Id: interlck.c 15557 2005-05-28 07:26:38Z hbirr $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ex/i386/interlck.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: No programmer listed. + * FILE: ntoskrnl/ex/i386/interlck_asm.S + * PURPOSE: STDCALL Interlocked Functions + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ + +/* INCLUDES ******************************************************************/ +#include <ndk/asm.h> +.intel_syntax noprefix +//#define CONFIG_SMP + #ifdef CONFIG_SMP #define LOCK lock +#define ACQUIRE_SPINLOCK(x, y) \ + lock bts dword ptr [x], 0; \ + jb y +#define RELEASE_SPINLOCK(x) mov byte ptr [x], 0 +#define SPIN_ON_LOCK(x, y) \ +1: \ + test dword ptr [x], 1; \ + jz y; \ + pause; \ + jmp 1b #else #define LOCK +#define ACQUIRE_SPINLOCK(x, y) +#define RELEASE_SPINLOCK(x) #endif -.global @Exfi386InterlockedIncrementLong@4 -@Exfi386InterlockedIncrementLong@4: - LOCK - addl $1,(%ecx) - lahf - andl $0xC000, %eax - ret +/* FUNCTIONS ****************************************************************/ -.global @Exfi386InterlockedDecrementLong@4 -@Exfi386InterlockedDecrementLong@4: - LOCK - subl $1,(%ecx) - lahf - andl $0xC000, %eax - ret +/* + * NOTE: These functions must obey the following rules: + * - Acquire locks only on MP systems. + * - Be safe at HIGH_LEVEL (no paged access). + * - Preserve flags. + * - Disable interrups. + */ -.global @Exfi386InterlockedExchangeUlong@8 -@Exfi386InterlockedExchangeUlong@8: - LOCK - xchgl %edx,(%ecx) - movl %edx,%eax - ret +/*PLIST_ENTRY + *NTAPI + *ExInterlockedAddLargeInteger(IN PLIST_ENTRY ListHead, + * IN PLIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global _ExInterlockedAddLargeInteger@16 +_ExInterlockedAddLargeInteger@16: + /* Prepare stack frame */ + push ebp + mov ebp, esp + sub esp, 8 + + /* Save lock pointer */ +#ifdef CONFIG_SMP + mov eax, [ebp+20] +#endif + + /* Save flags and disable interrupts */ +.start1: + pushfd + cli + + /* Acquire lock */ + ACQUIRE_SPINLOCK(eax, .spin1) + + /* Do the calculation */ + mov eax, [ebp+8] + mov ecx, [eax] + mov edx, [eax+4] + + /* Save result */ + mov [ebp-8], ecx + mov [ebp-4], edx + + /* Add increment */ + add ecx, [ebp+12] + adc edx, [ebp+16] + + /* Save result */ + mov [eax], ecx + mov [eax+4], edx + + /* Release lock */ +#ifdef CONFIG_SMP + mov eax, [ebp+20] + RELEASE_SPINLOCK(eax) +#endif + + /* Restore flags */ + popfd + + /* Restore frame and return values */ + mov eax, [ebp-8] + mov edx, [ebp-4] + mov esp, ebp + pop ebp + ret 16 + +#ifdef CONFIG_SMP +.spin1: + popfd + SPIN_ON_LOCK(eax, .start1) +#endif + +/*PLIST_ENTRY + *NTAPI + *ExInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, + * IN PLIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global _ExInterlockedAddUlong@12 +_ExInterlockedAddUlong@12: + + /* Save flags and disable interrupts */ + pushfd + + /* Get lock address */ +#ifdef CONFIG_SMP + mov edx, [ebp+16] +#endif +.start2: + cli + + /* Acquire lock */ + ACQUIRE_SPINLOCK(edx, .spin2) + + /* Do the calculation */ + mov ecx, [esp+8] +#ifdef CONFIG_SMP + mov eax, [ecx] + add eax, [esp+12] + + /* Save result */ + mov [ecx], eax +#else + + /* Do the calculation */ + mov edx, [ecx] + mov eax, edx + add edx, [esp+12] + + /* Save result */ + mov [ecx], edx +#endif + + /* Release lock, restore flags and return */ +#ifdef CONFIG_SMP + sub eax, [esp+12] + RELEASE_SPINLOCK(edx) +#endif + popfd + ret 12 + +#ifdef CONFIG_SMP +.spin2: + popfd + pushfd + SPIN_ON_LOCK(eax, .start2) +#endif + +/*PLIST_ENTRY + *NTAPI + *ExInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, + * IN PLIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global _ExInterlockedInsertHeadList@12 +_ExInterlockedInsertHeadList@12: + + /* Save lock pointer */ +#ifdef CONFIG_SMP + mov edx, [esp+12] +#endif + + /* Save flags and disable interrupts */ +.start3: + pushfd + cli + ACQUIRE_SPINLOCK(edx, .spin3) + + /* Get list pointers */ + mov eax, [esp+8] + mov ecx, [esp+12] + mov edx, [eax] + + /* Do the insert */ + mov [ecx], edx + mov [ecx+4], eax + mov [eax], ecx + mov [edx+4], ecx + + /* Release lock */ +#ifdef CONFIG_SMP + mov ecx, [esp+16] + RELEASE_SPINLOCK(ecx) +#endif + + /* Restore flags */ + popfd + + /* check if the list was empty and return NULL */ + xor eax, edx + jz 2f + + /* Return pointer */ + mov eax, edx + +2: + ret 12 + +#ifdef CONFIG_SMP +.spin3: + popfd + SPIN_ON_LOCK(edx, .start3) +#endif + +/*PLIST_ENTRY + *NTAPI + *ExInterlockedInsertTailList(IN PLIST_ENTRY ListHead, + * IN PLIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global _ExInterlockedInsertTailList@12 +_ExInterlockedInsertTailList@12: + + /* Save lock pointer */ +#ifdef CONFIG_SMP + mov edx, [esp+12] +#endif + + /* Save flags and disable interrupts */ +.start4: + pushfd + cli + ACQUIRE_SPINLOCK(edx, .spin4) + + /* Get list pointers */ + mov eax, [esp+8] + mov ecx, [esp+12] + mov edx, [eax+4] + + /* Do the insert */ + mov [ecx], eax + mov [ecx+4], edx + mov [eax+4], ecx [truncated at 1000 lines; 1285 more skipped]

18 years, 8 months

[gvg] 20473: Kaj Kaloinen <kkaloine@gmail.com>

by gvg＠svn.reactos.org

Kaj Kaloinen <kkaloine(a)gmail.com> Finnish translation Modified: trunk/reactos/lib/shlwapi/shlwapi.rc Added: trunk/reactos/lib/shlwapi/shlwapi_Fi.rc _____ Modified: trunk/reactos/lib/shlwapi/shlwapi.rc --- trunk/reactos/lib/shlwapi/shlwapi.rc 2005-12-30 23:44:03 UTC (rev 20472) +++ trunk/reactos/lib/shlwapi/shlwapi.rc 2005-12-30 23:50:05 UTC (rev 20473) @@ -28,6 +28,7 @@ #include "shlwapi_De.rc" #include "shlwapi_En.rc" #include "shlwapi_Es.rc" +#include "shlwapi_Fi.rc" #include "shlwapi_Hu.rc" #include "shlwapi_Ko.rc" #include "shlwapi_Nl.rc" _____ Added: trunk/reactos/lib/shlwapi/shlwapi_Fi.rc --- trunk/reactos/lib/shlwapi/shlwapi_Fi.rc 2005-12-30 23:44:03 UTC (rev 20472) +++ trunk/reactos/lib/shlwapi/shlwapi_Fi.rc 2005-12-30 23:50:05 UTC (rev 20473) @@ -0,0 +1,35 @@ +/* + * Finnish resources for shlwapi + * + * Copyright 2005 Kaj Kaloinen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT + +IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Virhe!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "?lõ nõytõ tõtõ viestiõ enõõ", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Peruuta" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Kyllõ" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} Property changes on: trunk/reactos/lib/shlwapi/shlwapi_Fi.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

18 years, 8 months

[gvg] 20472: Allocate room for terminator. Fixes bug 1203, r20343 can be re-applied.

by gvg＠svn.reactos.org

Allocate room for terminator. Fixes bug 1203, r20343 can be re-applied. Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-12-30 23:42:04 UTC (rev 20471) +++ trunk/reactos/lib/setupapi/devinst.c 2005-12-30 23:44:03 UTC (rev 20472) @@ -5608,7 +5608,7 @@ currentInfFileDetails = HeapAlloc( GetProcessHeap(), 0, - FIELD_OFFSET(struct InfFileDetails, FullInfFileName) + wcslen(FullInfFileName) * sizeof(WCHAR) + UNICODE_NULL); + FIELD_OFFSET(struct InfFileDetails, FullInfFileName) + wcslen(FullInfFileName) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); if (!currentInfFileDetails) continue; memset(currentInfFileDetails, 0, sizeof(struct InfFileDetails));

18 years, 8 months

[gvg] 20471: ExpandEnvironmentStrings returns the number of TCHARs, not bytes

by gvg＠svn.reactos.org

ExpandEnvironmentStrings returns the number of TCHARs, not bytes Modified: trunk/reactos/subsys/system/services/config.c _____ Modified: trunk/reactos/subsys/system/services/config.c --- trunk/reactos/subsys/system/services/config.c 2005-12-30 22:02:59 UTC (rev 20470) +++ trunk/reactos/subsys/system/services/config.c 2005-12-30 23:42:04 UTC (rev 20471) @@ -269,7 +269,7 @@ dwError = GetLastError(); goto done; } - expanded = HeapAlloc(GetProcessHeap(), 0, dwSizeNeeded); + expanded = HeapAlloc(GetProcessHeap(), 0, dwSizeNeeded * sizeof(WCHAR)); if (dwSizeNeeded < ExpandEnvironmentStringsW((LPCWSTR)ptr, expanded, dwSizeNeeded)) { dwError = GetLastError();

18 years, 8 months

[greatlrd] 20470: Implement ShowCursor, it is a issue with quake when you moving the mouse, the mousepointer will show, when you stand still with the mouse it will not show the mousepointer.

by greatlrd＠svn.reactos.org

Implement ShowCursor, it is a issue with quake when you moving the mouse, the mousepointer will show, when you stand still with the mouse it will not show the mousepointer. Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/user32/include/user32p.h Modified: trunk/reactos/lib/user32/windows/cursor.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-12-30 21:18:25 UTC (rev 20469) +++ trunk/reactos/include/win32k/ntuser.h 2005-12-30 22:02:59 UTC (rev 20470) @@ -379,6 +379,7 @@ #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27 #define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28 #define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 +#define ONEPARAM_ROUTINE_SHOWCURSOR 0x30 DWORD NTAPI NtUserCallOneParam( _____ Modified: trunk/reactos/lib/user32/include/user32p.h --- trunk/reactos/lib/user32/include/user32p.h 2005-12-30 21:18:25 UTC (rev 20469) +++ trunk/reactos/lib/user32/include/user32p.h 2005-12-30 22:02:59 UTC (rev 20470) @@ -112,6 +112,11 @@ #define NtUserEnableProcessWindowGhosting(bEnable) \ NtUserCallOneParam((DWORD)bEnable, ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING) +#define NtUserShowCursor(bShow) \ + NtUserCallOneParam((DWORD)bShow, ONEPARAM_ROUTINE_SHOWCURSOR) + + + /* Internal Thread Data */ extern HINSTANCE User32Instance; _____ Modified: trunk/reactos/lib/user32/windows/cursor.c --- trunk/reactos/lib/user32/windows/cursor.c 2005-12-30 21:18:25 UTC (rev 20469) +++ trunk/reactos/lib/user32/windows/cursor.c 2005-12-30 22:02:59 UTC (rev 20470) @@ -320,13 +320,12 @@ /* - * @unimplemented + * @implemented */ int STDCALL ShowCursor(BOOL bShow) { - UNIMPLEMENTED; - return 0; + return NtUserShowCursor(bShow); } HCURSOR _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-12-30 21:18:25 UTC (rev 20469) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-12-30 22:02:59 UTC (rev 20470) @@ -11,7 +11,8 @@ #include <w32k.h> -#define NDEBUG +//#define NDEBUG +#undef NDEBUG #include <debug.h> /* registered Logon process */ @@ -164,6 +165,7 @@ END_CLEANUP; } + /* * @implemented */ @@ -176,10 +178,90 @@ DECLARE_RETURN(DWORD); DPRINT("Enter NtUserCallOneParam\n"); + + + if (Routine == ONEPARAM_ROUTINE_SHOWCURSOR) + { + PWINSTATION_OBJECT WinSta = PsGetWin32Thread()->Desktop->WindowStation; + PSYSTEM_CURSORINFO CurInfo; + + HDC Screen; + HBITMAP dcbmp; + SURFOBJ *SurfObj; + BITMAPOBJ *BitmapObj; + GDIDEVICE *ppdev; + GDIPOINTER *pgp; + + if(!(Screen = IntGetScreenDC())) + { + return 1; /* No mouse */ + } + + PDC dc = DC_LockDc(Screen); + + if (!dc) + { + return 1; /* No mouse */ + } + + dcbmp = dc->w.hBitmap; + DC_UnlockDc(dc); + + BitmapObj = BITMAPOBJ_LockBitmap(dcbmp); + if ( !BitmapObj ) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + return 1; /* No Mouse */ + } + + SurfObj = &BitmapObj->SurfObj; + if (SurfObj == NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + return 1; /* No mouse */ + } + + ppdev = GDIDEV(SurfObj); + + if(ppdev == NULL) + { + BITMAPOBJ_UnlockBitmap(BitmapObj); + return 1; /* No mouse */ + } + + pgp = &ppdev->Pointer; + + CurInfo = IntGetSysCursorInfo(WinSta); + + if (Param == FALSE) + { + if (CurInfo->ShowingCursor != 0) + { + ppdev->SafetyRemoveCount = 1; + ppdev->SafetyRemoveLevel = 1; + EngMovePointer(SurfObj,-1,-1,NULL); + CurInfo->ShowingCursor = 0; + } + + } + else + { + /* Show Cursor */ + ppdev->SafetyRemoveCount = 0; + ppdev->SafetyRemoveLevel = 0; + EngMovePointer(SurfObj,-1,-1,NULL); + CurInfo->ShowingCursor = CURSOR_SHOWING; + } + + BITMAPOBJ_UnlockBitmap(BitmapObj); + return 0; + } + + UserEnterExclusive(); switch(Routine) - { + { case ONEPARAM_ROUTINE_GETMENU: { PWINDOW_OBJECT Window;

18 years, 8 months

[weiden] 20469: use a .spec file and fix the export ordinals

by weiden＠svn.reactos.org

use a .spec file and fix the export ordinals Deleted: trunk/reactos/lib/devmgr/devmgr.def Added: trunk/reactos/lib/devmgr/devmgr.spec Modified: trunk/reactos/lib/devmgr/devmgr.xml Modified: trunk/reactos/lib/devmgr/hwpage.c Modified: trunk/reactos/lib/devmgr/precomp.h Modified: trunk/reactos/lib/devmgr/stubs.c _____ Deleted: trunk/reactos/lib/devmgr/devmgr.def --- trunk/reactos/lib/devmgr/devmgr.def 2005-12-30 20:31:11 UTC (rev 20468) +++ trunk/reactos/lib/devmgr/devmgr.def 2005-12-30 21:18:25 UTC (rev 20469) @@ -1,29 +0,0 @@ -LIBRARY devmgr.dll - -EXPORTS -DeviceProperties_RunDLLA@16 -DeviceProperties_RunDLLW@16 -DevicePropertiesA@20 -DevicePropertiesW@20 -DeviceManager_ExecuteA@16 -DeviceManager_ExecuteW@16 -DeviceProblemTextA@20 -DeviceProblemTextW@20 -DeviceProblemWizardA@12 -DeviceProblemWizardW@12 -DeviceManagerPrintA@20 -DeviceManagerPrintW@20 -DeviceAdvancedPropertiesA@12 -DeviceAdvancedPropertiesW@12 -DeviceCreateHardwarePage@8 -DeviceCreateHardwarePageEx@16 -DevicePropertiesExA@20 -DevicePropertiesExW@20 -DeviceProblemWizard_RunDLLA@16 -DeviceProblemWizard_RunDLLW@16 - -; Export these functions only for the sake of compatibility, they're obviously typos -DeviceProblenWizard_RunDLLA@16=DeviceProblemWizard_RunDLLA@16 -DeviceProblenWizard_RunDLLW@16=DeviceProblemWizard_RunDLLW@16 - -; EOF _____ Added: trunk/reactos/lib/devmgr/devmgr.spec --- trunk/reactos/lib/devmgr/devmgr.spec 2005-12-30 20:31:11 UTC (rev 20468) +++ trunk/reactos/lib/devmgr/devmgr.spec 2005-12-30 21:18:25 UTC (rev 20469) @@ -0,0 +1,27 @@ +# devmgr.dll exports + + 5 stdcall DeviceProperties_RunDLLA(ptr ptr str long) + 6 stdcall DeviceProperties_RunDLLW(ptr ptr wstr long) + 7 stdcall DevicePropertiesA(ptr ptr str str long) + 8 stdcall DevicePropertiesW(ptr ptr wstr wstr long) + 9 stdcall DeviceManager_ExecuteA(ptr ptr str long) +10 stdcall DeviceManager_ExecuteW(ptr ptr wstr long) +11 stdcall DeviceProblemTextA(ptr long long str long) +12 stdcall DeviceProblemTextW(ptr long long wstr long) +13 stdcall DeviceProblemWizardA(ptr str str) +14 stdcall DeviceProblemWizardW(ptr wstr wstr) +15 stdcall DeviceManagerPrintA(str str long long ptr) +16 stdcall DeviceManagerPrintW(wstr wstr long long ptr) +17 stdcall DeviceAdvancedPropertiesA(ptr str str) +18 stdcall DeviceAdvancedPropertiesW(ptr wstr wstr) +19 stdcall DeviceCreateHardwarePage(ptr ptr) +20 stdcall DeviceCreateHardwarePageEx(ptr ptr long long) +21 stdcall DevicePropertiesExA(ptr str str long long) +22 stdcall DevicePropertiesExW(ptr wstr wstr long long) +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 Property changes on: trunk/reactos/lib/devmgr/devmgr.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/devmgr/devmgr.xml --- trunk/reactos/lib/devmgr/devmgr.xml 2005-12-30 20:31:11 UTC (rev 20468) +++ trunk/reactos/lib/devmgr/devmgr.xml 2005-12-30 21:18:25 UTC (rev 20469) @@ -1,6 +1,6 @@ <module name="devmgr" type="win32dll" baseaddress="${BASEADDRESS_DEVENUM}" installbase="system32" installname="devmgr.dll" allowwarnings="true"> - <importlibrary definition="devmgr.def" /> <include base="devmgr">.</include> + <importlibrary definition="devmgr.spec.def" /> <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__REACTOS__" /> @@ -19,5 +19,6 @@ <file>hwpage.c</file> <file>misc.c</file> <file>stubs.c</file> + <file>devmgr.spec</file> <pch>precomp.h</pch> </module> \ No newline at end of file _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-12-30 20:31:11 UTC (rev 20468) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-12-30 21:18:25 UTC (rev 20469) @@ -1030,8 +1030,7 @@ hpd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(HARDWARE_PAGE_DATA, - ClassDevInfo) + - (uNumberOfGuids * sizeof(HWCLASSDEVINFO))); + ClassDevInfo[uNumberOfGuids])); if (hpd != NULL) { HWND hWnd; _____ Modified: trunk/reactos/lib/devmgr/precomp.h --- trunk/reactos/lib/devmgr/precomp.h 2005-12-30 20:31:11 UTC (rev 20468) +++ trunk/reactos/lib/devmgr/precomp.h 2005-12-30 21:18:25 UTC (rev 20469) @@ -30,14 +30,14 @@ WINAPI DeviceProperties_RunDLLA(HWND hWndParent, HINSTANCE hInst, - LPCWSTR lpDeviceCmd, + LPCSTR lpDeviceCmd, int nCmdShow); VOID WINAPI DeviceProperties_RunDLLW(HWND hWndParent, HINSTANCE hInst, - LPCSTR lpDeviceCmd, + LPCWSTR lpDeviceCmd, int nCmdShow); int _____ Modified: trunk/reactos/lib/devmgr/stubs.c --- trunk/reactos/lib/devmgr/stubs.c 2005-12-30 20:31:11 UTC (rev 20468) +++ trunk/reactos/lib/devmgr/stubs.c 2005-12-30 21:18:25 UTC (rev 20469) @@ -123,7 +123,7 @@ WINAPI DeviceProperties_RunDLLA(HWND hWndParent, HINSTANCE hInst, - LPCWSTR lpDeviceCmd, + LPCSTR lpDeviceCmd, int nCmdShow) { UNIMPLEMENTED; @@ -159,7 +159,7 @@ WINAPI DeviceProperties_RunDLLW(HWND hWndParent, HINSTANCE hInst, - LPCSTR lpDeviceCmd, + LPCWSTR lpDeviceCmd, int nCmdShow) { UNIMPLEMENTED;

18 years, 8 months

[ion] 20468: Make sure compiler doesn't optimize our wait loop away. Patch by Thomas Weidenmueller

by ion＠svn.reactos.org

Make sure compiler doesn't optimize our wait loop away. Patch by Thomas Weidenmueller Modified: trunk/reactos/ntoskrnl/ke/spinlock.c _____ Modified: trunk/reactos/ntoskrnl/ke/spinlock.c --- trunk/reactos/ntoskrnl/ke/spinlock.c 2005-12-30 20:28:35 UTC (rev 20467) +++ trunk/reactos/ntoskrnl/ke/spinlock.c 2005-12-30 20:31:11 UTC (rev 20468) @@ -151,7 +151,7 @@ if (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) { /* Value changed... wait until it's locked */ - while (*SpinLock == 1) YieldProcessor(); + while (*(volatile KSPIN_LOCK *)SpinLock == 1) YieldProcessor(); } else {

18 years, 8 months

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 December 2005