Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 29676: - load dynamic IContextMenu extensions from registry - it uses the key shellex\ContextMenuHandlers\{CLSID} to load extensions - make SHCreateDefaultContextMenu use default IContextMenu implementation - TBD for static IContextMenu extensions and for creating a new object of that type (ShellNew) - code currently if 0' out
by janderwald＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: janderwald Date: Fri Oct 19 14:52:07 2007 New Revision: 29676 URL: http://svn.reactos.org/svn/reactos?rev=29676&view=rev Log: - load dynamic IContextMenu extensions from registry - it uses the key shellex\ContextMenuHandlers\{CLSID} to load extensions - make SHCreateDefaultContextMenu use default IContextMenu implementation - TBD for static IContextMenu extensions and for creating a new object of that type (ShellNew) - code currently if 0' out Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Fri Oct 19 14:52:07 2007 @@ -35,7 +35,7 @@ #include "shell32_main.h" #include "shellfolder.h" - +#include "debughlp.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); /* ugly hack for cut&paste files */ @@ -52,8 +52,13 @@ LPITEMIDLIST *apidl; /* array of child pidls */ UINT cidl; BOOL bAllValues; + IContextMenu ** ecmenu; + UINT esize; + UINT ecount; } ItemCmImpl; +UINT +SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj); static const IContextMenu2Vtbl cmvt; @@ -209,6 +214,67 @@ InsertMenuItemA( hmenu, indexMenu, fByPosition, &mii); } +BOOL +SH_EnlargeContextMenuArray(ItemCmImpl *This, UINT newsize) +{ + BOOL ret = FALSE; + + if (This->ecmenu == NULL) + { + This->ecmenu = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(IContextMenu*) *10); + if(This->ecmenu) + ret = TRUE; + This->ecount = 0; + This->esize = 10; + } + else + { + IContextMenu ** newcmenu = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IContextMenu*)*newsize); + if (newcmenu) + { + memcpy(newcmenu, This->ecmenu, This->ecount * sizeof(IContextMenu*)); + HeapFree(GetProcessHeap(), 0, This->ecmenu); + This->ecmenu = newcmenu; + ret = TRUE; + } + } + return ret; +} + +VOID +SH_LoadContextMenuHandlers(ItemCmImpl *This, IDataObject * pDataObj) +{ + UINT i; + WCHAR buffer[111]; + char ebuf[10]; + HRESULT hr; + + for (i = 0; i < This->cidl; i++) + { + GUID * guid = _ILGetGUIDPointer(This->apidl[i]); + if (guid) + { + LPOLESTR pwszCLSID; + static const WCHAR CLSID[] = { 'C','L','S','I','D','\\',0 }; + wcscpy(buffer, CLSID); + hr = StringFromCLSID(guid, &pwszCLSID); + if (hr == S_OK) + { + memcpy(&buffer[6], pwszCLSID, 38 * sizeof(WCHAR)); + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + } + } + + if (_ILGetExtension(This->apidl[i], ebuf, sizeof(ebuf) / sizeof(char))) + { + buffer[0] = L'\0'; + if (MultiByteToWideChar(CP_ACP, 0, ebuf, -1, buffer, 111)) + SH_EnumerateDynamicContextHandlerForKey(buffer, This, pDataObj); + } + } + +} + /************************************************************************** * ISvItemCm_fnQueryContextMenu() * FIXME: load menu MENU_SHV_FILE out of resources instead if creating @@ -222,7 +288,10 @@ UINT idCmdLast, UINT uFlags) { - ItemCmImpl *This = (ItemCmImpl *)iface; + IDataObject * pDataObj; + ItemCmImpl *This = (ItemCmImpl *)iface; + USHORT lastindex = 0; + TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -260,9 +329,18 @@ _InsertMenuItem(hmenu, indexMenu++, TRUE, 0, MFT_SEPARATOR, NULL, 0); _InsertMenuItem(hmenu, indexMenu++, TRUE, FCIDM_SHVIEW_PROPERTIES, MFT_STRING, "&Properties", MFS_ENABLED); - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, (FCIDM_SHVIEWLAST)); - } - return MAKE_HRESULT(SEVERITY_SUCCESS, 0, 0); + lastindex = FCIDM_SHVIEWLAST; + } +#if 0 + pDataObj = IDataObject_Constructor(NULL, This->pidl, This->apidl, This->cidl); + if (pDataObj) + { + SH_LoadContextMenuHandlers(This, pDataObj); + pDataObj->Release (); + } +#endif + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, lastindex); } /************************************************************************** @@ -600,6 +678,93 @@ ISvItemCm_fnHandleMenuMsg }; +HRESULT +SH_LoadDynamicContextMenuHandler(HKEY hKey, LPCWSTR szClass, IContextMenu** ppv, IDataObject * pDataObj) +{ + HRESULT hr; + IContextMenu * cmobj; + IShellExtInit *shext; + + hr = SHCoCreateInstance(szClass, NULL, NULL, &IID_IContextMenu, (void**)&cmobj); + if (hr != S_OK) + { + TRACE("SHCoCreateInstance failed\n"); + return hr; + } + + hr = cmobj->lpVtbl->QueryInterface(cmobj, &IID_IShellExtInit, (void**)&shext); + if (hr != S_OK) + { + TRACE("Failed to query for interface IID_IShellExtInit\n"); + cmobj->lpVtbl->Release(cmobj); + return FALSE; + } + + hr = shext->lpVtbl->Initialize(shext, NULL, pDataObj, hKey); + if (hr != S_OK) + { + TRACE("Failed to initialize shell extension\n"); + shext->lpVtbl->Release(shext); + cmobj->lpVtbl->Release(cmobj); + } + else + { + *ppv = cmobj; + } + + return hr; +} + +UINT +SH_EnumerateDynamicContextHandlerForKey(LPWSTR szFileClass, ItemCmImpl *This, IDataObject * pDataObj) +{ + HKEY hKey; + WCHAR szKey[MAX_PATH]; + WCHAR szName[MAX_PATH]; + DWORD dwIndex, dwName; + LONG res; + HRESULT hResult; + IContextMenu * cmobj; + UINT index; + static const WCHAR szShellEx[] = { '\\','s','h','e','l','l','e','x','\\','C','o','n','t','e','x','t','M','e','n','u','H','a','n','d','l','e','r','s',0 }; + + wcscpy(szKey, szFileClass); + wcscat(szKey, szShellEx); + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &hKey) != ERROR_SUCCESS) + { + TRACE("RegOpenKeyExW failed for key %s\n", debugstr_w(szKey)); + return 0; + } + + dwIndex = 0; + index = 0; + do + { + dwName = MAX_PATH; + res = RegEnumKeyExW(hKey, dwIndex, szName, &dwName, NULL, NULL, NULL, NULL); + if (res == ERROR_SUCCESS) + { + hResult = SH_LoadDynamicContextMenuHandler(hKey, szName, &cmobj, pDataObj); + if (hResult == S_OK) + { + if (This->ecount + 1 > This->esize) + { + if (!SH_EnlargeContextMenuArray(This, max(This->esize * 2, 10))) + break; + } + + This->ecmenu[This->ecount] = cmobj; + This->ecount++; + } + } + dwIndex++; + }while(res == ERROR_SUCCESS); + + RegCloseKey(hKey); + return index; +} + /************************************************************************* * SHCreateDefaultContextMenu [SHELL32.325] Vista API * @@ -610,7 +775,18 @@ REFIID riid, void **ppv) { - return E_FAIL; + HRESULT hr; + IContextMenu2 * pcm; + + if (pdcm->cidl > 0) + pcm = ISvItemCm_Constructor( pdcm->psf, pdcm->pidlFolder, pdcm->apidl, pdcm->cidl ); + else + pcm = ISvBgCm_Constructor( pdcm->psf, TRUE ); + + hr = S_OK; + *ppv = pcm; + + return hr; } /************************************************************************* @@ -630,6 +806,7 @@ IContextMenu **ppcm) { DEFCONTEXTMENU pdcm; + HRESULT hr; pdcm.hwnd = hwnd; pdcm.pcmcb = NULL; //FIXME @@ -641,5 +818,6 @@ pdcm.cKeys = nKeys; pdcm.aKeys = ahkeyClsKeys; - return SHCreateDefaultContextMenu(&pdcm, &IID_IContextMenu, (void**)ppcm); -} + hr = SHCreateDefaultContextMenu(&pdcm, &IID_IContextMenu, (void**)ppcm); + return hr; +}

1 0

[dreimer] 29675: Update Russian LangFile of options.exe (thx to towerr once more) STILL a problem which causes the resources to be displayed wrong. Set EOL:Style native Remove trailing Spaces
by dreimer＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: dreimer Date: Fri Oct 19 13:52:23 2007 New Revision: 29675 URL: http://svn.reactos.org/svn/reactos?rev=29675&view=rev Log: Update Russian LangFile of options.exe (thx to towerr once more) STILL a problem which causes the resources to be displayed wrong. Set EOL:Style native Remove trailing Spaces Added: trunk/tools/RosBE-Windows/Tools/config/rsrc.rc (with props) Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/Build.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/ChangeLog.txt (contents, props changed) trunk/tools/RosBE-Windows/Root/Clean.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/Config.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/Help.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/LICENSE.txt (contents, props changed) trunk/tools/RosBE-Windows/Root/README.txt (contents, props changed) trunk/tools/RosBE-Windows/Root/RosBE.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/RosBE.mac (contents, props changed) trunk/tools/RosBE-Windows/Root/TimeDate.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/sSVN.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/scut.cmd (contents, props changed) trunk/tools/RosBE-Windows/Root/srclist.xml (contents, props changed) trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh (contents, props changed) trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh (contents, props changed) trunk/tools/RosBE-Windows/RosBE.nsi (contents, props changed) trunk/tools/RosBE-Windows/RosSourceDir.ini (contents, props changed) trunk/tools/RosBE-Windows/RosSourceDir.nsh (contents, props changed) trunk/tools/RosBE-Windows/Tools/buildtime.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE-Windows/Tools/config/makefile (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest (contents, props changed) trunk/tools/RosBE-Windows/Tools/config/options.rc (contents, props changed) trunk/tools/RosBE-Windows/Tools/cpucount.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/cutz.cmd (contents, props changed) trunk/tools/RosBE-Windows/Tools/echoh.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/flash.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/getdate.c (contents, props changed) trunk/tools/RosBE-Windows/Tools/info.txt (contents, props changed) trunk/tools/RosBE-Windows/Tools/makefile (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Mul… Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog… Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… Modified: trunk/tools/RosBE-Windows/Root/LICENSE.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/LICENSE.t… Modified: trunk/tools/RosBE-Windows/Root/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/README.tx… Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… Modified: trunk/tools/RosBE-Windows/Root/RosBE.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.mac… Modified: trunk/tools/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/TimeDate.… Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… Modified: trunk/tools/RosBE-Windows/Root/srclist.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/srclist.x… Modified: trunk/tools/RosBE-Windows/RosBE.Files-4.1.3.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-4.… Modified: trunk/tools/RosBE-Windows/RosBE.Files-Miscellaneous.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.Files-Mi… Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=… Modified: trunk/tools/RosBE-Windows/RosSourceDir.ini URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosSourceDir.i… Modified: trunk/tools/RosBE-Windows/RosSourceDir.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosSourceDir.n… Modified: trunk/tools/RosBE-Windows/Tools/buildtime.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/buildtim… Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… Modified: trunk/tools/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/m… Modified: trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… Modified: trunk/tools/RosBE-Windows/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… Added: trunk/tools/RosBE-Windows/Tools/config/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… Modified: trunk/tools/RosBE-Windows/Tools/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cpucount… Modified: trunk/tools/RosBE-Windows/Tools/cutz.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/cutz.cmd… Modified: trunk/tools/RosBE-Windows/Tools/echoh.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/echoh.c?… Modified: trunk/tools/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/flash.c?… Modified: trunk/tools/RosBE-Windows/Tools/getdate.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/getdate.… Modified: trunk/tools/RosBE-Windows/Tools/info.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/info.txt… Modified: trunk/tools/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/makefile…

1 0

[mnordell] 29674: [FORMATTING] Misuse of TAB. Converted to spaces.
by mnordell＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: mnordell Date: Fri Oct 19 11:50:59 2007 New Revision: 29674 URL: http://svn.reactos.org/svn/reactos?rev=29674&view=rev Log: [FORMATTING] Misuse of TAB. Converted to spaces. Modified: trunk/reactos/drivers/filesystems/vfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/vfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/f… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/vfat/fsctl.c Fri Oct 19 11:50:59 2007 @@ -31,14 +31,14 @@ /* FUNCTIONS ****************************************************************/ #define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \ - (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE) + (pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE) #define VOLUME_IS_DIRTY 0x00000001 static NTSTATUS VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount, - PBOOLEAN RecognizedFS, - PFATINFO pFatInfo) + PBOOLEAN RecognizedFS, + PFATINFO pFatInfo) { NTSTATUS Status; PARTITION_INFORMATION PartitionInfo; @@ -57,12 +57,12 @@ Size = sizeof(DISK_GEOMETRY); Status = VfatBlockDeviceIoControl(DeviceToMount, - IOCTL_DISK_GET_DRIVE_GEOMETRY, - NULL, - 0, - &DiskGeometry, - &Size, - FALSE); + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + &Size, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT("VfatBlockDeviceIoControl faild (%x)\n", Status); @@ -74,12 +74,12 @@ // We have found a hard disk Size = sizeof(PARTITION_INFORMATION); Status = VfatBlockDeviceIoControl(DeviceToMount, - IOCTL_DISK_GET_PARTITION_INFO, - NULL, - 0, - &PartitionInfo, - &Size, - FALSE); + IOCTL_DISK_GET_PARTITION_INFO, + NULL, + 0, + &PartitionInfo, + &Size, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT("VfatBlockDeviceIoControl faild (%x)\n", Status); @@ -150,10 +150,10 @@ *RecognizedFS = FALSE; } if (*RecognizedFS && - Boot->BytesPerSector != 512 && - Boot->BytesPerSector != 1024 && + Boot->BytesPerSector != 512 && + Boot->BytesPerSector != 1024 && Boot->BytesPerSector != 2048 && - Boot->BytesPerSector != 4096) + Boot->BytesPerSector != 4096) { DPRINT1("BytesPerSector %d\n", Boot->BytesPerSector); *RecognizedFS = FALSE; @@ -161,7 +161,7 @@ if (*RecognizedFS && Boot->FATCount != 1 && - Boot->FATCount != 2) + Boot->FATCount != 2) { DPRINT1("FATCount %d\n", Boot->FATCount); *RecognizedFS = FALSE; @@ -239,9 +239,9 @@ FatInfo.RootCluster = FatInfo.rootStart / FatInfo.SectorsPerCluster; } if (PartitionInfoIsValid && - FatInfo.Sectors > PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerSector) + FatInfo.Sectors > PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerSector) { - CHECKPOINT1; + CHECKPOINT1; *RecognizedFS = FALSE; } @@ -322,7 +322,7 @@ FatInfo.dataStart = FatInfo.rootStart + FatInfo.rootDirectorySectors; FatInfo.NumberOfClusters = (FatInfo.Sectors - FatInfo.dataStart) / FatInfo.SectorsPerCluster; - if (pFatInfo && *RecognizedFS) + if (pFatInfo && *RecognizedFS) { *pFatInfo = FatInfo; } @@ -337,7 +337,7 @@ static NTSTATUS VfatMountDevice(PDEVICE_EXTENSION DeviceExt, - PDEVICE_OBJECT DeviceToMount) + PDEVICE_OBJECT DeviceToMount) /* * FUNCTION: Mounts the device */ @@ -421,12 +421,12 @@ HashTableSize = FCB_HASH_TABLE_SIZE; DPRINT("VFAT: Recognized volume\n"); Status = IoCreateDevice(VfatGlobalData->DriverObject, - ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, - NULL, - FILE_DEVICE_FILE_SYSTEM, - 0, - FALSE, - &DeviceObject); + ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, + NULL, + FILE_DEVICE_FILE_SYSTEM, + 0, + FALSE, + &DeviceObject); if (!NT_SUCCESS(Status)) { goto ByeBye; @@ -635,12 +635,12 @@ DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject; Status = VfatBlockDeviceIoControl(DeviceToVerify, - IOCTL_DISK_CHECK_VERIFY, - NULL, - 0, - NULL, - 0, - TRUE); + IOCTL_DISK_CHECK_VERIFY, + NULL, + 0, + NULL, + 0, + TRUE); DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME; if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED) { @@ -660,13 +660,13 @@ * FIXME: * Preformated floppy disks have very often a serial number of 0000:0000. * We should calculate a crc sum over the sectors from the root directory as secondary volume number. - * Each write to the root directory must update this crc sum. + * Each write to the root directory must update this crc sum. */ } else - { - Status = STATUS_WRONG_VOLUME; + { + Status = STATUS_WRONG_VOLUME; } } @@ -733,7 +733,7 @@ CurrentCluster = FirstCluster = vfatDirEntryGetFirstCluster(DeviceExt, &Fcb->entry); Status = OffsetToCluster(DeviceExt, FirstCluster, Vcn.u.LowPart * DeviceExt->FatInfo.BytesPerCluster, - &CurrentCluster, FALSE); + &CurrentCluster, FALSE); if (!NT_SUCCESS(Status)) { goto ByeBye; @@ -757,13 +757,13 @@ if (LastCluster + 1 != CurrentCluster) { - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].NextVcn = Vcn; - RetrievalPointers->ExtentCount++; - if (RetrievalPointers->ExtentCount < MaxExtentCount) - { - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.HighPart = 0; - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.LowPart = CurrentCluster - 2; - } + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].NextVcn = Vcn; + RetrievalPointers->ExtentCount++; + if (RetrievalPointers->ExtentCount < MaxExtentCount) + { + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.HighPart = 0; + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.LowPart = CurrentCluster - 2; + } } } @@ -878,45 +878,45 @@ { case IRP_MN_USER_FS_REQUEST: switch(IrpContext->Stack->Parameters.DeviceIoControl.IoControlCode) - { - case FSCTL_GET_VOLUME_BITMAP: + { + case FSCTL_GET_VOLUME_BITMAP: Status = VfatGetVolumeBitmap(IrpContext); - break; - case FSCTL_GET_RETRIEVAL_POINTERS: + break; + case FSCTL_GET_RETRIEVAL_POINTERS: Status = VfatGetRetrievalPointers(IrpContext); - break; - case FSCTL_MOVE_FILE: - Status = VfatMoveFile(IrpContext); - break; + break; + case FSCTL_MOVE_FILE: + Status = VfatMoveFile(IrpContext); + break; #ifdef USE_ROS_CC_AND_FS - case FSCTL_ROS_QUERY_LCN_MAPPING: - Status = VfatRosQueryLcnMapping(IrpContext); - break; + case FSCTL_ROS_QUERY_LCN_MAPPING: + Status = VfatRosQueryLcnMapping(IrpContext); + break; #endif - case FSCTL_IS_VOLUME_DIRTY: - Status = VfatIsVolumeDirty(IrpContext); - break; - case FSCTL_MARK_VOLUME_DIRTY: - Status = VfatMarkVolumeDirty(IrpContext); - break; - default: - Status = STATUS_INVALID_DEVICE_REQUEST; - } - break; + case FSCTL_IS_VOLUME_DIRTY: + Status = VfatIsVolumeDirty(IrpContext); + break; + case FSCTL_MARK_VOLUME_DIRTY: + Status = VfatMarkVolumeDirty(IrpContext); + break; + default: + Status = STATUS_INVALID_DEVICE_REQUEST; + } + break; case IRP_MN_MOUNT_VOLUME: Status = VfatMount(IrpContext); - break; + break; case IRP_MN_VERIFY_VOLUME: - DPRINT("VFATFS: IRP_MN_VERIFY_VOLUME\n"); - Status = VfatVerify(IrpContext); - break; + DPRINT("VFATFS: IRP_MN_VERIFY_VOLUME\n"); + Status = VfatVerify(IrpContext); + break; default: - DPRINT("VFAT FSC: MinorFunction %d\n", IrpContext->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; + DPRINT("VFAT FSC: MinorFunction %d\n", IrpContext->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; } IrpContext->Irp->IoStatus.Status = Status;

1 0

[arty] 29673: Uncaught error when moving to trunk. Thanks gdb.
by arty＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: arty Date: Fri Oct 19 11:47:21 2007 New Revision: 29673 URL: http://svn.reactos.org/svn/reactos?rev=29673&view=rev Log: Uncaught error when moving to trunk. Thanks gdb. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Fri Oct 19 11:47:21 2007 @@ -635,6 +635,7 @@ PULONG ModuleSize) { ULONG LocalModuleSize; + ULONG_PTR ThisModuleBase = NextModuleBase; PLOADER_MODULE ModuleData; LPSTR NameBuffer; LPSTR TempName; @@ -682,7 +683,7 @@ *ModuleSize = LocalModuleSize; } - return NextModuleBase; + return ThisModuleBase; } PVOID

1 0

[arty] 29672: Debug DbgBreakPoint and drop to GDB on program trap.
by arty＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: arty Date: Fri Oct 19 11:22:01 2007 New Revision: 29672 URL: http://svn.reactos.org/svn/reactos?rev=29672&view=rev Log: Debug DbgBreakPoint and drop to GDB on program trap. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/lib/ppcmmu/gdblib.c trunk/reactos/lib/ppcmmu/mmuobject.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Fri Oct 19 11:22:01 2007 @@ -514,7 +514,7 @@ } extern int _bss; -typedef unsigned int uint32_t; +//typedef unsigned int uint32_t; void PpcDefaultMachVtbl() { @@ -661,5 +661,5 @@ } void DbgBreakPoint() { - ofw_exit(); -} + __asm__("twi 31,0,0"); +} Modified: trunk/reactos/lib/ppcmmu/gdblib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/gdblib.c?rev=29… ============================================================================== --- trunk/reactos/lib/ppcmmu/gdblib.c (original) +++ trunk/reactos/lib/ppcmmu/gdblib.c Fri Oct 19 11:22:01 2007 @@ -249,42 +249,24 @@ PacketSent = 0; - do { - if (!count) - { - SerialWrite('$'); - for (i = 0; i < DataOutAddr; i++) - { - SerialWrite(DataOutBuffer[i]); - } - SerialWrite('#'); - SerialWrite(hex[(DataOutCsum >> 4) & 15]); - SerialWrite(hex[DataOutCsum & 15]); - } - while(count-- != 0) - { - if (chr(serport)) - { - ch = SerialRead(); - break; - } - } - - switch (ch) - { - default: - break; - - case '-': - count = 0; - break; - - case '+': - PacketSent = 1; - break; - } - } while(PacketSent != 1); -} + SerialWrite('$'); + for (i = 0; i < DataOutAddr; i++) + { + SerialWrite(DataOutBuffer[i]); + } + SerialWrite('#'); + SerialWrite(hex[(DataOutCsum >> 4) & 15]); + SerialWrite(hex[DataOutCsum & 15]); + + while(!chr(serport) && ((ch = SerialRead()) != '+') && (ch != '$')); + if (ch == '$') + { + ParseState = 0; + DataInAddr = 0; + ComputedCsum = 0; + } +} + void PacketWriteString(char *str) { @@ -481,8 +463,7 @@ { Signal = n; RegisterSaveArea = tf; - if (SendSignal) - PacketWriteSignal(Signal); + PacketWriteSignal(Signal); SendSignal = 0; Continue = 0; while(!Continue) SerialInterrupt(n, tf); Modified: trunk/reactos/lib/ppcmmu/mmuobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/mmuobject.c?rev… ============================================================================== --- trunk/reactos/lib/ppcmmu/mmuobject.c (original) +++ trunk/reactos/lib/ppcmmu/mmuobject.c Fri Oct 19 11:22:01 2007 @@ -304,6 +304,9 @@ /* Serial Interrupt */ callback[5] = SerialInterrupt; + /* Program Exception */ + callback[6] = TakeException; + /* Floating point exception */ callback[8] = fpenable;

1 0

[weiden] 29671: Destroy created pen after use (fixes a GDI object leak)
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 08:51:07 2007 New Revision: 29671 URL: http://svn.reactos.org/svn/reactos?rev=29671&view=rev Log: Destroy created pen after use (fixes a GDI object leak) Modified: trunk/reactos/dll/cpl/desk/monslctl.c Modified: trunk/reactos/dll/cpl/desk/monslctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/monslctl.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/monslctl.c (original) +++ trunk/reactos/dll/cpl/desk/monslctl.c Fri Oct 19 08:51:07 2007 @@ -922,6 +922,8 @@ hpOldFg); SelectObject(hDC, hbOldBk); + + DeleteObject(hpFg); } static VOID

1 0

[weiden] 29670: Tweak the ScrollDC implementation a bit so that it produces a better output. The implementation still is completely incorrect as it should call the driver for this operation instead of doing a BitBlt operation...
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 07:23:04 2007 New Revision: 29670 URL: http://svn.reactos.org/svn/reactos?rev=29670&view=rev Log: Tweak the ScrollDC implementation a bit so that it produces a better output. The implementation still is completely incorrect as it should call the driver for this operation instead of doing a BitBlt operation... Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Fri Oct 19 07:23:04 2007 @@ -1132,27 +1132,39 @@ { PDC pDC; RECT rcScroll, rcSrc, rcDst; + SIZE szSrcOrg; INT Result; IntGdiGetClipBox(hDC, &rcScroll); + if (prcClip) + { + IntGdiIntersectRect(&rcScroll, &rcScroll, prcClip); + } + if (prcScroll) { - IntGdiIntersectRect(&rcScroll, &rcScroll, prcScroll); - } - if (prcClip) - { - IntGdiIntersectRect(&rcScroll, &rcScroll, prcClip); - } - - rcDst = rcScroll; + IntGdiIntersectRect(&rcSrc, &rcScroll, prcScroll); + } + else + { + rcSrc = rcScroll; + } + + rcDst = rcSrc; IntGdiOffsetRect(&rcDst, dx, dy); + if (rcDst.left < rcScroll.left) + szSrcOrg.cx = rcScroll.left - rcDst.left; + else + szSrcOrg.cx = 0; + if (rcDst.top < rcScroll.top) + szSrcOrg.cy = rcScroll.top - rcDst.top; + else + szSrcOrg.cy = 0; IntGdiIntersectRect(&rcDst, &rcDst, &rcScroll); - rcSrc = rcDst; - IntGdiOffsetRect(&rcSrc, -dx, -dy); if (!NtGdiBitBlt(hDC, rcDst.left, rcDst.top, rcDst.right - rcDst.left, rcDst.bottom - rcDst.top, - hDC, rcSrc.left, rcSrc.top, SRCCOPY, 0, 0)) + hDC, rcSrc.left + szSrcOrg.cx, rcSrc.top + szSrcOrg.cy, SRCCOPY, 0, 0)) { return ERROR; }

1 0

[weiden] 29669: Extend hack in NtUserEnumDisplayDevices to fail enumerating monitors. Fixes an infinite loop in deskmon.dll
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 06:51:48 2007 New Revision: 29669 URL: http://svn.reactos.org/svn/reactos?rev=29669&view=rev Log: Extend hack in NtUserEnumDisplayDevices to fail enumerating monitors. Fixes an infinite loop in deskmon.dll Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Fri Oct 19 06:51:48 2007 @@ -216,6 +216,11 @@ { /* Only one display device present */ return FALSE; + } + else if (lpDevice->Length != 0) + { + /* Can't enumerate monitors :( */ + return FALSE; } if (lpDisplayDevice->cb < sizeof(DISPLAY_DEVICE)) return FALSE;

1 0

[weiden] 29668: Port RegLoadMUIStringA/W from WINE HEAD and adjust parameter names
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 06:40:23 2007 New Revision: 29668 URL: http://svn.reactos.org/svn/reactos?rev=29668&view=rev Log: Port RegLoadMUIStringA/W from WINE HEAD and adjust parameter names Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Fri Oct 19 06:40:23 2007 @@ -4848,11 +4848,53 @@ return ERROR_SUCCESS; } +/****************************************************************************** + * load_string [Internal] + * + * This is basically a copy of user32/resource.c's LoadStringW. Necessary to + * avoid importing user32, which is higher level than advapi32. Helper for + * RegLoadMUIString. + */ +static int load_string(HINSTANCE hModule, UINT resId, LPWSTR pwszBuffer, INT cMaxChars) +{ + HGLOBAL hMemory; + HRSRC hResource; + WCHAR *pString; + int idxString; + + /* Negative values have to be inverted. */ + if (HIWORD(resId) == 0xffff) + resId = (UINT)(-((INT)resId)); + + /* Load the resource into memory and get a pointer to it. */ + hResource = FindResourceW(hModule, MAKEINTRESOURCEW(LOWORD(resId >> 4) + 1), (LPWSTR)RT_STRING); + if (!hResource) return 0; + hMemory = LoadResource(hModule, hResource); + if (!hMemory) return 0; + pString = LockResource(hMemory); + + /* Strings are length-prefixed. Lowest nibble of resId is an index. */ + idxString = resId & 0xf; + while (idxString--) pString += *pString + 1; + + /* If no buffer is given, return length of the string. */ + if (!pwszBuffer) return *pString; + + /* Else copy over the string, respecting the buffer size. */ + cMaxChars = (*pString < cMaxChars) ? *pString : (cMaxChars - 1); + if (cMaxChars >= 0) { + memcpy(pwszBuffer, pString+1, cMaxChars * sizeof(WCHAR)); + pwszBuffer[cMaxChars] = L'\0'; + } + + return cMaxChars; +} + /************************************************************************ * RegLoadMUIStringW * - * @unimplemented + * @implemented */ LONG STDCALL RegLoadMUIStringW(IN HKEY hKey, @@ -4863,16 +4905,85 @@ IN DWORD Flags, IN LPCWSTR pszDirectory OPTIONAL) { - FIXME("RegLoadMUIStringW(0x%p, 0x%p, 0x%p, 0x%x, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", - hKey, pszValue, pszOutBuf, cbOutBuf, pcbData, Flags, pszDirectory); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD dwValueType, cbData; + LPWSTR pwszTempBuffer = NULL, pwszExpandedBuffer = NULL; + LONG result; + + /* Parameter sanity checks. */ + if (!hKey || !pszOutBuf) + return ERROR_INVALID_PARAMETER; + + if (pszDirectory && *pszDirectory) { + FIXME("BaseDir parameter not yet supported!\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Check for value existence and correctness of it's type, allocate a buffer and load it. */ + result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, NULL, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + if (!(dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ) || !cbData) { + result = ERROR_FILE_NOT_FOUND; + goto cleanup; + } + pwszTempBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszTempBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + result = RegQueryValueExW(hKey, pszValue, NULL, &dwValueType, (LPBYTE)pwszTempBuffer, &cbData); + if (result != ERROR_SUCCESS) goto cleanup; + + /* Expand environment variables, if appropriate, or copy the original string over. */ + if (dwValueType == REG_EXPAND_SZ) { + cbData = ExpandEnvironmentStringsW(pwszTempBuffer, NULL, 0) * sizeof(WCHAR); + if (!cbData) goto cleanup; + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + if (!pwszExpandedBuffer) { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + ExpandEnvironmentStringsW(pwszTempBuffer, pwszExpandedBuffer, cbData); + } else { + pwszExpandedBuffer = HeapAlloc(GetProcessHeap(), 0, cbData); + memcpy(pwszExpandedBuffer, pwszTempBuffer, cbData); + } + + /* If the value references a resource based string, parse the value and load the string. + * Else just copy over the original value. */ + result = ERROR_SUCCESS; + if (*pwszExpandedBuffer != L'@') { /* '@' is the prefix for resource based string entries. */ + lstrcpynW(pszOutBuf, pwszExpandedBuffer, cbOutBuf / sizeof(WCHAR)); + } else { + WCHAR *pComma = wcsrchr(pwszExpandedBuffer, L','); + UINT uiStringId; + HMODULE hModule; + + /* Format of the expanded value is 'path_to_dll,-resId' */ + if (!pComma || pComma[1] != L'-') { + result = ERROR_BADKEY; + goto cleanup; + } + + uiStringId = _wtoi(pComma+2); + *pComma = L'\0'; + + hModule = LoadLibraryW(pwszExpandedBuffer + 1); + if (!hModule || !load_string(hModule, uiStringId, pszOutBuf, cbOutBuf / sizeof(WCHAR))) + result = ERROR_BADKEY; + FreeLibrary(hModule); + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszTempBuffer); + HeapFree(GetProcessHeap(), 0, pwszExpandedBuffer); + return result; } /************************************************************************ * RegLoadMUIStringA * - * @unimplemented + * @implemented */ LONG STDCALL RegLoadMUIStringA(IN HKEY hKey, @@ -4883,9 +4994,35 @@ IN DWORD Flags, IN LPCSTR pszDirectory OPTIONAL) { - FIXME("RegLoadMUIStringA(0x%p, 0x%p, 0x%p, 0x%x, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", - hKey, pszValue, pszOutBuf, cbOutBuf, pcbData, Flags, pszDirectory); - return ERROR_CALL_NOT_IMPLEMENTED; + UNICODE_STRING valueW, baseDirW; + WCHAR *pwszBuffer; + DWORD cbData = cbOutBuf * sizeof(WCHAR); + LONG result; + + valueW.Buffer = baseDirW.Buffer = pwszBuffer = NULL; + if (!RtlCreateUnicodeStringFromAsciiz(&valueW, pszValue) || + !RtlCreateUnicodeStringFromAsciiz(&baseDirW, pszDirectory) || + !(pwszBuffer = HeapAlloc(GetProcessHeap(), 0, cbData))) + { + result = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } + + result = RegLoadMUIStringW(hKey, valueW.Buffer, pwszBuffer, cbData, NULL, Flags, + baseDirW.Buffer); + + if (result == ERROR_SUCCESS) { + cbData = WideCharToMultiByte(CP_ACP, 0, pwszBuffer, -1, pszOutBuf, cbOutBuf, NULL, NULL); + if (pcbData) + *pcbData = cbData; + } + +cleanup: + HeapFree(GetProcessHeap(), 0, pwszBuffer); + RtlFreeUnicodeString(&baseDirW); + RtlFreeUnicodeString(&valueW); + + return result; }

1 0

[weiden] 29667: Initialize the COM library
by weiden＠svn.reactos.org 19 Oct '07

19 Oct '07

Author: weiden Date: Fri Oct 19 06:16:54 2007 New Revision: 29667 URL: http://svn.reactos.org/svn/reactos?rev=29667&view=rev Log: Initialize the COM library Modified: trunk/reactos/dll/cpl/desk/desk.c Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=29… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Fri Oct 19 06:16:54 2007 @@ -214,6 +214,7 @@ switch (dwReason) { case DLL_PROCESS_ATTACH: + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); RegisterPreviewControl(hInstDLL); // case DLL_THREAD_ATTACH: hApplet = hInstDLL; @@ -221,6 +222,7 @@ case DLL_PROCESS_DETACH: UnregisterPreviewControl(hInstDLL); + CoUninitialize(); break; }

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