Ros-diffs December 2009

ros-diffs@reactos.org

22 participants
501 discussions

[sserapion] 44762: [rbuild] - Fix make install. - Fix mkhive command. - Automatically generate reactos.dff using the installfile and installbase attributes found in rbuild files. -- Fixes race to grab reactos.dff on concurrent builds in the same tree. -- Makes the result of make install, make livecd and make bootcd the same(some modules arent in reactos.dff but have installfile/base attributes, which means they got intto livecd/install but not bootcd!) -- Works really great with rosapps/rostests
by sserapion＠svn.reactos.org 26 Dec '09

26 Dec '09

Author: sserapion Date: Sat Dec 26 07:07:38 2009 New Revision: 44762 URL: http://svn.reactos.org/svn/reactos?rev=44762&view=rev Log: [rbuild] - Fix make install. - Fix mkhive command. - Automatically generate reactos.dff using the installfile and installbase attributes found in rbuild files. -- Fixes race to grab reactos.dff on concurrent builds in the same tree. -- Makes the result of make install, make livecd and make bootcd the same(some modules arent in reactos.dff but have installfile/base attributes, which means they got intto livecd/install but not bootcd!) -- Works really great with rosapps/rostests. -- Downside is some files now exist inside and outside the generated cab file, maybe this could be useful if we wanted to have a package that contained reactos and an app that installed it from livecd... just thinking out loud... Added: branches/ros-amd64-bringup/reactos/boot/bootdata/hiveinst_amd64.inf (with props) Removed: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/ Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/tcpsvcs.rbuild branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild branches/ros-amd64-bringup/reactos/media/inf/inf.rbuild branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/installfile.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/tcpsvcs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/tcpsvcs.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/tcpsvcs.rbuild [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<installfile installbase="system32/drivers/etc">quotes</installfile> <module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe" unicode="yes"> <include base="arp">.</include> <library>ws2_32</library> Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -66,7 +66,7 @@ <file>explorer.rc</file> <linkerflag>--enable-stdcall-fixup</linkerflag> </module> -<installfile installbase=".">explorer-cfg-template.xml</installfile> +<installfile>explorer-cfg-template.xml</installfile> <directory name="notifyhook"> <xi:include href="notifyhook/notifyhook.rbuild" /> </directory> Added: branches/ros-amd64-bringup/reactos/boot/bootdata/hiveinst_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/bootdata/hiveinst_amd64.inf (added) +++ branches/ros-amd64-bringup/reactos/boot/bootdata/hiveinst_amd64.inf [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -1,0 +1,19 @@ +[Version] +Signature = "$ReactOS$" + +[AddReg] +; Enable _one_ driver per section by removing the leading semicolon. + +; +; Display driver section +; + +; VBE SVGA driver +HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.BitsPerPel",0x00010001,16 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.XResolution",0x00010001,800 +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.YResolution",0x00010001,600 + +; VGA miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000001 Propchange: branches/ros-amd64-bringup/reactos/boot/bootdata/hiveinst_amd64.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -22,13 +22,13 @@ </module> </if> <if property="ARCH" value="i386"> - <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> + <module ifnot="false" name="halupalias" type="alias" aliasof="halup"> </module> - <module if="false" name="halmpalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halmp"> + <module if="false" name="halmpalias" type="alias" aliasof="halmp"> </module> </if> <if property="ARCH" value="powerpc"> - <module name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halppc_up"/> + <module name="halupalias" type="alias" aliasof="halppc_up"/> </if> <if property="ARCH" value="amd64"> <module name="hal" type="kernelmodedll"> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="halup" type="kernelmodedll" entrypoint="0" installname="hal.dll"> + <module name="halup" type="kernelmodedll" entrypoint="0" installbase="system32" installname="hal.dll"> <importlibrary base="hal" definition="hal.pspec" /> <bootstrap installbase="$(CDOUTPUT)" /> <include>include</include> Modified: branches/ros-amd64-bringup/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… ============================================================================== --- branches/ros-amd64-bringup/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/media/inf/inf.rbuild [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -1,10 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> + <installfile installbase="inf">acpi.inf</installfile> <installfile installbase="inf">audio.inf</installfile> - <installfile installbase="inf">acpi.inf</installfile> <installfile installbase="inf">cdrom.inf</installfile> + <installfile installbase="inf">cpu.inf</installfile> <installfile installbase="inf">display.inf</installfile> + <installfile installbase="inf">fdc.inf</installfile> <installfile installbase="inf">font.inf</installfile> <installfile installbase="inf">hdc.inf</installfile> <installfile installbase="inf">intl.inf</installfile> @@ -21,6 +23,7 @@ <installfile installbase="inf">ports.inf</installfile> <installfile installbase="inf">scsi.inf</installfile> <installfile installbase="inf" root="output">syssetup.inf</installfile> + <installfile installbase="inf">usb.inf</installfile> <installfile installbase="inf">usbport.inf</installfile> <installfile installbase="inf">usbstor.inf</installfile> <installfile installbase="inf">xboxdisp.inf</installfile> Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -365,9 +365,16 @@ GenerateTestSupportCode (); GenerateCompilationUnitSupportCode (); GenerateSysSetup (); + GenerateInstallerFileList(); GenerateProxyMakefiles (); CheckAutomaticDependencies (); CloseMakefile (); +} + +void +MingwBackend::GenerateInstallerFileList() +{ + this->ProjectNode.GenerateInstallerFileList(); } void @@ -1297,7 +1304,7 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) boot%cbootdata %s $(ARCH) boot%cbootdata%chiveinst_$(ARCH).inf\n", + "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%chiveinst_$(ARCH).inf\n", cSep, GetFullPath ( system32 ).c_str (), cSep, cSep ); fprintf ( fMakefile, Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -119,6 +119,7 @@ bool use_pch; bool DetectMicrosoftCompiler ( std::string& version, std::string& path ); bool DetectMicrosoftLinker ( std::string& version, std::string& path ); + void GenerateInstallerFileList(); }; Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -2763,8 +2763,8 @@ const FileLocation *isoboot = bootModule->output; // prepare reactos.dff and reactos.inf - FileLocation reactosDff ( SourceDirectory, - "boot" + sSep + "bootdata" + sSep + "packages", + FileLocation reactosDff ( IntermediateDirectory, + "", "reactos.dff" ); FileLocation reactosInf ( bootcdReactos.directory, bootcdReactos.relative_path, Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/installfile.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/installfile.cpp [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -36,6 +36,11 @@ const XMLAttribute* base = node.GetAttribute ( "installbase", false ); const XMLAttribute* newname = node.GetAttribute ( "newname", false ); + if(base) + installbase = base->value; + else + installbase = ""; + DirectoryLocation source_directory = SourceDirectory; const XMLAttribute* att = node.GetAttribute ( "root", false ); if ( att != NULL) @@ -65,4 +70,4 @@ ? newname->value : node.value, &node ); -} +} Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -396,6 +396,12 @@ if ( att != NULL ) { const XMLAttribute* installbase = moduleNode.GetAttribute ( "installbase", false ); + + if(installbase) + this->installbase = installbase->value; + else + this->installbase = ""; + install = new FileLocation ( InstallDirectory, installbase ? installbase->value : "", att->value, Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -541,3 +541,95 @@ } return ""; } + +void +Project::GenerateInstallerFileList() +{ + std::map<std::string, Module*> Result; + std::map<std::string, Module*>::iterator i; + std::string buffer = ""; + + printf ( "Generating reactos.dff..." ); + std::string path = Environment::GetIntermediatePath(); + path += sSep + "reactos.dff"; + FILE* f = fopen(path.c_str(), "wb"); + + buffer = "; Main ReactOS package\r\n" + ".Set DiskLabelTemplate=\"ReactOS\" ; Label of disk\r\n" + ".Set CabinetNameTemplate=\"reactos.cab\" ; reactos.cab\r\n" + ".Set InfFileName=\"reactos.inf\" ; reactos.inf\r\n" + ".InfBegin\r\n" + "[Version]\r\n" + "Signature = \"$ReactOS$\"\r\n" + "[Directories]\r\n" + "1 = system32\r\n" + "2 = system32\\drivers\r\n" + "3 = Fonts\r\n" + "4 =\r\n" + "5 = system32\\drivers\\etc\r\n" + "6 = inf\r\n" + "7 = bin\r\n" + "8 = media\r\n" + ".InfEnd\r\n" + "; Contents of disk\r\n" + ".InfBegin\r\n" + "[SourceFiles]\r\n" + ".InfEnd\r\n"; + fprintf(f,buffer.c_str()); + for(i = modules.begin(); i != modules.end(); ++i) + { + buffer = ""; + if(i->second->install) + { + buffer = i->second->output->relative_path + sSep; + buffer += i->second->output->name; + if(i->second->installbase == "system32") + buffer += "\t1"; + if(i->second->installbase == "system32/drivers") + buffer += "\t2"; + else if(i->second->installbase == "fonts") + buffer += "\t3"; + else if(i->second->installbase == "") + buffer += "\t4"; + else if(i->second->installbase == "system32/drivers/etc") + buffer += "\t5"; + else if(i->second->installbase == "inf") + buffer += "\t6"; + else if(i->second->installbase == "bin") + buffer += "\t7"; + else if(i->second->installbase == "media") + buffer += "\t8"; + + fprintf(f, "%s\r\n",buffer.c_str()); + } + } + + for(size_t j = 0; j< installfiles.size(); j++) + { + buffer = ""; + buffer = installfiles[j]->source->relative_path + sSep; + buffer += installfiles[j]->target->name; + if(installfiles[j]->installbase == "system32") + buffer += "\t1"; + if(installfiles[j]->installbase == "system32/drivers") + buffer += "\t2"; + else if(installfiles[j]->installbase == "fonts") + buffer += "\t3"; + else if(installfiles[j]->installbase == "") + buffer += "\t4"; + else if(installfiles[j]->installbase == "system32/drivers/etc") + buffer += "\t5"; + else if(installfiles[j]->installbase == "inf") + buffer += "\t6"; + else if(installfiles[j]->installbase == "bin") + buffer += "\t7"; + else if(installfiles[j]->installbase == "media") + buffer += "\t8"; + + + fprintf(f,"%s\r\n",buffer.c_str()); + } + + printf ( "done\n" ); + +} Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h [iso-8859-1] Sat Dec 26 07:07:38 2009 @@ -276,6 +276,7 @@ const Property* LookupProperty ( const std::string& name ) const; std::string GetCompilerSet () const; std::string GetLinkerSet () const; + void GenerateInstallerFileList(); private: std::string ResolveNextProperty ( const std::string& s ) const; void ReadXml (); @@ -400,6 +401,7 @@ bool isCRT; std::string CRT; bool dynamicCRT; + std::string installbase; FileLocation *output; // "path/foo.exe" FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a" FileLocation *install; @@ -904,6 +906,7 @@ public: FileLocation *source; FileLocation *target; + std::string installbase; InstallFile ( const Project& project, const XMLElement& bootstrapNode,

1 0

[gschneider] 44761: [win32k] - IntGetDIBColorTable: return the number of actually copied color table entries - DIB_CreateDIBSection: simplify calculation of palette entry count - IntHandleSpecialColorType: remove leftover debug print
by gschneider＠svn.reactos.org 25 Dec '09

25 Dec '09

Author: gschneider Date: Fri Dec 25 18:54:41 2009 New Revision: 44761 URL: http://svn.reactos.org/svn/reactos?rev=44761&view=rev Log: [win32k] - IntGetDIBColorTable: return the number of actually copied color table entries - DIB_CreateDIBSection: simplify calculation of palette entry count - IntHandleSpecialColorType: remove leftover debug print Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Dec 25 18:54:41 2009 @@ -681,10 +681,6 @@ if (IntGetPaletteEntries(pdc->dclevel.hpal, index, 1, &palEntry) == 1) { *Color = RGB(palEntry.peRed, palEntry.peGreen, palEntry.peBlue); - } - else - { - DPRINT1("no wai!\n"); } DC_UnlockDc(pdc); break; Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Fri Dec 25 18:54:41 2009 @@ -149,7 +149,7 @@ PDC dc; PSURFACE psurf; PPALETTE PalGDI; - UINT Index; + UINT Index, Count = 0; ULONG biBitCount; if (!(dc = DC_LockDc(hDC))) return 0; @@ -197,15 +197,14 @@ Colors[Index - StartIndex].rgbGreen = PalGDI->IndexedColors[Index].peGreen; Colors[Index - StartIndex].rgbBlue = PalGDI->IndexedColors[Index].peBlue; Colors[Index - StartIndex].rgbReserved = 0; + Count++; } PALETTE_UnlockPalette(PalGDI); } - else - Entries = 0; DC_UnlockDc(dc); - return Entries; + return Count; } // Converts a DIB to a device-dependent bitmap @@ -1509,17 +1508,14 @@ table between the DIB and the X physical device. Obviously, this is left out of the ReactOS implementation. Instead, we call NtGdiSetDIBColorTable. */ - bi->biClrUsed = 0; - /* set number of entries in bmi.bmiColors table */ - if (bi->biBitCount == 1) { - bi->biClrUsed = 2; - } else - if (bi->biBitCount == 4) { - bi->biClrUsed = 16; - } else - if (bi->biBitCount == 8) { - bi->biClrUsed = 256; - } + if (bi->biBitCount <= 8) + { + bi->biClrUsed = 1 << bi->biBitCount; + } + else + { + bi->biClrUsed = 0; + } bmp->hDIBSection = section; bmp->hSecure = hSecure;

1 0

[ekohl] 44760: The service thread must receive all commands.
by ekohl＠svn.reactos.org 25 Dec '09

25 Dec '09

Author: ekohl Date: Fri Dec 25 17:41:06 2009 New Revision: 44760 URL: http://svn.reactos.org/svn/reactos?rev=44760&view=rev Log: The service thread must receive all commands. Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Fri Dec 25 17:41:06 2009 @@ -395,7 +395,8 @@ break; default: - TRACE("Unknown command %lu", ControlPacket->dwControl); + TRACE("Command %lu received", ControlPacket->dwControl); + ScControlService(ControlPacket); continue; } @@ -519,7 +520,7 @@ Service->HandlerFunctionEx = lpHandlerProc; Service->HandlerContext = lpContext; - TRACE("RegisterServiceCtrlHandlerEx returning %lu", Service->hService); + TRACE("RegisterServiceCtrlHandlerEx returning %lu\n", Service->hService); return (SERVICE_STATUS_HANDLE)Service->hService; }

1 0

[ekohl] 44759: RQueryServiceConfigA/W: Add missing dependency information.
by ekohl＠svn.reactos.org 25 Dec '09

25 Dec '09

Author: ekohl Date: Fri Dec 25 16:08:03 2009 New Revision: 44759 URL: http://svn.reactos.org/svn/reactos?rev=44759&view=rev Log: RQueryServiceConfigA/W: Add missing dependency information. Modified: trunk/reactos/base/system/services/config.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/confi… ============================================================================== --- trunk/reactos/base/system/services/config.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/config.c [iso-8859-1] Fri Dec 25 16:08:03 2009 @@ -300,5 +300,124 @@ return dwError; } + +DWORD +ScmReadDependencies(HKEY hServiceKey, + LPWSTR *lpDependencies, + DWORD *lpdwDependenciesLength) +{ + LPWSTR lpGroups = NULL; + LPWSTR lpServices = NULL; + DWORD dwGroupsLength = 0; + DWORD dwServicesLength = 0; + LPWSTR lpSrc; + LPWSTR lpDest; + DWORD len; + DWORD dwTotalLength; + + *lpDependencies = NULL; + *lpdwDependenciesLength = 0; + + /* Read the dependency values */ + ScmReadString(hServiceKey, + L"DependOnGroup", + &lpGroups); + + ScmReadString(hServiceKey, + L"DependOnService", + &lpServices); + + /* Leave, if there are no dependencies */ + if (lpGroups == NULL && lpServices == NULL) + return ERROR_SUCCESS; + + /* Determine the total buffer size for the dependencies */ + if (lpGroups) + { + DPRINT("Groups:\n"); + lpSrc = lpGroups; + while (*lpSrc != 0) + { + DPRINT(" %S\n", lpSrc); + + len = wcslen(lpSrc) + 1; + dwGroupsLength += len + 1; + + lpSrc = lpSrc + len; + } + } + + if (lpServices) + { + DPRINT("Services:\n"); + lpSrc = lpServices; + while (*lpSrc != 0) + { + DPRINT(" %S\n", lpSrc); + + len = wcslen(lpSrc) + 1; + dwServicesLength += len; + + lpSrc = lpSrc + len; + } + } + + dwTotalLength = dwGroupsLength + dwServicesLength + 1; + DPRINT("dwTotalLength: %lu\n", dwTotalLength); + + /* Allocate the common buffer for the dependencies */ + *lpDependencies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwTotalLength * sizeof(WCHAR)); + if (*lpDependencies == NULL) + { + if (lpGroups) + HeapFree(GetProcessHeap(), 0, lpGroups); + + if (lpServices) + HeapFree(GetProcessHeap(), 0, lpServices); + + return ERROR_NOT_ENOUGH_MEMORY; + } + + /* Return the allocated buffer length in characters */ + *lpdwDependenciesLength = dwTotalLength; + + /* Copy the service dependencies into the common buffer */ + lpDest = *lpDependencies; + if (lpServices) + { + memcpy(lpDest, + lpServices, + dwServicesLength * sizeof(WCHAR)); + + lpDest = lpDest + dwServicesLength; + } + + /* Copy the group dependencies into the common buffer */ + if (lpGroups) + { + lpSrc = lpGroups; + while (*lpSrc != 0) + { + len = wcslen(lpSrc) + 1; + + *lpDest = SC_GROUP_IDENTIFIERW; + lpDest++; + + wcscpy(lpDest, lpSrc); + + lpDest = lpDest + len; + lpSrc = lpSrc + len; + } + } + + /* Free the temporary buffers */ + if (lpGroups) + HeapFree(GetProcessHeap(), 0, lpGroups); + + if (lpServices) + HeapFree(GetProcessHeap(), 0, lpServices); + + return ERROR_SUCCESS; +} + /* EOF */ - Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Fri Dec 25 16:08:03 2009 @@ -2521,6 +2521,8 @@ HKEY hServiceKey = NULL; LPWSTR lpImagePath = NULL; LPWSTR lpServiceStartName = NULL; + LPWSTR lpDependencies = NULL; + DWORD dwDependenciesLength = 0; DWORD dwRequiredSize; LPQUERY_SERVICE_CONFIGW lpConfig = NULL; WCHAR lpEmptyString[] = {0,0}; @@ -2560,15 +2562,22 @@ if (dwError != ERROR_SUCCESS) goto Done; + /* Read the image path */ dwError = ScmReadString(hServiceKey, L"ImagePath", &lpImagePath); if (dwError != ERROR_SUCCESS) goto Done; + /* Read the service start name */ ScmReadString(hServiceKey, L"ObjectName", &lpServiceStartName); + + /* Read the dependencies */ + ScmReadDependencies(hServiceKey, + &lpDependencies, + &dwDependenciesLength); dwRequiredSize = sizeof(QUERY_SERVICE_CONFIGW); @@ -2582,7 +2591,10 @@ else dwRequiredSize += 2 * sizeof(WCHAR); - /* FIXME: Add Dependencies length*/ + if (lpDependencies != NULL) + dwRequiredSize += dwDependenciesLength * sizeof(WCHAR); + else + dwRequiredSize += 2 * sizeof(WCHAR); if (lpServiceStartName != NULL) dwRequiredSize += ((wcslen(lpServiceStartName) + 1) * sizeof(WCHAR)); @@ -2608,6 +2620,7 @@ lpStr = (LPWSTR)(lpConfig + 1); + /* Append the image path */ if (lpImagePath != NULL) { wcscpy(lpStr, lpImagePath); @@ -2620,6 +2633,7 @@ lpConfig->lpBinaryPathName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); lpStr += (wcslen(lpStr) + 1); + /* Append the group name */ if (lpService->lpGroup != NULL) { wcscpy(lpStr, lpService->lpGroup->lpGroupName); @@ -2632,12 +2646,25 @@ lpConfig->lpLoadOrderGroup = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); lpStr += (wcslen(lpStr) + 1); - /* FIXME: Append Dependencies */ - wcscpy(lpStr, lpEmptyString); - - lpStr += (wcslen(lpStr) + 1); + /* Append Dependencies */ + if (lpDependencies != NULL) + { + memcpy(lpStr, + lpDependencies, + dwDependenciesLength * sizeof(WCHAR)); + } + else + { + wcscpy(lpStr, lpEmptyString); + } + lpConfig->lpDependencies = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); - + if (lpDependencies != NULL) + lpStr += dwDependenciesLength * sizeof(WCHAR); + else + lpStr += (wcslen(lpStr) + 1); + + /* Append the service start name */ if (lpServiceStartName != NULL) { wcscpy(lpStr, lpServiceStartName); @@ -2650,6 +2677,7 @@ lpConfig->lpServiceStartName = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); lpStr += (wcslen(lpStr) + 1); + /* Append the display name */ if (lpService->lpDisplayName != NULL) { wcscpy(lpStr, lpService->lpDisplayName); @@ -2671,6 +2699,9 @@ if (lpServiceStartName != NULL) HeapFree(GetProcessHeap(), 0, lpServiceStartName); + + if (lpDependencies != NULL) + HeapFree(GetProcessHeap(), 0, lpDependencies); if (hServiceKey != NULL) RegCloseKey(hServiceKey); @@ -3537,6 +3568,8 @@ HKEY hServiceKey = NULL; LPWSTR lpImagePath = NULL; LPWSTR lpServiceStartName = NULL; + LPWSTR lpDependencies = NULL; + DWORD dwDependenciesLength = 0; DWORD dwRequiredSize; LPQUERY_SERVICE_CONFIGA lpConfig = NULL; CHAR lpEmptyString[]={0,0}; @@ -3576,15 +3609,22 @@ if (dwError != ERROR_SUCCESS) goto Done; + /* Read the image path */ dwError = ScmReadString(hServiceKey, L"ImagePath", &lpImagePath); if (dwError != ERROR_SUCCESS) goto Done; + /* Read the service start name */ ScmReadString(hServiceKey, L"ObjectName", &lpServiceStartName); + + /* Read the dependencies */ + ScmReadDependencies(hServiceKey, + &lpDependencies, + &dwDependenciesLength); dwRequiredSize = sizeof(QUERY_SERVICE_CONFIGW); @@ -3598,8 +3638,11 @@ else dwRequiredSize += 2; - /* FIXME: Add Dependencies length*/ - dwRequiredSize += 2; + /* Add Dependencies length */ + if (lpDependencies != NULL) + dwRequiredSize += dwDependenciesLength; + else + dwRequiredSize += 2; if (lpServiceStartName != NULL) dwRequiredSize += wcslen(lpServiceStartName) + 1; @@ -3635,7 +3678,7 @@ lpImagePath, -1, lpStr, - wcslen(lpImagePath)+1, + wcslen(lpImagePath) + 1, 0, 0); } @@ -3654,7 +3697,7 @@ lpService->lpGroup->lpGroupName, -1, lpStr, - wcslen(lpService->lpGroup->lpGroupName)+1, + wcslen(lpService->lpGroup->lpGroupName) + 1, 0, 0); } @@ -3666,11 +3709,28 @@ lpConfig->lpLoadOrderGroup = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); lpStr += (strlen(lpStr) + 1); - /* FIXME: Append Dependencies */ - strcpy(lpStr, lpEmptyString); + /* Append Dependencies */ + if (lpDependencies) + { + WideCharToMultiByte(CP_ACP, + 0, + lpDependencies, + dwDependenciesLength, + lpStr, + dwDependenciesLength, + 0, + 0); + } + else + { + strcpy(lpStr, lpEmptyString); + } lpConfig->lpDependencies = (LPSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpConfig); - lpStr += (strlen(lpStr) + 1); + if (lpDependencies) + lpStr += dwDependenciesLength; + else + lpStr += (strlen(lpStr) + 1); if (lpServiceStartName) { @@ -3679,7 +3739,7 @@ lpServiceStartName, -1, lpStr, - wcslen(lpServiceStartName)+1, + wcslen(lpServiceStartName) + 1, 0, 0); } @@ -3698,7 +3758,7 @@ lpService->lpDisplayName, -1, lpStr, - wcslen(lpService->lpDisplayName)+1, + wcslen(lpService->lpDisplayName) + 1, 0, 0); } @@ -3719,6 +3779,9 @@ if (lpServiceStartName != NULL) HeapFree(GetProcessHeap(), 0, lpServiceStartName); + + if (lpDependencies != NULL) + HeapFree(GetProcessHeap(), 0, lpDependencies); if (hServiceKey != NULL) RegCloseKey(hServiceKey); @@ -4231,7 +4294,8 @@ LPWSTR lpDescriptionW = NULL; LPSTR lpDescription = NULL; - DPRINT1("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n",hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + DPRINT1("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n", + hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); if (!lpBuffer) return ERROR_INVALID_ADDRESS; @@ -4268,7 +4332,7 @@ if (dwError != ERROR_SUCCESS) goto done; - if (dwInfoLevel & SERVICE_CONFIG_DESCRIPTION) + if (dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { LPSERVICE_DESCRIPTIONA lpServiceDescription = (LPSERVICE_DESCRIPTIONA)lpBuffer; LPSTR lpStr; @@ -4388,7 +4452,7 @@ if (dwError != ERROR_SUCCESS) goto done; - if (dwInfoLevel & SERVICE_CONFIG_DESCRIPTION) + if (dwInfoLevel == SERVICE_CONFIG_DESCRIPTION) { LPSERVICE_DESCRIPTIONW lpServiceDescription = (LPSERVICE_DESCRIPTIONW)lpBuffer; LPWSTR lpStr; @@ -4412,7 +4476,7 @@ wcscpy(lpStr, lpDescription); lpServiceDescription->lpDescription = (LPWSTR)((ULONG_PTR)lpStr - (ULONG_PTR)lpServiceDescription); } - else if (dwInfoLevel & SERVICE_CONFIG_FAILURE_ACTIONS) + else if (dwInfoLevel == SERVICE_CONFIG_FAILURE_ACTIONS) { LPWSTR lpStr; LPSERVICE_FAILURE_ACTIONSW lpFailureActions = (LPSERVICE_FAILURE_ACTIONSW)lpBuffer; @@ -4578,6 +4642,7 @@ DPRINT1("Failed to allocate buffer!\n"); return ERROR_NOT_ENOUGH_MEMORY; } + MultiByteToWideChar(CP_ACP, 0, pszGroupName, @@ -4608,7 +4673,8 @@ pszGroupNameW); /* if no services were returned then we are Done */ - if (*lpServicesReturned == 0) goto Done; + if (*lpServicesReturned == 0) + goto Done; lpStatusPtrA = (LPENUM_SERVICE_STATUS_PROCESSA)lpBuffer; lpStringPtrA = (LPSTR)((ULONG_PTR)lpBuffer + @@ -4657,9 +4723,11 @@ } Done:; - if (pszGroupNameW) HeapFree(GetProcessHeap(), 0, pszGroupNameW); - - if (lpStatusPtrW) HeapFree(GetProcessHeap(), 0, lpStatusPtrW); + if (pszGroupNameW) + HeapFree(GetProcessHeap(), 0, pszGroupNameW); + + if (lpStatusPtrW) + HeapFree(GetProcessHeap(), 0, lpStatusPtrW); DPRINT("REnumServicesStatusExA() done (Error %lu)\n", dwError); @@ -4843,7 +4911,9 @@ DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); - if (lpResumeIndex) *lpResumeIndex = dwLastResumeCount; + if (lpResumeIndex) + *lpResumeIndex = dwLastResumeCount; + *lpServicesReturned = dwServiceCount; *pcbBytesNeeded = dwRequiredSize; @@ -4929,7 +4999,8 @@ if (dwError == 0) { *pcbBytesNeeded = 0; - if (lpResumeIndex) *lpResumeIndex = 0; + if (lpResumeIndex) + *lpResumeIndex = 0; } Done:; Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Fri Dec 25 16:08:03 2009 @@ -92,6 +92,11 @@ LPWSTR lpValueName, LPWSTR *lpValue); +DWORD +ScmReadDependencies(HKEY hServiceKey, + LPWSTR *lpDependencies, + DWORD *lpdwDependenciesLength); + /* database.c */

1 0

[janderwald] 44758: [PORTCLS] - Return status code of operation - Cancel all irps when pin state is set to stop. Fixes ReactOS portcls regression under WindowsXP - Handle IRP_MN_READ_CONFIG
by janderwald＠svn.reactos.org 25 Dec '09

25 Dec '09

Author: janderwald Date: Fri Dec 25 13:24:42 2009 New Revision: 44758 URL: http://svn.reactos.org/svn/reactos?rev=44758&view=rev Log: [PORTCLS] - Return status code of operation - Cancel all irps when pin state is set to stop. Fixes ReactOS portcls regression under WindowsXP - Handle IRP_MN_READ_CONFIG Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Fri Dec 25 13:24:42 2009 @@ -139,6 +139,10 @@ return PcCompleteIrp(DeviceObject, Irp, Status); case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + Status = PcForwardIrpSynchronous(DeviceObject, Irp); + return PcCompleteIrp(DeviceObject, Irp, Status); + case IRP_MN_READ_CONFIG: + DPRINT("IRP_MN_READ_CONFIG\n"); Status = PcForwardIrpSynchronous(DeviceObject, Irp); return PcCompleteIrp(DeviceObject, Irp, Status); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Fri Dec 25 13:24:42 2009 @@ -451,9 +451,14 @@ // complete with successful state Pin->m_IrpQueue->CancelBuffers(); } + else if (Pin->m_State == KSSTATE_STOP) + { + Pin->m_IrpQueue->CancelBuffers(); + } // store result Irp->IoStatus.Information = sizeof(KSSTATE); } + return Status; } else if (Request->Flags & KSPROPERTY_TYPE_GET) { @@ -848,7 +853,6 @@ } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_RESET_STATE) { - /// FIXME Status = KsAcquireResetValue(Irp, &ResetValue); DPRINT("Status %x Value %u\n", Status, ResetValue); /* check for success */

1 0

[janderwald] 44757: [PSDK] - Fix KSEVENTSETID_AudioControlChange definition
by janderwald＠svn.reactos.org 25 Dec '09

25 Dec '09

Author: janderwald Date: Fri Dec 25 03:54:24 2009 New Revision: 44757 URL: http://svn.reactos.org/svn/reactos?rev=44757&view=rev Log: [PSDK] - Fix KSEVENTSETID_AudioControlChange definition Modified: trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4475… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Fri Dec 25 03:54:24 2009 @@ -828,18 +828,6 @@ KSPROPERTY_TOPOLOGYNODE_ENABLE KSPROPERTY_TOPOLOGYNODE_RESET */ - - - - -/* =============================================================== - Event Sets for audio drivers - TODO -*/ -#define KSEVENTSETID_AudioControlChange -/* - KSEVENT_CONTROL_CHANGE -*/ - /* =============================================================== Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Fri Dec 25 03:54:24 2009 @@ -529,6 +529,16 @@ } KSPROPERTY_AUDIO; +#define STATIC_KSEVENTSETID_AudioControlChange\ + 0xE85E9698L, 0xFA2F, 0x11D1, 0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("E85E9698-FA2F-11D1-95BD-00C04FB925D3", KSEVENTSETID_AudioControlChange); +#define KSEVENTSETID_AudioControlChange DEFINE_GUIDNAMED(KSEVENTSETID_AudioControlChange) + +typedef enum { + KSEVENT_CONTROL_CHANGE, +} KSEVENT_AUDIO_CONTROL_CHANGE; + + #define STATIC_KSEVENTSETID_LoopedStreaming\ 0x4682B940L, 0xC6EF, 0x11D0, 0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D DEFINE_GUIDSTRUCT("4682B940-C6EF-11D0-96D8-00AA0051E51D", KSEVENTSETID_LoopedStreaming);

1 0

[janderwald] 44756: [MMIXER] - Store correct mixer handle in the mixer info - mmixer can now handle set / get volume and on-off (mute) requests
by janderwald＠svn.reactos.org 25 Dec '09

25 Dec '09

Author: janderwald Date: Fri Dec 25 02:21:29 2009 New Revision: 44756 URL: http://svn.reactos.org/svn/reactos?rev=44756&view=rev Log: [MMIXER] - Store correct mixer handle in the mixer info - mmixer can now handle set / get volume and on-off (mute) requests Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Fri Dec 25 02:21:29 2009 @@ -691,6 +691,9 @@ OutConnection->SymbolicLinkName[1] = L'\\'; MixerData = MMixerGetDataByDeviceName(MixerList, OutConnection->SymbolicLinkName); ASSERT(MixerData); + + // store connected mixer handle + MixerInfo->hMixer = MixerData->hDevice; // get connected filter pin count PinsRefCount = MMixerGetFilterPinCount(MixerContext, MixerData->hDevice);

1 0

[janderwald] 44755: [KS] - Store missing result of operation - Fixes a regression of KsStudio
by janderwald＠svn.reactos.org 25 Dec '09

25 Dec '09

Author: janderwald Date: Fri Dec 25 02:17:39 2009 New Revision: 44755 URL: http://svn.reactos.org/svn/reactos?rev=44755&view=rev Log: [KS] - Store missing result of operation - Fixes a regression of KsStudio Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Fri Dec 25 02:17:39 2009 @@ -741,6 +741,7 @@ if (IoStack->Parameters.DeviceIoControl.OutputBufferLength == sizeof(KSMULTIPLE_ITEM)) { /* buffer can only hold the length descriptor */ + Irp->IoStatus.Information = sizeof(KSMULTIPLE_ITEM); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Fri Dec 25 02:17:39 2009 @@ -159,7 +159,9 @@ HANDLE hKey; PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; - DPRINT("KsTopologyPropertyHandler Irp %p Property %p Data %p Topology %p\n", Irp, Property, Data, Topology); + IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("KsTopologyPropertyHandler Irp %p Property %p Data %p Topology %p OutputLength %lu PropertyId %lu\n", Irp, Property, Data, Topology, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Property->Id); if (Property->Flags != KSPROPERTY_TYPE_GET) { @@ -167,8 +169,6 @@ Irp->IoStatus.Information = 0; return STATUS_NOT_IMPLEMENTED; } - - IoStack = IoGetCurrentIrpStackLocation(Irp); switch(Property->Id) {

1 0

[tkreuzer] 44754: [freeldr] Fix apic base
by tkreuzer＠svn.reactos.org 24 Dec '09

24 Dec '09

Author: tkreuzer Date: Fri Dec 25 00:17:18 2009 New Revision: 44754 URL: http://svn.reactos.org/svn/reactos?rev=44754&view=rev Log: [freeldr] Fix apic base Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… ============================================================================== --- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Fri Dec 25 00:17:18 2009 @@ -46,7 +46,7 @@ #define HYPERSPACE_BASE 0xfffff70000000000ULL #define HAL_BASE 0xffffffff80000000ULL -#define APIC_BASE 0xfffffffffee00000ULL // FIXME +#define APIC_BASE 0xFFFFFFFFFFFE0000ULL #define APIC_PHYS_BASE 0xfee00000

1 0

[cwittich] 44753: [gdi32] fix typo in comment
by cwittich＠svn.reactos.org 24 Dec '09

24 Dec '09

Author: cwittich Date: Thu Dec 24 10:01:43 2009 New Revision: 44753 URL: http://svn.reactos.org/svn/reactos?rev=44753&view=rev Log: [gdi32] fix typo in comment Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Thu Dec 24 10:01:43 2009 @@ -265,7 +265,7 @@ SetLastError(ERROR_INVALID_PARAMETER); return NULL; } -//// Remove when Bush/Pen/Rgn Attr is ready! +//// Remove when Brush/Pen/Rgn Attr is ready! return NtGdiCreateRectRgn(x1,y1,x2,y2); //// hrgn = hGetPEBHandle(hctRegionHandle, 0);

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
51
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2009