Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 31602: - Fix possible handle leak. See issue #2934 for more details.
by fireball＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: fireball Date: Sat Jan 5 13:01:34 2008 New Revision: 31602 URL: http://svn.reactos.org/svn/reactos?rev=31602&view=rev Log: - Fix possible handle leak. See issue #2934 for more details. Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Sat Jan 5 13:01:34 2008 @@ -171,10 +171,11 @@ /* Return the requested data */ *DeviceObject = IoGetRelatedDeviceObject(LocalFileObject); *FileObject = LocalFileObject; - ZwClose(FileHandle); } /* Close the handle */ + ZwClose(FileHandle); + return Status; }

1 0

[jimtabor] 31601: Fix inverse sort for rects.
by jimtabor＠svn.reactos.org 05 Jan '08

05 Jan '08

Author: jimtabor Date: Sat Jan 5 08:58:40 2008 New Revision: 31601 URL: http://svn.reactos.org/svn/reactos?rev=31601&view=rev Log: Fix inverse sort for rects. Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Sat Jan 5 08:58:40 2008 @@ -6,24 +6,35 @@ FASTCALL SortRects(PRECT pRect, INT nCount) { - INT i = 0, a = 0, b = 0; + INT i = 0, a = 0, b = 0, c, s; RECT sRect; if (nCount > 0) { - for(;;) - { - do - { - if(pRect[b].top != pRect[i].bottom) break; - if(pRect[b].left < pRect[a].left) - { - sRect = pRect[a]; - pRect[a] = pRect[b]; - pRect[b] = sRect; - } - } while(0); - } + i = 1; // set index point + c = nCount; // set inverse count + do + { + s = i; // set sort count + if ( i < nCount ) + { + a = i - 1; + b = i; + do + { + if(pRect[b].top != pRect[i].bottom) break; + if(pRect[b].left < pRect[a].left) + { + sRect = pRect[a]; + pRect[a] = pRect[b]; + pRect[b] = sRect; + } + ++s; + ++b; + } while ( s < nCount ); + } + ++i; + } while ( c-- != 1 ); } } @@ -223,9 +234,9 @@ { INT Ret = NtGdiGetRandomRgn(hdc, hrgn, 1); // if (Ret) - // { - // if(GetLayout(hdc) & LAYOUT_RTL) MirrorRgnDC(hdc,(HRGN)Ret, NULL); - // } +// { +// if(GetLayout(hdc) & LAYOUT_RTL) MirrorRgnDC(hdc,(HRGN)Ret, NULL); +// } return Ret; }

1 0

[zguo] 31600: Continue with editing of documentation.
by zguo＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: zguo Date: Sat Jan 5 02:24:37 2008 New Revision: 31600 URL: http://svn.reactos.org/svn/reactos?rev=31600&view=rev Log: Continue with editing of documentation. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Sat Jan 5 02:24:37 2008 @@ -238,39 +238,39 @@ * @name DxEngGetHdevData * @implemented * -* The function DxEngGetHdevData get a value in hdev +* The function DxEngGetHdevData retrieves a value from the HDEV * @param HDEV hPDev -* The hdev +* The HDEV * * @param DXEGSHDEVDATA Type -* follow type are supported -* type what it does -* DxEGShDevData_Surface get pointer to Surface handle. -* DxEGShDevData_hSpooler get If the device is a spooler driver. -* DxEGShDevData_DitherFmt get the device iDitherFormat -* DxEGShDevData_FxCaps get the device flGraphicsCaps -* DxEGShDevData_FxCaps2 get the device flGraphicsCaps2 -* DxEGShDevData_DrvFuncs get the device DriverFunctions function table -* DxEGShDevData_dhpdev get the device hPDev the real DHPDEV -* DxEGShDevData_eddg get the device pEDDgpl -* DxEGShDevData_dd_nCount get the device DxDd_nCount -* DxEGShDevData_dd_flags get the device DxDd_Flags -* DxEGShDevData_disable get if the device pdev is disable or not -* DxEGShDevData_metadev get if the device pdev is meta device or not -* DxEGShDevData_display get if the device is primary display driver or not -* DxEGShDevData_Parent get the ppdevParent -* DxEGShDevData_OpenRefs get the pdevOpenRefs counter -* DxEGShDevData_palette get the device RC_PALETTE is set or not -* DxEGShDevData_ldev ATM we do not support the Loader Device driver structure -* DxEGShDevData_GDev get the device pGraphicsDev -* DxEGShDevData_clonedev get the device PDEV_CLONE_DEVICE flag is set or not +* The following typs are supported +* Type Purpose +* DxEGShDevData_Surface Retrieve pointer to Surface handle. +* DxEGShDevData_hSpooler See if the device is a spooler driver. +* DxEGShDevData_DitherFmt Retrieve the device iDitherFormat +* DxEGShDevData_FxCaps Retrieve the device flGraphicsCaps +* DxEGShDevData_FxCaps2 Retrieve the device flGraphicsCaps2 +* DxEGShDevData_DrvFuncs Retrieve the device DriverFunctions function table +* DxEGShDevData_dhpdev Retrieve the device hPDev, the real DHPDEV +* DxEGShDevData_eddg Retrieve the device pEDDgpl +* DxEGShDevData_dd_nCount Retrieve the device DxDd_nCount +* DxEGShDevData_dd_flags Retrieve the device DxDd_Flags +* DxEGShDevData_disable See if the device pdev is disabled +* DxEGShDevData_metadev See if the device pdev is a meta device +* DxEGShDevData_display See if the device is the primary display driver +* DxEGShDevData_Parent Retrieve the ppdevParent +* DxEGShDevData_OpenRefs Retrieve the pdevOpenRefs counter +* DxEGShDevData_palette See if the device RC_PALETTE is set +* DxEGShDevData_ldev ATM we do not support the Loader Device driver structure +* DxEGShDevData_GDev Retrieve the device pGraphicsDev +* DxEGShDevData_clonedev Retrieve the device PDEV_CLONE_DEVICE flag is set or not * * @return * Returns the data we requested * * @remarks. -* ReactOS specific: Implementation ins incomplete, I do not save the value into the hdev yet. +* ReactOS specific: Implementation is incomplete, I do not save the value into the hdev yet. * *--*/ DWORD @@ -359,7 +359,7 @@ * The hdev * * @param DXEGSHDEVDATA Type -* Support only DxEGShDevData_dd_nCount it is a internal counter how many time hdev been lock and unlock +* Supports only DxEGShDevData_dd_nCount. It is an internal counter on how many times hdev has been locked and unlocked * * @param DWORD Data * The value to be saved to hdev's internal counter.

1 0

[hpoussin] 31599: Add hlink.dll and schannel.dll to bootcd
by hpoussin＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: hpoussin Date: Sat Jan 5 00:55:51 2008 New Revision: 31599 URL: http://svn.reactos.org/svn/reactos?rev=31599&view=rev Log: Add hlink.dll and schannel.dll to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE 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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sat Jan 5 00:55:51 2008 @@ -190,6 +190,7 @@ dll\win32\glu32\glu32.dll 1 dll\win32\hhctrl.ocx\hhctrl.ocx 1 dll\win32\hid\hid.dll 1 +dll\win32\hlink\hlink.dll 1 dll\win32\icmp\icmp.dll 1 dll\win32\imagehlp\imagehlp.dll 1 dll\win32\imm32\imm32.dll 1 @@ -236,6 +237,7 @@ dll\win32\rsaenh\rsaenh.dll 1 dll\win32\samlib\samlib.dll 1 dll\win32\samsrv\samsrv.dll 1 +dll\win32\schannel\schannel.dll 1 dll\win32\secur32\secur32.dll 1 dll\win32\sensapi\sensapi.dll 1 dll\win32\serialui\serialui.dll 1 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 (original) +++ trunk/reactos/dll/win32/win32.rbuild Sat Jan 5 00:55:51 2008 @@ -94,6 +94,9 @@ <directory name="hid"> <xi:include href="hid/hid.rbuild" /> </directory> +<directory name="hlink"> + <xi:include href="hlink/hlink.rbuild" /> +</directory> <directory name="icmp"> <xi:include href="icmp/icmp.rbuild" /> </directory> @@ -235,6 +238,9 @@ <directory name="samsrv"> <xi:include href="samsrv/samsrv.rbuild" /> </directory> +<directory name="schannel"> + <xi:include href="schannel/schannel.rbuild" /> +</directory> <directory name="secur32"> <xi:include href="secur32/secur32.rbuild" /> </directory> 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 (original) +++ trunk/reactos/media/doc/README.WINE Sat Jan 5 00:55:51 2008 @@ -44,6 +44,7 @@ reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/dbghelp # Synced to Wine-0_9_51 reactos/dll/win32/hhctrl.ocx # Autosync +reactos/dll/win32/hlink # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imm32 # Autosync reactos/dll/win32/iphlpapi # Out of sync @@ -73,6 +74,7 @@ reactos/dll/win32/rpcrt4 # Synced to Wine-0_9_10 reactos/dll/win32/rsabase # Autosync reactos/dll/win32/rsaenh # Autosync +reactos/dll/win32/schannel # Autosync reactos/dll/win32/sensapi # Autosync reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shell32 # Forked at Wine-20071011

1 0

[winesync] 31598: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: winesync Date: Sat Jan 5 00:53:55 2008 New Revision: 31598 URL: http://svn.reactos.org/svn/reactos?rev=31598&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/schannel/ trunk/reactos/dll/win32/schannel/lsamode.c (with props) trunk/reactos/dll/win32/schannel/schannel.rbuild (with props) trunk/reactos/dll/win32/schannel/schannel.spec (with props) trunk/reactos/dll/win32/schannel/schannel_main.c (with props) trunk/reactos/dll/win32/schannel/usermode.c (with props) trunk/reactos/dll/win32/schannel/version.rc (with props) Added: trunk/reactos/dll/win32/schannel/lsamode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/lsamode… ============================================================================== --- trunk/reactos/dll/win32/schannel/lsamode.c (added) +++ trunk/reactos/dll/win32/schannel/lsamode.c Sat Jan 5 00:53:55 2008 @@ -1,0 +1,158 @@ +/* + * LSA-mode functions of the SChannel security provider + * + * Copyright 2007 Yuval Fledel + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "sspi.h" +#include "ntsecapi.h" +#include "ntsecpkg.h" +#include "schannel.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + +/*********************************************************************** + * SpGetInfoUnified + */ +static NTSTATUS WINAPI SpGetInfoUnified(PSecPkgInfoW PackageInfo) +{ + TRACE("(%p)\n", PackageInfo); + + PackageInfo->fCapabilities = SECPKG_FLAG_MUTUAL_AUTH | + SECPKG_FLAG_INTEGRITY | SECPKG_FLAG_PRIVACY | + SECPKG_FLAG_CONNECTION | SECPKG_FLAG_MULTI_REQUIRED | + SECPKG_FLAG_EXTENDED_ERROR | SECPKG_FLAG_IMPERSONATION | + SECPKG_FLAG_ACCEPT_WIN32_NAME | SECPKG_FLAG_STREAM; + PackageInfo->wVersion = 1; + PackageInfo->wRPCID = UNISP_RPC_ID; + PackageInfo->cbMaxToken = 0x4000; + PackageInfo->Name = (LPWSTR)UNISP_NAME_W; + PackageInfo->Comment = (LPWSTR)UNISP_NAME_W; + + return STATUS_SUCCESS; +} + +static SEC_WCHAR schannelCommentW[] = { 'S','c','h','a','n','n','e','l', + ' ','S','e','c','u','r','i','t','y',' ','P','a','c','k','a','g','e',0 }; + +/*********************************************************************** + * SpGetInfoSChannel + */ +static NTSTATUS WINAPI SpGetInfoSChannel(PSecPkgInfoW PackageInfo) +{ + TRACE("(%p)\n", PackageInfo); + + PackageInfo->fCapabilities = SECPKG_FLAG_MUTUAL_AUTH | + SECPKG_FLAG_INTEGRITY | SECPKG_FLAG_PRIVACY | + SECPKG_FLAG_CONNECTION | SECPKG_FLAG_MULTI_REQUIRED | + SECPKG_FLAG_EXTENDED_ERROR | SECPKG_FLAG_IMPERSONATION | + SECPKG_FLAG_ACCEPT_WIN32_NAME | SECPKG_FLAG_STREAM; + PackageInfo->wVersion = 1; + PackageInfo->wRPCID = UNISP_RPC_ID; + PackageInfo->cbMaxToken = 0x4000; + PackageInfo->Name = (LPWSTR)SCHANNEL_NAME_W; + PackageInfo->Comment = schannelCommentW; + + return STATUS_SUCCESS; +} + +static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = +{ { + NULL, /* InitializePackage */ + NULL, /* LsaLogonUser */ + NULL, /* CallPackage */ + NULL, /* LogonTerminated */ + NULL, /* CallPackageUntrusted */ + NULL, /* CallPackagePassthrough */ + NULL, /* LogonUserEx */ + NULL, /* LogonUserEx2 */ + NULL, /* Initialize */ + NULL, /* Shutdown */ + SpGetInfoUnified, + NULL, /* AcceptCredentials */ + NULL, /* SpAcquireCredentialsHandle */ + NULL, /* SpQueryCredentialsAttributes */ + NULL, /* FreeCredentialsHandle */ + NULL, /* SaveCredentials */ + NULL, /* GetCredentials */ + NULL, /* DeleteCredentials */ + NULL, /* InitLsaModeContext */ + NULL, /* AcceptLsaModeContext */ + NULL, /* DeleteContext */ + NULL, /* ApplyControlToken */ + NULL, /* GetUserInfo */ + NULL, /* GetExtendedInformation */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpAddCredentials */ + NULL, /* SetExtendedInformation */ + NULL, /* SetContextAttributes */ + NULL, /* SetCredentialsAttributes */ + }, { + NULL, /* InitializePackage */ + NULL, /* LsaLogonUser */ + NULL, /* CallPackage */ + NULL, /* LogonTerminated */ + NULL, /* CallPackageUntrusted */ + NULL, /* CallPackagePassthrough */ + NULL, /* LogonUserEx */ + NULL, /* LogonUserEx2 */ + NULL, /* Initialize */ + NULL, /* Shutdown */ + SpGetInfoSChannel, + NULL, /* AcceptCredentials */ + NULL, /* SpAcquireCredentialsHandle */ + NULL, /* SpQueryCredentialsAttributes */ + NULL, /* FreeCredentialsHandle */ + NULL, /* SaveCredentials */ + NULL, /* GetCredentials */ + NULL, /* DeleteCredentials */ + NULL, /* InitLsaModeContext */ + NULL, /* AcceptLsaModeContext */ + NULL, /* DeleteContext */ + NULL, /* ApplyControlToken */ + NULL, /* GetUserInfo */ + NULL, /* GetExtendedInformation */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpAddCredentials */ + NULL, /* SetExtendedInformation */ + NULL, /* SetContextAttributes */ + NULL, /* SetCredentialsAttributes */ + } +}; + +/*********************************************************************** + * SpLsaModeInitialize (SCHANNEL.@) + */ +NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, + PSECPKG_FUNCTION_TABLE *ppTables, PULONG pcTables) +{ + TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); + + *PackageVersion = SECPKG_INTERFACE_VERSION_3; + *pcTables = 2; + *ppTables = secPkgFunctionTable; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/dll/win32/schannel/lsamode.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/schannel/schannel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel.rbuild (added) +++ trunk/reactos/dll/win32/schannel/schannel.rbuild Sat Jan 5 00:53:55 2008 @@ -1,0 +1,19 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="schannel" type="win32dll" baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32" installname="schannel.dll" allowwarnings="true"> + <importlibrary definition="schannel.spec.def" /> + <include base="schannel">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>wine</library> + <library>secur32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>lsamode.c</file> + <file>schannel_main.c</file> + <file>usermode.c</file> + <file>version.rc</file> + <file>schannel.spec</file> +</module> Propchange: trunk/reactos/dll/win32/schannel/schannel.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/schannel/schannel.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel.spec (added) +++ trunk/reactos/dll/win32/schannel/schannel.spec Sat Jan 5 00:53:55 2008 @@ -1,0 +1,37 @@ +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) secur32.AcceptSecurityContext +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleA +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleW +@ stdcall ApplyControlToken(ptr ptr) secur32.ApplyControlToken +@ stub CloseSslPerformanceData +@ stub CollectSslPerformanceData +@ stdcall CompleteAuthToken(ptr ptr) secur32.CompleteAuthToken +@ stdcall DeleteSecurityContext(ptr) secur32.DeleteSecurityContext +@ stdcall EnumerateSecurityPackagesA(ptr ptr) secur32.EnumerateSecurityPackagesA +@ stdcall EnumerateSecurityPackagesW(ptr ptr) secur32.EnumerateSecurityPackagesW +@ stdcall FreeContextBuffer(ptr) secur32.FreeContextBuffer +@ stdcall FreeCredentialsHandle(ptr) secur32.FreeCredentialsHandle +@ stdcall ImpersonateSecurityContext(ptr) secur32.ImpersonateSecurityContext +@ stdcall InitSecurityInterfaceA() secur32.InitSecurityInterfaceA +@ stdcall InitSecurityInterfaceW() secur32.InitSecurityInterfaceW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextW +@ stdcall MakeSignature(ptr long ptr long) secur32.MakeSignature +@ stub OpenSslPerformanceData +@ stdcall QueryContextAttributesA(ptr long ptr) secur32.QueryContextAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) secur32.QueryContextAttributesW +@ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext +@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage +@ stdcall SpLsaModeInitialize(long ptr ptr ptr) +@ stdcall SpUserModeInitialize(long ptr ptr ptr) +@ stub SslCrackCertificate +@ stub SslEmptyCacheA +@ stub SslEmptyCacheW +@ stub SslFreeCertificate +@ stub SslGenerateKeyPair +@ stub SslGenerateRandomBits +@ stub SslGetMaximumKeySize +@ stub SslLoadCertificate +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage +@ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature Propchange: trunk/reactos/dll/win32/schannel/schannel.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/schannel/schannel_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/schanne… ============================================================================== --- trunk/reactos/dll/win32/schannel/schannel_main.c (added) +++ trunk/reactos/dll/win32/schannel/schannel_main.c Sat Jan 5 00:53:55 2008 @@ -1,0 +1,40 @@ +/* + * SSL/TLS Security Library + * + * Copyright 2007 Rob Shearman, for CodeWeavers + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(hinstDLL); + + return TRUE; +} Propchange: trunk/reactos/dll/win32/schannel/schannel_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/schannel/usermode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/usermod… ============================================================================== --- trunk/reactos/dll/win32/schannel/usermode.c (added) +++ trunk/reactos/dll/win32/schannel/usermode.c Sat Jan 5 00:53:55 2008 @@ -1,0 +1,85 @@ +/* + * User-mode functions of the SChannel security provider + * + * Copyright 2007 Yuval Fledel + * + * 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 <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "sspi.h" +#include "ntsecapi.h" +#include "ntsecpkg.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(schannel); + +static SECPKG_USER_FUNCTION_TABLE secPkgUserTables[2] = +{ { + NULL, /* InstanceInit */ + NULL, /* InitUserModeContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* SealMessage */ + NULL, /* UnsealMessage */ + NULL, /* GetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteUserModeContext */ + NULL, /* FormatCredentials */ + NULL, /* MarshallSupplementalCreds */ + NULL, /* ExportContext */ + NULL, /* ImportContext */ + }, { + NULL, /* InstanceInit */ + NULL, /* InitUserModeContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* SealMessage */ + NULL, /* UnsealMessage */ + NULL, /* GetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteUserModeContext */ + NULL, /* FormatCredentials */ + NULL, /* MarshallSupplementalCreds */ + NULL, /* ExportContext */ + NULL, /* ImportContext */ + } +}; + +/*********************************************************************** + * SpUserModeInitialize (SCHANNEL.@) + */ +NTSTATUS WINAPI SpUserModeInitialize(ULONG LsaVersion, PULONG PackageVersion, + PSECPKG_USER_FUNCTION_TABLE *ppTables, PULONG pcTables) +{ + TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); + + if (LsaVersion != SECPKG_INTERFACE_VERSION) + return STATUS_INVALID_PARAMETER; + + *PackageVersion = SECPKG_INTERFACE_VERSION; + *pcTables = 2; + *ppTables = secPkgUserTables; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/dll/win32/schannel/usermode.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/schannel/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/version… ============================================================================== --- trunk/reactos/dll/win32/schannel/version.rc (added) +++ trunk/reactos/dll/win32/schannel/version.rc Sat Jan 5 00:53:55 2008 @@ -1,0 +1,26 @@ +/* + * Copyright (c) 2007 Detlef Riekenberg + * + * 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 WINE_FILEDESCRIPTION_STR "Wine schannel" +#define WINE_FILENAME_STR "schannel.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/schannel/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 31597: Autosyncing with Wine HEAD
by hpoussin＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: hpoussin Date: Sat Jan 5 00:53:35 2008 New Revision: 31597 URL: http://svn.reactos.org/svn/reactos?rev=31597&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/hlink/ trunk/reactos/dll/win32/hlink/browse_ctx.c (with props) trunk/reactos/dll/win32/hlink/extserv.c (with props) trunk/reactos/dll/win32/hlink/hlink.rbuild (with props) trunk/reactos/dll/win32/hlink/hlink.spec (with props) trunk/reactos/dll/win32/hlink/hlink_main.c (with props) trunk/reactos/dll/win32/hlink/hlink_private.h (with props) trunk/reactos/dll/win32/hlink/link.c (with props) Added: trunk/reactos/dll/win32/hlink/browse_ctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/browse_ctx… ============================================================================== --- trunk/reactos/dll/win32/hlink/browse_ctx.c (added) +++ trunk/reactos/dll/win32/hlink/browse_ctx.c Sat Jan 5 00:53:35 2008 @@ -1,0 +1,270 @@ +/* + * Implementation of hyperlinking (hlink.dll) + * + * Copyright 2005 Aric Stewart for CodeWeavers + * + * 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 "hlink_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlink); + +static const IHlinkBrowseContextVtbl hlvt; + +typedef struct +{ + const IHlinkBrowseContextVtbl *lpVtbl; + LONG ref; + HLBWINFO* BrowseWindowInfo; + IHlink* CurrentPage; +} HlinkBCImpl; + + +HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown *pUnkOuter, REFIID riid, + LPVOID *ppv) +{ + HlinkBCImpl * hl; + + TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); + *ppv = NULL; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + hl = heap_alloc_zero(sizeof(HlinkBCImpl)); + if (!hl) + return E_OUTOFMEMORY; + + hl->ref = 1; + hl->lpVtbl = &hlvt; + + *ppv = hl; + return S_OK; +} + +static HRESULT WINAPI IHlinkBC_fnQueryInterface( IHlinkBrowseContext *iface, + REFIID riid, LPVOID* ppvObj) +{ + HlinkBCImpl *This = (HlinkBCImpl*)iface; + TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppvObj); + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IHlinkBrowseContext)) + *ppvObj = This; + + if (*ppvObj) + { + IUnknown_AddRef((IUnknown*)(*ppvObj)); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI IHlinkBC_fnAddRef (IHlinkBrowseContext* iface) +{ + HlinkBCImpl *This = (HlinkBCImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) +{ + HlinkBCImpl *This = (HlinkBCImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount + 1); + if (refCount) + return refCount; + + TRACE("-- destroying IHlinkBrowseContext (%p)\n", This); + heap_free(This->BrowseWindowInfo); + if (This->CurrentPage) + IHlink_Release(This->CurrentPage); + heap_free(This); + return 0; +} + +static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, + DWORD dwReserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) +{ + static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; + HlinkBCImpl *This = (HlinkBCImpl*)iface; + IMoniker *mon; + IMoniker *composite; + IRunningObjectTable *ROT; + + FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); + + CreateItemMoniker(NULL, szIdent, &mon); + CreateGenericComposite(mon, pimk, &composite); + + GetRunningObjectTable(0, &ROT); + IRunningObjectTable_Register(ROT, 0, piunk, composite, pdwRegister); + + IRunningObjectTable_Release(ROT); + IMoniker_Release(composite); + IMoniker_Release(mon); + + return S_OK; +} + +static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* face, + IMoniker *pimk, BOOL fBindifRootRegistered, IUnknown **ppiunk) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlinkBC_Revoke(IHlinkBrowseContext* iface, + DWORD dwRegister) +{ + HRESULT r = S_OK; + IRunningObjectTable *ROT; + HlinkBCImpl *This = (HlinkBCImpl*)iface; + + FIXME("(%p)->(%i)\n", This, dwRegister); + + GetRunningObjectTable(0, &ROT); + r = IRunningObjectTable_Revoke(ROT, dwRegister); + IRunningObjectTable_Release(ROT); + + return r; +} + +static HRESULT WINAPI IHlinkBC_SetBrowseWindowInfo(IHlinkBrowseContext* iface, + HLBWINFO *phlbwi) +{ + HlinkBCImpl *This = (HlinkBCImpl*)iface; + TRACE("(%p)->(%p)\n", This, phlbwi); + + heap_free(This->BrowseWindowInfo); + This->BrowseWindowInfo = heap_alloc(phlbwi->cbSize); + memcpy(This->BrowseWindowInfo, phlbwi, phlbwi->cbSize); + + return S_OK; +} + +static HRESULT WINAPI IHlinkBC_GetBrowseWindowInfo(IHlinkBrowseContext* iface, + HLBWINFO *phlbwi) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlinkBC_SetInitialHlink(IHlinkBrowseContext* iface, + IMoniker *pimkTarget, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +{ + HlinkBCImpl *This = (HlinkBCImpl*)iface; + + FIXME("(%p)->(%p %s %s)\n", This, pimkTarget, + debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName)); + + if (This->CurrentPage) + IHlink_Release(This->CurrentPage); + + HlinkCreateFromMoniker(pimkTarget, pwzLocation, pwzFriendlyName, NULL, + 0, NULL, &IID_IHlink, (LPVOID*) &This->CurrentPage); + + return S_OK; +} + +static HRESULT WINAPI IHlinkBC_OnNavigateHlink(IHlinkBrowseContext *iface, + DWORD grfHLNF, IMoniker* pmkTarget, LPCWSTR pwzLocation, LPCWSTR + pwzFriendlyName, ULONG *puHLID) +{ + HlinkBCImpl *This = (HlinkBCImpl*)iface; + + FIXME("(%p)->(%i %p %s %s %p)\n", This, grfHLNF, pmkTarget, + debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID); + + return S_OK; +} + +static HRESULT WINAPI IHlinkBC_UpdateHlink(IHlinkBrowseContext* iface, + ULONG uHLID, IMoniker* pimkTarget, LPCWSTR pwzLocation, + LPCWSTR pwzFriendlyName) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlinkBC_EnumNavigationStack( IHlinkBrowseContext *iface, + DWORD dwReserved, DWORD grfHLFNAMEF, IEnumHLITEM** ppienumhlitem) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlinkBC_QueryHlink( IHlinkBrowseContext* iface, + DWORD grfHLONG, ULONG uHLID) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, + ULONG uHLID, IHlink** ppihl) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlinkBC_SetCurrentHlink( IHlinkBrowseContext* iface, + ULONG uHLID) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlinkBC_Clone( IHlinkBrowseContext* iface, + IUnknown* piunkOuter, REFIID riid, IUnknown** ppiunkOjb) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlinkBC_Close(IHlinkBrowseContext* iface, + DWORD reserverd) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const IHlinkBrowseContextVtbl hlvt = +{ + IHlinkBC_fnQueryInterface, + IHlinkBC_fnAddRef, + IHlinkBC_fnRelease, + IHlinkBC_Register, + IHlinkBC_GetObject, + IHlinkBC_Revoke, + IHlinkBC_SetBrowseWindowInfo, + IHlinkBC_GetBrowseWindowInfo, + IHlinkBC_SetInitialHlink, + IHlinkBC_OnNavigateHlink, + IHlinkBC_UpdateHlink, + IHlinkBC_EnumNavigationStack, + IHlinkBC_QueryHlink, + IHlinkBC_GetHlink, + IHlinkBC_SetCurrentHlink, + IHlinkBC_Clone, + IHlinkBC_Close +}; Propchange: trunk/reactos/dll/win32/hlink/browse_ctx.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hlink/extserv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/extserv.c?… ============================================================================== --- trunk/reactos/dll/win32/hlink/extserv.c (added) +++ trunk/reactos/dll/win32/hlink/extserv.c Sat Jan 5 00:53:35 2008 @@ -1,0 +1,259 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * 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 "hlink_private.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlink); + +#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) + +typedef struct { + const IUnknownVtbl *lpIUnknownVtbl; + const IAuthenticateVtbl *lpIAuthenticateVtbl; + const IHttpNegotiateVtbl *lpIHttpNegotiateVtbl; + + LONG ref; + IUnknown *outer; + + HWND hwnd; + LPWSTR username; + LPWSTR password; + LPWSTR headers; +} ExtensionService; + +#define EXTSERVUNK(x) ((IUnknown*) &(x)->lpIUnknownVtbl) +#define AUTHENTICATE(x) ((IAuthenticate*) &(x)->lpIAuthenticateVtbl) +#define HTTPNEGOTIATE(x) ((IHttpNegotiate*) &(x)->lpIHttpNegotiateVtbl) + +#define EXTSERVUNK_THIS(iface) DEFINE_THIS(ExtensionService, IUnknown, iface) + +static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + ExtensionService *This = EXTSERVUNK_THIS(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = EXTSERVUNK(This); + }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { + TRACE("(%p)->(IID_IAuthenticate %p)\n", This, ppv); + *ppv = AUTHENTICATE(This); + }else if(IsEqualGUID(&IID_IHttpNegotiate, riid)) { + TRACE("(%p)->(IID_IHttpNegotiate %p)\n", This, ppv); + *ppv = HTTPNEGOTIATE(This); + } + + if(*ppv) { + IUnknown_AddRef(EXTSERVUNK(This)); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ExtServUnk_AddRef(IUnknown *iface) +{ + ExtensionService *This = EXTSERVUNK_THIS(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ExtServUnk_Release(IUnknown *iface) +{ + ExtensionService *This = EXTSERVUNK_THIS(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + heap_free(This->username); + heap_free(This->password); + heap_free(This->headers); + heap_free(This); + } + + return ref; +} + +#undef EXTSERVUNK_THIS + +static const IUnknownVtbl ExtServUnkVtbl = { + ExtServUnk_QueryInterface, + ExtServUnk_AddRef, + ExtServUnk_Release +}; + +#define AUTHENTICATE_THIS(iface) DEFINE_THIS(ExtensionService, IAuthenticate, iface) + +static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, REFIID riid, void **ppv) +{ + ExtensionService *This = AUTHENTICATE_THIS(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) +{ + ExtensionService *This = AUTHENTICATE_THIS(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) +{ + ExtensionService *This = AUTHENTICATE_THIS(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, + HWND *phwnd, LPWSTR *pszUsername, LPWSTR *pszPassword) +{ + ExtensionService *This = AUTHENTICATE_THIS(iface); + + TRACE("(%p)->(%p %p %p)\n", This, phwnd, pszUsername, pszPassword); + + if(!phwnd || !pszUsername || !pszPassword) + return E_INVALIDARG; + + *phwnd = This->hwnd; + *pszUsername = hlink_co_strdupW(This->username); + *pszPassword = hlink_co_strdupW(This->password); + + return S_OK; +} + +#undef AUTHENTICATE_THIS + +static const IAuthenticateVtbl AuthenticateVtbl = { + Authenticate_QueryInterface, + Authenticate_AddRef, + Authenticate_Release, + Authenticate_Authenticate +}; + +#define HTTPNEGOTIATE_THIS(iface) DEFINE_THIS(ExtensionService, IHttpNegotiate, iface) + +static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate *iface, REFIID riid, void **ppv) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate *iface) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate *iface) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, + LPCWSTR szURL, LPCWSTR szHeaders, DWORD dwReserved, LPWSTR *pszAdditionalHeaders) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + + TRACE("(%p)->(%s %s %x %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, + pszAdditionalHeaders); + + if(!pszAdditionalHeaders) + return E_INVALIDARG; + + *pszAdditionalHeaders = hlink_co_strdupW(This->headers); + return S_OK; +} + +static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD dwResponseCode, + LPCWSTR szResponseHeaders, LPCWSTR szRequestHeaders, LPWSTR *pszAdditionalRequestHeaders) +{ + ExtensionService *This = HTTPNEGOTIATE_THIS(iface); + + TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), + debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); + + *pszAdditionalRequestHeaders = NULL; + return S_OK; +} + +#undef HTTPNEGOTIATE_THIS + +static const IHttpNegotiateVtbl HttpNegotiateVtbl = { + HttpNegotiate_QueryInterface, + HttpNegotiate_AddRef, + HttpNegotiate_Release, + HttpNegotiate_BeginningTransaction, + HttpNegotiate_OnResponse +}; + +HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, + HWND phwnd, LPCWSTR pszUsername, LPCWSTR pszPassword, + IUnknown *punkOuter, REFIID riid, void** ppv) +{ + ExtensionService *ret; + int len = 0; + HRESULT hres = S_OK; + + TRACE("%s %p %s %s %p %s %p\n",debugstr_w(pwzAdditionalHeaders), + phwnd, debugstr_w(pszUsername), debugstr_w(pszPassword), + punkOuter, debugstr_guid(riid), ppv); + + ret = heap_alloc(sizeof(*ret)); + + ret->lpIUnknownVtbl = &ExtServUnkVtbl; + ret->lpIAuthenticateVtbl = &AuthenticateVtbl; + ret->lpIHttpNegotiateVtbl = &HttpNegotiateVtbl; + ret->ref = 1; + ret->hwnd = phwnd; + ret->username = hlink_strdupW(pszUsername); + ret->password = hlink_strdupW(pszPassword); + + if(pwzAdditionalHeaders) + len = strlenW(pwzAdditionalHeaders); + + if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { + static const WCHAR endlW[] = {'\r','\n',0}; + ret->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(endlW)); + memcpy(ret->headers, pwzAdditionalHeaders, len*sizeof(WCHAR)); + memcpy(ret->headers+len, endlW, sizeof(endlW)); + }else { + ret->headers = hlink_strdupW(pwzAdditionalHeaders); + } + + if(!punkOuter) { + ret->outer = EXTSERVUNK(ret); + hres = IUnknown_QueryInterface(EXTSERVUNK(ret), riid, ppv); + IUnknown_Release(EXTSERVUNK(ret)); + }else if(IsEqualGUID(&IID_IUnknown, riid)) { + ret->outer = punkOuter; + *ppv = EXTSERVUNK(ret); + }else { + IUnknown_Release(EXTSERVUNK(ret)); + hres = E_INVALIDARG; + } + + return hres; +} Propchange: trunk/reactos/dll/win32/hlink/extserv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hlink/hlink.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.rbui… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink.rbuild (added) +++ trunk/reactos/dll/win32/hlink/hlink.rbuild Sat Jan 5 00:53:35 2008 @@ -1,0 +1,24 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="hlink" type="win32dll" baseaddress="${BASEADDRESS_HLINK}" installbase="system32" installname="hlink.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="hlink.spec.def" /> + <include base="hlink">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>wine</library> + <library>shell32</library> + <library>ole32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>urlmon</library> + <library>uuid</library> + <library>ntdll</library> + <file>browse_ctx.c</file> + <file>extserv.c</file> + <file>hlink_main.c</file> + <file>link.c</file> + <file>hlink.spec</file> +</module> Propchange: trunk/reactos/dll/win32/hlink/hlink.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hlink/hlink.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink.spec… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink.spec (added) +++ trunk/reactos/dll/win32/hlink/hlink.spec Sat Jan 5 00:53:35 2008 @@ -1,0 +1,33 @@ +3 stdcall HlinkCreateFromMoniker(ptr wstr wstr ptr long ptr ptr ptr) +4 stdcall HlinkCreateFromString(wstr wstr wstr ptr long ptr ptr ptr) +5 stdcall HlinkCreateFromData(ptr ptr long ptr ptr ptr) +6 stdcall HlinkCreateBrowseContext(ptr ptr ptr) +7 stub HlinkClone +8 stdcall HlinkNavigateToStringReference(wstr wstr ptr long ptr long ptr ptr ptr) +9 stdcall HlinkOnNavigate(ptr ptr long ptr wstr wstr ptr) +10 stdcall HlinkNavigate(ptr ptr long ptr ptr ptr) +11 stdcall HlinkUpdateStackItem(ptr ptr long ptr wstr wstr) +12 stub HlinkOnRenameDocument +14 stub HlinkResolveMonikerForData +15 stub HlinkResolveStringForData +16 stub OleSaveToStreamEx +18 stub HlinkParseDisplayName +20 stdcall HlinkQueryCreateFromData(ptr) +21 stub HlinkSetSpecialReference +22 stdcall HlinkGetSpecialReference(long ptr) +23 stub HlinkCreateShortcut +24 stub HlinkResolveShortcut +25 stdcall HlinkIsShortcut(wstr) +26 stub HlinkResolveShortcutToString +27 stub HlinkCreateShortcutFromString +28 stub HlinkGetValueFromParams +29 stub HlinkCreateShortcutFromMoniker +30 stub HlinkResolveShortcutToMoniker +31 stdcall HlinkTranslateURL(wstr long ptr) +32 stdcall HlinkCreateExtensionServices(wstr long wstr wstr ptr ptr ptr) +33 stub HlinkPreprocessMoniker + +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +# @ stub -private DllUnregisterServer Propchange: trunk/reactos/dll/win32/hlink/hlink.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hlink/hlink_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_main… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_main.c (added) +++ trunk/reactos/dll/win32/hlink/hlink_main.c Sat Jan 5 00:53:35 2008 @@ -1,0 +1,447 @@ +/* + * Implementation of hyperlinking (hlink.dll) + * + * Copyright 2005 Aric Stewart for CodeWeavers + * + * 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 "hlink_private.h" + +#include "winreg.h" +#include "hlguids.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlink); + +typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); + +typedef struct +{ + const IClassFactoryVtbl *lpVtbl; + LPFNCREATEINSTANCE lpfnCI; +} CFImpl; + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p %d %p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +HRESULT WINAPI DllCanUnloadNow( void ) +{ + FIXME("\n"); + return S_OK; +} + +HRESULT WINAPI HlinkCreateFromMoniker( IMoniker *pimkTrgt, LPCWSTR pwzLocation, + LPCWSTR pwzFriendlyName, IHlinkSite* pihlsite, DWORD dwSiteData, + IUnknown* piunkOuter, REFIID riid, void** ppvObj) +{ + IHlink *hl = NULL; + HRESULT r = S_OK; + + TRACE("%p %s %s %p %i %p %s %p\n", pimkTrgt, debugstr_w(pwzLocation), + debugstr_w(pwzFriendlyName), pihlsite, dwSiteData, piunkOuter, + debugstr_guid(riid), ppvObj); + + r = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, riid, (LPVOID*)&hl); + if (FAILED(r)) + return r; + + if (pwzLocation) + IHlink_SetStringReference(hl, HLINKSETF_LOCATION, NULL, pwzLocation); + if (pwzFriendlyName) + IHlink_SetFriendlyName(hl, pwzFriendlyName); + if (pihlsite) + IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); + if (pimkTrgt) + IHlink_SetMonikerReference(hl, 0, pimkTrgt, pwzLocation); + + *ppvObj = hl; + + TRACE("Returning %i\n",r); + + return r; +} + +HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, + LPCWSTR pwzFriendlyName, IHlinkSite* pihlsite, DWORD dwSiteData, + IUnknown* piunkOuter, REFIID riid, void** ppvObj) +{ + IHlink *hl = NULL; + HRESULT r = S_OK; + + TRACE("%s %s %s %p %i %p %s %p\n", debugstr_w(pwzTarget), + debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), pihlsite, + dwSiteData, piunkOuter, debugstr_guid(riid), ppvObj); + + r = CoCreateInstance(&CLSID_StdHlink, piunkOuter, CLSCTX_INPROC_SERVER, riid, (LPVOID*)&hl); + if (FAILED(r)) + return r; + + if (pwzLocation) + IHlink_SetStringReference(hl, HLINKSETF_LOCATION, NULL, pwzLocation); + + if (pwzTarget) + { + IMoniker *pTgtMk = NULL; + IBindCtx *pbc = NULL; + ULONG eaten; + + CreateBindCtx(0, &pbc); + r = MkParseDisplayName(pbc, pwzTarget, &eaten, &pTgtMk); + IBindCtx_Release(pbc); + + if (FAILED(r)) + { + LPCWSTR p = strchrW(pwzTarget, ':'); + if (p && (p - pwzTarget > 1)) + r = CreateURLMoniker(NULL, pwzTarget, &pTgtMk); + else + r = CreateFileMoniker(pwzTarget,&pTgtMk); + } + + if (FAILED(r)) + { + ERR("couldn't create moniker for %s, failed with error 0x%08x\n", + debugstr_w(pwzTarget), r); + return r; + } + + IHlink_SetMonikerReference(hl, 0, pTgtMk, pwzLocation); + IMoniker_Release(pTgtMk); + + IHlink_SetStringReference(hl, HLINKSETF_TARGET, pwzTarget, NULL); + } + + if (pwzFriendlyName) + IHlink_SetFriendlyName(hl, pwzFriendlyName); + if (pihlsite) + IHlink_SetHlinkSite(hl, pihlsite, dwSiteData); + + TRACE("Returning %i\n",r); + *ppvObj = hl; + + return r; +} + + +HRESULT WINAPI HlinkCreateBrowseContext( IUnknown* piunkOuter, REFIID riid, void** ppvObj) +{ + HRESULT r = S_OK; + + TRACE("%p %s %p\n", piunkOuter, debugstr_guid(riid), ppvObj); + + r = CoCreateInstance(&CLSID_StdHlinkBrowseContext, piunkOuter, CLSCTX_INPROC_SERVER, riid, ppvObj); + + TRACE("returning %i\n",r); + + return r; +} + +HRESULT WINAPI HlinkNavigate(IHlink *phl, IHlinkFrame *phlFrame, + DWORD grfHLNF, LPBC pbc, IBindStatusCallback *pbsc, + IHlinkBrowseContext *phlbc) +{ + HRESULT r = S_OK; + + TRACE("%p %p %i %p %p %p\n", phl, phlFrame, grfHLNF, pbc, pbsc, phlbc); + + if (phlFrame) + r = IHlinkFrame_Navigate(phlFrame, grfHLNF, pbc, pbsc, phl); + else if (phl) + r = IHlink_Navigate(phl, grfHLNF, pbc, pbsc, phlbc); + + return r; +} + +HRESULT WINAPI HlinkOnNavigate( IHlinkFrame *phlFrame, + IHlinkBrowseContext* phlbc, DWORD grfHLNF, IMoniker *pmkTarget, + LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName, ULONG* puHLID) +{ + HRESULT r = S_OK; + + TRACE("%p %p %i %p %s %s %p\n",phlFrame, phlbc, grfHLNF, pmkTarget, + debugstr_w(pwzLocation), debugstr_w(pwzFriendlyName), puHLID); + + r = IHlinkBrowseContext_OnNavigateHlink(phlbc, grfHLNF, pmkTarget, + pwzLocation, pwzFriendlyName, puHLID); + + if (phlFrame) + r = IHlinkFrame_OnNavigate(phlFrame,grfHLNF,pmkTarget, pwzLocation, + pwzFriendlyName, 0); + + return r; +} + +HRESULT WINAPI HlinkCreateFromData(IDataObject *piDataObj, + IHlinkSite *pihlsite, DWORD dwSiteData, IUnknown *piunkOuter, + REFIID riid, void **ppvObj) +{ + FIXME("%p %p %d %p %p %p\n", + piDataObj, pihlsite, dwSiteData, piunkOuter, riid, ppvObj); + *ppvObj = NULL; + return E_NOTIMPL; +} + +HRESULT WINAPI HlinkQueryCreateFromData(IDataObject* piDataObj) +{ + FIXME("%p\n", piDataObj); + return E_NOTIMPL; +} + +HRESULT WINAPI HlinkNavigateToStringReference( LPCWSTR pwzTarget, + LPCWSTR pwzLocation, IHlinkSite *pihlsite, DWORD dwSiteData, + IHlinkFrame *pihlframe, DWORD grfHLNF, LPBC pibc, + IBindStatusCallback *pibsc, IHlinkBrowseContext *pihlbc) +{ + HRESULT r; + IHlink *hlink = NULL; + + FIXME("%s %s %p %08x %p %08x %p %p %p\n", + debugstr_w(pwzTarget), debugstr_w(pwzLocation), pihlsite, + dwSiteData, pihlframe, grfHLNF, pibc, pibsc, pihlbc); + + r = HlinkCreateFromString( pwzTarget, pwzLocation, NULL, pihlsite, + dwSiteData, NULL, &IID_IHlink, (LPVOID*) &hlink ); + if (SUCCEEDED(r)) + r = HlinkNavigate(hlink, pihlframe, grfHLNF, pibc, pibsc, pihlbc); + + return r; +} + +HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) +{ + int len; + + static const WCHAR url_ext[] = {'.','u','r','l',0}; + + TRACE("(%s)\n", debugstr_w(pwzFileName)); + + if(!pwzFileName) + return E_INVALIDARG; + + len = strlenW(pwzFileName)-4; + if(len < 0) + return S_FALSE; + + return strcmpiW(pwzFileName+len, url_ext) ? S_FALSE : S_OK; +} + +HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) +{ + DWORD res, type, size = 100; + LPCWSTR value_name; + WCHAR *buf; + HKEY hkey; + + static const WCHAR start_pageW[] = {'S','t','a','r','t',' ','P','a','g','e',0}; + static const WCHAR search_pageW[] = {'S','e','a','r','c','h',' ','P','a','g','e',0}; + + static const WCHAR ie_main_keyW[] = + {'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r', + '\\','M','a','i','n',0}; + + TRACE("(%u %p)\n", uReference, ppwzReference); + + *ppwzReference = NULL; + + switch(uReference) { + case HLSR_HOME: + value_name = start_pageW; + break; + case HLSR_SEARCHPAGE: + value_name = search_pageW; + break; + case HLSR_HISTORYFOLDER: + return E_NOTIMPL; + default: + return E_INVALIDARG; + } + + res = RegOpenKeyW(HKEY_CURRENT_USER, ie_main_keyW, &hkey); + if(res != ERROR_SUCCESS) { + WARN("Could not open key: %u\n", res); + return HRESULT_FROM_WIN32(res); + } + + buf = CoTaskMemAlloc(size); + res = RegQueryValueExW(hkey, value_name, NULL, &type, (PBYTE)buf, &size); + buf = CoTaskMemRealloc(buf, size); + if(res == ERROR_MORE_DATA) + res = RegQueryValueExW(hkey, value_name, NULL, &type, (PBYTE)buf, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) { + WARN("Could not query value %s: %u\n", debugstr_w(value_name), res); + CoTaskMemFree(buf); + return HRESULT_FROM_WIN32(res); + } + + *ppwzReference = buf; + return S_OK; +} + +HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL) +{ + FIXME("(%s %08x %p)\n", debugstr_w(pwzURL), grfFlags, ppwzTranslatedURL); + return E_NOTIMPL; +} + +HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *pihlframe, IHlinkBrowseContext *pihlbc, + ULONG uHLID, IMoniker *pimkTrgt, LPCWSTR pwzLocation, LPCWSTR pwzFriendlyName) +{ + FIXME("(%p %p %u %p %s %s)\n", pihlframe, pihlbc, uHLID, pimkTrgt, debugstr_w(pwzLocation), + debugstr_w(pwzFriendlyName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HLinkCF_fnQueryInterface ( LPCLASSFACTORY iface, + REFIID riid, LPVOID *ppvObj) +{ + CFImpl *This = (CFImpl *)iface; + + TRACE("(%p)->(%s)\n",This,debugstr_guid(riid)); + + *ppvObj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) + { + *ppvObj = This; + return S_OK; + } + + TRACE("-- E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI HLinkCF_fnAddRef (LPCLASSFACTORY iface) +{ + return 2; +} + +static ULONG WINAPI HLinkCF_fnRelease(LPCLASSFACTORY iface) +{ + return 1; +} + +static HRESULT WINAPI HLinkCF_fnCreateInstance( LPCLASSFACTORY iface, + LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObject) +{ + CFImpl *This = (CFImpl *)iface; + + TRACE("%p->(%p,%s,%p)\n", This, pUnkOuter, debugstr_guid(riid), ppvObject); + + *ppvObject = NULL; + + return This->lpfnCI(pUnkOuter, riid, ppvObject); +} + +static HRESULT WINAPI HLinkCF_fnLockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("%p %d\n", iface, fLock); + return E_NOTIMPL; +} + +static const IClassFactoryVtbl hlcfvt = +{ + HLinkCF_fnQueryInterface, + HLinkCF_fnAddRef, + HLinkCF_fnRelease, + HLinkCF_fnCreateInstance, + HLinkCF_fnLockServer +}; + +static CFImpl HLink_cf = { &hlcfvt, &HLink_Constructor }; +static CFImpl HLinkBrowseContext_cf = { &hlcfvt, &HLinkBrowseContext_Constructor }; + +/*********************************************************************** + * DllGetClassObject (HLINK.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + IClassFactory *pcf = NULL; + + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + + if (!ppv) + return E_INVALIDARG; + *ppv = NULL; + + if (IsEqualIID(rclsid, &CLSID_StdHlink)) + pcf = (IClassFactory*) &HLink_cf; + else if (IsEqualIID(rclsid, &CLSID_StdHlinkBrowseContext)) + pcf = (IClassFactory*) &HLinkBrowseContext_cf; + else + return CLASS_E_CLASSNOTAVAILABLE; + + return IClassFactory_QueryInterface(pcf, iid, ppv); +} + +static HRESULT register_clsid(LPCGUID guid) +{ + static const WCHAR clsid[] = + {'C','L','S','I','D','\\',0}; + static const WCHAR ips[] = + {'\\','I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; + static const WCHAR hlink[] = + {'h','l','i','n','k','.','d','l','l',0}; + static const WCHAR threading_model[] = + {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; + static const WCHAR apartment[] = + {'A','p','a','r','t','m','e','n','t',0}; + WCHAR path[80]; + HKEY key = NULL; + LONG r; + + lstrcpyW(path, clsid); + StringFromGUID2(guid, &path[6], 80); + lstrcatW(path, ips); + r = RegCreateKeyW(HKEY_CLASSES_ROOT, path, &key); + if (r != ERROR_SUCCESS) + return E_FAIL; + + RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE *)hlink, sizeof hlink); + RegSetValueExW(key, threading_model, 0, REG_SZ, (const BYTE *)apartment, sizeof apartment); + RegCloseKey(key); + + return S_OK; +} + +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT r; + + r = register_clsid(&CLSID_StdHlink); + if (SUCCEEDED(r)) + r = register_clsid(&CLSID_StdHlinkBrowseContext); + + return S_OK; +} Propchange: trunk/reactos/dll/win32/hlink/hlink_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hlink/hlink_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/hlink_priv… ============================================================================== --- trunk/reactos/dll/win32/hlink/hlink_private.h (added) +++ trunk/reactos/dll/win32/hlink/hlink_private.h Sat Jan 5 00:53:35 2008 @@ -1,0 +1,78 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * 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 <stdarg.h> + +#define COBJMACROS + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "hlink.h" + +#include "wine/unicode.h" + +extern HRESULT WINAPI HLink_Constructor(IUnknown*,REFIID,void**); +extern HRESULT WINAPI HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**); + +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void *heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + +static inline LPWSTR hlink_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + +static inline LPWSTR hlink_co_strdupW(LPCWSTR str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD size; + + size = (strlenW(str)+1)*sizeof(WCHAR); + ret = CoTaskMemAlloc(size); + memcpy(ret, str, size); + } + + return ret; +} Propchange: trunk/reactos/dll/win32/hlink/hlink_private.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/hlink/link.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/link.c?rev… ============================================================================== --- trunk/reactos/dll/win32/hlink/link.c (added) +++ trunk/reactos/dll/win32/hlink/link.c Sat Jan 5 00:53:35 2008 @@ -1,0 +1,843 @@ +/* + * Implementation of hyperlinking (hlink.dll) + * + * Copyright 2005 Aric Stewart for CodeWeavers + * + * 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 "hlink_private.h" + +#include "shellapi.h" +#include "hlguids.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hlink); + +#define HLINK_SAVE_MAGIC 0x00000002 +#define HLINK_SAVE_MONIKER_PRESENT 0x01 +#define HLINK_SAVE_MONIKER_IS_ABSOLUTE 0x02 +#define HLINK_SAVE_LOCATION_PRESENT 0x08 +#define HLINK_SAVE_FRIENDLY_PRESENT 0x10 +/* 0x20, 0x40 unknown */ +#define HLINK_SAVE_TARGET_FRAME_PRESENT 0x80 +/* known flags */ +#define HLINK_SAVE_ALL (HLINK_SAVE_TARGET_FRAME_PRESENT|HLINK_SAVE_FRIENDLY_PRESENT|HLINK_SAVE_LOCATION_PRESENT|0x04|HLINK_SAVE_MONIKER_IS_ABSOLUTE|HLINK_SAVE_MONIKER_PRESENT) + +static const IHlinkVtbl hlvt; +static const IPersistStreamVtbl psvt; +static const IDataObjectVtbl dovt; + +typedef struct +{ + const IHlinkVtbl *lpVtbl; + LONG ref; + + const IPersistStreamVtbl *lpPSVtbl; + const IDataObjectVtbl *lpDOVtbl; + + LPWSTR FriendlyName; + LPWSTR Location; + LPWSTR Target; + LPWSTR TargetFrameName; + IMoniker *Moniker; + IHlinkSite *Site; + DWORD SiteData; + BOOL absolute; +} HlinkImpl; + + +static inline HlinkImpl* HlinkImpl_from_IPersistStream( IPersistStream* iface) +{ + return (HlinkImpl*) ((CHAR*)iface - FIELD_OFFSET(HlinkImpl, lpPSVtbl)); +} + +static inline HlinkImpl* HlinkImpl_from_IDataObject( IDataObject* iface) +{ + return (HlinkImpl*) ((CHAR*)iface - FIELD_OFFSET(HlinkImpl, lpDOVtbl)); +} + +static inline void __GetMoniker(HlinkImpl* This, IMoniker** moniker) +{ + *moniker = NULL; + if (This->Moniker) + { + *moniker = This->Moniker; + if (*moniker) + IMoniker_AddRef(*moniker); + } + else if (This->Site) + { + IHlinkSite_GetMoniker(This->Site, This->SiteData, + OLEGETMONIKER_FORCEASSIGN, OLEWHICHMK_CONTAINER, + (LPVOID)moniker); + } +} + +HRESULT WINAPI HLink_Constructor(IUnknown *pUnkOuter, REFIID riid, + LPVOID *ppv) +{ + HlinkImpl * hl; + + TRACE("unkOut=%p riid=%s\n", pUnkOuter, debugstr_guid(riid)); + *ppv = NULL; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + hl = heap_alloc_zero(sizeof(HlinkImpl)); + if (!hl) + return E_OUTOFMEMORY; + + hl->ref = 1; + hl->lpVtbl = &hlvt; + hl->lpPSVtbl = &psvt; + hl->lpDOVtbl = &dovt; + + *ppv = hl; + return S_OK; +} + +static HRESULT WINAPI IHlink_fnQueryInterface(IHlink* iface, REFIID riid, + LPVOID *ppvObj) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + TRACE ("(%p)->(%s,%p)\n", This, debugstr_guid (riid), ppvObj); + + *ppvObj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IHlink))) + *ppvObj = This; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ppvObj = (LPVOID*)&(This->lpPSVtbl); + else if (IsEqualIID(riid, &IID_IDataObject)) + *ppvObj = (LPVOID*)&(This->lpDOVtbl); + + if (*ppvObj) + { + IUnknown_AddRef((IUnknown*)(*ppvObj)); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI IHlink_fnAddRef (IHlink* iface) +{ + HlinkImpl *This = (HlinkImpl*)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI IHlink_fnRelease (IHlink* iface) +{ + HlinkImpl *This = (HlinkImpl*)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(count=%u)\n", This, refCount + 1); + if (refCount) + return refCount; + + TRACE("-- destroying IHlink (%p)\n", This); + heap_free(This->FriendlyName); + heap_free(This->Target); + heap_free(This->TargetFrameName); + heap_free(This->Location); + if (This->Moniker) + IMoniker_Release(This->Moniker); + if (This->Site) + IHlinkSite_Release(This->Site); + heap_free(This); + return 0; +} + +static HRESULT WINAPI IHlink_fnSetHlinkSite( IHlink* iface, + IHlinkSite* pihlSite, DWORD dwSiteData) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + TRACE("(%p)->(%p %i)\n", This, pihlSite, dwSiteData); + + if (This->Site) + IHlinkSite_Release(This->Site); + + This->Site = pihlSite; + if (This->Site) + IHlinkSite_AddRef(This->Site); + + This->SiteData = dwSiteData; + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnGetHlinkSite( IHlink* iface, + IHlinkSite** ppihlSite, DWORD *pdwSiteData) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + TRACE("(%p)->(%p %p)\n", This, ppihlSite, pdwSiteData); + + *ppihlSite = This->Site; + *pdwSiteData = This->SiteData; + + if (This->Site) + IHlinkSite_AddRef(This->Site); + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, + DWORD rfHLSETF, IMoniker *pmkTarget, LPCWSTR pwzLocation) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + FIXME("(%p)->(%i %p %s)\n", This, rfHLSETF, pmkTarget, + debugstr_w(pwzLocation)); + + if (This->Moniker) + IMoniker_Release(This->Moniker); + + This->Moniker = pmkTarget; + if (This->Moniker) + { + LPOLESTR display_name; + IMoniker_AddRef(This->Moniker); + IMoniker_GetDisplayName(This->Moniker, NULL, NULL, &display_name); + This->absolute = display_name && strchrW(display_name, ':'); + CoTaskMemFree(display_name); + } + + heap_free(This->Location); + This->Location = hlink_strdupW( pwzLocation ); + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, + DWORD grfHLSETF, LPCWSTR pwzTarget, LPCWSTR pwzLocation) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + TRACE("(%p)->(%i %s %s)\n", This, grfHLSETF, debugstr_w(pwzTarget), + debugstr_w(pwzLocation)); + + if (grfHLSETF & HLINKSETF_TARGET) + { + heap_free(This->Target); + This->Target = hlink_strdupW( pwzTarget ); + } + if (grfHLSETF & HLINKSETF_LOCATION) + { + heap_free(This->Location); + This->Location = hlink_strdupW( pwzLocation ); + } + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnGetMonikerReference(IHlink* iface, + DWORD dwWhichRef, IMoniker **ppimkTarget, LPWSTR *ppwzLocation) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + TRACE("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppimkTarget, + ppwzLocation); + + if(ppimkTarget) + __GetMoniker(This, ppimkTarget); + + if (ppwzLocation) + IHlink_GetStringReference(iface, dwWhichRef, NULL, ppwzLocation); + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnGetStringReference (IHlink* iface, + DWORD dwWhichRef, LPWSTR *ppwzTarget, LPWSTR *ppwzLocation) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + FIXME("(%p) -> (%i %p %p)\n", This, dwWhichRef, ppwzTarget, ppwzLocation); + + if (ppwzTarget) + { + *ppwzTarget = hlink_co_strdupW( This->Target ); + + if (!This->Target) + { + IMoniker* mon; + __GetMoniker(This, &mon); + if (mon) + { + IBindCtx *pbc; + + CreateBindCtx( 0, &pbc); + IMoniker_GetDisplayName(mon, pbc, NULL, ppwzTarget); + IBindCtx_Release(pbc); + IMoniker_Release(mon); + } + else + FIXME("Unhandled case, no set Target and no moniker\n"); + } + } + if (ppwzLocation) + *ppwzLocation = hlink_co_strdupW( This->Location ); + + TRACE("(Target: %s Location: %s)\n", + (ppwzTarget)?debugstr_w(*ppwzTarget):"<NULL>", + (ppwzLocation)?debugstr_w(*ppwzLocation):"<NULL>"); + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnSetFriendlyName (IHlink *iface, + LPCWSTR pwzFriendlyName) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + TRACE("(%p) -> (%s)\n", This, debugstr_w(pwzFriendlyName)); + + heap_free(This->FriendlyName); + This->FriendlyName = hlink_strdupW( pwzFriendlyName ); + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnGetFriendlyName (IHlink* iface, + DWORD grfHLFNAMEF, LPWSTR* ppwzFriendlyName) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + TRACE("(%p) -> (%i %p)\n", This, grfHLFNAMEF, ppwzFriendlyName); + + /* FIXME: Only using explicitly set and cached friendly names */ + + if (This->FriendlyName) + *ppwzFriendlyName = hlink_co_strdupW( This->FriendlyName ); + else + { + IMoniker *moniker; + __GetMoniker(This, &moniker); + if (moniker) + { + IBindCtx *bcxt; + CreateBindCtx(0, &bcxt); + + IMoniker_GetDisplayName(moniker, bcxt, NULL, ppwzFriendlyName); + IBindCtx_Release(bcxt); + IMoniker_Release(moniker); + } + else + *ppwzFriendlyName = NULL; + } + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnSetTargetFrameName(IHlink* iface, + LPCWSTR pwzTargetFramename) +{ + HlinkImpl *This = (HlinkImpl*)iface; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzTargetFramename)); + + heap_free(This->TargetFrameName); + This->TargetFrameName = hlink_strdupW( pwzTargetFramename ); + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnGetTargetFrameName(IHlink* iface, + LPWSTR *ppwzTargetFrameName) +{ + HlinkImpl *This = (HlinkImpl*)iface; + + TRACE("(%p)->(%p)\n", This, ppwzTargetFrameName); + *ppwzTargetFrameName = hlink_co_strdupW( This->TargetFrameName ); + + return S_OK; +} + +static HRESULT WINAPI IHlink_fnGetMiscStatus(IHlink* iface, DWORD* pdwStatus) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, + IBindStatusCallback *pbsc, IHlinkBrowseContext *phbc) +{ + HlinkImpl *This = (HlinkImpl*)iface; + IMoniker *mon = NULL; + + FIXME("Semi-Stub:(%p)->(%i %p %p %p)\n", This, grfHLNF, pbc, pbsc, phbc); + + if (This->Site) + IHlinkSite_ReadyToNavigate(This->Site, This->SiteData, 0); + + __GetMoniker(This, &mon); + TRACE("Moniker %p\n", mon); + + if (mon) + { + IBindCtx *bcxt; + IHlinkTarget *target = NULL; + HRESULT r = S_OK; + + CreateBindCtx(0, &bcxt); + + RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); + + r = IMoniker_BindToObject(mon, bcxt, NULL, &IID_IHlinkTarget, + (LPVOID*)&target); + TRACE("IHlinkTarget returned 0x%x\n", r); + if (r == S_OK) + { + IHlinkTarget_SetBrowseContext(target, phbc); + IHlinkTarget_Navigate(target, grfHLNF, This->Location); + IHlinkTarget_Release(target); + } + else + { + static const WCHAR szOpen[] = {'o','p','e','n',0}; + LPWSTR target = NULL; + + r = IHlink_GetStringReference(iface, HLINKGETREF_DEFAULT, &target, NULL); + if (SUCCEEDED(r) && target) + { + ShellExecuteW(NULL, szOpen, target, NULL, NULL, SW_SHOW); + CoTaskMemFree(target); + } + } + + RevokeBindStatusCallback(bcxt, pbsc); + + IBindCtx_Release(bcxt); + IMoniker_Release(mon); + } + + if (This->Site) + IHlinkSite_OnNavigationComplete(This->Site, This->SiteData, 0, 0, NULL); + + TRACE("Finished Navigation\n"); + return S_OK; +} + +static HRESULT WINAPI IHlink_fnSetAdditonalParams(IHlink* iface, + LPCWSTR pwzAdditionalParams) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IHlink_fnGetAdditionalParams(IHlink* iface, + LPWSTR* ppwzAdditionalParams) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const IHlinkVtbl hlvt = +{ + IHlink_fnQueryInterface, + IHlink_fnAddRef, + IHlink_fnRelease, + IHlink_fnSetHlinkSite, + IHlink_fnGetHlinkSite, + IHlink_fnSetMonikerReference, + IHlink_fnGetMonikerReference, + IHlink_fnSetStringReference, + IHlink_fnGetStringReference, + IHlink_fnSetFriendlyName, + IHlink_fnGetFriendlyName, + IHlink_fnSetTargetFrameName, + IHlink_fnGetTargetFrameName, + IHlink_fnGetMiscStatus, + IHlink_fnNavigate, + IHlink_fnSetAdditonalParams, + IHlink_fnGetAdditionalParams +}; + +static HRESULT WINAPI IDataObject_fnQueryInterface(IDataObject* iface, + REFIID riid, LPVOID *ppvObj) +{ + HlinkImpl *This = HlinkImpl_from_IDataObject(iface); + TRACE("%p\n", This); + return IHlink_QueryInterface((IHlink*)This, riid, ppvObj); +} + +static ULONG WINAPI IDataObject_fnAddRef (IDataObject* iface) +{ + HlinkImpl *This = HlinkImpl_from_IDataObject(iface); + TRACE("%p\n", This); + return IHlink_AddRef((IHlink*)This); +} + +static ULONG WINAPI IDataObject_fnRelease (IDataObject* iface) +{ + HlinkImpl *This = HlinkImpl_from_IDataObject(iface); + TRACE("%p\n", This); + return IHlink_Release((IHlink*)This); +} + +static HRESULT WINAPI IDataObject_fnGetData(IDataObject* iface, + FORMATETC* pformatetcIn, STGMEDIUM* pmedium) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObject_fnGetDataHere(IDataObject* iface, + FORMATETC* pformatetc, STGMEDIUM* pmedium) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObject_fnQueryGetData(IDataObject* iface, + FORMATETC* pformatetc) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObject_fnGetConicalFormatEtc(IDataObject* iface, + FORMATETC* pformatetcIn, FORMATETC* pformatetcOut) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObject_fnSetData(IDataObject* iface, + FORMATETC* pformatetc, STGMEDIUM* pmedium, BOOL fRelease) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObject_fnEnumFormatEtc(IDataObject* iface, + DWORD dwDirection, IEnumFORMATETC** ppenumFormatEtc) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObject_fnDAdvise(IDataObject* iface, + FORMATETC* pformatetc, DWORD advf, IAdviseSink* pAdvSink, + DWORD* pdwConnection) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObject_fnDUnadvise(IDataObject* iface, + DWORD dwConnection) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI IDataObject_fnEnumDAdvise(IDataObject* iface, + IEnumSTATDATA** ppenumAdvise) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const IDataObjectVtbl dovt = +{ + IDataObject_fnQueryInterface, + IDataObject_fnAddRef, + IDataObject_fnRelease, + IDataObject_fnGetData, + IDataObject_fnGetDataHere, + IDataObject_fnQueryGetData, + IDataObject_fnGetConicalFormatEtc, + IDataObject_fnSetData, + IDataObject_fnEnumFormatEtc, + IDataObject_fnDAdvise, + IDataObject_fnDUnadvise, + IDataObject_fnEnumDAdvise +}; + +static HRESULT WINAPI IPersistStream_fnQueryInterface(IPersistStream* iface, + REFIID riid, LPVOID *ppvObj) +{ + HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + TRACE("(%p)\n", This); + return IHlink_QueryInterface((IHlink*)This, riid, ppvObj); +} + +static ULONG WINAPI IPersistStream_fnAddRef (IPersistStream* iface) +{ + HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + TRACE("(%p)\n", This); + return IHlink_AddRef((IHlink*)This); +} + +static ULONG WINAPI IPersistStream_fnRelease (IPersistStream* iface) +{ + HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + TRACE("(%p)\n", This); + return IHlink_Release((IHlink*)This); +} + +static HRESULT WINAPI IPersistStream_fnGetClassID(IPersistStream* iface, + CLSID* pClassID) +{ + HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + TRACE("(%p)\n", This); + memcpy(pClassID, &CLSID_StdHlink, sizeof(CLSID)); + return S_OK; +} + +static HRESULT WINAPI IPersistStream_fnIsDirty(IPersistStream* iface) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT write_hlink_string(IStream *pStm, LPCWSTR str) +{ + DWORD len; + HRESULT hr; + + TRACE("(%p, %s)\n", pStm, debugstr_w(str)); + + len = strlenW(str) + 1; + + hr = IStream_Write(pStm, &len, sizeof(len), NULL); + if (FAILED(hr)) return hr; + + hr = IStream_Write(pStm, str, len * sizeof(WCHAR), NULL); + if (FAILED(hr)) return hr; + + return S_OK; +} + +static inline ULONG size_hlink_string(LPCWSTR str) +{ + return sizeof(DWORD) + (strlenW(str) + 1) * sizeof(WCHAR); +} + +static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str) +{ + LPWSTR str; + DWORD len; + ULONG read; + HRESULT hr; + + hr = IStream_Read(pStm, &len, sizeof(len), &read); + if (FAILED(hr)) return hr; + if (read != sizeof(len)) return STG_E_READFAULT; + + TRACE("read len %d\n", len); + + str = heap_alloc(len * sizeof(WCHAR)); + if (!str) return E_OUTOFMEMORY; + + hr = IStream_Read(pStm, str, len * sizeof(WCHAR), &read); + if (FAILED(hr)) + { + heap_free(str); + return hr; + } + if (read != len * sizeof(WCHAR)) + { + heap_free(str); + return STG_E_READFAULT; + } + TRACE("read string %s\n", debugstr_w(str)); + + *out_str = str; + return S_OK; +} + +static HRESULT WINAPI IPersistStream_fnLoad(IPersistStream* iface, + IStream* pStm) +{ + HRESULT r; + DWORD hdr[2]; + DWORD read; + HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + + r = IStream_Read(pStm, &hdr, sizeof(hdr), &read); + if (read != sizeof(hdr) || (hdr[0] != HLINK_SAVE_MAGIC)) + { + r = E_FAIL; + goto end; + } + if (hdr[1] & ~HLINK_SAVE_ALL) + FIXME("unknown flag(s) 0x%x\n", hdr[1] & ~HLINK_SAVE_ALL); + + if (hdr[1] & HLINK_SAVE_TARGET_FRAME_PRESENT) + { + TRACE("loading target frame name\n"); + r = read_hlink_string(pStm, &This->TargetFrameName); + if (FAILED(r)) goto end; + } + + if (hdr[1] & HLINK_SAVE_FRIENDLY_PRESENT) + { + TRACE("loading target friendly name\n"); + if (!(hdr[1] & 0x4)) + FIXME("0x4 flag not present with friendly name flag - not sure what this means\n"); + r = read_hlink_string(pStm, &This->FriendlyName); + if (FAILED(r)) goto end; + } + + if (hdr[1] & HLINK_SAVE_MONIKER_PRESENT) + { + TRACE("loading moniker\n"); + r = OleLoadFromStream(pStm, &IID_IMoniker, (LPVOID*)&(This->Moniker)); + if (FAILED(r)) + goto end; + This->absolute = hdr[1] & HLINK_SAVE_MONIKER_IS_ABSOLUTE ? TRUE : FALSE; + } + + if (hdr[1] & HLINK_SAVE_LOCATION_PRESENT) + { + TRACE("loading location\n"); + r = read_hlink_string(pStm, &This->Location); + if (FAILED(r)) goto end; + } + +end: + TRACE("Load Result 0x%x (%p)\n", r, This->Moniker); + + return r; +} + +static HRESULT WINAPI IPersistStream_fnSave(IPersistStream* iface, + IStream* pStm, BOOL fClearDirty) +{ + HRESULT r = E_FAIL; + HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + DWORD hdr[2]; + IMoniker *moniker; + + TRACE("(%p) Moniker(%p)\n", This, This->Moniker); + + __GetMoniker(This, &moniker); + + hdr[0] = HLINK_SAVE_MAGIC; + hdr[1] = 0; + + if (moniker) + hdr[1] |= HLINK_SAVE_MONIKER_PRESENT; + if (This->absolute) + hdr[1] |= HLINK_SAVE_MONIKER_IS_ABSOLUTE; + if (This->Location) + hdr[1] |= HLINK_SAVE_LOCATION_PRESENT; + if (This->FriendlyName) + hdr[1] |= HLINK_SAVE_FRIENDLY_PRESENT | 4 /* FIXME */; + if (This->TargetFrameName) + hdr[1] |= HLINK_SAVE_TARGET_FRAME_PRESENT; + + IStream_Write(pStm, &hdr, sizeof(hdr), NULL); + + if (This->TargetFrameName) + { + r = write_hlink_string(pStm, This->TargetFrameName); + if (FAILED(r)) goto end; + } + + if (This->FriendlyName) + { + r = write_hlink_string(pStm, This->FriendlyName); + if (FAILED(r)) goto end; + } + + if (moniker) + { + IPersistStream* monstream; + + monstream = NULL; + IMoniker_QueryInterface(moniker, &IID_IPersistStream, + (LPVOID*)&monstream); + if (monstream) + { + r = OleSaveToStream(monstream, pStm); + IPersistStream_Release(monstream); + } + if (FAILED(r)) goto end; + } + + if (This->Location) + { + r = write_hlink_string(pStm, This->Location); + if (FAILED(r)) goto end; + } + +end: + if (moniker) IMoniker_Release(moniker); + TRACE("Save Result 0x%x\n", r); + + return r; +} + +static HRESULT WINAPI IPersistStream_fnGetSizeMax(IPersistStream* iface, + ULARGE_INTEGER* pcbSize) +{ + HRESULT r = E_FAIL; + HlinkImpl *This = HlinkImpl_from_IPersistStream(iface); + IMoniker *moniker; + + TRACE("(%p) Moniker(%p)\n", This, This->Moniker); + + pcbSize->QuadPart = sizeof(DWORD)*2; + + if (This->TargetFrameName) + pcbSize->QuadPart += size_hlink_string(This->TargetFrameName); + + if (This->FriendlyName) + pcbSize->QuadPart += size_hlink_string(This->FriendlyName); + + __GetMoniker(This, &moniker); + if (moniker) + { + IPersistStream* monstream = NULL; + IMoniker_QueryInterface(moniker, &IID_IPersistStream, + (LPVOID*)&monstream); + if (monstream) + { + ULARGE_INTEGER mon_size; + r = IPersistStream_GetSizeMax(monstream, &mon_size); + pcbSize->QuadPart += mon_size.QuadPart; + IPersistStream_Release(monstream); + } + IMoniker_Release(moniker); + } + + if (This->Location) + pcbSize->QuadPart += size_hlink_string(This->Location); + + return r; +} + +static const IPersistStreamVtbl psvt = +{ + IPersistStream_fnQueryInterface, + IPersistStream_fnAddRef, + IPersistStream_fnRelease, + IPersistStream_fnGetClassID, + IPersistStream_fnIsDirty, + IPersistStream_fnLoad, + IPersistStream_fnSave, + IPersistStream_fnGetSizeMax, +}; Propchange: trunk/reactos/dll/win32/hlink/link.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akorotaev] 31596: Some rework on merging, but it doesn't help bugcheck
by akorotaev＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: akorotaev Date: Sat Jan 5 00:23:16 2008 New Revision: 31596 URL: http://svn.reactos.org/svn/reactos?rev=31596&view=rev Log: Some rework on merging, but it doesn't help bugcheck Modified: branches/cache_manager_rewrite/mm/elf.inc.h branches/cache_manager_rewrite/mm/elf32.c branches/cache_manager_rewrite/mm/elf64.c branches/cache_manager_rewrite/mm/freelist.c branches/cache_manager_rewrite/mm/mminit.c branches/cache_manager_rewrite/mm/pageop.c branches/cache_manager_rewrite/mm/rmap.c branches/cache_manager_rewrite/mm/section.c branches/cache_manager_rewrite/mm/virtual.c Modified: branches/cache_manager_rewrite/mm/elf.inc.h URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf.in… ============================================================================== --- branches/cache_manager_rewrite/mm/elf.inc.h (original) +++ branches/cache_manager_rewrite/mm/elf.inc.h Sat Jan 5 00:23:16 2008 @@ -1,5 +1,6 @@ /* $Id$ */ +#include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> Modified: branches/cache_manager_rewrite/mm/elf32.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf32.… ============================================================================== --- branches/cache_manager_rewrite/mm/elf32.c (original) +++ branches/cache_manager_rewrite/mm/elf32.c Sat Jan 5 00:23:16 2008 @@ -7,7 +7,7 @@ * * PROGRAMMERS: No programmer listed. */ -#include <ntoskrnl.h> + #define __ELF_WORD_SIZE 32 #include "elf.inc.h" Modified: branches/cache_manager_rewrite/mm/elf64.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf64.… ============================================================================== --- branches/cache_manager_rewrite/mm/elf64.c (original) +++ branches/cache_manager_rewrite/mm/elf64.c Sat Jan 5 00:23:16 2008 @@ -7,6 +7,6 @@ * * PROGRAMMERS: No programmer listed. */ -#include <ntoskrnl.h> + #define __ELF_WORD_SIZE 64 #include "elf.inc.h" Modified: branches/cache_manager_rewrite/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/freeli… ============================================================================== --- branches/cache_manager_rewrite/mm/freelist.c (original) +++ branches/cache_manager_rewrite/mm/freelist.c Sat Jan 5 00:23:16 2008 @@ -183,8 +183,8 @@ KeAcquireSpinLock(&PageListLock, &oldIrql); - last = min(HighestAcceptableAddress.QuadPart / PAGE_SIZE, MmPageArraySize - 1); - boundary = BoundaryAddressMultiple.QuadPart / PAGE_SIZE; + last = min(HighestAcceptableAddress.LowPart / PAGE_SIZE, MmPageArraySize - 1); + boundary = BoundaryAddressMultiple.LowPart / PAGE_SIZE; for (j = 0; j < 2; j++) { @@ -195,7 +195,7 @@ * pages above the 16MB area because the caller has specify an upper limit. * The second try uses the specified lower limit. */ - for (i = j == 0 ? 0x100000 / PAGE_SIZE : LowestAcceptableAddress.QuadPart / PAGE_SIZE; i <= last; ) + for (i = j == 0 ? 0x100000 / PAGE_SIZE : LowestAcceptableAddress.LowPart / PAGE_SIZE; i <= last; ) { if (MmPageArray[i].Flags.Type == MM_PHYSICAL_PAGE_FREE) { @@ -1036,8 +1036,8 @@ if (NumberOfPages == 0) return 0; - LowestPage = LowestAddress.QuadPart / PAGE_SIZE; - HighestPage = HighestAddress.QuadPart / PAGE_SIZE; + LowestPage = LowestAddress.LowPart / PAGE_SIZE; + HighestPage = HighestAddress.LowPart / PAGE_SIZE; if ((HighestAddress.u.LowPart % PAGE_SIZE) != 0) HighestPage++; @@ -1172,7 +1172,7 @@ ULONG Count; /* Free initial kernel memory */ - MiFreeInitMemory(); + //MiFreeInitMemory(); /* Set our priority to 0 */ KeGetCurrentThread()->BasePriority = 0; Modified: branches/cache_manager_rewrite/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit… ============================================================================== --- branches/cache_manager_rewrite/mm/mminit.c (original) +++ branches/cache_manager_rewrite/mm/mminit.c Sat Jan 5 00:23:16 2008 @@ -493,10 +493,29 @@ return TRUE; } +#if 0 + +VOID static +MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, + PFN_TYPE Page, SWAPENTRY SwapEntry, + BOOLEAN Dirty) +{ + ASSERT(SwapEntry == 0); + if (Page != 0) + { + MmReleasePageMemoryConsumer(MC_NPPOOL, Page); + } +} + VOID NTAPI MiFreeInitMemory(VOID) { MmLockAddressSpace(MmGetKernelAddressSpace()); + MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), + (PVOID)&_init_start__, + MiFreeInitMemoryPage, + NULL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); } +#endif Modified: branches/cache_manager_rewrite/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pageop… ============================================================================== --- branches/cache_manager_rewrite/mm/pageop.c (original) +++ branches/cache_manager_rewrite/mm/pageop.c Sat Jan 5 00:23:16 2008 @@ -46,10 +46,7 @@ KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); return; } - if (PageOp->MArea) - { - (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); - } + (void)InterlockedDecrementUL(&PageOp->MArea->PageOpCount); PrevPageOp = MmPageOpHashTable[PageOp->Hash]; if (PrevPageOp == PageOp) { @@ -143,6 +140,8 @@ KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); return(NULL); } + +extern BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; PMM_PAGEOP NTAPI @@ -157,6 +156,12 @@ ULONG_PTR Hash = 0; KIRQL oldIrql; PMM_PAGEOP PageOp; + + if (!PageOpReady) + { + DPRINT1("PAGEOPS USED TOO SOON!!!\n"); + while (TRUE); + } /* * Calcuate the hash value for pageop structure @@ -256,10 +261,7 @@ PageOp->MArea = MArea; KeInitializeEvent(&PageOp->CompletionEvent, NotificationEvent, FALSE); MmPageOpHashTable[Hash] = PageOp; - if (MArea) - { - (void)InterlockedIncrementUL(&MArea->PageOpCount); - } + (void)InterlockedIncrementUL(&MArea->PageOpCount); KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); return(PageOp); @@ -281,10 +283,3 @@ TAG_MM_PAGEOP, 50); } - - - - - - - Modified: branches/cache_manager_rewrite/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/rmap.c… ============================================================================== --- branches/cache_manager_rewrite/mm/rmap.c (original) +++ branches/cache_manager_rewrite/mm/rmap.c Sat Jan 5 00:23:16 2008 @@ -390,6 +390,8 @@ return(FALSE); } +extern BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; + VOID NTAPI MmInsertRmap(PFN_TYPE Page, PEPROCESS Process, @@ -399,6 +401,12 @@ PMM_RMAP_ENTRY new_entry; ULONG PrevSize; + if (!RmapReady) + { + DPRINT1("RMAPS USED TOO SOON!!!\n"); + while (TRUE); + } + Address = (PVOID)PAGE_ROUND_DOWN(Address); new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList); @@ -409,7 +417,11 @@ new_entry->Address = Address; new_entry->Process = (PEPROCESS)Process; #ifdef DBG +#ifdef __GNUC__ new_entry->Caller = __builtin_return_address(0); +#else + new_entry->Caller = _ReturnAddress(); +#endif #endif if (MmGetPfnForProcess(Process, Address) != Page) @@ -431,9 +443,9 @@ { DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n current caller ", current_entry->Address); - KeRosPrintAddress(new_entry->Caller); + DbgPrint("%p", new_entry->Caller); DbgPrint("\n previous caller "); - KeRosPrintAddress(current_entry->Caller); + DbgPrint("%p", current_entry->Caller); DbgPrint("\n"); KeBugCheck(0); } @@ -466,6 +478,12 @@ PMM_RMAP_ENTRY previous_entry; PEPROCESS Process; + if (!RmapReady) + { + DPRINT1("RMAPS USED TOO SOON!!!\n"); + while (TRUE); + } + ExAcquireFastMutex(&RmapListLock); current_entry = MmGetRmapListHeadPage(Page); if (current_entry == NULL) @@ -503,6 +521,12 @@ PVOID Address) { PMM_RMAP_ENTRY current_entry, previous_entry; + + if (!RmapReady) + { + DPRINT1("RMAPS USED TOO SOON!!!\n"); + while (TRUE); + } ExAcquireFastMutex(&RmapListLock); previous_entry = NULL; @@ -535,6 +559,5 @@ previous_entry = current_entry; current_entry = current_entry->Next; } - DPRINT1("%x %x %x\n", Page, Process, Address); KEBUGCHECK(0); } Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Sat Jan 5 00:23:16 2008 @@ -32,7 +32,7 @@ * Ge van Geldorp * Royce Mitchell III * Filip Navara - * Aleksey Bragin + * Aleksey Bragin * Jason Filby * Thomas Weidenmueller * Gunnar Andre' Dalsnes @@ -182,7 +182,7 @@ /* * FIXME: TODO. * Filip says to get the MADDRESS_SPACE from EPROCESS, - * then use the MmMarea routines to locate the Marea that + * then use the MmMarea routines to locate the Marea that * corresponds to the address. Then make sure it's a section * view type (MEMORY_AREA_SECTION_VIEW) and use the marea's * per-type union to get the .u.SectionView.Section pointer to @@ -1049,8 +1049,8 @@ AddressSpace, MemoryArea, Address, Locked); PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - SegmentOffset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + SegmentOffset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; @@ -2281,7 +2281,7 @@ * Find the offset of the page */ PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; Segment = MemoryArea->Data.SectionData.Segment; @@ -2459,7 +2459,7 @@ { MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); } - + if (PageOutContext->Private) { MmReleasePageMemoryConsumer(PageOutContext->Consumer, Page); @@ -2494,7 +2494,7 @@ Context.Consumer = MemoryArea->Type == MEMORY_AREA_CACHE_SEGMENT ? MC_CACHE : MC_USER; - Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; FileOffset = Context.Offset + Context.Segment->FileOffset; @@ -2796,7 +2796,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; /* @@ -2965,7 +2965,7 @@ ULONG Entry; PFN_TYPE Page; - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; Entry = MmGetPageEntrySectionSegment(Segment, Offset); Page = MmGetPfnForProcess(AddressSpace->Process, Address); @@ -3272,7 +3272,7 @@ UNICODE_STRING Name; DPRINT("Creating Section Object Type\n"); - + /* Initialize the Section object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Section"); @@ -3434,13 +3434,10 @@ /* * Reference the file object */ - Status = ObReferenceObjectByHandle(FileObject, - FileAccess, - IoFileObjectType, - ExGetPreviousMode(), - (PVOID*)(PVOID)&FileObject, - NULL); - + Status = ObReferenceObjectByPointer(FileObject, + FileAccess, + IoFileObjectType, + UserMode); if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); @@ -4375,7 +4372,7 @@ ObDereferenceObject(Section); return(STATUS_NO_MEMORY); } - + RtlZeroMemory(ImageSectionObject, sizeof(MM_IMAGE_SECTION_OBJECT)); StatusExeFmt = ExeFmtpCreateImageSection(FileObject, ImageSectionObject); @@ -4760,6 +4757,8 @@ SafeViewSize = (ViewSize != NULL ? *ViewSize : 0); } + SafeSectionOffset.LowPart = PAGE_ROUND_DOWN(SafeSectionOffset.LowPart); + Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, PsProcessType, @@ -4796,6 +4795,18 @@ InheritDisposition, AllocationType, Protect); + + /* Check if this is an image for the current process */ + if ((Section->AllocationAttributes & SEC_IMAGE) && + (Process == PsGetCurrentProcess()) && + (Status != STATUS_IMAGE_NOT_AT_BASE)) + { + /* Notify the debugger */ + DbgkMapViewOfSection(Section, + SafeBaseAddress, + SafeSectionOffset.LowPart, + SafeViewSize); + } ObDereferenceObject(Section); ObDereferenceObject(Process); @@ -4990,7 +5001,7 @@ ASSERT(Process); AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; - + MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); @@ -5626,6 +5637,8 @@ ImageSize = max(ImageSize, MaxExtent); } } + + ImageSectionObject->ImageSize = ImageSize; /* Check there is enough space to map the section at that point. */ if (MmLocateMemoryAreaByRegion(AddressSpace, (PVOID)ImageBase, Modified: branches/cache_manager_rewrite/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/virtua… ============================================================================== --- branches/cache_manager_rewrite/mm/virtual.c (original) +++ branches/cache_manager_rewrite/mm/virtual.c Sat Jan 5 00:23:16 2008 @@ -397,7 +397,7 @@ NTSTATUS Status; *NumberOfBytesToProtect = - PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - + PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (ULONG_PTR)(*NumberOfBytesToProtect)) - PAGE_ROUND_DOWN(*BaseAddress); *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress);

1 0

[cwittich] 31595: add Active Setup\HTML Help entries to registry
by cwittich＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: cwittich Date: Fri Jan 4 13:44:54 2008 New Revision: 31595 URL: http://svn.reactos.org/svn/reactos?rev=31595&view=rev Log: add Active Setup\HTML Help entries to registry Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Fri Jan 4 13:44:54 2008 @@ -14,6 +14,13 @@ HKLM,Software\Microsoft\Rpc\SecurityService,18,2,"secur32.dll" HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" + +; HTML Help +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" ; Common shell folders HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012

1 0

[cwittich] 31594: add RPC entries to registry
by cwittich＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: cwittich Date: Fri Jan 4 13:27:19 2008 New Revision: 31594 URL: http://svn.reactos.org/svn/reactos?rev=31594&view=rev Log: add RPC entries to registry Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Fri Jan 4 13:27:19 2008 @@ -5,6 +5,15 @@ ; DirectX HKLM,"SOFTWARE\Microsoft\DirectX","Version",0x00000000,"4.09.00.0904" + +; RPC +HKLM,Software\Microsoft\Rpc\SecurityService,1,2,"secur32.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,10,2,"secur32.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,14,2,"schannel.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,16,2,"secur32.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,18,2,"secur32.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" ; Common shell folders HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012

1 0

[cwittich] 31593: add DirectX version information to registry
by cwittich＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: cwittich Date: Fri Jan 4 13:12:00 2008 New Revision: 31593 URL: http://svn.reactos.org/svn/reactos?rev=31593&view=rev Log: add DirectX version information to registry Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Fri Jan 4 13:12:00 2008 @@ -2,6 +2,9 @@ Signature="$ReactOS$ [AddReg] + +; DirectX +HKLM,"SOFTWARE\Microsoft\DirectX","Version",0x00000000,"4.09.00.0904" ; Common shell folders HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012

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