Ros-diffs April 2007

ros-diffs@reactos.org

19 participants
380 discussions

[jimtabor] 26323: Fix signedness error.
by jimtabor＠svn.reactos.org 12 Apr '07

12 Apr '07

Author: jimtabor Date: Thu Apr 12 09:14:24 2007 New Revision: 26323 URL: http://svn.reactos.org/svn/reactos?rev=26323&view=rev Log: Fix signedness error. Modified: trunk/reactos/dll/win32/user32/include/user32.h Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h (original) +++ trunk/reactos/dll/win32/user32/include/user32.h Thu Apr 12 09:14:24 2007 @@ -40,4 +40,4 @@ /* FIXME: Use ntgdi.h then cleanup... */ HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); BOOL STDCALL NtGdiPatBlt(HDC hdcDst, INT x, INT y, INT cx, INT cy, DWORD rop4); -DWORD STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, DWORD *); +LONG STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);

1 0

[ion] 26322: - Fix several pushlock bugs (thanks in part to hto). Should fix bug 2063.
by ion＠svn.reactos.org 11 Apr '07

11 Apr '07

Author: ion Date: Thu Apr 12 00:00:53 2007 New Revision: 26322 URL: http://svn.reactos.org/svn/reactos?rev=26322&view=rev Log: - Fix several pushlock bugs (thanks in part to hto). Should fix bug 2063. Modified: trunk/reactos/ntoskrnl/ex/pushlock.c Modified: trunk/reactos/ntoskrnl/ex/pushlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/pushlock.c (original) +++ trunk/reactos/ntoskrnl/ex/pushlock.c Thu Apr 12 00:00:53 2007 @@ -76,31 +76,24 @@ ASSERT(!OldValue.MultipleShared); /* Check if it's locked */ - if (OldValue.Locked) - { - /* If it's locked we must simply un-wake it*/ - for (;;) - { - /* It's not waking anymore */ - NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_WAKING; - - /* Sanity checks */ - ASSERT(!NewValue.Waking); - ASSERT(NewValue.Locked); - ASSERT(NewValue.Waiting); - - /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - if (NewValue.Value == OldValue.Value) return; - - /* Someone changed the value behind our back, update it*/ - OldValue = NewValue; - - /* Check if it's still locked */ - if (!OldValue.Locked) break; - } + while (OldValue.Locked) + { + /* It's not waking anymore */ + NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_WAKING; + + /* Sanity checks */ + ASSERT(!NewValue.Waking); + ASSERT(NewValue.Locked); + ASSERT(NewValue.Waiting); + + /* Write the New Value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value == OldValue.Value) return; + + /* Someone changed the value behind our back, update it*/ + OldValue = NewValue; } /* Save the First Block */ @@ -131,8 +124,17 @@ !(PreviousWaitBlock)) { /* Destroy the pushlock */ - if (InterlockedCompareExchangePointer(PushLock, 0, OldValue.Ptr) == - OldValue.Ptr) break; + NewValue.Value = 0; + ASSERT(!NewValue.Waking); + + /* Write the New Value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value == OldValue.Value) break; + + /* Someone changed the value behind our back, update it*/ + OldValue = NewValue; } else { @@ -224,7 +226,7 @@ /* Loop the blocks */ LastWaitBlock = WaitBlock->Last; - while (LastWaitBlock) + while (!LastWaitBlock) { /* Save the block */ PreviousWaitBlock = WaitBlock; @@ -393,13 +395,13 @@ { PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock = pWaitBlock; EX_PUSH_LOCK NewValue, OldValue; - + /* Detect invalid wait block alignment */ - ASSERT((ULONG_PTR)pWaitBlock & 0x10); + ASSERT(((ULONG_PTR)pWaitBlock & 0xF) == 0); /* Set the waiting bit */ WaitBlock->Flags = EX_PUSH_LOCK_FLAGS_WAIT; - + /* Get the old value */ OldValue = *PushLock; @@ -414,7 +416,7 @@ WaitBlock, OldValue.Ptr); if (OldValue.Ptr == NewValue.Ptr) break; - + /* Try again with the new value */ NewValue = OldValue; } @@ -492,10 +494,10 @@ /* Point to ours */ NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_MULTIPLE_SHARED) | - EX_PUSH_LOCK_LOCK | - EX_PUSH_LOCK_WAKING | - EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + EX_PUSH_LOCK_LOCK | + EX_PUSH_LOCK_WAKING | + EX_PUSH_LOCK_WAITING | + PtrToUlong(WaitBlock); /* Check if the pushlock was already waking */ if (OldValue.Waking) NeedWake = TRUE; @@ -515,7 +517,7 @@ NewValue.Value = EX_PUSH_LOCK_MULTIPLE_SHARED | EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + PtrToUlong(WaitBlock); } else { @@ -525,7 +527,7 @@ /* Point to our wait block */ NewValue.Value = EX_PUSH_LOCK_LOCK | EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + PtrToUlong(WaitBlock); } } @@ -589,10 +591,10 @@ } /*++ - * @name ExAcquirePushLockExclusive + * @name ExAcquirePushLockShared * @implemented NT5.1 * - * The ExAcquirePushLockShared macro acquires a shared PushLock. + * The ExAcquirePushLockShared routine acquires a shared PushLock. * * @params PushLock * Pointer to the pushlock which is to be acquired. @@ -616,7 +618,7 @@ for (;;) { /* Check if it's unlocked or if it's waiting without any sharers */ - if (!(OldValue.Locked) || (OldValue.Waiting && OldValue.Shared == 0)) + if (!(OldValue.Locked) || (!(OldValue.Waiting) && (OldValue.Shared > 0))) { /* Check if anyone is waiting on it */ if (!OldValue.Waiting) @@ -671,10 +673,10 @@ EX_PUSH_LOCK_LOCK)) | EX_PUSH_LOCK_WAKING | EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + PtrToUlong(WaitBlock); /* Check if the pushlock was already waking */ - if (OldValue.Waking) NeedWake = TRUE; + if (!OldValue.Waking) NeedWake = TRUE; } else { @@ -682,10 +684,9 @@ WaitBlock->Last = WaitBlock; /* Point to our wait block */ - NewValue.Value = (OldValue.Value & (EX_PUSH_LOCK_MULTIPLE_SHARED | - EX_PUSH_LOCK_WAKING)) | + NewValue.Value = (OldValue.Value & EX_PUSH_LOCK_PTR_BITS) | EX_PUSH_LOCK_WAITING | - PtrToUlong(&WaitBlock); + PtrToUlong(WaitBlock); } /* Sanity check */ @@ -700,9 +701,10 @@ #endif /* Write the new value */ - if (InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr) != OldValue.Ptr) + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Ptr != OldValue.Ptr) { /* Retry */ OldValue = NewValue; @@ -748,15 +750,15 @@ * @name ExfReleasePushLock * @implemented NT5.1 * - * The ExReleasePushLockExclusive routine releases a previously - * exclusively acquired PushLock. + * The ExReleasePushLock routine releases a previously acquired PushLock. + * * * @params PushLock * Pointer to a previously acquired pushlock. * * @return None. * - * @remarks Callers of ExReleasePushLockExclusive must be running at IRQL <= APC_LEVEL. + * @remarks Callers of ExfReleasePushLock must be running at IRQL <= APC_LEVEL. * This macro should usually be paired up with KeLeaveCriticalRegion. * *--*/ @@ -794,11 +796,7 @@ NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, OldValue.Ptr); - if (NewValue.Value == OldValue.Value) - { - /* No waiters left, we're done */ - goto quit; - } + if (NewValue.Value == OldValue.Value) return; /* Did it enter a wait state? */ OldValue = NewValue; @@ -812,21 +810,17 @@ /* Find the last Wait Block */ for (WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & ~EX_PUSH_LOCK_PTR_BITS); - WaitBlock->Last; + !WaitBlock->Last; WaitBlock = WaitBlock->Next); /* Make sure the Share Count is above 0 */ - if (WaitBlock->ShareCount) + if (WaitBlock->ShareCount > 0) { /* This shouldn't be an exclusive wait block */ - ASSERT(WaitBlock->Flags&EX_PUSH_LOCK_FLAGS_EXCLUSIVE); + ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); /* Do the decrease and check if the lock isn't shared anymore */ - if (InterlockedExchangeAdd(&WaitBlock->ShareCount, -1)) - { - /* Someone is still holding the lock */ - goto quit; - } + if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; } } @@ -854,10 +848,7 @@ NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, OldValue.Ptr); - if (NewValue.Value == OldValue.Value) break; - - /* The value changed, try the unlock again */ - continue; + if (NewValue.Value == OldValue.Value) return; } else { @@ -880,12 +871,9 @@ /* The write was successful. The pushlock is Unlocked and Waking */ ExfWakePushLock(PushLock, NewValue); - break; - } - } -quit: - /* Done! */ - return; + return; + } + } } /*++ @@ -912,38 +900,29 @@ PEX_PUSH_LOCK_WAIT_BLOCK WaitBlock; /* Check if someone is waiting on the lock */ - if (!OldValue.Waiting) - { - /* Nobody is waiting on it, so we'll try a quick release */ - for (;;) - { - /* Check if it's shared */ - if (OldValue.Shared > 1) - { - /* Write the Old Value but decrease share count */ - NewValue = OldValue; - NewValue.Shared--; - } - else - { - /* Simply clear the lock */ - NewValue.Value = 0; - } - - /* Write the New Value */ - NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, - NewValue.Ptr, - OldValue.Ptr); - if (NewValue.Value == OldValue.Value) - { - /* No waiters left, we're done */ - goto quit; - } - - /* Did it enter a wait state? */ - OldValue = NewValue; - if (NewValue.Waiting) break; - } + while (!OldValue.Waiting) + { + /* Check if it's shared */ + if (OldValue.Shared > 1) + { + /* Write the Old Value but decrease share count */ + NewValue = OldValue; + NewValue.Shared--; + } + else + { + /* Simply clear the lock */ + NewValue.Value = 0; + } + + /* Write the New Value */ + NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, + NewValue.Ptr, + OldValue.Ptr); + if (NewValue.Value == OldValue.Value) return; + + /* Did it enter a wait state? */ + OldValue = NewValue; } /* Ok, we do know someone is waiting on it. Are there more then one? */ @@ -952,15 +931,15 @@ /* Find the last Wait Block */ for (WaitBlock = (PEX_PUSH_LOCK_WAIT_BLOCK)((ULONG_PTR)OldValue.Ptr & ~EX_PUSH_LOCK_PTR_BITS); - WaitBlock->Last; + !WaitBlock->Last; WaitBlock = WaitBlock->Next); /* Sanity checks */ ASSERT(WaitBlock->ShareCount > 0); - ASSERT(WaitBlock->Flags&EX_PUSH_LOCK_FLAGS_EXCLUSIVE); + ASSERT(WaitBlock->Flags & EX_PUSH_LOCK_FLAGS_EXCLUSIVE); /* Do the decrease and check if the lock isn't shared anymore */ - if (InterlockedExchangeAdd(&WaitBlock->ShareCount, -1)) goto quit; + if (InterlockedDecrement(&WaitBlock->ShareCount) > 0) return; } /* @@ -987,10 +966,7 @@ NewValue.Ptr = InterlockedCompareExchangePointer(PushLock, NewValue.Ptr, OldValue.Ptr); - if (NewValue.Value == OldValue.Value) break; - - /* The value changed, try the unlock again */ - continue; + if (NewValue.Value == OldValue.Value) return; } else { @@ -1013,12 +989,9 @@ /* The write was successful. The pushlock is Unlocked and Waking */ ExfWakePushLock(PushLock, NewValue); - break; - } - } -quit: - /* Done! */ - return; + return; + } + } } /*++

1 0

[dgorbachev] 26321: Fix some bugs.
by dgorbachev＠svn.reactos.org 11 Apr '07

11 Apr '07

Author: dgorbachev Date: Wed Apr 11 12:43:34 2007 New Revision: 26321 URL: http://svn.reactos.org/svn/reactos?rev=26321&view=rev Log: Fix some bugs. Modified: trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/ke/gate.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Wed Apr 11 12:43:34 2007 @@ -104,7 +104,7 @@ // // Detect GCC 4.1.2+ // -#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40102 +#if 1 // (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40102 // // Broken GCC with Alignment Bug. We'll do alignment ourselves at higher cost. @@ -963,7 +963,7 @@ if (OldValue.Shared > 1) { /* Decrease the share count */ - NewValue.Value = OldValue.Value &~ EX_PUSH_LOCK_SHARE_INC; + NewValue.Value = OldValue.Value - EX_PUSH_LOCK_SHARE_INC; } else { Modified: trunk/reactos/ntoskrnl/ke/gate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gate.c?rev=263… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gate.c (original) +++ trunk/reactos/ntoskrnl/ke/gate.c Wed Apr 11 12:43:34 2007 @@ -21,7 +21,7 @@ /* Initialize the Dispatcher Header */ KeInitializeDispatcherHeader(&Gate->Header, GateObject, - sizeof(Gate) / sizeof(ULONG), + sizeof(KGATE) / sizeof(ULONG), 0); } @@ -170,7 +170,7 @@ WaitThread = WaitBlock->Thread; /* Check to see if the waiting thread is locked */ - if (!KiTryThreadLock(WaitThread)) + if (KiTryThreadLock(WaitThread)) { /* Unlock the gate */ KiReleaseDispatcherObject(&Gate->Header);

1 0

[greatlrd] 26320: DO not waring if no keyboard layout does not exists or loading, I change the msg from DPRINT1 to DRPINT
by greatlrd＠svn.reactos.org 11 Apr '07

11 Apr '07

Author: greatlrd Date: Wed Apr 11 11:01:44 2007 New Revision: 26320 URL: http://svn.reactos.org/svn/reactos?rev=26320&view=rev Log: DO not waring if no keyboard layout does not exists or loading, I change the msg from DPRINT1 to DRPINT Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Wed Apr 11 11:01:44 2007 @@ -144,7 +144,7 @@ if(!NT_SUCCESS(Status)) { - DPRINT1("Can't get layout filename for %wZ. (%08lx)\n", klid, Status); + DPRINT("Can't get layout filename for %wZ. (%08lx)\n", klid, Status); return FALSE; } @@ -210,7 +210,7 @@ if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) { - DPRINT1("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); + DPRINT("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); ExFreePool(NewKbl); return NULL; } @@ -300,7 +300,7 @@ if(!pKbl) { - DPRINT1("Failed to load %x!!! Returning any availableKL.\n", LocaleId); + DPRINT("Failed to load %x!!! Returning any availableKL.\n", LocaleId); return KBLList; }

1 0

[arty] 26319: Tweaks for gcc 4.
by arty＠svn.reactos.org 11 Apr '07

11 Apr '07

Author: arty Date: Wed Apr 11 10:23:48 2007 New Revision: 26319 URL: http://svn.reactos.org/svn/reactos?rev=26319&view=rev Log: Tweaks for gcc 4. Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild branches/powerpc/reactos/include/psdk/winnt.h Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ReactOS-ppc.rbu… ============================================================================== --- branches/powerpc/reactos/ReactOS-ppc.rbuild (original) +++ branches/powerpc/reactos/ReactOS-ppc.rbuild Wed Apr 11 10:23:48 2007 @@ -32,6 +32,7 @@ <compilerflag>-meabi</compilerflag> <compilerflag>-O2</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wno-trampolines</compilerflag> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if> Modified: branches/powerpc/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/psdk/wi… ============================================================================== --- branches/powerpc/reactos/include/psdk/winnt.h (original) +++ branches/powerpc/reactos/include/psdk/winnt.h Wed Apr 11 10:23:48 2007 @@ -63,7 +63,7 @@ #define FORCEINLINE __inline #else #ifdef _PPC_ -#define FORCEINLINE __inline +#define FORCEINLINE __inline __attribute__((unused)) __attribute__((weak)) #else #define FORCEINLINE static __attribute__((unused)) #endif

1 0

[arty] 26318: Remove the rest of the LE parts in freeldr. We get into freeldr proper in BE.
by arty＠svn.reactos.org 11 Apr '07

11 Apr '07

Author: arty Date: Wed Apr 11 07:52:48 2007 New Revision: 26318 URL: http://svn.reactos.org/svn/reactos?rev=26318&view=rev Log: Remove the rest of the LE parts in freeldr. We get into freeldr proper in BE. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Wed Apr 11 07:52:48 2007 @@ -36,23 +36,6 @@ volatile char *video_mem = 0; boot_infos_t BootInfo; -void le_swap( void *start_addr_v, - void *end_addr_v, - void *target_addr_v ) { - long - *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), - *end_addr = (long *)ROUND_UP((long)end_addr_v,8), - *target_addr = (long *)ROUND_DOWN((long)target_addr_v,8); - long tmp; - while( start_addr <= end_addr ) { - tmp = start_addr[0]; - target_addr[0] = REV(start_addr[1]); - target_addr[1] = REV(tmp); - start_addr += 2; - target_addr += 2; - } -} - void PpcPutChar( int ch ) { char buf[3]; if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } @@ -266,10 +249,10 @@ ofw_getprop(display_package, "linebytes", (void *)&BootInfo.dispDeviceRowBytes, sizeof(int)); - BootInfo.dispDeviceRect[2] = REV(BootInfo.dispDeviceRect[2]); - BootInfo.dispDeviceRect[3] = REV(BootInfo.dispDeviceRect[3]); - BootInfo.dispDeviceDepth = REV(BootInfo.dispDeviceDepth); - BootInfo.dispDeviceRowBytes = REV(BootInfo.dispDeviceRowBytes); + BootInfo.dispDeviceRect[2] = BootInfo.dispDeviceRect[2]; + BootInfo.dispDeviceRect[3] = BootInfo.dispDeviceRect[3]; + BootInfo.dispDeviceDepth = BootInfo.dispDeviceDepth; + BootInfo.dispDeviceRowBytes = BootInfo.dispDeviceRowBytes; if(ofw_getprop (display_package, @@ -280,7 +263,7 @@ return; } - BootInfo.dispDeviceBase = (PVOID)(REV(device_address)); + BootInfo.dispDeviceBase = (PVOID)(device_address); display_size = BootInfo.dispDeviceRowBytes * BootInfo.dispDeviceRect[3]; @@ -334,8 +317,8 @@ for( i = 0; i < returned / 2; i++ ) { BiosMemoryMap[slots].Type = 1/*MEMTYPE_USABLE*/; - BiosMemoryMap[slots].BaseAddress = REV(memdata[i*2]); - BiosMemoryMap[slots].Length = REV(memdata[i*2+1]); + BiosMemoryMap[slots].BaseAddress = memdata[i*2]; + BiosMemoryMap[slots].Length = memdata[i*2+1]; printf("MemoryMap[%d] = (%x:%x)\n", i, (int)BiosMemoryMap[slots].BaseAddress, @@ -527,8 +510,8 @@ ofw_print_number(stdin_handle_chosen); ofw_print_string("\r\n"); - stdin_handle = REV(stdin_handle_chosen); - mmu_handle = REV(mmu_handle_chosen); + stdin_handle = stdin_handle_chosen; + mmu_handle = mmu_handle_chosen; MachVtbl.ConsPutChar = PpcPutChar; MachVtbl.ConsKbHit = PpcConsKbHit; Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c Wed Apr 11 07:52:48 2007 @@ -18,7 +18,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "isync\n\t" @@ -38,7 +37,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "sync\n\t" @@ -60,7 +58,6 @@ "mflr 0\n\t" "stwu 0,-16(1)\n\t" "mfmsr 5\n\t" - "xori 3,3,7\n\t" /* Undo effects of LE without swapping */ "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ "mtmsr 6\n\t" "sync\n\t" Modified: branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h Wed Apr 11 07:52:48 2007 @@ -3,8 +3,6 @@ #define OF_FAILED 0 #define ERR_NOT_FOUND 0xc0000010 - -#define REV(x) (((x)>>24)&0xff)|(((x)>>8)&0xff00)|(((x)<<24)&0xff000000)|(((x)<<8)&0xff0000) #include "of_call.h" #include <string.h> @@ -13,7 +11,6 @@ ( int table_off, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 ); typedef long jmp_buf[100]; extern of_proxy ofproxy; -extern void le_swap( void *begin, void *end, void *dest ); int setjmp( jmp_buf buf ); int longjmp( jmp_buf buf, int retval );

1 0

[dgorbachev] 26317: Norvegian translation by LMH1 (bug reports 1737 and 1738).
by dgorbachev＠svn.reactos.org 10 Apr '07

10 Apr '07

Author: dgorbachev Date: Wed Apr 11 03:06:01 2007 New Revision: 26317 URL: http://svn.reactos.org/svn/reactos?rev=26317&view=rev Log: Norvegian translation by LMH1 (bug reports 1737 and 1738). Added: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc Added: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Wed Apr 11 03:06:01 2007 @@ -1,0 +1,129 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/nb-NO.rc + * PURPOSE: Norwegian Language File for Solitaire + * TRANSLATOR: LMH1 + */ + +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS + +/* winemaker: #include "afxres.h" */ +/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ +#include "winres.h" + +///// + +#undef APSTUDIO_READONLY_SYMBOLS + +///// +// Norwegian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +#ifdef _WIN32 +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL +#pragma code_page(1252) +#endif //_WIN32 + +///// +// Dialog + +IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT +BEGIN + DEFPUSHBUTTON "OK",IDOK,129,7,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,129,24,50,14 +END + + +///// +// DESIGNINFO + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_DIALOG1, DIALOGEX + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 179 + TOPMARGIN, 7 + BOTTOMMARGIN, 88 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED + +///// +// TEXTINCLUDE + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///// +// Menu + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Spill" + BEGIN + MENUITEM "&Del ut\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "Kort&stokk...", IDM_GAME_DECK + MENUITEM "&Valg...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Avslutt", IDM_GAME_EXIT + END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Emner i hjelp\tF1", IDM_HELP_CONTENTS + MENUITEM "&Om", IDM_HELP_ABOUT + END +END + +///// +// Accelerator + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END + + +///// +// Icon + +IDI_ICON1 ICON DISCARDABLE "solitaire.ico" +#endif // Norwegian resource + +///// + + +#ifndef APSTUDIO_INVOKED + +///// +#endif // not APSTUDIO_INVOKED Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Wed Apr 11 03:06:01 2007 @@ -6,4 +6,5 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/nb-NO.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc Wed Apr 11 03:06:01 2007 @@ -12,76 +12,72 @@ POPUP "&Valg" { MENUITEM "&Nytt", IDM_NEW MENUITEM SEPARATOR - MENUITEM "&Merk spørsmål", IDM_MARKQ + MENUITEM "&Merk spørsmål", IDM_MARKQ MENUITEM SEPARATOR - MENUITEM "&Nybegynner", IDM_BEGINNER - MENUITEM "&Anvansert", IDM_ADVANCED + MENUITEM "&Nybegynner", IDM_BEGINNER + MENUITEM "&Avansert", IDM_ADVANCED MENUITEM "&Ekspert", IDM_EXPERT - MENUITEM "&Egendefinert", IDM_CUSTOM + MENUITEM "&Egendefinert", IDM_CUSTOM MENUITEM SEPARATOR - MENUITEM "A&vslutt", IDM_EXIT + MENUITEM "A&vslutt", IDM_EXIT } POPUP "&Informasjon" { MENUITEM "&Beste tider", IDM_TIMES - MENUITEM "&Om", IDM_ABOUT + MENUITEM "&Om", IDM_ABOUT } } -DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Beste tider" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { - GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45 - LTEXT "Nybegynner", IDNONE, 20, 20, 40, 8 - LTEXT "Anvansert", IDNONE, 20, 30, 40, 8 - LTEXT "Ekspert", IDNONE, 20, 40, 40, 8 + GROUPBOX "Beste tider", IDNONE, 10, 10, 140, 45 + LTEXT "Nybegynner", IDNONE, 20, 20, 40, 8 + LTEXT "Avansert", IDNONE, 20, 30, 40, 8 + LTEXT "Ekspert", IDNONE, 20, 40, 40, 8 LTEXT "999", IDC_TIME1, 70, 20, 15, 8 LTEXT "999", IDC_TIME2, 70, 30, 15, 8 LTEXT "999", IDC_TIME3, 70, 40, 15, 8 LTEXT "", IDC_NAME1, 90, 20, 55, 8 LTEXT "", IDC_NAME2, 90, 30, 55, 8 LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 } -DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Congratulations!" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "gratulerer!" { LTEXT "Skriv inn navnet ditt", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 } -DLG_CUSTOM DIALOGEX DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Egendefinert spill" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { - LTEXT "Høyde", IDNONE, 5, 5, 30, 10 + LTEXT "Høyde", IDNONE, 5, 5, 30, 10 LTEXT "Bredde", IDNONE, 5, 35, 30, 10 - LTEXT "Miner", IDNONE, 5, 65, 30, 10 + LTEXT "Miner", IDNONE, 5, 65, 30, 10 EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 + DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 } -DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP CAPTION "Om" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT { - LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 + LTEXT "Minesveiper", IDNONE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDNONE, 35, 25, 100, 10 LTEXT "under Wine lisensen", IDNONE, 35, 35, 100, 10 - ICON "Minesveiper", IDNONE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 + ICON "Minesveiper", IDNONE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 }

1 0

[cwittich] 26316: get GreatLord's hack at least to work
by cwittich＠svn.reactos.org 10 Apr '07

10 Apr '07

Author: cwittich Date: Wed Apr 11 02:57:57 2007 New Revision: 26316 URL: http://svn.reactos.org/svn/reactos?rev=26316&view=rev Log: get GreatLord's hack at least to work Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=26316&r1=2631… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Apr 11 02:57:57 2007 @@ -397,7 +397,7 @@ # will not be autogenretaed for right # platforms. -$ARCH :=i386 +ARCH :=i386 include lib/lib.mak include tools/tools.mak @@ -413,6 +413,7 @@ $(BUGCODES_RC) \ $(ERRCODES_H) \ $(ERRCODES_RC) \ + $(NCI_SERVICE_FILES) \ $(GENDIB_DIB_FILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)

1 0

[greatlrd] 26315: 1. small hack to getting a new checked treed being build. 2. This bug does not show if you doing make clean and Build only affect a new frech tree 3. please fix the makefile more right this is a small hack until some fix it.
by greatlrd＠svn.reactos.org 10 Apr '07

10 Apr '07

Author: greatlrd Date: Wed Apr 11 02:47:12 2007 New Revision: 26315 URL: http://svn.reactos.org/svn/reactos?rev=26315&view=rev Log: 1. small hack to getting a new checked treed being build. 2. This bug does not show if you doing make clean and Build only affect a new frech tree 3. please fix the makefile more right this is a small hack until some fix it. Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=26315&r1=2631… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Apr 11 02:47:12 2007 @@ -387,6 +387,18 @@ ERRCODES_H = include$(SEP)reactos$(SEP)errcodes.h ERRCODES_RC = dll$(SEP)win32$(SEP)kernel32$(SEP)errcodes.rc + +# Hack getting ReactOS trunk Build again +# the reail ARCH are not avail until we run +# rbuild and rbuild genreate makefile.auto +# only in makefile.auto we got the +# ARCH avail not before. So FIX THIS +# ISSSUE ASAP, other wise the ntapi.h +# will not be autogenretaed for right +# platforms. + +$ARCH :=i386 + include lib/lib.mak include tools/tools.mak include boot/freeldr/bootsect/bootsect.mak

1 0

[tkreuzer] 26314: NtGdiMoveToEx: copy old cursor pos back to caller instead of copying from caller.
by tkreuzer＠svn.reactos.org 10 Apr '07

10 Apr '07

Author: tkreuzer Date: Wed Apr 11 01:58:15 2007 New Revision: 26314 URL: http://svn.reactos.org/svn/reactos?rev=26314&view=rev Log: NtGdiMoveToEx: copy old cursor pos back to caller instead of copying from caller. Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Wed Apr 11 01:58:15 2007 @@ -519,14 +519,16 @@ return TRUE; } + Ret = IntGdiMoveToEx(dc, X, Y, (Point ? &SafePoint : NULL)); + if(Point) { _SEH_TRY { - ProbeForRead(Point, + ProbeForWrite(Point, sizeof(POINT), 1); - SafePoint = *Point; + *Point = SafePoint; } _SEH_HANDLE { @@ -541,8 +543,6 @@ return FALSE; } } - - Ret = IntGdiMoveToEx(dc, X, Y, (Point ? &SafePoint : NULL)); DC_UnlockDc(dc); return Ret;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
38
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 April 2007