Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 39053: Add property USERMODE, set it to 1 to compile usermode parts (base, dlls and mingw lib)
by tkreuzer＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: tkreuzer Date: Fri Jan 23 17:37:51 2009 New Revision: 39053 URL: http://svn.reactos.org/svn/reactos?rev=39053&view=rev Log: Add property USERMODE, set it to 1 to compile usermode parts (base, dlls and mingw lib) Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Fri Jan 23 17:37:51 2009 @@ -127,17 +127,19 @@ <include host="true">include/reactos</include> <include host="true">include/reactos/wine</include> -  + <if property="USERMODE" value="1"> + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> + + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> + </directory> + </if> <directory name="boot"> <xi:include href="boot/boot.rbuild" /> </directory> - -  <directory name="drivers"> <directory name="bus"> @@ -254,9 +256,12 @@ <directory name="libxml2"> <xi:include href="lib/3rdparty/libxml2/libxml2.rbuild" /> </directory> - <directory name="mingw"> - <xi:include href="lib/3rdparty/mingw/mingw.rbuild" /> - </directory> + + <if property="USERMODE" value="1"> + <directory name="mingw"> + <xi:include href="lib/3rdparty/mingw/mingw.rbuild" /> + </directory> + </if> <directory name="zlib"> <xi:include href="lib/3rdparty/zlib/zlib.rbuild" /> </directory> Modified: branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… ============================================================================== --- branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild [iso-8859-1] Fri Jan 23 17:37:51 2009 @@ -83,4 +83,11 @@ --> <property name="_ELF_" value="0" /> + +<property name="USERMODE" value="0" /> + + </group>

1 0

[tkreuzer] 39052: NDK: fix and update LDR_DATA_TABLE_ENTRY
by tkreuzer＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: tkreuzer Date: Fri Jan 23 16:13:08 2009 New Revision: 39052 URL: http://svn.reactos.org/svn/reactos?rev=39052&view=rev Log: NDK: fix and update LDR_DATA_TABLE_ENTRY Modified: branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/ldrtypes.h [iso-8859-1] Fri Jan 23 16:13:08 2009 @@ -112,9 +112,12 @@ union { LIST_ENTRY HashLinks; - PVOID SectionPointer; + struct + { + PVOID SectionPointer; + ULONG CheckSum; + }; }; - ULONG CheckSum; union { ULONG TimeDateStamp; @@ -122,6 +125,11 @@ }; PVOID EntryPointActivationContext; PVOID PatchInformation; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + LIST_ENTRY ForwarderLinks; + LIST_ENTRY ServiceTagLinks; + LIST_ENTRY StaticLinks; +#endif } LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY; //

1 0

[dreimer] 39051: Changelog Update
by dreimer＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: dreimer Date: Fri Jan 23 14:00:43 2009 New Revision: 39051 URL: http://svn.reactos.org/svn/reactos?rev=39051&view=rev Log: Changelog Update Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Fri Jan 23 14:00:43 2009 @@ -1,5 +1,25 @@ -*** XXX xxth, 200x - RosBE 1.3.1 Released - +*** February xxth, 200x - RosBE 1.4 Released + +"Quote of the year: A loooong time ago there was something called Batch. It was a old +scripting "language" which you could use for some stuff, but with hacks, so ugly, you +would turn to stone if used. Then there was the new shiny Powershell Scripting Language +which came from the deep resorts of the Devil GaTeS with great features like a XML +parser and more. A great war began for the right to be used in the Glorious Heaven of +RosBE. After some salves of XML parse and shrapnels of DeHacking, Batch was fainted and +vanished. The glorious winner of the war helped to gain worldwide peace and food for the +hungry ppl. After a loong live Powershell died and was replaced by PS 2.0." + +- Added: Spanish Resource Files for options.exe (Javier Remacha) +- Added: Experimental GCC 3.4.5 Support added back (Daniel Reimer) +- Added: Support for config.rbuild TUNE and BUILD_MP Values +- Fixed: More logical names for the GCC Folders +- Fixed: Drive not Found Errors (Colin Finck, d0g) +- Fixed: clean when using _ROSBE_OBJPATH and/or _ROSBE_OUTPATH +- Fixed: If the specified OBJ and OUT Paths are non existant, don't just abort. Create + them and continue. +- Fixed: Options.exe configs the PS Port now too. +- Updated: "clean MODULENAME" does the same like "make MODULENAME_clean now" + (Daniel Reimer) - Updated: The Update Utility now does not just blindly sync the script files. It loads complete Update Packs, which can contain from a single script update up to a fully new GCC Version and installs them if the User confirms it. (Daniel Reimer) @@ -9,6 +29,7 @@ it. Without this param, build was broken. (Daniel Reimer) - Modified: Changed the default values of config to the previous setting instead of the real default one if you don't type in anything for a setting. (Daniel Reimer) +- Tons of Code cleanup, code reduction and Bugfixes (Daniel Reimer) *** October 26th, 2008 - RosBE 1.3 Released

1 0

[cfinck] 39050: - Convert the function headers to a Doxygen-compatible style - Fix some typos
by cfinck＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: cfinck Date: Fri Jan 23 13:36:35 2009 New Revision: 39050 URL: http://svn.reactos.org/svn/reactos?rev=39050&view=rev Log: - Convert the function headers to a Doxygen-compatible style - Fix some typos Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] Fri Jan 23 13:36:35 2009 @@ -22,7 +22,7 @@ { PFILE_OBJECT FileObject; LARGE_INTEGER PageOffset; - LONGLONG BeyoundLastEntryOffset; + LONGLONG BeyondLastEntryOffset; PVOID PageBuffer; PBCB PageBcb; @@ -512,9 +512,9 @@ Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PUCHAR); /* Next Page Offset */ PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; - if (PageOffset > Context->BeyoundLastEntryOffset) - { - PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + if (PageOffset > Context->BeyondLastEntryOffset) + { + PageValidLength = (SIZE_T) (Context->BeyondLastEntryOffset - Context->PageOffset.QuadPart); } BeyondLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); @@ -545,7 +545,7 @@ /* Check if this is the last available entry */ if (PageValidLength < PAGE_SIZE) break; - /* We are getting beyound current page and + /* We are getting beyond current page and * are still in the continous run, map the next page. */ Context->PageOffset.QuadPart = PageOffset; @@ -564,9 +564,9 @@ Entry = (PUCHAR) Context->PageBuffer; /* Next Page Offset */ PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; - if (PageOffset > Context->BeyoundLastEntryOffset) - { - PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + if (PageOffset > Context->BeyondLastEntryOffset) + { + PageValidLength = (SIZE_T) (Context->BeyondLastEntryOffset - Context->PageOffset.QuadPart); } BeyondLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] Fri Jan 23 13:36:35 2009 @@ -16,7 +16,7 @@ { PFILE_OBJECT FileObject; LARGE_INTEGER PageOffset; - LONGLONG BeyoundLastEntryOffset; + LONGLONG BeyondLastEntryOffset; PVOID PageBuffer; PBCB PageBcb; } FAT_SCAN_CONTEXT; @@ -127,12 +127,14 @@ /* FUNCTIONS ****************************************************************/ -/* - * FUNCTION: - * Determines the index of the set bit. - * ARGUMENTS: - * Number = Number having a single bit set. - * RETURNS: Index of the set bit. +/** + * Determines the index of the set bit. + * + * @param Number + * Number having a single bit set. + * + * @return + * Index of the set bit. */ FORCEINLINE ULONG @@ -218,17 +220,25 @@ ExRaiseStatus(STATUS_NOT_IMPLEMENTED); } -/* - * FUNCTION: - * Scans FAT32 for continous chain of clusters - * ARGUMENTS: - * Context = Pointer to FAT_SCAN_CONTEXT. - * Index = Supplies the Index of the first cluster - * and receves the last index after the last - * cluster in the chain. - * CanWait = Indicates if the context allows blocking. - * RETURNS: Value of the last claster terminated the scan. - * NOTES: Raises STATUS_CANT_WAIT race condition. +/** + * Scans FAT32 for continous chain of clusters + * + * @param Context + * Pointer to FAT_SCAN_CONTEXT. + * + * @param Index + * Supplies the Index of the first cluster + * and receves the last index after the last + * cluster in the chain. + * + * @param CanWait + * Indicates if the context allows blocking. + * + * @return + * Value of the last claster terminated the scan. + * + * @note + * Raises STATUS_CANT_WAIT race condition. */ ULONG FatScanFat32ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, @@ -270,8 +280,8 @@ Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PULONG); /* Next Page Offset */ PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; - if (PageOffset > Context->BeyoundLastEntryOffset) - PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + if (PageOffset > Context->BeyondLastEntryOffset) + PageValidLength = (SIZE_T) (Context->BeyondLastEntryOffset - Context->PageOffset.QuadPart); BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PULONG); while (TRUE) @@ -284,7 +294,7 @@ /* Check if this is the last available entry */ if (PageValidLength < PAGE_SIZE) break; - /* We are getting beyound current page and + /* We are getting beyond current page and * are still in the continous run, map the next page. */ Context->PageOffset.QuadPart = PageOffset; @@ -300,8 +310,8 @@ Entry = (PULONG) Context->PageBuffer; /* Next Page Offset */ PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; - if (PageOffset > Context->BeyoundLastEntryOffset) - PageValidLength = (SIZE_T) (Context->BeyoundLastEntryOffset + if (PageOffset > Context->BeyondLastEntryOffset) + PageValidLength = (SIZE_T) (Context->BeyondLastEntryOffset - Context->PageOffset.QuadPart); BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PULONG); } @@ -336,25 +346,37 @@ ExRaiseStatus(STATUS_NOT_IMPLEMENTED); } -/* - * FUNCTION: - * Queries file MCB for the specified region [Vbo, Vbo + Length], - * returns the number of runs in the region as well as the first - * run of the range itself. - * If the specified region is not fully cached in MCB the routine - * scans FAT for the file and fills the MCB until the file offset - * (defined as Vbo + Length) is reached. - * ARGUMENTS: - * Fcb = Pointer to FCB structure for the file. - * Vbo = Virtual Byte Offset in the file. - * Lbo = Receives the Value of Logical Byte offset corresponding - * to supplied Vbo Value. - * Length = Supplies file range length to be examined and recieves - * the length of first run. - * OutIndex = Recieves the index (in MCB cache) of first run. - * RETURNS: Incremented index of the last run (+1). - * NOTES: Should be called by I/O routines to split the I/O operation - * into sequential or parallel I/O operations. +/** + * Queries file MCB for the specified region [Vbo, Vbo + Length], + * returns the number of runs in the region as well as the first + * run of the range itself. + * If the specified region is not fully cached in MCB the routine + * scans FAT for the file and fills the MCB until the file offset + * (defined as Vbo + Length) is reached. + * + * @param Fcb + * Pointer to FCB structure for the file. + * + * @param Vbo + * Virtual Byte Offset in the file. + * + * @param Lbo + * Receives the Value of Logical Byte offset corresponding + * to supplied Vbo Value. + * + * @param Length + * Supplies file range length to be examined and receives + * the length of first run. + * + * @param OutIndex + * Receives the index (in MCB cache) of first run. + * + * @return + * Incremented index of the last run (+1). + * + * @note + * Should be called by I/O routines to split the I/O operation + * into sequential or parallel I/O operations. */ ULONG FatScanFat(IN PFCB Fcb, @@ -364,7 +386,7 @@ OUT PULONG Index, IN BOOLEAN CanWait) { - LONGLONG CurrentLbo, CurrentVbo, BeyoundLastVbo, CurrentLength; + LONGLONG CurrentLbo, CurrentVbo, BeyondLastVbo, CurrentLength; ULONG Entry, NextEntry, NumberOfEntries, CurrentIndex; FAT_SCAN_CONTEXT Context; PVCB Vcb; @@ -372,15 +394,15 @@ /* Some often used values */ Vcb = Fcb->Vcb; CurrentIndex = 0; - BeyoundLastVbo = Vbo + *Length; + BeyondLastVbo = Vbo + *Length; CurrentLength = ((LONGLONG) Vcb->Clusters) << Vcb->BytesPerClusterLog; - if (BeyoundLastVbo > CurrentLength) - BeyoundLastVbo = CurrentLength; + if (BeyondLastVbo > CurrentLength) + BeyondLastVbo = CurrentLength; /* Try to locate first run */ if (FsRtlLookupLargeMcbEntry(&Fcb->Mcb, Vbo, Lbo, Length, NULL, NULL, Index)) { /* Check if we have a single mapped run */ - if (Vbo >= BeyoundLastVbo) + if (Vbo >= BeyondLastVbo) goto FatScanFcbFatExit; } else { *Length = 0L; @@ -401,14 +423,14 @@ { if (Entry < FAT_CLUSTER_LAST) ExRaiseStatus(STATUS_FILE_CORRUPT_ERROR); - BeyoundLastVbo = 0LL; + BeyondLastVbo = 0LL; } CurrentIndex = 0L; CurrentVbo = 0LL; } RtlZeroMemory(&Context, sizeof(Context)); Context.FileObject = Vcb->VolumeFileObject; - while (CurrentVbo < BeyoundLastVbo) + while (CurrentVbo < BeyondLastVbo) { /* Locate Continous run starting with the current entry */ NumberOfEntries = Entry; @@ -509,7 +531,7 @@ Vcb->Clusters = ClustersCapacity; Vcb->BytesPerCluster = SectorsToBytes(Vcb, Vcb->Bpb.SectorsPerCluster); Vcb->BytesPerClusterLog = FatPowerOfTwo(Vcb->BytesPerCluster); - Vcb->BeyoundLastClusterInFat = ((LONGLONG) Vcb->Clusters) * Vcb->IndexDepth / 0x8; + Vcb->BeyondLastClusterInFat = ((LONGLONG) Vcb->Clusters) * Vcb->IndexDepth / 0x8; } NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Fri Jan 23 13:36:35 2009 @@ -107,7 +107,7 @@ ULONG IndexDepth; ULONG RootDirent; ULONG RootDirentSectors; - LONGLONG BeyoundLastClusterInFat; + LONGLONG BeyondLastClusterInFat; FAT_METHODS Methods; /* Root Directory Fcb: */ struct _FCB *RootFcb;

1 0

[sginsberg] 39049: - Fix build. Addendum to r39048 (from KJK)
by sginsberg＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: sginsberg Date: Fri Jan 23 09:56:07 2009 New Revision: 39049 URL: http://svn.reactos.org/svn/reactos?rev=39049&view=rev Log: - Fix build. Addendum to r39048 (from KJK) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Jan 23 09:56:07 2009 @@ -1721,7 +1721,7 @@ vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); if ( rpcDependencies.size () > 0 ) - dependencies = v2s ( backend, rpcDependencies, 5 ); + dependencies = " " + v2s ( backend, rpcDependencies, 5 ); pchRule.Execute ( fMakefile, backend,

1 0

[hyperion] 39048: modified tools/rbuild/backend/mingw/modulehandler.cpp Use a Rule object for formatting PCH rules. Results in an almost identical makefile.auto, the differences (improvements) being: - the new rule uses $@ and $< instead of the full filenames - the new rule doesn't add the -g option (the module's CFLAGS/CXXFLAGS already contain it) - .gch files now depend on the module's .rbuild as well (a standard Rule feature) No rebuild needed, but rbuild will force one for most of you anyway
by hyperion＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: hyperion Date: Fri Jan 23 08:27:12 2009 New Revision: 39048 URL: http://svn.reactos.org/svn/reactos?rev=39048&view=rev Log: modified tools/rbuild/backend/mingw/modulehandler.cpp Use a Rule object for formatting PCH rules. Results in an almost identical makefile.auto, the differences (improvements) being: - the new rule uses $@ and $< instead of the full filenames - the new rule doesn't add the -g option (the module's CFLAGS/CXXFLAGS already contain it) - .gch files now depend on the module's .rbuild as well (a standard Rule feature) No rebuild needed, but rbuild will force one for most of you anyways modified tools/rbuild/backend/mingw/rule.cpp modified tools/rbuild/backend/mingw/rule.h Rule::Execute now supports an arbitrary set of replaceable variables, too (required for the PCH rule) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/rule.cpp trunk/reactos/tools/rbuild/backend/mingw/rule.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Fri Jan 23 08:27:12 2009 @@ -1158,14 +1158,14 @@ "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(intermediate_path_noext)_p.h -p -P $(intermediate_path_noext)_p.c $(source)\n" "$(intermediate_path_noext)_p.o: $(intermediate_path_noext)_p.c $(intermediate_path_noext)_p.h$(dependencies) | $(intermediate_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", + "\t$(ECHO_CC)\n" + "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -fno-unit-at-a-time -c $<\n", "$(intermediate_path_noext)_p.h", "$(intermediate_path_noext)_p.c", "$(intermediate_path_noext)_p.o", "$(intermediate_dir)$(SEP)", NULL ); Rule widlDlldataRule ( "$(source): $(dependencies) ${$(module_name)_precondition} $(WIDL_TARGET) | $(intermediate_dir)\n" - "\t$(ECHO_WIDL)\n" + "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) --dlldata-only --dlldata=$(source) $(bare_dependencies)\n" "$(intermediate_path_noext).o: $(source) $(dependencies) | $(intermediate_dir)\n" "\t$(ECHO_CC)\n" @@ -1196,6 +1196,10 @@ "\t$(ECHO_HOSTCC)\n" "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c $<\n", "$(intermediate_path_unique).o", NULL ); +Rule pchRule ( "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch: $(source)$(dependencies) | $(intermediate_dir)$(SEP).gch_$(module_name)\n" + "\t$(ECHO_PCH)\n" + "\t$(pch_cc) -o $@ $(pch_ccflags)$(compiler_flags) -x $(pch_language) -c $<\n", + "$(intermediate_dir)$(SEP).gch_$(module_name)$(SEP)$(source_name).gch", NULL ); Rule emptyRule ( "", NULL ); void @@ -1689,38 +1693,45 @@ void MingwModuleHandler::GenerateObjectFileTargets () { - const FileLocation *pchFilename = GetPrecompiledHeaderFilename (); - fprintf ( fMakefile, "# OBJECT FILE TARGETS\n" ); - if ( pchFilename ) - { - string cc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gcc}" : "${gcc}" ); - string cppc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gpp}" : "${gpp}" ); - - const FileLocation& baseHeaderFile = *module.pch->file; - CLEAN_FILE ( *pchFilename ); - string dependencies = backend->GetFullName ( baseHeaderFile ); + if ( module.pch && use_pch ) + { + + std::map<string, string> vars; + + if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ) + vars["pch_cc"] = "${host_gcc}"; + else + vars["pch_cc"] = "${gcc}"; + + if ( module.cplusplus ) + { + vars["pch_language"] = "c++-header"; + vars["pch_ccflags"] = cxxflagsMacro.c_str(); + } + else + { + vars["pch_language"] = "c-header"; + vars["pch_ccflags"] = cflagsMacro.c_str(); + } + /* WIDL generated headers may be used */ + string dependencies; vector<FileLocation> rpcDependencies; GetRpcHeaderDependencies ( rpcDependencies ); if ( rpcDependencies.size () > 0 ) - dependencies += " " + v2s ( backend, rpcDependencies, 5 ); - fprintf ( fMakefile, - "%s: %s | %s\n", - backend->GetFullName ( *pchFilename ).c_str(), - dependencies.c_str(), - backend->GetFullPath ( *pchFilename ).c_str() ); - fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); - fprintf ( fMakefile, - "\t%s -o %s %s %s -gstabs+ -x %s %s\n\n", - cc.c_str(), - backend->GetFullName ( *pchFilename ).c_str(), - module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(), - GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(), - module.cplusplus ? "c++-header" : "c-header", - backend->GetFullName ( baseHeaderFile ).c_str() ); - delete pchFilename; + dependencies = v2s ( backend, rpcDependencies, 5 ); + + pchRule.Execute ( fMakefile, + backend, + module, + module.pch->file, + clean_files, + dependencies, + GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags, module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(), + vars ); + fprintf ( fMakefile, "\n" ); } GenerateObjectFileTargets ( module.non_if_data ); Modified: trunk/reactos/tools/rbuild/backend/mingw/rule.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rule.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.cpp [iso-8859-1] Fri Jan 23 08:27:12 2009 @@ -37,9 +37,16 @@ static std::string FixString ( const string& str, Backend *backend, const Module& module, const FileLocation *source, - const std::string& additional_dependencies, const std::string& compiler_flags ) + const std::string& additional_dependencies, const std::string& compiler_flags, + const std::map<std::string, std::string>& custom_variables ) { string ret = str; + + for ( std::map<std::string, std::string>::const_iterator p = custom_variables.begin(); p != custom_variables.end(); ++ p ) + { + ReplaceVariable ( ret, "$(" + p->first + ")", p->second ); + } + string dep = additional_dependencies; dep += " " + module.xmlbuildFile; @@ -91,15 +98,16 @@ const FileLocation *source, string_list& clean_files, const std::string& additional_dependencies, - const std::string& compiler_flags ) const + const std::string& compiler_flags, + const std::map<std::string, std::string>& custom_variables ) const { - string cmd = FixString ( command, backend, module, source, additional_dependencies, compiler_flags ); + string cmd = FixString ( command, backend, module, source, additional_dependencies, compiler_flags, custom_variables ); fprintf ( outputFile, "%s", cmd.c_str () ); for ( size_t i = 0; i < generatedFiles.size (); i++ ) { - string file = FixString ( generatedFiles[i], backend, module, source, "", "" ); + string file = FixString ( generatedFiles[i], backend, module, source, "", "", custom_variables ); if ( file[file.length () - 1] != cSep ) { clean_files.push_back ( file ); @@ -128,3 +136,22 @@ dir.c_str () ); } } + + +void Rule::Execute ( FILE *outputFile, + MingwBackend *backend, + const Module& module, + const FileLocation *source, + string_list& clean_files, + const std::string& additional_dependencies, + const std::string& compiler_flags ) const +{ + this->Execute ( outputFile, + backend, + module, + source, + clean_files, + additional_dependencies, + compiler_flags, + std::map<std::string, std::string>() ); +} Modified: trunk/reactos/tools/rbuild/backend/mingw/rule.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rule.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rule.h [iso-8859-1] Fri Jan 23 08:27:12 2009 @@ -21,6 +21,8 @@ #include "mingw.h" +#include <map> + class Rule { public: @@ -32,6 +34,14 @@ string_list& clean_files, const std::string& additional_dependencies = "", const std::string& compiler_flags = "" ) const; + void Execute ( FILE *outputFile, + MingwBackend *backend, + const Module& module, + const FileLocation *source, + string_list& clean_files, + const std::string& additional_dependencies, + const std::string& compiler_flags, + const std::map<std::string, std::string>& custom_variables ) const; private: const std::string command; string_list generatedFiles;

1 0

[cwittich] 39047: Namea -> Name
by cwittich＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: cwittich Date: Fri Jan 23 08:03:45 2009 New Revision: 39047 URL: http://svn.reactos.org/svn/reactos?rev=39047&view=rev Log: Namea -> Name Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Fri Jan 23 08:03:45 2009 @@ -2580,9 +2580,9 @@ } /*TRACE("Key Namea0 Length %d\n", StringU.Length);*/ /* BUGBUG could be uninitialized */ - TRACE("Key Namea1 Length %d\n", NameLength); - TRACE("Key Namea Length %d\n", *lpcbName); - TRACE("Key Namea %s\n", lpName); + TRACE("Key Name1 Length %d\n", NameLength); + TRACE("Key Name Length %d\n", *lpcbName); + TRACE("Key Name %s\n", lpName); RtlFreeHeap(ProcessHeap, 0,

1 0

[cwittich] 39046: add missing DllRegisterServer
by cwittich＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: cwittich Date: Fri Jan 23 07:46:36 2009 New Revision: 39046 URL: http://svn.reactos.org/svn/reactos?rev=39046&view=rev Log: add missing DllRegisterServer Modified: trunk/reactos/dll/win32/pstorec/pstorec.rbuild Modified: trunk/reactos/dll/win32/pstorec/pstorec.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.rbuild [iso-8859-1] Fri Jan 23 07:46:36 2009 @@ -1,4 +1,5 @@ <module name="pstorec" type="win32dll" baseaddress="${BASEADDRESS_PSTOREC}" installbase="system32" installname="pstorec.dll"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="pstorec.spec" /> <include base="pstorec">.</include> <library>wine</library>

1 0

[cwittich] 39045: sync mpr with wine 1.1.13
by cwittich＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: cwittich Date: Fri Jan 23 07:29:06 2009 New Revision: 39045 URL: http://svn.reactos.org/svn/reactos?rev=39045&view=rev Log: sync mpr with wine 1.1.13 Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc trunk/reactos/dll/win32/mpr/mpr_Ko.rc trunk/reactos/dll/win32/mpr/mpr_Zh.rc trunk/reactos/dll/win32/mpr/pwcache.c trunk/reactos/dll/win32/mpr/wnet.c Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ja.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ja.rc [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -18,9 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "lbg[NSÌ" + IDS_ENTIRENETWORK "ãããã¯ã¼ã¯å¨ä½" } + +#pragma code_page(default) Modified: trunk/reactos/dll/win32/mpr/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ko.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Ko.rc [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { @@ -29,7 +29,7 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "³×Æ®¿öÅ© ¾ÏÈ£ ÀÔ·Â" -FONT 8, "MS Shell Dlg" +FONT 9, "MS Shell Dlg" { LTEXT "´ç½ÅÀÇ »ç¿ëÀÚÀÌ¸§°ú ¾ÏÈ£¸¦ ÀÔ·ÂÇÏ½Ã¿À:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "ÇÁ·Ï½Ã", -1, 40, 26, 50, 10 Modified: trunk/reactos/dll/win32/mpr/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Zh.rc?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_Zh.rc [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -31,7 +31,7 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "è¾å¥ç½ç»å¯ç " -FONT 9, "MS Song" +FONT 9, "MS Shell Dlg" { LTEXT "è¯·è¾å¥ç¨æ·ååå¯ç :", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "ä»£ç", -1, 40, 26, 50, 10 @@ -58,7 +58,7 @@ IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "è¼¸å¥ç¶²è·¯å¯ç¢¼" -FONT 8, "PMingLiu" +FONT 9, "MS Shell Dlg" { LTEXT "è«è¼¸å¥ç¨æ¶ååå¯ç¢¼:", IDC_EXPLAIN, 40, 6, 150, 15 LTEXT "ä»£ç", -1, 40, 26, 50, 10 Modified: trunk/reactos/dll/win32/mpr/pwcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -39,7 +39,7 @@ return x + 'A' - 10; } -static inline CHAR ctox( CHAR x ) +static inline signed char ctox( CHAR x ) { if( ( x >= '0' ) && ( x <= '9' ) ) return x - '0'; @@ -282,7 +282,7 @@ /* decode the value */ for(j=5; j<val_sz; j+=2 ) { - CHAR hi = ctox( val[j] ), lo = ctox( val[j+1] ); + signed char hi = ctox( val[j] ), lo = ctox( val[j+1] ); if( ( hi < 0 ) || ( lo < 0 ) ) break; val[(j-5)/2] = (hi<<4) | lo; Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=3… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Fri Jan 23 07:29:06 2009 @@ -746,8 +746,7 @@ dwScope, dwType, dwUsage, lpNet, &handle); if (ret == WN_SUCCESS) { - *lphEnum = - (HANDLE)_createProviderEnumerator( + *lphEnum = _createProviderEnumerator( dwScope, dwType, dwUsage, index, handle); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; @@ -761,7 +760,7 @@ } else if (lpNet->lpRemoteName) { - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; } @@ -773,13 +772,13 @@ /* comment matches the "Entire Network", enumerate * global scope of every provider */ - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); } else { /* this is the same as not having passed lpNet */ - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, NULL); } ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; @@ -787,19 +786,18 @@ } else { - *lphEnum = (HANDLE)_createGlobalEnumeratorW(dwScope, dwType, + *lphEnum = _createGlobalEnumeratorW(dwScope, dwType, dwUsage, lpNet); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; } break; case RESOURCE_CONTEXT: - *lphEnum = (HANDLE)_createContextEnumerator(dwScope, dwType, - dwUsage); + *lphEnum = _createContextEnumerator(dwScope, dwType, dwUsage); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; case RESOURCE_REMEMBERED: case RESOURCE_CONNECTED: - *lphEnum = (HANDLE)_createNullEnumerator(); + *lphEnum = _createNullEnumerator(); ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY; break; default: @@ -853,8 +851,8 @@ * size is the appropriate usage of this function, so * hopefully it won't be an issue. */ - ret = _thunkNetResourceArrayWToA((LPNETRESOURCEW)localBuffer, - &localCount, lpBuffer, lpBufferSize); + ret = _thunkNetResourceArrayWToA(localBuffer, &localCount, + lpBuffer, lpBufferSize); *lpcCount = localCount; } HeapFree(GetProcessHeap(), 0, localBuffer); @@ -923,8 +921,7 @@ } } strNext = (LPWSTR)((LPBYTE)lpBuffer + count * sizeof(NETRESOURCEW)); - for (i = 0, resource = (LPNETRESOURCEW)lpBuffer; i < count; - i++, resource++) + for (i = 0, resource = lpBuffer; i < count; i++, resource++) { resource->dwScope = RESOURCE_GLOBALNET; resource->dwType = RESOURCETYPE_ANY; @@ -1136,7 +1133,7 @@ } else { - LPNETRESOURCEW lpNet = (LPNETRESOURCEW)lpBuffer; + LPNETRESOURCEW lpNet = lpBuffer; lpNet->dwScope = RESOURCE_GLOBALNET; lpNet->dwType = enumerator->dwType; @@ -1418,7 +1415,7 @@ if (!(lpBuffer)) ret = WN_OUT_OF_MEMORY; - else + else if (providerTable != NULL) { /* FIXME: For function value of a variable is indifferent, it does * search of all providers in a network. @@ -1861,7 +1858,7 @@ { case UNIVERSAL_NAME_INFO_LEVEL: { - LPUNIVERSAL_NAME_INFOA info = (LPUNIVERSAL_NAME_INFOA)lpBuffer; + LPUNIVERSAL_NAME_INFOA info = lpBuffer; size = sizeof(*info) + lstrlenA(lpLocalPath) + 1; if (*lpBufferSize < size) @@ -1903,7 +1900,7 @@ { case UNIVERSAL_NAME_INFO_LEVEL: { - LPUNIVERSAL_NAME_INFOW info = (LPUNIVERSAL_NAME_INFOW)lpBuffer; + LPUNIVERSAL_NAME_INFOW info = lpBuffer; size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); if (*lpBufferSize < size) @@ -2121,7 +2118,7 @@ providerTable->table[providerIndex].dwSpecVersion; lpNetInfoStruct->dwStatus = NO_ERROR; lpNetInfoStruct->dwCharacteristics = 0; - lpNetInfoStruct->dwHandle = (ULONG_PTR)NULL; + lpNetInfoStruct->dwHandle = 0; lpNetInfoStruct->wNetType = HIWORD(providerTable->table[providerIndex].dwNetType); lpNetInfoStruct->dwPrinters = -1;

1 0

[cwittich] 39044: add cryptdlg from wine 1.1.13
by cwittich＠svn.reactos.org 23 Jan '09

23 Jan '09

Author: cwittich Date: Fri Jan 23 07:06:33 2009 New Revision: 39044 URL: http://svn.reactos.org/svn/reactos?rev=39044&view=rev Log: add cryptdlg from wine 1.1.13 Added: trunk/reactos/dll/win32/cryptdlg/ (with props) trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild (with props) trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc (with props) trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec (with props) trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc (with props) trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc (with props) trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc (with props) trunk/reactos/dll/win32/cryptdlg/cryptres.h (with props) trunk/reactos/dll/win32/cryptdlg/main.c (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=390… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -3,6 +3,7 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" /> + <property name="BASEADDRESS_CRYPTDLG" value="0x209C0000" /> <property name="BASEADDRESS_COMCAT" value="0x20A50000" /> <property name="BASEADDRESS_DEVENUM" value="0x35680000" /> <property name="BASEADDRESS_RSABASE" value="0x35700000" /> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -248,6 +248,7 @@ dll\win32\credui\credui.dll 1 dll\win32\crtdll\crtdll.dll 1 dll\win32\crypt32\crypt32.dll 1 +dll\win32\cryptdlg\cryptdlg.dll 1 dll\win32\cryptdll\cryptdll.dll 1 dll\win32\cryptnet\cryptnet.dll 1 dll\win32\cryptui\cryptui.dll 1 Propchange: trunk/reactos/dll/win32/cryptdlg/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jan 23 07:06:33 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/cryptdlg/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/cryptdlg/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/cryptdlg/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="cryptdlg" type="win32dll" baseaddress="${BASEADDRESS_CRYPTDLG}" installbase="system32" installname="cryptdlg.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="cryptdlg.spec" /> + <include base="cryptdlg">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <library>wine</library> + <library>advapi32</library> + <library>kernel32</library> + <library>user32</library> + <library>crypt32</library> + <library>cryptui</library> + <library>wintrust</library> + <library>ntdll</library> + <file>main.c</file> + <file>cryptdlg.rc</file> +</module> Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -1,0 +1,27 @@ +/* + * cryptdlg dll resources + * + * Copyright 2008 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "cryptres.h" + +#include "cryptdlg_En.rc" +#include "cryptdlg_Fr.rc" +#include "cryptdlg_Ko.rc" Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -1,0 +1,21 @@ +1 stub CertConfigureTrustA +2 stub CertConfigureTrustW +3 stdcall CertTrustCertPolicy(ptr long long long) +4 stdcall CertTrustCleanup(ptr) +5 stdcall CertTrustFinalPolicy(ptr) +6 stdcall CertTrustInit(ptr) +7 stub DecodeAttrSequence +8 stub DecodeRecipientID +9 stub EncodeAttrSequence +10 stub EncodeRecipientID +11 stub FormatPKIXEmailProtection +12 stdcall FormatVerisignExtension(long long long ptr str ptr long ptr ptr) +13 stub CertModifyCertificatesToTrust +14 stub CertSelectCertificateA +15 stub CertSelectCertificateW +16 stdcall CertViewPropertiesA(ptr) +17 stdcall CertViewPropertiesW(ptr) +18 stdcall -private DllRegisterServer() +19 stdcall -private DllUnregisterServer() +20 stdcall GetFriendlyNameOfCertA(ptr ptr long) +21 stdcall GetFriendlyNameOfCertW(ptr ptr long) Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -1,0 +1,36 @@ +/* + * cryptdlg dll resources + * + * Copyright 2008 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Certificate Policy" + IDS_POLICY_ID "Policy Identifier: " + IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" + IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" + IDS_CPS "CPS" + IDS_USER_NOTICE "User Notice" + IDS_QUALIFIER "Qualifier" + IDS_NOTICE_REF "Notice Reference" + IDS_ORGANIZATION "Organization=" + IDS_NOTICE_NUM "Notice Number=" + IDS_NOTICE_TEXT "Notice Text=" +} Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_En.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -1,0 +1,36 @@ +/* + * cryptdlg dll French resources + * + * Copyright 2008 JonathanÂ Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "Politique de certificat" + IDS_POLICY_ID "Identifiant de politiqueÂ : " + IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" + IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" + IDS_CPS "CPS" + IDS_USER_NOTICE "User Notice" + IDS_QUALIFIER "Qualifier" + IDS_NOTICE_REF "Notice Reference" + IDS_ORGANIZATION "Organisation=" + IDS_NOTICE_NUM "Notice Number=" + IDS_NOTICE_TEXT "Notice Text=" +} Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Fr.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -1,0 +1,37 @@ +/* + * cryptdlg dll resources + * + * Copyright 2008 Juan Lang + * Copyright 2008 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "ÀÎÁõ Á¤Ã¥" + IDS_POLICY_ID "Á¤Ã¥ ½Äº°ÀÚ: " + IDS_POLICY_QUALIFIER_INFO "Á¤Ã¥ ±¸º°ÀÚ Á¤º¸" + IDS_POLICY_QUALIFIER_ID "Á¤Ã¥ ±¸º°ÀÚ ¾ÆÀÌµð=" + IDS_CPS "CPS" + IDS_USER_NOTICE "»ç¿ëÀÚ ÅëÁö" + IDS_QUALIFIER "±¸º°ÀÚ" + IDS_NOTICE_REF "ÅëÁö ÂüÁ¶" + IDS_ORGANIZATION "±â°ü=" + IDS_NOTICE_NUM "ÅëÁö ¹øÈ£=" + IDS_NOTICE_TEXT "ÅëÁö ÅØ½ºÆ®=" +} Propchange: trunk/reactos/dll/win32/cryptdlg/cryptdlg_Ko.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/cryptdlg/cryptres.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/cryptre… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/cryptres.h (added) +++ trunk/reactos/dll/win32/cryptdlg/cryptres.h [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -1,0 +1,33 @@ +/* + * Copyright 2008 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __CRYPTRES_H__ +#define __CRYPTRES_H__ + +#define IDS_CERT_POLICY 100 +#define IDS_POLICY_ID 101 +#define IDS_POLICY_QUALIFIER_INFO 102 +#define IDS_POLICY_QUALIFIER_ID 103 +#define IDS_CPS 104 +#define IDS_USER_NOTICE 105 +#define IDS_QUALIFIER 106 +#define IDS_NOTICE_REF 107 +#define IDS_ORGANIZATION 108 +#define IDS_NOTICE_NUM 109 +#define IDS_NOTICE_TEXT 110 + +#endif /* ndef __CRYPTRES_H__ */ Propchange: trunk/reactos/dll/win32/cryptdlg/cryptres.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/cryptdlg/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/main.c?… ============================================================================== --- trunk/reactos/dll/win32/cryptdlg/main.c (added) +++ trunk/reactos/dll/win32/cryptdlg/main.c [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -1,0 +1,1211 @@ +/* + * Copyright 2008 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "wincrypt.h" +#include "wintrust.h" +#include "winuser.h" +#include "objbase.h" +#include "cryptdlg.h" +#include "cryptuiapi.h" +#include "cryptres.h" +#include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cryptdlg); + +static HINSTANCE hInstance; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + hInstance = hinstDLL; + break; + case DLL_PROCESS_DETACH: + break; + default: + break; + } + return TRUE; +} + +/*********************************************************************** + * GetFriendlyNameOfCertA (CRYPTDLG.@) + */ +DWORD WINAPI GetFriendlyNameOfCertA(PCCERT_CONTEXT pccert, LPSTR pchBuffer, + DWORD cchBuffer) +{ + return CertGetNameStringA(pccert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, + pchBuffer, cchBuffer); +} + +/*********************************************************************** + * GetFriendlyNameOfCertW (CRYPTDLG.@) + */ +DWORD WINAPI GetFriendlyNameOfCertW(PCCERT_CONTEXT pccert, LPWSTR pchBuffer, + DWORD cchBuffer) +{ + return CertGetNameStringW(pccert, CERT_NAME_FRIENDLY_DISPLAY_TYPE, 0, NULL, + pchBuffer, cchBuffer); +} + +/*********************************************************************** + * CertTrustInit (CRYPTDLG.@) + */ +HRESULT WINAPI CertTrustInit(CRYPT_PROVIDER_DATA *pProvData) +{ + HRESULT ret = S_FALSE; + + TRACE("(%p)\n", pProvData); + + if (pProvData->padwTrustStepErrors && + !pProvData->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_WVTINIT]) + ret = S_OK; + TRACE("returning %08x\n", ret); + return ret; +} + +/*********************************************************************** + * CertTrustCertPolicy (CRYPTDLG.@) + */ +BOOL WINAPI CertTrustCertPolicy(CRYPT_PROVIDER_DATA *pProvData, DWORD idxSigner, BOOL fCounterSignerChain, DWORD idxCounterSigner) +{ + FIXME("(%p, %d, %s, %d)\n", pProvData, idxSigner, fCounterSignerChain ? "TRUE" : "FALSE", idxCounterSigner); + return FALSE; +} + +/*********************************************************************** + * CertTrustCleanup (CRYPTDLG.@) + */ +HRESULT WINAPI CertTrustCleanup(CRYPT_PROVIDER_DATA *pProvData) +{ + FIXME("(%p)\n", pProvData); + return E_NOTIMPL; +} + +static BOOL CRYPTDLG_CheckOnlineCRL(void) +{ + static const WCHAR policyFlagsKey[] = { 'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g', + 'r','a','p','h','y','\\','{','7','8','0','1','e','b','d','0','-','c','f', + '4','b','-','1','1','d','0','-','8','5','1','f','-','0','0','6','0','9', + '7','9','3','8','7','e','a','}',0 }; + static const WCHAR policyFlags[] = { 'P','o','l','i','c','y','F','l','a', + 'g','s',0 }; + HKEY key; + BOOL ret = FALSE; + + if (!RegOpenKeyExW(HKEY_LOCAL_MACHINE, policyFlagsKey, 0, KEY_READ, &key)) + { + DWORD type, flags, size = sizeof(flags); + + if (!RegQueryValueExW(key, policyFlags, NULL, &type, (BYTE *)&flags, + &size) && type == REG_DWORD) + { + /* The flag values aren't defined in any header I'm aware of, but + * this value is well documented on the net. + */ + if (flags & 0x00010000) + ret = TRUE; + } + RegCloseKey(key); + } + return ret; +} + +/* Returns TRUE if pCert is not in the Disallowed system store, or FALSE if it + * is. + */ +static BOOL CRYPTDLG_IsCertAllowed(PCCERT_CONTEXT pCert) +{ + BOOL ret; + BYTE hash[20]; + DWORD size = sizeof(hash); + + if ((ret = CertGetCertificateContextProperty(pCert, + CERT_SIGNATURE_HASH_PROP_ID, hash, &size))) + { + static const WCHAR disallowedW[] = + { 'D','i','s','a','l','l','o','w','e','d',0 }; + HCERTSTORE disallowed = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, + X509_ASN_ENCODING, 0, CERT_SYSTEM_STORE_CURRENT_USER, disallowedW); + + if (disallowed) + { + PCCERT_CONTEXT found = CertFindCertificateInStore(disallowed, + X509_ASN_ENCODING, 0, CERT_FIND_SIGNATURE_HASH, hash, NULL); + + if (found) + { + ret = FALSE; + CertFreeCertificateContext(found); + } + CertCloseStore(disallowed, 0); + } + } + return ret; +} + +static DWORD CRYPTDLG_TrustStatusToConfidence(DWORD errorStatus) +{ + DWORD confidence = 0; + + confidence = 0; + if (!(errorStatus & CERT_TRUST_IS_NOT_SIGNATURE_VALID)) + confidence |= CERT_CONFIDENCE_SIG; + if (!(errorStatus & CERT_TRUST_IS_NOT_TIME_VALID)) + confidence |= CERT_CONFIDENCE_TIME; + if (!(errorStatus & CERT_TRUST_IS_NOT_TIME_NESTED)) + confidence |= CERT_CONFIDENCE_TIMENEST; + return confidence; +} + +static BOOL CRYPTDLG_CopyChain(CRYPT_PROVIDER_DATA *data, + PCCERT_CHAIN_CONTEXT chain) +{ + BOOL ret; + CRYPT_PROVIDER_SGNR signer; + PCERT_SIMPLE_CHAIN simpleChain = chain->rgpChain[0]; + DWORD i; + + memset(&signer, 0, sizeof(signer)); + signer.cbStruct = sizeof(signer); + ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, 0, &signer); + if (ret) + { + CRYPT_PROVIDER_SGNR *sgnr = WTHelperGetProvSignerFromChain(data, 0, + FALSE, 0); + + if (sgnr) + { + sgnr->dwError = simpleChain->TrustStatus.dwErrorStatus; + sgnr->pChainContext = CertDuplicateCertificateChain(chain); + } + else + ret = FALSE; + for (i = 0; ret && i < simpleChain->cElement; i++) + { + ret = data->psPfns->pfnAddCert2Chain(data, 0, FALSE, 0, + simpleChain->rgpElement[i]->pCertContext); + if (ret) + { + CRYPT_PROVIDER_CERT *cert; + + if ((cert = WTHelperGetProvCertFromChain(sgnr, i))) + { + CERT_CHAIN_ELEMENT *element = simpleChain->rgpElement[i]; + + cert->dwConfidence = CRYPTDLG_TrustStatusToConfidence( + element->TrustStatus.dwErrorStatus); + cert->dwError = element->TrustStatus.dwErrorStatus; + cert->pChainElement = element; + } + else + ret = FALSE; + } + } + } + return ret; +} + +static CERT_VERIFY_CERTIFICATE_TRUST *CRYPTDLG_GetVerifyData( + CRYPT_PROVIDER_DATA *data) +{ + CERT_VERIFY_CERTIFICATE_TRUST *pCert = NULL; + + /* This should always be true, but just in case the calling function is + * called directly: + */ + if (data->pWintrustData->dwUnionChoice == WTD_CHOICE_BLOB && + data->pWintrustData->u.pBlob && data->pWintrustData->u.pBlob->cbMemObject == + sizeof(CERT_VERIFY_CERTIFICATE_TRUST) && + data->pWintrustData->u.pBlob->pbMemObject) + pCert = (CERT_VERIFY_CERTIFICATE_TRUST *) + data->pWintrustData->u.pBlob->pbMemObject; + return pCert; +} + +static HCERTCHAINENGINE CRYPTDLG_MakeEngine(CERT_VERIFY_CERTIFICATE_TRUST *cert) +{ + HCERTCHAINENGINE engine = NULL; + HCERTSTORE root = NULL, trust = NULL; + DWORD i; + + if (cert->cRootStores) + { + root = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (root) + { + for (i = 0; i < cert->cRootStores; i++) + CertAddStoreToCollection(root, cert->rghstoreRoots[i], 0, 0); + } + } + if (cert->cTrustStores) + { + trust = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (root) + { + for (i = 0; i < cert->cTrustStores; i++) + CertAddStoreToCollection(trust, cert->rghstoreTrust[i], 0, 0); + } + } + if (cert->cRootStores || cert->cStores || cert->cTrustStores) + { + CERT_CHAIN_ENGINE_CONFIG config; + + memset(&config, 0, sizeof(config)); + config.cbSize = sizeof(config); + config.hRestrictedRoot = root; + config.hRestrictedTrust = trust; + config.cAdditionalStore = cert->cStores; + config.rghAdditionalStore = cert->rghstoreCAs; + config.hRestrictedRoot = root; + CertCreateCertificateChainEngine(&config, &engine); + CertCloseStore(root, 0); + CertCloseStore(trust, 0); + } + return engine; +} + +/*********************************************************************** + * CertTrustFinalPolicy (CRYPTDLG.@) + */ +HRESULT WINAPI CertTrustFinalPolicy(CRYPT_PROVIDER_DATA *data) +{ + BOOL ret; + DWORD err = S_OK; + CERT_VERIFY_CERTIFICATE_TRUST *pCert = CRYPTDLG_GetVerifyData(data); + + TRACE("(%p)\n", data); + + if (data->pWintrustData->dwUIChoice != WTD_UI_NONE) + FIXME("unimplemented for UI choice %d\n", + data->pWintrustData->dwUIChoice); + if (pCert) + { + DWORD flags = 0; + CERT_CHAIN_PARA chainPara; + HCERTCHAINENGINE engine; + + memset(&chainPara, 0, sizeof(chainPara)); + chainPara.cbSize = sizeof(chainPara); + if (CRYPTDLG_CheckOnlineCRL()) + flags |= CERT_CHAIN_REVOCATION_CHECK_END_CERT; + engine = CRYPTDLG_MakeEngine(pCert); + GetSystemTimeAsFileTime(&data->sftSystemTime); + ret = CRYPTDLG_IsCertAllowed(pCert->pccert); + if (ret) + { + PCCERT_CHAIN_CONTEXT chain; + + ret = CertGetCertificateChain(engine, pCert->pccert, + &data->sftSystemTime, NULL, &chainPara, flags, NULL, &chain); + if (ret) + { + if (chain->cChain != 1) + { + FIXME("unimplemented for more than 1 simple chain\n"); + err = TRUST_E_SUBJECT_FORM_UNKNOWN; + ret = FALSE; + } + else if ((ret = CRYPTDLG_CopyChain(data, chain))) + { + if (CertVerifyTimeValidity(&data->sftSystemTime, + pCert->pccert->pCertInfo)) + { + ret = FALSE; + err = CERT_E_EXPIRED; + } + } + else + err = TRUST_E_SYSTEM_ERROR; + CertFreeCertificateChain(chain); + } + else + err = TRUST_E_SUBJECT_NOT_TRUSTED; + } + CertFreeCertificateChainEngine(engine); + } + else + { + ret = FALSE; + err = TRUST_E_NOSIGNATURE; + } + /* Oddly, native doesn't set the error in the trust step error location, + * probably because this action is more advisory than anything else. + * Instead it stores it as the final error, but the function "succeeds" in + * any case. + */ + if (!ret) + data->dwFinalError = err; + TRACE("returning %d (%08x)\n", S_OK, data->dwFinalError); + return S_OK; +} + +/*********************************************************************** + * CertViewPropertiesA (CRYPTDLG.@) + */ +BOOL WINAPI CertViewPropertiesA(CERT_VIEWPROPERTIES_STRUCT_A *info) +{ + CERT_VIEWPROPERTIES_STRUCT_W infoW; + LPWSTR title = NULL; + BOOL ret; + + TRACE("(%p)\n", info); + + memcpy(&infoW, info, sizeof(infoW)); + if (info->szTitle) + { + int len = MultiByteToWideChar(CP_ACP, 0, info->szTitle, -1, NULL, 0); + + title = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (title) + { + MultiByteToWideChar(CP_ACP, 0, info->szTitle, -1, title, len); + infoW.szTitle = title; + } + else + { + ret = FALSE; + goto error; + } + } + ret = CertViewPropertiesW(&infoW); + HeapFree(GetProcessHeap(), 0, title); +error: + return ret; +} + +/*********************************************************************** + * CertViewPropertiesW (CRYPTDLG.@) + */ +BOOL WINAPI CertViewPropertiesW(CERT_VIEWPROPERTIES_STRUCT_W *info) +{ + static GUID cert_action_verify = CERT_CERTIFICATE_ACTION_VERIFY; + CERT_VERIFY_CERTIFICATE_TRUST trust; + WINTRUST_BLOB_INFO blob; + WINTRUST_DATA wtd; + LONG err; + BOOL ret; + + TRACE("(%p)\n", info); + + memset(&trust, 0, sizeof(trust)); + trust.cbSize = sizeof(trust); + trust.pccert = info->pCertContext; + trust.cRootStores = info->cRootStores; + trust.rghstoreRoots = info->rghstoreRoots; + trust.cStores = info->cStores; + trust.rghstoreCAs = info->rghstoreCAs; + trust.cTrustStores = info->cTrustStores; + trust.rghstoreTrust = info->rghstoreTrust; + memset(&blob, 0, sizeof(blob)); + blob.cbStruct = sizeof(blob); + blob.cbMemObject = sizeof(trust); + blob.pbMemObject = (BYTE *)&trust; + memset(&wtd, 0, sizeof(wtd)); + wtd.cbStruct = sizeof(wtd); + wtd.dwUIChoice = WTD_UI_NONE; + wtd.dwUnionChoice = WTD_CHOICE_BLOB; + wtd.u.pBlob = &blob; + wtd.dwStateAction = WTD_STATEACTION_VERIFY; + err = WinVerifyTrust(NULL, &cert_action_verify, &wtd); + if (err == ERROR_SUCCESS) + { + CRYPTUI_VIEWCERTIFICATE_STRUCTW uiInfo; + BOOL propsChanged = FALSE; + + memset(&uiInfo, 0, sizeof(uiInfo)); + uiInfo.dwSize = sizeof(uiInfo); + uiInfo.hwndParent = info->hwndParent; + uiInfo.dwFlags = + CRYPTUI_DISABLE_ADDTOSTORE | CRYPTUI_ENABLE_EDITPROPERTIES; + uiInfo.szTitle = info->szTitle; + uiInfo.pCertContext = info->pCertContext; + uiInfo.cPurposes = info->cArrayPurposes; + uiInfo.rgszPurposes = (LPCSTR *)info->arrayPurposes; + uiInfo.u.hWVTStateData = wtd.hWVTStateData; + uiInfo.fpCryptProviderDataTrustedUsage = TRUE; + uiInfo.cPropSheetPages = info->cArrayPropSheetPages; + uiInfo.rgPropSheetPages = info->arrayPropSheetPages; + uiInfo.nStartPage = info->nStartPage; + ret = CryptUIDlgViewCertificateW(&uiInfo, &propsChanged); + wtd.dwStateAction = WTD_STATEACTION_CLOSE; + WinVerifyTrust(NULL, &cert_action_verify, &wtd); + } + else + ret = FALSE; + return ret; +} + +static BOOL CRYPT_FormatHexString(const BYTE *pbEncoded, DWORD cbEncoded, + WCHAR *str, DWORD *pcchStr) +{ + BOOL ret; + DWORD charsNeeded; + + if (cbEncoded) + charsNeeded = (cbEncoded * 3); + else + charsNeeded = 1; + if (!str) + { + *pcchStr = charsNeeded; + ret = TRUE; + } + else if (*pcchStr < charsNeeded) + { + *pcchStr = charsNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + static const WCHAR fmt[] = { '%','0','2','x',' ',0 }; + static const WCHAR endFmt[] = { '%','0','2','x',0 }; + DWORD i; + LPWSTR ptr = str; + + *pcchStr = charsNeeded; + if (cbEncoded) + { + for (i = 0; i < cbEncoded; i++) + { + if (i < cbEncoded - 1) + ptr += sprintfW(ptr, fmt, pbEncoded[i]); + else + ptr += sprintfW(ptr, endFmt, pbEncoded[i]); + } + } + else + *ptr = 0; + ret = TRUE; + } + return ret; +} + +static const WCHAR indent[] = { ' ',' ',' ',' ',' ',0 }; +static const WCHAR colonCrlf[] = { ':','\r','\n',0 }; +static const WCHAR colonSpace[] = { ':',' ',0 }; +static const WCHAR crlf[] = { '\r','\n',0 }; +static const WCHAR commaSep[] = { ',',' ',0 }; + +static BOOL CRYPT_FormatCPS(DWORD dwCertEncodingType, + DWORD dwFormatStrType, const BYTE *pbEncoded, DWORD cbEncoded, + WCHAR *str, DWORD *pcchStr) +{ + BOOL ret; + DWORD size, charsNeeded = 1; + CERT_NAME_VALUE *cpsValue; + + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_UNICODE_ANY_STRING, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &cpsValue, &size))) + { + LPCWSTR headingSep, sep; + DWORD headingSepLen, sepLen; + + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + headingSep = colonCrlf; + sep = crlf; + } + else + { + headingSep = colonSpace; + sep = commaSep; + } + sepLen = strlenW(sep); + headingSepLen = strlenW(headingSep); + + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += 3 * strlenW(indent); + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += cpsValue->Value.cbData / sizeof(WCHAR); + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, (LPWSTR)cpsValue->Value.pbData); + str += cpsValue->Value.cbData / sizeof(WCHAR); + } + charsNeeded += sepLen; + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, sep); + str += sepLen; + } + LocalFree(cpsValue); + if (!str) + *pcchStr = charsNeeded; + else if (*pcchStr < charsNeeded) + { + *pcchStr = charsNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + *pcchStr = charsNeeded; + } + return ret; +} + +static BOOL CRYPT_FormatUserNotice(DWORD dwCertEncodingType, + DWORD dwFormatStrType, const BYTE *pbEncoded, DWORD cbEncoded, + WCHAR *str, DWORD *pcchStr) +{ + BOOL ret; + DWORD size, charsNeeded = 1; + CERT_POLICY_QUALIFIER_USER_NOTICE *notice; + + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, + X509_PKIX_POLICY_QUALIFIER_USERNOTICE, pbEncoded, cbEncoded, + CRYPT_DECODE_ALLOC_FLAG, NULL, &notice, &size))) + { + static const WCHAR numFmt[] = { '%','d',0 }; + CERT_POLICY_QUALIFIER_NOTICE_REFERENCE *pNoticeRef = + notice->pNoticeReference; + LPCWSTR headingSep, sep; + DWORD headingSepLen, sepLen; + LPWSTR noticeRef, organization, noticeNum, noticeText; + DWORD noticeRefLen, organizationLen, noticeNumLen, noticeTextLen; + WCHAR noticeNumStr[11]; + + noticeRefLen = LoadStringW(hInstance, IDS_NOTICE_REF, + (LPWSTR)&noticeRef, 0); + organizationLen = LoadStringW(hInstance, IDS_ORGANIZATION, + (LPWSTR)&organization, 0); + noticeNumLen = LoadStringW(hInstance, IDS_NOTICE_NUM, + (LPWSTR)&noticeNum, 0); + noticeTextLen = LoadStringW(hInstance, IDS_NOTICE_TEXT, + (LPWSTR)&noticeText, 0); + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + headingSep = colonCrlf; + sep = crlf; + } + else + { + headingSep = colonSpace; + sep = commaSep; + } + sepLen = strlenW(sep); + headingSepLen = strlenW(headingSep); + + if (pNoticeRef) + { + DWORD k; + LPCSTR src; + + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += 3 * strlenW(indent); + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += noticeRefLen; + if (str && *pcchStr >= charsNeeded) + { + memcpy(str, noticeRef, noticeRefLen * sizeof(WCHAR)); + str += noticeRefLen; + } + charsNeeded += headingSepLen; + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, headingSep); + str += headingSepLen; + } + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += 4 * strlenW(indent); + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += organizationLen; + if (str && *pcchStr >= charsNeeded) + { + memcpy(str, organization, organizationLen * sizeof(WCHAR)); + str += organizationLen; + } + charsNeeded += strlen(pNoticeRef->pszOrganization); + if (str && *pcchStr >= charsNeeded) + for (src = pNoticeRef->pszOrganization; src && *src; + src++, str++) + *str = *src; + charsNeeded += sepLen; + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, sep); + str += sepLen; + } + for (k = 0; k < pNoticeRef->cNoticeNumbers; k++) + { + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += 4 * strlenW(indent); + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += noticeNumLen; + if (str && *pcchStr >= charsNeeded) + { + memcpy(str, noticeNum, noticeNumLen * sizeof(WCHAR)); + str += noticeNumLen; + } + sprintfW(noticeNumStr, numFmt, k + 1); + charsNeeded += strlenW(noticeNumStr); + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, noticeNumStr); + str += strlenW(noticeNumStr); + } + charsNeeded += sepLen; + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, sep); + str += sepLen; + } + } + } + if (notice->pszDisplayText) + { + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += 3 * strlenW(indent); + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += noticeTextLen; + if (str && *pcchStr >= charsNeeded) + { + memcpy(str, noticeText, noticeTextLen * sizeof(WCHAR)); + str += noticeTextLen; + } + charsNeeded += strlenW(notice->pszDisplayText); + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, notice->pszDisplayText); + str += strlenW(notice->pszDisplayText); + } + charsNeeded += sepLen; + if (str && *pcchStr >= charsNeeded) + { + strcpyW(str, sep); + str += sepLen; + } + } + LocalFree(notice); + if (!str) + *pcchStr = charsNeeded; + else if (*pcchStr < charsNeeded) + { + *pcchStr = charsNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + *pcchStr = charsNeeded; + } + return ret; +} + +/*********************************************************************** + * FormatVerisignExtension (CRYPTDLG.@) + */ +BOOL WINAPI FormatVerisignExtension(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + CERT_POLICIES_INFO *policies; + DWORD size; + BOOL ret = FALSE; + + if (!cbEncoded) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_POLICIES, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &policies, &size))) + { + static const WCHAR numFmt[] = { '%','d',0 }; + DWORD charsNeeded = 1; /* space for NULL terminator */ + LPCWSTR headingSep, sep; + DWORD headingSepLen, sepLen; + WCHAR policyNum[11], policyQualifierNum[11]; + LPWSTR certPolicy, policyId, policyQualifierInfo, policyQualifierId; + LPWSTR cps, userNotice, qualifier; + DWORD certPolicyLen, policyIdLen, policyQualifierInfoLen; + DWORD policyQualifierIdLen, cpsLen, userNoticeLen, qualifierLen; + DWORD i; + LPWSTR str = pbFormat; + + certPolicyLen = LoadStringW(hInstance, IDS_CERT_POLICY, + (LPWSTR)&certPolicy, 0); + policyIdLen = LoadStringW(hInstance, IDS_POLICY_ID, (LPWSTR)&policyId, + 0); + policyQualifierInfoLen = LoadStringW(hInstance, + IDS_POLICY_QUALIFIER_INFO, (LPWSTR)&policyQualifierInfo, 0); + policyQualifierIdLen = LoadStringW(hInstance, IDS_POLICY_QUALIFIER_ID, + (LPWSTR)&policyQualifierId, 0); + cpsLen = LoadStringW(hInstance, IDS_CPS, (LPWSTR)&cps, 0); + userNoticeLen = LoadStringW(hInstance, IDS_USER_NOTICE, + (LPWSTR)&userNotice, 0); + qualifierLen = LoadStringW(hInstance, IDS_QUALIFIER, + (LPWSTR)&qualifier, 0); + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + headingSep = colonCrlf; + sep = crlf; + } + else + { + headingSep = colonSpace; + sep = commaSep; + } + sepLen = strlenW(sep); + headingSepLen = strlenW(headingSep); + + for (i = 0; ret && i < policies->cPolicyInfo; i++) + { + CERT_POLICY_INFO *policy = &policies->rgPolicyInfo[i]; + DWORD j; + LPCSTR src; + + charsNeeded += 1; /* '['*/ + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + *str++ = '['; + sprintfW(policyNum, numFmt, i + 1); + charsNeeded += strlenW(policyNum); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, policyNum); + str += strlenW(policyNum); + } + charsNeeded += 1; /* ']'*/ + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + *str++ = ']'; + charsNeeded += certPolicyLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + memcpy(str, certPolicy, certPolicyLen * sizeof(WCHAR)); + str += certPolicyLen; + } + charsNeeded += headingSepLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, headingSep); + str += headingSepLen; + } + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += strlenW(indent); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += policyIdLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + memcpy(str, policyId, policyIdLen * sizeof(WCHAR)); + str += policyIdLen; + } + charsNeeded += strlen(policy->pszPolicyIdentifier); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + for (src = policy->pszPolicyIdentifier; src && *src; + src++, str++) + *str = *src; + } + charsNeeded += sepLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, sep); + str += sepLen; + } + for (j = 0; j < policy->cPolicyQualifier; j++) + { + CERT_POLICY_QUALIFIER_INFO *qualifierInfo = + &policy->rgPolicyQualifier[j]; + DWORD sizeRemaining; + + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += strlenW(indent); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += 1; /* '['*/ + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + *str++ = '['; + charsNeeded += strlenW(policyNum); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, policyNum); + str += strlenW(policyNum); + } + charsNeeded += 1; /* ','*/ + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + *str++ = ','; + sprintfW(policyQualifierNum, numFmt, j + 1); + charsNeeded += strlenW(policyQualifierNum); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, policyQualifierNum); + str += strlenW(policyQualifierNum); + } + charsNeeded += 1; /* ']'*/ + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + *str++ = ']'; + charsNeeded += policyQualifierInfoLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + memcpy(str, policyQualifierInfo, + policyQualifierInfoLen * sizeof(WCHAR)); + str += policyQualifierInfoLen; + } + charsNeeded += headingSepLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, headingSep); + str += headingSepLen; + } + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += 2 * strlenW(indent); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += policyQualifierIdLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + memcpy(str, policyQualifierId, + policyQualifierIdLen * sizeof(WCHAR)); + str += policyQualifierIdLen; + } + if (!strcmp(qualifierInfo->pszPolicyQualifierId, + szOID_PKIX_POLICY_QUALIFIER_CPS)) + { + charsNeeded += cpsLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + memcpy(str, cps, cpsLen * sizeof(WCHAR)); + str += cpsLen; + } + } + else if (!strcmp(qualifierInfo->pszPolicyQualifierId, + szOID_PKIX_POLICY_QUALIFIER_USERNOTICE)) + { + charsNeeded += userNoticeLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + memcpy(str, userNotice, userNoticeLen * sizeof(WCHAR)); + str += userNoticeLen; + } + } + else + { + charsNeeded += strlen(qualifierInfo->pszPolicyQualifierId); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + for (src = qualifierInfo->pszPolicyQualifierId; + src && *src; src++, str++) + *str = *src; + } + } + charsNeeded += sepLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, sep); + str += sepLen; + } + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + charsNeeded += 2 * strlenW(indent); + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, indent); + str += strlenW(indent); + strcpyW(str, indent); + str += strlenW(indent); + } + } + charsNeeded += qualifierLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + memcpy(str, qualifier, qualifierLen * sizeof(WCHAR)); + str += qualifierLen; + } + charsNeeded += headingSepLen; + if (str && *pcbFormat >= charsNeeded * sizeof(WCHAR)) + { + strcpyW(str, headingSep); + str += headingSepLen; + } + /* This if block is deliberately redundant with the same if + * block above, in order to keep the code more readable (the + * code flow follows the order in which the strings are output.) + */ + if (!strcmp(qualifierInfo->pszPolicyQualifierId, + szOID_PKIX_POLICY_QUALIFIER_CPS)) + { + if (!str || *pcbFormat < charsNeeded * sizeof(WCHAR)) + { + /* Insufficient space, determine how much is needed. */ + ret = CRYPT_FormatCPS(dwCertEncodingType, + dwFormatStrType, qualifierInfo->Qualifier.pbData, + qualifierInfo->Qualifier.cbData, NULL, &size); + if (ret) + charsNeeded += size - 1; + } + else + { + sizeRemaining = *pcbFormat / sizeof(WCHAR); + sizeRemaining -= str - (LPWSTR)pbFormat; + ret = CRYPT_FormatCPS(dwCertEncodingType, + dwFormatStrType, qualifierInfo->Qualifier.pbData, + qualifierInfo->Qualifier.cbData, str, &sizeRemaining); + if (ret || GetLastError() == ERROR_MORE_DATA) + { + charsNeeded += sizeRemaining - 1; + str += sizeRemaining - 1; + } + } + } + else if (!strcmp(qualifierInfo->pszPolicyQualifierId, + szOID_PKIX_POLICY_QUALIFIER_USERNOTICE)) + { + if (!str || *pcbFormat < charsNeeded * sizeof(WCHAR)) + { + /* Insufficient space, determine how much is needed. */ + ret = CRYPT_FormatUserNotice(dwCertEncodingType, + dwFormatStrType, qualifierInfo->Qualifier.pbData, + qualifierInfo->Qualifier.cbData, NULL, &size); + if (ret) + charsNeeded += size - 1; + } + else + { + sizeRemaining = *pcbFormat / sizeof(WCHAR); + sizeRemaining -= str - (LPWSTR)pbFormat; + ret = CRYPT_FormatUserNotice(dwCertEncodingType, + dwFormatStrType, qualifierInfo->Qualifier.pbData, + qualifierInfo->Qualifier.cbData, str, &sizeRemaining); + if (ret || GetLastError() == ERROR_MORE_DATA) + { + charsNeeded += sizeRemaining - 1; + str += sizeRemaining - 1; + } + } + } + else + { + if (!str || *pcbFormat < charsNeeded * sizeof(WCHAR)) + { + /* Insufficient space, determine how much is needed. */ + ret = CRYPT_FormatHexString( + qualifierInfo->Qualifier.pbData, + qualifierInfo->Qualifier.cbData, NULL, &size); + if (ret) + charsNeeded += size - 1; + } + else + { + sizeRemaining = *pcbFormat / sizeof(WCHAR); + sizeRemaining -= str - (LPWSTR)pbFormat; + ret = CRYPT_FormatHexString( + qualifierInfo->Qualifier.pbData, + qualifierInfo->Qualifier.cbData, str, &sizeRemaining); + if (ret || GetLastError() == ERROR_MORE_DATA) + { + charsNeeded += sizeRemaining - 1; + str += sizeRemaining - 1; + } + } + } + } + } + LocalFree(policies); + if (ret) + { + if (!pbFormat) + *pcbFormat = charsNeeded * sizeof(WCHAR); + else if (*pcbFormat < charsNeeded * sizeof(WCHAR)) + { + *pcbFormat = charsNeeded * sizeof(WCHAR); + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + *pcbFormat = charsNeeded * sizeof(WCHAR); + } + } + return ret; +} + +#define szOID_MICROSOFT_Encryption_Key_Preference "1.3.6.1.4.1.311.16.4" + +/*********************************************************************** + * DllRegisterServer (CRYPTDLG.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + static WCHAR cryptdlg[] = { 'c','r','y','p','t','d','l','g','.', + 'd','l','l',0 }; + static WCHAR wintrust[] = { 'w','i','n','t','r','u','s','t','.', + 'd','l','l',0 }; + static WCHAR certTrustInit[] = { 'C','e','r','t','T','r','u','s','t', + 'I','n','i','t',0 }; + static WCHAR wintrustCertificateTrust[] = { 'W','i','n','t','r','u','s','t', + 'C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t',0 }; + static WCHAR certTrustCertPolicy[] = { 'C','e','r','t','T','r','u','s','t', + 'C','e','r','t','P','o','l','i','c','y',0 }; + static WCHAR certTrustFinalPolicy[] = { 'C','e','r','t','T','r','u','s','t', + 'F','i','n','a','l','P','o','l','i','c','y',0 }; + static WCHAR certTrustCleanup[] = { 'C','e','r','t','T','r','u','s','t', + 'C','l','e','a','n','u','p',0 }; + static const WCHAR cryptDlg[] = { 'c','r','y','p','t','d','l','g','.', + 'd','l','l',0 }; + CRYPT_REGISTER_ACTIONID reg; + GUID guid = CERT_CERTIFICATE_ACTION_VERIFY; + HRESULT hr = S_OK; + + memset(&reg, 0, sizeof(reg)); + reg.cbStruct = sizeof(reg); + reg.sInitProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sInitProvider.pwszDLLName = cryptdlg; + reg.sInitProvider.pwszFunctionName = certTrustInit; + reg.sCertificateProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sCertificateProvider.pwszDLLName = wintrust; + reg.sCertificateProvider.pwszFunctionName = wintrustCertificateTrust; + reg.sCertificatePolicyProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sCertificatePolicyProvider.pwszDLLName = cryptdlg; + reg.sCertificatePolicyProvider.pwszFunctionName = certTrustCertPolicy; + reg.sFinalPolicyProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sFinalPolicyProvider.pwszDLLName = cryptdlg; + reg.sFinalPolicyProvider.pwszFunctionName = certTrustFinalPolicy; + reg.sCleanupProvider.cbStruct = sizeof(CRYPT_TRUST_REG_ENTRY); + reg.sCleanupProvider.pwszDLLName = cryptdlg; + reg.sCleanupProvider.pwszFunctionName = certTrustCleanup; + if (!WintrustAddActionID(&guid, WT_ADD_ACTION_ID_RET_RESULT_FLAG, &reg)) + hr = GetLastError(); + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, + "1.3.6.1.4.1.311.16.1.1", cryptDlg, "EncodeAttrSequence"); + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, + szOID_MICROSOFT_Encryption_Key_Preference, cryptDlg, "EncodeRecipientID"); + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, + "1.3.6.1.4.1.311.16.1.1", cryptDlg, "DecodeAttrSequence"); + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, + szOID_MICROSOFT_Encryption_Key_Preference, cryptDlg, "DecodeRecipientID"); + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_FORMAT_OBJECT_FUNC, + szOID_PKIX_KP_EMAIL_PROTECTION, cryptDlg, "FormatPKIXEmailProtection"); + CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_FORMAT_OBJECT_FUNC, + szOID_CERT_POLICIES, cryptDlg, "FormatVerisignExtension"); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (CRYPTDLG.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + GUID guid = CERT_CERTIFICATE_ACTION_VERIFY; + + WintrustRemoveActionID(&guid); + CryptUnregisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, + "1.3.6.1.4.1.311.16.1.1"); + CryptUnregisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, + szOID_MICROSOFT_Encryption_Key_Preference); + CryptUnregisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, + "1.3.6.1.4.1.311.16.1.1"); + CryptUnregisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, + szOID_MICROSOFT_Encryption_Key_Preference); + CryptUnregisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_FORMAT_OBJECT_FUNC, + szOID_PKIX_KP_EMAIL_PROTECTION); + CryptUnregisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_FORMAT_OBJECT_FUNC, + szOID_CERT_POLICIES); + return S_OK; +} Propchange: trunk/reactos/dll/win32/cryptdlg/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Fri Jan 23 07:06:33 2009 @@ -61,6 +61,9 @@ <directory name="crypt32"> <xi:include href="crypt32/crypt32.rbuild" /> </directory> +<directory name="cryptdlg"> + <xi:include href="cryptdlg/cryptdlg.rbuild" /> +</directory> <directory name="cryptdll"> <xi:include href="cryptdll/cryptdll.rbuild" /> </directory>

1 0

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