Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[gvg] 18428: Nathan Woods <npwoods@cybercom.net>:

by gvg＠svn.reactos.com

Nathan Woods <npwoods(a)cybercom.net>: Resource translation status script Added: trunk/web/ Added: trunk/web/reactos.org/ Added: trunk/web/reactos.org/scripts/ Added: trunk/web/reactos.org/scripts/RosResCheck.pl Added: trunk/web/reactos.org/scripts/daily.sh Added: trunk/web/reactos.org/scripts/update_source.sh _____ Added: trunk/web/reactos.org/scripts/RosResCheck.pl --- trunk/web/reactos.org/scripts/RosResCheck.pl 2005-10-13 12:44:58 UTC (rev 18427) +++ trunk/web/reactos.org/scripts/RosResCheck.pl 2005-10-13 15:45:27 UTC (rev 18428) @@ -0,0 +1,85 @@ + + +sub check_dir +{ + my $dir = shift; + opendir(DIR, $dir); + my @files = readdir(DIR); + closedir(DIR); + + my %resrevs = {}; + my @subdirs = (); + + foreach my $file (@files) + { + if ((-f "$dir/$file") && ($file =~ /^[A-Za-z][A-Za-z]\.rc$/)) + { + # invoke Subversion to figure out info on this file + open(SVNINVOKE, "svn info $dir/$file |"); + my @props = <SVNINVOKE>; + close(SVNINVOKE); + + # pick out the appropriate property + my ($propline) = grep { $_ =~ /Last Changed Rev: / } @props; + if ($propline =~ /Last Changed Rev: (\d+)/) + { + my $rev = $1; + $resrevs{$file} = $rev; + } + } + elsif ((-d "$dir/$file") && !($file =~ /^\./)) + { + # found a subdirectory + push @subdirs, "$dir/$file"; + } + } + + # list all files older than En.rc + my $en_rev = $resrevs{'En.rc'}; + if ($en_rev > 0) + { + foreach my $file (keys(%resrevs)) + { + my $this_rev = $resrevs{$file}; + if (($this_rev < $en_rev) && ($this_rev > 0)) + { + my $path = "$dir/$file"; + $path =~ s/^\.\///; + + my $url = "http://svn.reactos.com/viewcvs/trunk/reactos/$path"; + + print "<tr>\n"; + print "<td><a href='$url'>$path</a></td>\n"; + print "<td>$this_rev</td>\n"; + print "<td>$en_rev</td>\n"; + print "</tr>\n"; + } + } + } + + # recurse into subdirectories + foreach my $dir (@subdirs) + { + &check_dir($dir); + } +} + +print "<html>\n"; +print "<head>\n"; +print "<title>Resources to update</title>\n"; +print "</head>\n"; + +print "<body>\n"; +print "<table border='1'>\n"; + +print "<tr>\n"; +print "<td>File</td>\n"; +print "<td>Rev</td>\n"; +print "<td>En.rc Rev</td>\n"; +print "</tr>\n"; + +check_dir('.'); + +print "</table>\n"; +print "</body>\n"; +print "</html>\n"; Property changes on: trunk/web/reactos.org/scripts/RosResCheck.pl ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/scripts/daily.sh --- trunk/web/reactos.org/scripts/daily.sh 2005-10-13 12:44:58 UTC (rev 18427) +++ trunk/web/reactos.org/scripts/daily.sh 2005-10-13 15:45:27 UTC (rev 18428) @@ -0,0 +1,7 @@ +#!/bin/sh + +cd /web/reactos.org/scripts + +./update_source.sh +cd ../source/reactos +perl ../../scripts/RosResCheck.pl > ../../htdocs/generated/transstatus.html Property changes on: trunk/web/reactos.org/scripts/daily.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native _____ Added: trunk/web/reactos.org/scripts/update_source.sh --- trunk/web/reactos.org/scripts/update_source.sh 2005-10-13 12:44:58 UTC (rev 18427) +++ trunk/web/reactos.org/scripts/update_source.sh 2005-10-13 15:45:27 UTC (rev 18428) @@ -0,0 +1,7 @@ +#!/bin/sh + +PATH=/bin:/usr/bin:/usr/local/bin +SRCDIR=../source/reactos + +cd $SRCDIR +svn -q update > /dev/null 2>&1 Property changes on: trunk/web/reactos.org/scripts/update_source.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native

19 years

[gdalsnes] 18427: make classes use session wide atom table. should fix bug 899

by gdalsnes＠svn.reactos.com

make classes use session wide atom table. should fix bug 899 Modified: trunk/reactos/subsys/win32k/include/userfuncs.h Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c Added: trunk/reactos/subsys/win32k/ntuser/session.c Modified: trunk/reactos/subsys/win32k/win32k.xml _____ Modified: trunk/reactos/subsys/win32k/include/userfuncs.h --- trunk/reactos/subsys/win32k/include/userfuncs.h 2005-10-13 10:55:16 UTC (rev 18426) +++ trunk/reactos/subsys/win32k/include/userfuncs.h 2005-10-13 12:44:58 UTC (rev 18427) @@ -73,13 +73,10 @@ #define UserDerefObject(o) ObmDereferenceObject(o) BOOL FASTCALL ObmCreateHandleTable(); +/******************** HANDLE.C ***************/ extern USER_HANDLE_TABLE gHandleTable; - -/******************** HANDLE.C ***************/ - - PUSER_HANDLE_ENTRY handle_to_entry(PUSER_HANDLE_TABLE ht, HANDLE handle ); VOID UserInitHandleTable(PUSER_HANDLE_TABLE ht, PVOID mem, ULONG bytes); HANDLE UserAllocHandle(PUSER_HANDLE_TABLE ht, PVOID object, USER_OBJECT_TYPE type ); @@ -120,6 +117,13 @@ DWORD FASTCALL UserGetWindowDC(PWINDOW_OBJECT Wnd); + +/*************** SESSION.C ***************/ + +extern PRTL_ATOM_TABLE gAtomTable; + +NTSTATUS FASTCALL InitSessionImpl(VOID); + /*************** METRIC.C ***************/ ULONG FASTCALL _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-10-13 10:55:16 UTC (rev 18426) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-10-13 12:44:58 UTC (rev 18427) @@ -48,7 +48,6 @@ } -/* return TRUE if class became destroyed */ inline VOID FASTCALL ClassDerefObject(PWNDCLASS_OBJECT Class) { @@ -67,22 +66,10 @@ VOID FASTCALL DestroyClass(PWNDCLASS_OBJECT Class) { - PWINSTATION_OBJECT WinSta; - ASSERT(Class->refs == 0); + RemoveEntryList(&Class->ListEntry); - - /* FIXME See bug 899 */ - if (NULL != PsGetWin32Thread()) - { - WinSta = PsGetWin32Thread()->Desktop->WindowStation; - //FIXME: release ATOM - RtlDeleteAtomFromAtomTable(WinSta->AtomTable, Class->Atom); - } - else - { - DPRINT1("Can't locate window station, see bug 899\n"); - } + RtlDeleteAtomFromAtomTable(gAtomTable, Class->Atom); ExFreePool(Class); } @@ -122,17 +109,14 @@ PWNDCLASS_OBJECT FASTCALL ClassGetClassByName(LPCWSTR ClassName, HINSTANCE hInstance) { - PWINSTATION_OBJECT WinSta; NTSTATUS Status; RTL_ATOM Atom; if (!ClassName || !PsGetWin32Thread()->Desktop) return FALSE; - WinSta = PsGetWin32Thread()->Desktop->WindowStation; - Status = RtlLookupAtomInAtomTable( - WinSta->AtomTable, + gAtomTable, (LPWSTR)ClassName, &Atom); @@ -445,7 +429,6 @@ */ { WNDCLASSEXW SafeClass; - PWINSTATION_OBJECT WinSta; NTSTATUS Status; RTL_ATOM Atom; DECLARE_RETURN(RTL_ATOM); @@ -485,14 +468,12 @@ RETURN( (RTL_ATOM)0); } - WinSta = PsGetWin32Thread()->Desktop->WindowStation; - //FIXME: make ClassName ptr the atom, not buffer if (ClassName->Length > 0) { DPRINT("NtUserRegisterClassExWOW(%S)\n", ClassName->Buffer); /* FIXME - Safely copy/verify the buffer first!!! */ - Status = RtlAddAtomToAtomTable(WinSta->AtomTable, + Status = RtlAddAtomToAtomTable(gAtomTable, ClassName->Buffer, &Atom); if (!NT_SUCCESS(Status)) @@ -518,7 +499,7 @@ { if (ClassName->Length) { - RtlDeleteAtomFromAtomTable(WinSta->AtomTable, Atom); + RtlDeleteAtomFromAtomTable(gAtomTable, Atom); } DPRINT("Failed creating window class object\n"); RETURN((RTL_ATOM)0); @@ -717,7 +698,6 @@ { PWINDOW_OBJECT Window; DECLARE_RETURN(DWORD); - PWINSTATION_OBJECT WinSta; NTSTATUS Status; UserEnterShared(); @@ -728,12 +708,10 @@ RETURN(0); } - WinSta = PsGetWin32Thread()->Desktop->WindowStation; - nMaxCount *= sizeof(WCHAR); //FIXME: wrap in SEH to protect lpClassName access - Status = RtlQueryAtomInAtomTable(WinSta->AtomTable, + Status = RtlQueryAtomInAtomTable(gAtomTable, Window->Class->Atom, NULL, NULL, lpClassName, &nMaxCount); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c --- trunk/reactos/subsys/win32k/ntuser/ntuser.c 2005-10-13 10:55:16 UTC (rev 18426) +++ trunk/reactos/subsys/win32k/ntuser/ntuser.c 2005-10-13 12:44:58 UTC (rev 18427) @@ -46,6 +46,7 @@ NTSTATUS FASTCALL InitUserImpl(VOID) { //PVOID mem; + NTSTATUS Status; // DPRINT("Enter InitUserImpl\n"); // ExInitializeResourceLite(&UserLock); @@ -58,6 +59,13 @@ return STATUS_INSUFFICIENT_RESOURCES; } + Status = InitSessionImpl(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error init session impl.\n"); + return Status; + } + return STATUS_SUCCESS; } _____ Added: trunk/reactos/subsys/win32k/ntuser/session.c --- trunk/reactos/subsys/win32k/ntuser/session.c 2005-10-13 10:55:16 UTC (rev 18426) +++ trunk/reactos/subsys/win32k/ntuser/session.c 2005-10-13 12:44:58 UTC (rev 18427) @@ -0,0 +1,43 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Session stuff + * FILE: subsys/win32k/ntuser/session.c + * PROGRAMER: Gunnar + */ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +PRTL_ATOM_TABLE gAtomTable = NULL; + +/* FUNCTIONS *******************************************************************/ + +NTSTATUS FASTCALL +InitSessionImpl(VOID) +{ + return RtlCreateAtomTable(37, &gAtomTable); +} + _____ Modified: trunk/reactos/subsys/win32k/win32k.xml --- trunk/reactos/subsys/win32k/win32k.xml 2005-10-13 10:55:16 UTC (rev 18426) +++ trunk/reactos/subsys/win32k/win32k.xml 2005-10-13 12:44:58 UTC (rev 18427) @@ -89,6 +89,7 @@ <file>painting.c</file> <file>prop.c</file> <file>scrollbar.c</file> + <file>session.c</file> <file>stubs.c</file> <file>timer.c</file> <file>useratom.c</file>

19 years

[hpoussin] 18426: Call specified class installer (if any) in SetupDiCallClassInstaller

by hpoussin＠svn.reactos.com

Call specified class installer (if any) in SetupDiCallClassInstaller Implement SetupDiOpenDeviceInterfaceA Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-10-13 10:29:04 UTC (rev 18425) +++ trunk/reactos/lib/setupapi/devinst.c 2005-10-13 10:55:16 UTC (rev 18426) @@ -93,6 +93,7 @@ { LIST_ENTRY ListEntry; + HMODULE Module; COINSTALLER_PROC Function; BOOL DoPostProcessing; PVOID PrivateData; @@ -121,6 +122,7 @@ DWORD DriverRank; SP_DRVINFO_DATA_V2_W Info; + GUID ClassGuid; LPWSTR InfPath; LPWSTR InfSection; LPWSTR MatchingId; @@ -1183,13 +1185,12 @@ static BOOL CreateDeviceInfoElement( IN LPCWSTR InstancePath, - LPCGUID pClassGuid, + IN LPCGUID pClassGuid, OUT struct DeviceInfoElement **pDeviceInfo) { struct DeviceInfoElement *deviceInfo; *pDeviceInfo = NULL; - if (IsEqualIID(&pClassGuid, &GUID_NULL)) { FIXME("Bad argument!!!"); return FALSE; }/* FIXME: remove */ deviceInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInfoElement) + (wcslen(InstancePath) + 1) * sizeof(WCHAR)); if (!deviceInfo) @@ -2758,9 +2759,21 @@ DWORD OpenFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { - FIXME("%p %s %08lx %p\n", DeviceInfoSet, - debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData); - return FALSE; + LPWSTR DevicePathW = NULL; + BOOL bResult; + + TRACE("%p %s %08lx %p\n", DeviceInfoSet, debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData); + + DevicePathW = MultiByteToUnicode(DevicePath, CP_ACP); + if (DevicePathW == NULL) + return FALSE; + + bResult = SetupDiOpenDeviceInterfaceW(DeviceInfoSet, + DevicePathW, OpenFlags, DeviceInterfaceData); + + MyFree(DevicePathW); + + return bResult; } /*********************************************************************** @@ -2777,6 +2790,76 @@ return FALSE; } +static DWORD +GetFunctionPointer( + IN PWSTR InstallerName, + OUT HMODULE* ModulePointer, + OUT PVOID* FunctionPointer) +{ + HMODULE hModule = NULL; + LPSTR FunctionNameA = NULL; + PWCHAR Comma; + DWORD rc; + + *ModulePointer = NULL; + *FunctionPointer = NULL; + + Comma = strchrW(InstallerName, ','); + if (!Comma) + { + rc = ERROR_INVALID_PARAMETER; + goto cleanup; + } + + /* W->A conversion for function name */ + FunctionNameA = UnicodeToMultiByte(Comma + 1, CP_ACP); + if (!FunctionNameA) + { + rc = GetLastError(); + goto cleanup; + } + + /* Load library */ + *Comma = '\0'; + hModule = LoadLibraryW(InstallerName); + *Comma = ','; + if (!hModule) + { + rc = GetLastError(); + goto cleanup; + } + + /* Search function */ + *FunctionPointer = GetProcAddress(hModule, FunctionNameA); + if (!*FunctionPointer) + { + rc = GetLastError(); + goto cleanup; + } + + *ModulePointer = hModule; + rc = ERROR_SUCCESS; + +cleanup: + if (rc != ERROR_SUCCESS && hModule) + FreeLibrary(hModule); + MyFree(FunctionNameA); + return rc; +} + +static DWORD +FreeFunctionPointer( + IN HMODULE ModulePointer, + IN PVOID FunctionPointer) +{ + if (ModulePointer == NULL) + return ERROR_SUCCESS; + if (FreeLibrary(ModulePointer)) + return ERROR_SUCCESS; + else + return GetLastError(); +} + /*********************************************************************** * SetupDiCallClassInstaller (SETUPAPI.@) */ @@ -2853,6 +2936,7 @@ { LIST_ENTRY ClassCoInstallersListHead; LIST_ENTRY DeviceCoInstallersListHead; + HMODULE ClassInstallerLibrary; CLASS_INSTALL_PROC ClassInstaller = NULL; COINSTALLER_CONTEXT_DATA Context; PLIST_ENTRY ListEntry; @@ -2918,8 +3002,8 @@ rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); if (rc == ERROR_SUCCESS) { - /* Set ClassInstaller function pointer */ - FIXME("Installer is '%S'\n", KeyBuffer); + /* Get ClassInstaller function pointer */ + rc = GetFunctionPointer(KeyBuffer, &ClassInstallerLibrary, (PVOID*)&ClassInstaller); } HeapFree(GetProcessHeap(), 0, KeyBuffer); } @@ -2962,7 +3046,10 @@ /* Call Class installer */ if (ClassInstaller) + { rc = (*ClassInstaller)(InstallFunction, DeviceInfoSet, DeviceInfoData); + FreeFunctionPointer(ClassInstallerLibrary, ClassInstaller); + } else rc = ERROR_DI_DO_DEFAULT; @@ -2992,6 +3079,7 @@ Context.PrivateData = coinstaller->PrivateData; rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); } + FreeFunctionPointer(coinstaller->Module, coinstaller->Function); ListEntry = ListEntry->Flink; } @@ -3006,6 +3094,7 @@ Context.PrivateData = coinstaller->PrivateData; rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); } + FreeFunctionPointer(coinstaller->Module, coinstaller->Function); ListEntry = ListEntry->Flink; } @@ -3246,6 +3335,7 @@ AddDriverToList( IN PLIST_ENTRY DriverListHead, IN DWORD DriverType, /* SPDIT_CLASSDRIVER or SPDIT_COMPATDRIVER */ + IN LPGUID ClassGuid, IN INFCONTEXT ContextDevice, IN LPCWSTR InfFile, IN LPCWSTR ProviderName, @@ -3351,6 +3441,7 @@ DeviceDescription, InfFile, InfInstallSection, Rank); driverInfo->DriverRank = Rank; + memcpy(&driverInfo->ClassGuid, ClassGuid, sizeof(GUID)); driverInfo->Info.DriverType = DriverType; driverInfo->Info.Reserved = (ULONG_PTR)driverInfo; wcsncpy(driverInfo->Info.Description, DeviceDescription, LINE_LEN - 1); @@ -3734,6 +3825,7 @@ if (!AddDriverToList( &list->DriverListHead, DriverType, + &ClassGuid, ContextDevice, filename, ProviderName, @@ -3788,6 +3880,7 @@ AddDriverToList( &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead, DriverType, + &ClassGuid, ContextDevice, filename, ProviderName, @@ -3807,6 +3900,7 @@ AddDriverToList( &((struct DeviceInfoElement *)DeviceInfoData->Reserved)->DriverListHead, DriverType, + &ClassGuid, ContextDevice, filename, ProviderName, @@ -4290,6 +4384,8 @@ ret = TRUE; TRACE("Choosing driver whose rank is 0x%lx\n", ((struct DriverInfoElement *)ItemList)->DriverRank); + if (DeviceInfoData) + memcpy(&DeviceInfoData->ClassGuid, &(*pDriverInfo)->ClassGuid, sizeof(GUID)); } } }

19 years

[weiden] 18425: properly reset the reference counter in ExReInitializeRundownProtection()

by weiden＠svn.reactos.com

properly reset the reference counter in ExReInitializeRundownProtection() Modified: trunk/reactos/ntoskrnl/ex/rundown.c _____ Modified: trunk/reactos/ntoskrnl/ex/rundown.c --- trunk/reactos/ntoskrnl/ex/rundown.c 2005-10-13 08:15:52 UTC (rev 18424) +++ trunk/reactos/ntoskrnl/ex/rundown.c 2005-10-13 10:29:04 UTC (rev 18425) @@ -94,9 +94,9 @@ /* Reset the count */ #ifdef _WIN64 - InterlockedExchangeAdd64((LONGLONG*)&RunRef->Count, 0LL); + InterlockedExchange64((LONGLONG*)&RunRef->Count, 0LL); #else - InterlockedExchangeAdd((LONG*)&RunRef->Count, 0); + InterlockedExchange((LONG*)&RunRef->Count, 0); #endif }

19 years

[gvg] 18424: Use the pitch provided by FreeType. Fixes bug 894.

by gvg＠svn.reactos.com

Use the pitch provided by FreeType. Fixes bug 894. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-10-13 08:05:12 UTC (rev 18423) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-10-13 08:15:52 UTC (rev 18424) @@ -1458,7 +1458,7 @@ FT_Face face; FT_GlyphSlot glyph; LONGLONG TextLeft, RealXStart; - ULONG TextTop, pitch, previous, BackgroundLeft; + ULONG TextTop, previous, BackgroundLeft; FT_Bool use_kerning; RECTL DestRect, MaskRect, SpecifiedDestRect; POINTL SourcePoint, BrushOrigin; @@ -1805,9 +1805,6 @@ DPRINT1("WARNING: Failed to render glyph!\n"); goto fail; } - pitch = glyph->bitmap.pitch; - } else { - pitch = glyph->bitmap.width; } if (fuOptions & ETO_OPAQUE) @@ -1845,9 +1842,17 @@ * We should create the bitmap out of the loop at the biggest possible * glyph size. Then use memset with 0 to clear it and sourcerect to * limit the work of the transbitblt. + * + * FIXME: DIB bitmaps should have an lDelta which is a multiple of 4. + * Here we pass in the pitch from the FreeType bitmap, which is not + * guaranteed to be a multiple of 4. If it's not, we should expand + * the FreeType bitmap to a temporary bitmap. */ - HSourceGlyph = EngCreateBitmap(bitSize, pitch, (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, glyph->bitmap.buffer); + HSourceGlyph = EngCreateBitmap(bitSize, glyph->bitmap.pitch, + (glyph->bitmap.pixel_mode == ft_pixel_mode_grays) ? + BMF_8BPP : BMF_1BPP, BMF_TOPDOWN, + glyph->bitmap.buffer); if ( !HSourceGlyph ) { DPRINT1("WARNING: EngLockSurface() failed!\n");

19 years

[hpoussin] 18423: Fix sublang IDs:

by hpoussin＠svn.reactos.com

Fix sublang IDs: SUBLANG_ENGLISH_US for english, as we always try to load language LANG_ENGLISH/SUBLANG_ENGLISH_US SUBLANG_NEUTRAL for the others, so all sublanguages can use the translation Modified: trunk/reactos/subsys/system/cmd/De.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/Fr.rc _____ Modified: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-10-13 07:43:25 UTC (rev 18422) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-10-13 08:05:12 UTC (rev 18423) @@ -4,7 +4,7 @@ * Update: frik85 2005-06-06 */ -LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-10-13 07:43:25 UTC (rev 18422) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-10-13 08:05:12 UTC (rev 18423) @@ -4,7 +4,7 @@ * By Magnus Olsen 2005 */ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE { _____ Modified: trunk/reactos/subsys/system/cmd/Fr.rc --- trunk/reactos/subsys/system/cmd/Fr.rc 2005-10-13 07:43:25 UTC (rev 18422) +++ trunk/reactos/subsys/system/cmd/Fr.rc 2005-10-13 08:05:12 UTC (rev 18423) @@ -4,7 +4,7 @@ * Sylvain PÚtrÚolle 2005 */ -LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE {

19 years

[hpoussin] 18422: IopGetBusTypeGuidIndex: Fix an infinite loop

by hpoussin＠svn.reactos.com

IopGetBusTypeGuidIndex: Fix an infinite loop IopAssignDeviceResources: Allocate bus number resources Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-13 07:35:48 UTC (rev 18421) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-10-13 07:43:25 UTC (rev 18422) @@ -606,6 +606,7 @@ FoundIndex = i; goto Quickie; } + i++; } /* Check if we have to grow the list */ @@ -1280,7 +1281,7 @@ = 0; break; } - /*case CmResourceTypeBusNumber: + case CmResourceTypeBusNumber: { DescriptorRaw->u.BusNumber.Start = DescriptorTranslated->u.BusNumber.Start = ResourceDescriptor->u.BusNumber.MinBusNumber; @@ -1289,7 +1290,7 @@ DescriptorRaw->u.BusNumber.Reserved = DescriptorTranslated->u.BusNumber.Reserved = ResourceDescriptor->u.BusNumber.Reserved; break; - }*/ + } /*CmResourceTypeDevicePrivate: case CmResourceTypePcCardConfig: case CmResourceTypeMfCardConfig:

19 years

[gvg] 18421: Send window-bound timers to the correctmessage queue

by gvg＠svn.reactos.com

Send window-bound timers to the correctmessage queue Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/timer.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/timer.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/timer.c 2005-10-13 07:35:19 UTC (rev 18420) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/timer.c 2005-10-13 07:35:48 UTC (rev 18421) @@ -60,6 +60,7 @@ { PWINDOW_OBJECT Window; UINT_PTR Ret = 0; + PUSER_MESSAGE_QUEUE MessageQueue; DPRINT("IntSetTimer wnd %x id %p elapse %u timerproc %p systemtimer %s\n", Wnd, IDEvent, Elapse, TimerFunc, SystemTimer ? "TRUE" : "FALSE"); @@ -82,6 +83,7 @@ HintIndex = ++IDEvent; IntUnlockWindowlessTimerBitmap(); Ret = IDEvent; + MessageQueue = PsGetWin32Thread()->MessageQueue; } else { @@ -99,6 +101,7 @@ } Ret = IDEvent; + MessageQueue = Window->MessageQueue; } #if 1 @@ -128,7 +131,7 @@ Elapse = 10; } - if (! MsqSetTimer(PsGetWin32Thread()->MessageQueue, Wnd, + if (! MsqSetTimer(MessageQueue, Wnd, IDEvent, Elapse, TimerFunc, SystemTimer ? WM_SYSTIMER : WM_TIMER)) {

19 years

[gvg] 18420: Workaround for bug 899

by gvg＠svn.reactos.com

Workaround for bug 899 Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/class.c _____ Modified: branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/class.c --- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/class.c 2005-10-12 23:10:31 UTC (rev 18419) +++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/class.c 2005-10-13 07:35:19 UTC (rev 18420) @@ -68,12 +68,21 @@ VOID FASTCALL DestroyClass(PWNDCLASS_OBJECT Class) { PWINSTATION_OBJECT WinSta; - WinSta = PsGetWin32Thread()->Desktop->WindowStation; ASSERT(Class->refs == 0); RemoveEntryList(&Class->ListEntry); - //FIXME: release ATOM - RtlDeleteAtomFromAtomTable(WinSta->AtomTable, Class->Atom); + + /* FIXME See bug 899 */ + if (NULL != PsGetWin32Thread()) + { + WinSta = PsGetWin32Thread()->Desktop->WindowStation; + //FIXME: release ATOM + RtlDeleteAtomFromAtomTable(WinSta->AtomTable, Class->Atom); + } + else + { + DPRINT1("Can't locate window station, see bug 899\n"); + } ExFreePool(Class); }

19 years

[gdalsnes] 18419: add comment about KeCancelTimer pitfall

by gdalsnes＠svn.reactos.com

add comment about KeCancelTimer pitfall Modified: trunk/reactos/ntoskrnl/ke/timer.c _____ Modified: trunk/reactos/ntoskrnl/ke/timer.c --- trunk/reactos/ntoskrnl/ke/timer.c 2005-10-12 22:15:22 UTC (rev 18418) +++ trunk/reactos/ntoskrnl/ke/timer.c 2005-10-12 23:10:31 UTC (rev 18419) @@ -34,6 +34,19 @@ * Timer = timer to cancel * RETURNS: True if the timer was running * False otherwise + * + * DANGER! + * The statement in the DDK for KeCancelTimer that "if a DPC object is + * associated with the timer, it too is canceled" is wrong -- nothing is + * done with the DPC object when the timer is removed from the system + * queue. So its very likely that the DPC will run after you have canceled + * the timer! + * For what it's worth, calling KeRemoveQueueDpc after KeCancelTimer would + * be sufficient to prevent any problems associated with destroying the DPC + * object, at least as the OS is currently implemented. This is because the + * DPC dispatcher doesn't need access to the object once the DPC is + * dequeued, and the dequeuing happens before the DPC routine gets called." + * -Gunnar (article by Walter Oney) */ BOOLEAN STDCALL

19 years

← Newer
1
...
47
48
49
50
51
52
53
...
74
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005