Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mpiulachs] 33321: -Add a new module type 'cabinet' to handle .cab files generation -Remove harcoded vgafonts.cab instructions from rbuild and move them to its own rbuild file
by mpiulachs＠svn.reactos.org 06 May '08

06 May '08

Author: mpiulachs Date: Tue May 6 09:24:16 2008 New Revision: 33321 URL: http://svn.reactos.org/svn/reactos?rev=33321&view=rev Log: -Add a new module type 'cabinet' to handle .cab files generation -Remove harcoded vgafonts.cab instructions from rbuild and move them to its own rbuild file Added: trunk/reactos/media/vgafonts/vgafonts.rbuild (with props) Modified: trunk/reactos/media/media.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/media/media.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/media.rbuild?rev=333… ============================================================================== --- trunk/reactos/media/media.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/media.rbuild [iso-8859-1] Tue May 6 09:24:16 2008 @@ -13,4 +13,7 @@ <directory name="nls"> <xi:include href="nls/nls.rbuild" /> </directory> + <directory name="vgafonts"> + <xi:include href="vgafonts/vgafonts.rbuild" /> + </directory> </group> Added: trunk/reactos/media/vgafonts/vgafonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/vgafonts/vgafonts.rb… ============================================================================== --- trunk/reactos/media/vgafonts/vgafonts.rbuild (added) +++ trunk/reactos/media/vgafonts/vgafonts.rbuild [iso-8859-1] Tue May 6 09:24:16 2008 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="vgafonts" type="cabinet"> + <bootstrap installbase="$(CDOUTPUT)" /> + <file>437-8x8.bin</file> + <file>737-8x8.bin</file> + <file>775-8x8.bin</file> + <file>850-8x8.bin</file> + <file>852-8x8.bin</file> + <file>865-8x8.bin</file> + <file>866-8x8.bin</file> +</module> Propchange: trunk/reactos/media/vgafonts/vgafonts.rbuild ------------------------------------------------------------------------------ svn:eol-style = native 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] Tue May 6 09:24:16 2008 @@ -243,6 +243,9 @@ break; case IdlHeader: handler = new MingwIdlHeaderModuleHandler ( module ); + break; + case Cabinet: + handler = new MingwCabinetModuleHandler ( module ); break; case EmbeddedTypeLib: handler = new MingwEmbeddedTypeLibModuleHandler ( module ); @@ -1357,6 +1360,7 @@ "\t$(ECHO_CC)\n" "\t${host_gpp} -c $< -o $@ $($(module_name)_CFLAGS)$(compiler_flags)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); +Rule emptyRule ( "", NULL ); void MingwModuleHandler::GenerateGccCommand ( @@ -1479,6 +1483,7 @@ { HostFalse, TypeDontCare, ".cc", &gppRule }, { HostFalse, TypeDontCare, ".cpp", &gppRule }, { HostFalse, TypeDontCare, ".cxx", &gppRule }, + { HostFalse, Cabinet, ".*", &emptyRule } }; size_t i; Rule *customRule = NULL; @@ -1489,7 +1494,7 @@ continue; if ( rules[i].type != TypeDontCare && rules[i].type != module.type ) continue; - if ( rules[i].extension != extension ) + if ( rules[i].extension != extension && rules[i].extension != ".*") continue; customRule = rules[i].rule; break; @@ -3484,12 +3489,6 @@ FileLocation reactosInf ( bootcdReactos.directory, bootcdReactos.relative_path, "reactos.inf" ); - FileLocation vgafontsCab( bootcdReactos.directory, - bootcdReactos.relative_path, - "vgafonts.cab"); - FileLocation vgafontsDir( SourceDirectory, - "media" + sSep + "vgafonts", - "" ); vSourceFiles.push_back ( reactosDff ); @@ -3518,11 +3517,6 @@ sourceFiles.c_str (), cdFiles.c_str (), cdDirectories.c_str () ); - fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); - fprintf ( fMakefile, - "\t$(Q)$(CABMAN_TARGET) -M raw -S %s %s\\*.bin\n", // Escape the asterisk for Make - backend->GetFullName ( vgafontsCab ).c_str (), - backend->GetFullName ( vgafontsDir ).c_str ()); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", backend->GetFullName ( reactosDff ).c_str (), @@ -3828,6 +3822,32 @@ GenerateRules (); } +MingwCabinetModuleHandler::MingwCabinetModuleHandler ( + const Module& module_ ) + + : MingwModuleHandler ( module_ ) +{ +} + +void +MingwCabinetModuleHandler::Process () +{ + string targetMacro ( GetTargetMacro (module) ); + + GenerateRules (); + + const FileLocation *target_file = GetTargetFilename ( module, NULL ); + fprintf ( fMakefile, "%s: | %s\n", + targetMacro.c_str (), + backend->GetFullPath ( *target_file ).c_str () ); + + fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" ); + fprintf ( fMakefile, + "\t$(Q)$(CABMAN_TARGET) -M raw -S %s $(%s_SOURCES)\n", // Escape the asterisk for Make + targetMacro.c_str (), + module.name.c_str()); +} + MingwElfExecutableModuleHandler::MingwElfExecutableModuleHandler ( const Module& module_ ) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Tue May 6 09:24:16 2008 @@ -486,6 +486,14 @@ virtual void Process (); }; +class MingwCabinetModuleHandler : public MingwModuleHandler +{ +public: + MingwCabinetModuleHandler ( const Module& module ); + virtual HostType DefaultHost() { return HostFalse; } + virtual void Process (); +}; + class MingwEmbeddedTypeLibModuleHandler : public MingwModuleHandler { public: Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] Tue May 6 09:24:16 2008 @@ -54,6 +54,7 @@ case BootSector: case BootLoader: case BootProgram: + case Cabinet: return true; case BuildTool: case StaticLibrary: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue May 6 09:24:16 2008 @@ -939,6 +939,8 @@ return EmbeddedTypeLib; if ( attribute.value == "elfexecutable" ) return ElfExecutable; + if ( attribute.value == "cabinet" ) + return Cabinet; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -970,6 +972,7 @@ case LiveIsoRegTest: case EmbeddedTypeLib: case ElfExecutable: + case Cabinet: return OutputDirectory; case StaticLibrary: case HostStaticLibrary: @@ -1019,6 +1022,8 @@ case KernelModeDriver: case BootLoader: return ".sys"; + case Cabinet: + return ".cab"; case BootSector: return ".o"; case Iso: @@ -1092,6 +1097,7 @@ case IdlHeader: case ElfExecutable: case EmbeddedTypeLib: + case Cabinet: return ""; case TypeDontCare: break; @@ -1140,6 +1146,7 @@ case BootProgram: case IdlHeader: case EmbeddedTypeLib: + case Cabinet: return ""; case TypeDontCare: break; @@ -1189,6 +1196,7 @@ case IdlHeader: case EmbeddedTypeLib: case ElfExecutable: + case Cabinet: return false; case TypeDontCare: break; Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Tue May 6 09:24:16 2008 @@ -303,6 +303,7 @@ RpcProxy, HostStaticLibrary, TypeDontCare, + Cabinet }; enum HostType

1 0

[fireball] 33320: atl: Remove freeing of an invalid pointer. http://www.winehq.org/pipermail/wine-patches/2008-May/054603.html
by fireball＠svn.reactos.org 06 May '08

06 May '08

Author: fireball Date: Tue May 6 07:51:08 2008 New Revision: 33320 URL: http://svn.reactos.org/svn/reactos?rev=33320&view=rev Log: atl: Remove freeing of an invalid pointer. http://www.winehq.org/pipermail/wine-patches/2008-May/054603.html Modified: trunk/reactos/dll/win32/atl/registrar.c Modified: trunk/reactos/dll/win32/atl/registrar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/registrar.c?… ============================================================================== --- trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/registrar.c [iso-8859-1] Tue May 6 07:51:08 2008 @@ -454,7 +454,8 @@ WARN("could not load resource\n"); hres = HRESULT_FROM_WIN32(GetLastError()); } - HeapFree(GetProcessHeap(), 0, regstra); + // Sent to wine-patches http://www.winehq.org/pipermail/wine-patches/2008-May/054603.html + //HeapFree(GetProcessHeap(), 0, regstra); }else { WARN("Could not find source\n"); hres = HRESULT_FROM_WIN32(GetLastError());

1 0

[fireball] 33319: - Fix a typo. See issue #3190 for more details.
by fireball＠svn.reactos.org 06 May '08

06 May '08

Author: fireball Date: Tue May 6 06:46:50 2008 New Revision: 33319 URL: http://svn.reactos.org/svn/reactos?rev=33319&view=rev Log: - Fix a typo. See issue #3190 for more details. Modified: trunk/reactos/drivers/base/null/null.c Modified: trunk/reactos/drivers/base/null/null.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/null/null.c?r… ============================================================================== --- trunk/reactos/drivers/base/null/null.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/null/null.c [iso-8859-1] Tue May 6 06:46:50 2008 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: drivers/base/null/null.c - * PURPOSE: Beep Device Driver + * PURPOSE: Null Device Driver * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * David Welch (welch(a)mcmail.com) */

1 0

[dchapyshev] 33318: - Add new dll's information
by dchapyshev＠svn.reactos.org 06 May '08

06 May '08

Author: dchapyshev Date: Tue May 6 04:22:39 2008 New Revision: 33318 URL: http://svn.reactos.org/svn/reactos?rev=33318&view=rev Log: - Add new dll's information Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue May 6 04:22:39 2008 @@ -50,6 +50,7 @@ reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imm32 # Autosync reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to winehq. +reactos/dll/win32/inetcomm # Autosync reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/lz32 # Autosync reactos/dll/win32/mapi32 # Autosync @@ -62,6 +63,7 @@ reactos/dll/win32/msvcrt20 # Autosync reactos/dll/win32/msvfw32 # Autosync reactos/dll/win32/msxml3 # Synced to Wine-20071230 +reactos/dll/win32/nddeapi # Autosync reactos/dll/win32/netapi32 # Autosync reactos/dll/win32/ntdsapi # Autosync reactos/dll/win32/objsel # Autosync

1 0

[dchapyshev] 33317: - Add new dll's to bootcd
by dchapyshev＠svn.reactos.org 06 May '08

06 May '08

Author: dchapyshev Date: Tue May 6 04:20:48 2008 New Revision: 33317 URL: http://svn.reactos.org/svn/reactos?rev=33317&view=rev Log: - Add new dll's to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff 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] Tue May 6 04:20:48 2008 @@ -233,6 +233,7 @@ dll\win32\icmp\icmp.dll 1 dll\win32\imagehlp\imagehlp.dll 1 dll\win32\imm32\imm32.dll 1 +dll\win32\inetcomm\inetcomm.dll 1 dll\win32\iphlpapi\iphlpapi.dll 1 dll\win32\kernel32\kernel32.dll 1 dll\win32\lsasrv\lsasrv.dll 1 @@ -253,6 +254,7 @@ dll\win32\msvfw32\msvfw32.dll 1 dll\win32\mswsock\mswsock.dll 1 dll\win32\msxml3\msxml3.dll 1 +dll\win32\nddeapi\nddeapi.dll 1 dll\win32\netapi32\netapi32.dll 1 dll\win32\netcfgx\netcfgx.dll 1 dll\win32\netid\netid.dll 1

1 0

[dchapyshev] 33316: - Add & update headers
by dchapyshev＠svn.reactos.org 06 May '08

06 May '08

Author: dchapyshev Date: Tue May 6 04:20:08 2008 New Revision: 33316 URL: http://svn.reactos.org/svn/reactos?rev=33316&view=rev Log: - Add & update headers Added: trunk/reactos/include/psdk/imnact.idl trunk/reactos/include/psdk/imnxport.idl trunk/reactos/include/psdk/mimeole.idl Modified: trunk/reactos/include/ddk/imm.h trunk/reactos/include/psdk/imm.h trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winuser.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/imm.h?rev=3331… Modified: trunk/reactos/include/psdk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=333… Added: trunk/reactos/include/psdk/imnact.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imnact.idl?re… Added: trunk/reactos/include/psdk/imnxport.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imnxport.idl?… Added: trunk/reactos/include/psdk/mimeole.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mimeole.idl?r… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…

1 0

[dchapyshev] 33315: - Add baseaddress for inetcomm.dll and nddeapi.dll
by dchapyshev＠svn.reactos.org 06 May '08

06 May '08

Author: dchapyshev Date: Tue May 6 04:17:31 2008 New Revision: 33315 URL: http://svn.reactos.org/svn/reactos?rev=33315&view=rev Log: - Add baseaddress for inetcomm.dll and nddeapi.dll Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=333… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Tue May 6 04:17:31 2008 @@ -110,10 +110,12 @@ <property name="BASEADDRESS_CABINET" value="0x75120000" /> <property name="BASEADDRESS_NETCFGX" value="0x755F0000" /> <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" /> + <property name="BASEADDRESS_NDDEAPI" value="0x75940000" /> <property name="BASEADDRESS_MSGINA" value="0x75970000" /> <property name="BASEADDRESS_CRYPTNET" value="0x75e60000" /> <property name="BASEADDRESS_RPCRT4" value="0x76000000" /> <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> + <property name="BASEADDRESS_INETCOMM" value="0x76150000" /> <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> <property name="BASEADDRESS_WINSTA" value="0x762F0000" />

1 0

[dchapyshev] 33314: - advapi32: Small implementation RegConnectRegistryW (from wine) - Add inetcomm.dll from wine - Add nddeapi.dll from wine - Sync imm32 with wine
by dchapyshev＠svn.reactos.org 06 May '08

06 May '08

Author: dchapyshev Date: Tue May 6 04:16:21 2008 New Revision: 33314 URL: http://svn.reactos.org/svn/reactos?rev=33314&view=rev Log: - advapi32: Small implementation RegConnectRegistryW (from wine) - Add inetcomm.dll from wine - Add nddeapi.dll from wine - Sync imm32 with wine Added: trunk/reactos/dll/win32/inetcomm/ trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild (with props) trunk/reactos/dll/win32/inetcomm/inetcomm.spec (with props) trunk/reactos/dll/win32/inetcomm/inetcomm_main.c (with props) trunk/reactos/dll/win32/inetcomm/inetcomm_private.h (with props) trunk/reactos/dll/win32/inetcomm/internettransport.c (with props) trunk/reactos/dll/win32/inetcomm/mimeole.c (with props) trunk/reactos/dll/win32/inetcomm/regsvr.c (with props) trunk/reactos/dll/win32/nddeapi/ trunk/reactos/dll/win32/nddeapi/nddeapi.c (with props) trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild (with props) trunk/reactos/dll/win32/nddeapi/nddeapi.spec (with props) Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c trunk/reactos/dll/win32/imm32/imm.c trunk/reactos/dll/win32/imm32/imm32.spec trunk/reactos/dll/win32/win32.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… Modified: trunk/reactos/dll/win32/imm32/imm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm.c?rev=… Modified: trunk/reactos/dll/win32/imm32/imm32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/imm32.spec… Added: trunk/reactos/dll/win32/inetcomm/inetcomm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… Added: trunk/reactos/dll/win32/inetcomm/inetcomm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… Added: trunk/reactos/dll/win32/inetcomm/inetcomm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… Added: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… Added: trunk/reactos/dll/win32/inetcomm/internettransport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/interne… Added: trunk/reactos/dll/win32/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole… Added: trunk/reactos/dll/win32/inetcomm/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/regsvr.… Added: trunk/reactos/dll/win32/nddeapi/nddeapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… Added: trunk/reactos/dll/win32/nddeapi/nddeapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… Added: trunk/reactos/dll/win32/nddeapi/nddeapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/nddeapi.… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…

1 0

[janderwald] 33313: - check for WHQL for display adapters (using d3d9) - destroy all dialogs on exit - fix a bug in destroying the dialogs - halfplement checking WHQL for audio drivers
by janderwald＠svn.reactos.org 06 May '08

06 May '08

Author: janderwald Date: Tue May 6 02:46:58 2008 New Revision: 33313 URL: http://svn.reactos.org/svn/reactos?rev=33313&view=rev Log: - check for WHQL for display adapters (using d3d9) - destroy all dialogs on exit - fix a bug in destroying the dialogs - halfplement checking WHQL for audio drivers Modified: trunk/reactos/base/applications/dxdiag/display.c trunk/reactos/base/applications/dxdiag/dxdiag.c trunk/reactos/base/applications/dxdiag/dxdiag.rbuild trunk/reactos/base/applications/dxdiag/precomp.h trunk/reactos/base/applications/dxdiag/sound.c Modified: trunk/reactos/base/applications/dxdiag/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/display.c [iso-8859-1] Tue May 6 02:46:58 2008 @@ -215,6 +215,36 @@ HWND hDlgCtrls[5]; DWORD dwMemory; DEVMODE DevMode; + IDirect3D9 * ppObj; + D3DADAPTER_IDENTIFIER9 Identifier; + HRESULT hResult; + + szText[0] = L'\0'; + ppObj = Direct3DCreate9(D3D_SDK_VERSION); + if (ppObj) + { + hResult = IDirect3D9_GetAdapterIdentifier(ppObj, D3DADAPTER_DEFAULT , 2/*D3DENUM_WHQL_LEVEL*/, &Identifier); + if (hResult == D3D_OK) + { + + if (Identifier.WHQLLevel) + { + /* adapter is WHQL certified */ + LoadStringW(hInst, IDS_OPTION_YES, szText, sizeof(szText)/sizeof(WCHAR)); + } + else + { + LoadStringW(hInst, IDS_OPTION_NO, szText, sizeof(szText)/sizeof(WCHAR)); + } + } + IDirect3D9_Release(ppObj); + } + else + { + LoadStringW(hInst, IDS_DEVICE_STATUS_UNKNOWN, szText, sizeof(szText)/sizeof(WCHAR)); + } + szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STATIC_ADAPTER_LOGO, WM_SETTEXT, 0, (LPARAM)szText); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, &pDispDevice->DeviceKey[18], 0, KEY_READ, &hKey) != ERROR_SUCCESS) return FALSE; Modified: trunk/reactos/base/applications/dxdiag/dxdiag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Tue May 6 02:46:58 2008 @@ -19,11 +19,27 @@ { UINT Index; - for(Index = 0; Index < 7; Index++) + /* destroy default dialogs */ + for(Index = 0; Index < sizeof(pContext->hDialogs) / sizeof(HWND); Index++) { if (pContext->hDialogs[Index]) DestroyWindow(pContext->hDialogs[Index]); } + + /* destroy display dialogs */ + for(Index = 0; Index < pContext->NumDisplayAdapter; Index++) + { + if (pContext->hDisplayWnd[Index]) + DestroyWindow(pContext->hDisplayWnd[Index]); + } + + /* destroy audio dialogs */ + for(Index = 0; Index < pContext->NumSoundAdapter; Index++) + { + if (pContext->hSoundWnd[Index]) + DestroyWindow(pContext->hSoundWnd[Index]); + } + } //--------------------------------------------------------------- Modified: trunk/reactos/base/applications/dxdiag/dxdiag.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/dxdiag.rbuild [iso-8859-1] Tue May 6 02:46:58 2008 @@ -20,6 +20,8 @@ <library>version</library> <library>gdi32</library> <library>winmm</library> + <library>wintrust</library> + <library>d3d9</library> <file>system.c</file> <file>display.c</file> <file>sound.c</file> Modified: trunk/reactos/base/applications/dxdiag/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/p… ============================================================================== --- trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/precomp.h [iso-8859-1] Tue May 6 02:46:58 2008 @@ -13,10 +13,15 @@ #include <setupapi.h> #include <commctrl.h> #include <dinput.h> +#include <d3d9.h> #include <ddraw.h> + #include <dsound.h> #include <mmreg.h> +#include <wintrust.h> +#include <softpub.h> +#include <mscat.h> #include "resource.h" typedef struct @@ -28,10 +33,7 @@ ULONG NumSoundAdapter; HWND * hSoundWnd; HWND hDialogs[5]; - }DXDIAG_CONTEXT, *PDXDIAG_CONTEXT; - - /* globals */ extern HINSTANCE hInst; @@ -44,10 +46,7 @@ INT_PTR CALLBACK InputPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK NetworkPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK HelpPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR Result, DWORD Size); -VOID InsertTabCtrlItem(HWND hDlgCtrl, INT Position, LPWSTR uId); -VOID EnumerateDrivers(PVOID Context, HDEVINFO hList, PSP_DEVINFO_DATA pInfoData); /* DirectDraw tests */ VOID DDTests(); @@ -57,6 +56,11 @@ /* display adapter initialization */ void InitializeDisplayAdapters(PDXDIAG_CONTEXT pContext); +/* general functions */ BOOL GetFileVersion(LPCWSTR szAppName, WCHAR * szVer, DWORD szVerSize); BOOL GetFileModifyTime(LPCWSTR pFullPath, WCHAR * szTime, int szTimeSize); +BOOL GetCatFileFromDriverPath(LPWSTR szFileName, LPWSTR szCatFileName); +BOOL GetRegValue(HKEY hBaseKey, LPWSTR SubKey, LPWSTR ValueName, DWORD Type, LPWSTR Result, DWORD Size); +VOID InsertTabCtrlItem(HWND hDlgCtrl, INT Position, LPWSTR uId); +VOID EnumerateDrivers(PVOID Context, HDEVINFO hList, PSP_DEVINFO_DATA pInfoData); #endif Modified: trunk/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… ============================================================================== --- trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Tue May 6 02:46:58 2008 @@ -11,6 +11,91 @@ //#include <initguid.h> #include <devguid.h> +#if 0 +BOOL +GetCatFileFromDriverPath(LPWSTR szFileName, LPWSTR szCatFileName) +{ + GUID VerifyGuid = DRIVER_ACTION_VERIFY; + HANDLE hFile; + DWORD dwHash; + BYTE bHash[100]; + HCATINFO hCatInfo; + HCATADMIN hActAdmin; + BOOL bRet = FALSE; + CATALOG_INFO CatInfo; + + /* attempt to open file */ + hFile = CreateFileW(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return FALSE; + + /* calculate hash from file handle */ + dwHash = sizeof(bHash); + if (!CryptCATAdminCalcHashFromFileHandle(hFile, &dwHash, bHash, 0)) + { + CloseHandle(hFile); + return FALSE; + } + + /* try open the CAT admin */ + if (!CryptCATAdminAcquireContext(&hActAdmin, &VerifyGuid, 0)) + { + CloseHandle(hFile); + return FALSE; + } + + /* search catalog to find for catalog containing this hash */ + hCatInfo = CryptCATAdminEnumCatalogFromHash(hActAdmin, bHash, dwHash, 0, NULL); + if (hCatInfo != NULL) + { + /* theres a catalog get the filename */ + bRet = CryptCATCatalogInfoFromContext(hCatInfo, &CatInfo, 0); + if (bRet) + wcscpy(szCatFileName, CatInfo.wszCatalogFile); + CryptCATAdminReleaseCatalogContext(hActAdmin, hCatInfo, 0); + } + + /* perform cleanup */ + CloseHandle(hFile); + CryptCATAdminReleaseContext(hActAdmin, 0); + return bRet; +} + +BOOL +IsDriverWHQL(LPWSTR szFileName) +{ + WCHAR szCatFile[MAX_PATH]; + HANDLE hCat; + BOOL bRet = FALSE; + + /* get the driver's cat file */ + if (!GetCatFileFromDriverPath(szFileName, szCatFile)) + { + /* driver has no cat so its definately not WHQL signed */ + return FALSE; + } + + /* open the CAT file */ + hCat = CryptCATOpen(szCatFile, CRYPTCAT_OPEN_EXISTING, 0, 0, 0); + if (hCat == INVALID_HANDLE_VALUE) + { + /* couldnt open cat */ + return FALSE; + } + + /* FIXME + * build certificate chain with CertGetCertificateChain + * verify certificate chain (WinVerifyTrust) + * retrieve signer (WTHelperGetProvSignerFromChain) + */ + + + /* close CAT file */ + CryptCATClose(hCat); + return bRet; +} +#endif + static void SetDeviceDetails(HWND hwndDlg, LPCGUID classGUID, LPCWSTR lpcstrDescription) @@ -18,11 +103,12 @@ HDEVINFO hInfo; DWORD dwIndex = 0; SP_DEVINFO_DATA InfoData; - WCHAR szText[100]; + WCHAR szText[30]; HWND hDlgCtrls[3]; WAVEOUTCAPSW waveOut; UINT numDev; MMRESULT errCode; + /* enumerate waveout devices */ numDev = waveOutGetNumDevs(); @@ -107,6 +193,9 @@ HWND hwndDlg; WCHAR szSound[20]; WCHAR szText[30]; + IDirectSound8 *pObj; + HRESULT hResult; + DWORD dwCertified; if (!lpGuid) return TRUE; @@ -123,6 +212,26 @@ hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG), pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext); if (!hwndDlg) return FALSE; + + hResult = DirectSoundCreate8(lpGuid, (LPDIRECTSOUND8*)&pObj, NULL); + if (hResult == DS_OK) + { + szText[0] = L'\0'; + if (IDirectSound8_VerifyCertification(pObj, &dwCertified) == DS_OK) + { + if (dwCertified == DS_CERTIFIED) + LoadStringW(hInst, IDS_OPTION_YES, szText, sizeof(szText)/sizeof(WCHAR)); + else if (dwCertified == DS_UNCERTIFIED) + LoadStringW(hInst, IDS_OPTION_NO, szText, sizeof(szText)/sizeof(WCHAR)); + } + else + { + LoadStringW(hInst, IDS_OPTION_NO, szText, sizeof(szText)/sizeof(WCHAR)); + } + szText[(sizeof(szText)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_STATIC_DSOUND_LOGO, WM_SETTEXT, 0, (LPARAM)szText); + IDirectSound8_Release(pObj); + } /* set device name */ SendDlgItemMessageW(hwndDlg, IDC_STATIC_DSOUND_NAME, WM_SETTEXT, 0, (LPARAM)lpcstrDescription); @@ -156,10 +265,10 @@ void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext) { HRESULT hResult; - //IDirectSound8 *pObj; + /* create DSound object */ -// hResult = DirectSoundCreate8(NULL, (LPDIRECTSOUND8*)&pObj, NULL); + // if (hResult != DS_OK) // return; hResult = DirectSoundEnumerateW(DSEnumCallback, pContext);

1 0

[janderwald] 33312: - define LPD3DVECTOR_DEFINED when d3d9 and dsound header is used - sync mscat.h from wine and add a few required definitions
by janderwald＠svn.reactos.org 06 May '08

06 May '08

Author: janderwald Date: Tue May 6 02:18:38 2008 New Revision: 33312 URL: http://svn.reactos.org/svn/reactos?rev=33312&view=rev Log: - define LPD3DVECTOR_DEFINED when d3d9 and dsound header is used - sync mscat.h from wine and add a few required definitions Modified: trunk/reactos/include/psdk/dsound.h trunk/reactos/include/psdk/mscat.h Modified: trunk/reactos/include/psdk/dsound.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsound.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dsound.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dsound.h [iso-8859-1] Tue May 6 02:18:38 2008 @@ -55,9 +55,16 @@ float x; float y; float z; -} D3DVECTOR, *LPD3DVECTOR; +} D3DVECTOR; #define D3DVECTOR_DEFINED #endif + +#ifndef LPD3DVECTOR_DEFINED +typedef D3DVECTOR *LPD3DVECTOR; +#define LPD3DVECTOR_DEFINED +#endif + + #define DX_SHARED_DEFINES #endif /* DX_SHARED_DEFINES */ Modified: trunk/reactos/include/psdk/mscat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mscat.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/mscat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mscat.h [iso-8859-1] Tue May 6 02:18:38 2008 @@ -29,6 +29,12 @@ #endif +#define CRYPTCAT_OPEN_CREATENEW 1 +#define CRYPTCAT_OPEN_ALWAYS 2 +#define CRYPTCAT_OPEN_EXISTING 4 + + + #include <pshpack8.h> typedef struct CRYPTCATMEMBER_ { @@ -45,16 +51,39 @@ CRYPT_ATTR_BLOB sEncodedMemberInfo; } CRYPTCATMEMBER; +typedef struct CRYPTCATATTRIBUTE_ +{ + DWORD cbStruct; + LPWSTR pwszReferenceTag; + DWORD dwAttrTypeAndAction; + DWORD cbValue; + BYTE *pbValue; + DWORD dwReserved; +}CRYPTCATATTRIBUTE; + +typedef struct CATALOG_INFO_ +{ + DWORD cbStruct; + WCHAR wszCatalogFile[MAX_PATH]; +} CATALOG_INFO; + + #include <poppack.h> - BOOL WINAPI CryptCATAdminAcquireContext(HCATADMIN*,const GUID*,DWORD); +BOOL WINAPI CryptCATAdminAddCatalog(HCATADMIN,PWSTR,PWSTR,DWORD); BOOL WINAPI CryptCATAdminCalcHashFromFileHandle(HANDLE,DWORD*,BYTE*,DWORD); HCATINFO WINAPI CryptCATAdminEnumCatalogFromHash(HCATADMIN,BYTE*,DWORD,DWORD,HCATINFO*); +BOOL WINAPI CryptCATAdminReleaseCatalogContext(HCATADMIN,HCATINFO,DWORD); BOOL WINAPI CryptCATAdminReleaseContext(HCATADMIN,DWORD); +BOOL WINAPI CryptCATAdminRemoveCatalog(HCATADMIN,LPCWSTR,DWORD); BOOL WINAPI CryptCATClose(HANDLE); +BOOL WINAPI CryptCATCatalogInfoFromContext(HCATINFO,CATALOG_INFO*,DWORD); + CRYPTCATMEMBER* WINAPI CryptCATEnumerateMember(HANDLE,CRYPTCATMEMBER*); HANDLE WINAPI CryptCATOpen(LPWSTR,DWORD,HCRYPTPROV,DWORD,DWORD); +CRYPTCATATTRIBUTE* WINAPI CryptCATEnumerateAttr(HANDLE hCatalog, CRYPTCATMEMBER*,CRYPTCATATTRIBUTE*); +CRYPTCATATTRIBUTE* WINAPI CryptCATEnumerateCatAttr(HANDLE,CRYPTCATATTRIBUTE*); #ifdef __cplusplus }

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