Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 29344: - start implementing a few shell property dialogs (shelllink, file, drive) and corresponding shell objects (i.e. Desktop properties opens sysdm cpl) etc
by janderwald＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: janderwald Date: Tue Oct 2 00:28:45 2007 New Revision: 29344 URL: http://svn.reactos.org/svn/reactos?rev=29344&view=rev Log: - start implementing a few shell property dialogs (shelllink, file, drive) and corresponding shell objects (i.e. Desktop properties opens sysdm cpl) etc Added: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/fprop.c (with props) Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_Bg.rc trunk/reactos/dll/win32/shell32/shell32_Ca.rc trunk/reactos/dll/win32/shell32/shell32_Cn.rc trunk/reactos/dll/win32/shell32/shell32_Cs.rc trunk/reactos/dll/win32/shell32/shell32_Da.rc trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shell32_En.rc trunk/reactos/dll/win32/shell32/shell32_Eo.rc trunk/reactos/dll/win32/shell32/shell32_Es.rc trunk/reactos/dll/win32/shell32/shell32_Fi.rc trunk/reactos/dll/win32/shell32/shell32_Fr.rc trunk/reactos/dll/win32/shell32/shell32_Hu.rc trunk/reactos/dll/win32/shell32/shell32_It.rc trunk/reactos/dll/win32/shell32/shell32_Ja.rc trunk/reactos/dll/win32/shell32/shell32_Ko.rc trunk/reactos/dll/win32/shell32/shell32_Nl.rc trunk/reactos/dll/win32/shell32/shell32_No.rc trunk/reactos/dll/win32/shell32/shell32_Pl.rc trunk/reactos/dll/win32/shell32/shell32_Pt.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/shell32/shell32_Si.rc trunk/reactos/dll/win32/shell32/shell32_Sk.rc trunk/reactos/dll/win32/shell32/shell32_Sv.rc trunk/reactos/dll/win32/shell32/shell32_Uk.rc trunk/reactos/dll/win32/shell32/shell32_Wa.rc trunk/reactos/dll/win32/shell32/shell32_Zh.rc trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shelllink.c trunk/reactos/dll/win32/shell32/shlexec.c trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/shv_item_cmenu.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/shell32/drive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/drive.c?… Added: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… Modified: trunk/reactos/dll/win32/shell32/shell32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Wa.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/shell32/shelllink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… Modified: trunk/reactos/dll/win32/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item…

1 0

[janderwald] 29343: - fix typo
by janderwald＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: janderwald Date: Tue Oct 2 00:25:16 2007 New Revision: 29343 URL: http://svn.reactos.org/svn/reactos?rev=29343&view=rev Log: - fix typo Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Tue Oct 2 00:25:16 2007 @@ -63,7 +63,7 @@ ; Applicatons HKCR,".exe","",0x00000000,"exefile" -HKCR,"exefile","",0x00000000,"ReactOS Applicaton" +HKCR,"exefile","",0x00000000,"ReactOS Application" HKCR,"exefile\Defaulticon","",0x00000000,"%1" HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" @@ -110,6 +110,7 @@ ; Show icons for shortcuts in shell views (lnkfile is handled specially in shell32) ; Don't display extension for shortcuts HKCR,".lnk","",0x00000000,"lnkfile" +HKCR,"lnkfile","",0x00000000,"Shortcut" HKCR,"lnkfile","NeverShowExt",0x00000000,"" HKCR,"lnkfile","IsShortcut",0x00000000,"yes" HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-000000000046}"

1 0

[fireball] 29342: - Finally move MmInit1 to MmInitSystem where it should belong, since FreeLdr now properly sets up SharedUserData. (Thanks to Alex for the hint)
by fireball＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: fireball Date: Tue Oct 2 00:24:01 2007 New Revision: 29342 URL: http://svn.reactos.org/svn/reactos?rev=29342&view=rev Log: - Finally move MmInit1 to MmInitSystem where it should belong, since FreeLdr now properly sets up SharedUserData. (Thanks to Alex for the hint) Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c Tue Oct 2 00:24:01 2007 @@ -17,10 +17,6 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; - -/* BIOS Memory Map. Not NTLDR-compliant yet */ -extern ULONG KeMemoryMapRangeCount; -extern ADDRESS_RANGE KeMemoryMap[64]; /* FUNCTIONS *****************************************************************/ @@ -536,14 +532,6 @@ /* HACK for MmUpdatePageDir */ ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess; - /* Initialize Kernel Memory Address Space */ - MmInit1(MmFreeLdrFirstKrnlPhysAddr, - MmFreeLdrLastKrnlPhysAddr, - MmFreeLdrLastKernelAddress, - KeMemoryMap, - KeMemoryMapRangeCount, - 4096); - /* Set basic CPU Features that user mode can read */ SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (KeFeatureBits & KF_MMX) ? TRUE: FALSE; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Tue Oct 2 00:24:01 2007 @@ -16,19 +16,10 @@ /* GLOBALS *****************************************************************/ -/* - * Compiler defined symbols - */ -#if 0 -extern unsigned int _image_base__; -extern unsigned int _text_start__; -extern unsigned int _text_end__; - -extern unsigned int _init_start__; -extern unsigned int _init_end__; - -extern unsigned int _bss_end__; -#endif +BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; +extern KMUTANT MmSystemLoadLock; +extern ULONG KeMemoryMapRangeCount; +extern ADDRESS_RANGE KeMemoryMap[64]; static BOOLEAN IsThisAnNtAsSystem = FALSE; MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; @@ -422,9 +413,6 @@ MmInitializeMdlImplementation(); } -BOOLEAN RmapReady, PageOpReady, SectionsReady, PagingReady; -extern KMUTANT MmSystemLoadLock; - BOOLEAN NTAPI MmInitSystem(IN ULONG Phase, @@ -433,6 +421,14 @@ ULONG Flags = 0; if (Phase == 0) { + /* Initialize Kernel Memory Address Space */ + MmInit1(MmFreeLdrFirstKrnlPhysAddr, + MmFreeLdrLastKrnlPhysAddr, + MmFreeLdrLastKernelAddress, + KeMemoryMap, + KeMemoryMapRangeCount, + 4096); + /* Initialize the Loader Lock */ KeInitializeMutant(&MmSystemLoadLock, FALSE);

1 0

[martinf] 29341: restore ignore settings
by martinf＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: martinf Date: Tue Oct 2 00:10:56 2007 New Revision: 29341 URL: http://svn.reactos.org/svn/reactos?rev=29341&view=rev Log: restore ignore settings Modified: trunk/rosapps/winefile/ (props changed) Propchange: trunk/rosapps/winefile/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Oct 2 00:10:56 2007 @@ -5,3 +5,7 @@ *.ncb *.suo *.sln +winefileDebug +winefileURelease +*.exe +*.coff

1 0

[martinf] 29340: remove <alloca.h>
by martinf＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: martinf Date: Tue Oct 2 00:00:24 2007 New Revision: 29340 URL: http://svn.reactos.org/svn/reactos?rev=29340&view=rev Log: remove <alloca.h> Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Tue Oct 2 00:00:24 2007 @@ -43,10 +43,6 @@ //#include "xmlstorage.h" #include <precomp.h> - -#ifdef __GNUC__ -#include <alloca.h> -#endif namespace XMLStorage {

1 0

[hpoussin] 29339: Fix build
by hpoussin＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: hpoussin Date: Mon Oct 1 23:54:37 2007 New Revision: 29339 URL: http://svn.reactos.org/svn/reactos?rev=29339&view=rev Log: Fix build Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Oct 1 23:54:37 2007 @@ -159,7 +159,7 @@ dll\win32\advpack\advpack.dll 1 dll\win32\aclui\aclui.dll 1 dll\win32\avifil32\avifil32.dll 1 -dll\win32\browseui.dll 1 +dll\win32\browseui\browseui.dll 1 dll\win32\cabinet\cabinet.dll 1 dll\win32\cards\cards.dll 1 dll\win32\cfgmgr32\cfgmgr32.dll 1

1 0

[martinf] 29338: update explorer/xmlstorage
by martinf＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: martinf Date: Mon Oct 1 23:53:58 2007 New Revision: 29338 URL: http://svn.reactos.org/svn/reactos?rev=29338&view=rev Log: update explorer/xmlstorage Modified: trunk/reactos/base/shell/explorer/ (props changed) trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/notifyhook/ (props changed) trunk/reactos/base/shell/explorer/res/ (props changed) trunk/reactos/base/shell/explorer/taskbar/favorites.cpp trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp trunk/reactos/base/shell/explorer/utility/xmlstorage.h trunk/reactos/base/shell/explorer/utility/xs-native.cpp Propchange: trunk/reactos/base/shell/explorer/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 1 23:53:58 2007 @@ -5,3 +5,18 @@ *.ncb *.suo *.sln +Debug +doxy-doc +Release +*.chm +UDebug +URelease +Win32 +*.coff +*.exe +*.dll +*.aps +.gdbinit +*.gch +pack.cfg +pack.ign Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp Mon Oct 1 23:53:58 2007 @@ -93,12 +93,12 @@ _cfg_dir.printf(TEXT("%s\\ReactOS"), (LPCTSTR)SpecialFolderFSPath(CSIDL_APPDATA,0)); _cfg_path.printf(TEXT("%s\\ros-explorer-cfg.xml"), _cfg_dir.c_str()); - if (!_cfg.read(_cfg_path)) { + if (!_cfg.read_file(_cfg_path)) { //if (_cfg._last_error != XML_ERROR_NO_ELEMENTS) MessageBox(_hwndDesktop, _cfg._errors.str(), TEXT("ROS Explorer - reading user settings"), MB_OK); - _cfg.read(TEXT("explorer-cfg-template.xml")); + _cfg.read_file(TEXT("explorer-cfg-template.xml")); } // read bookmarks @@ -115,7 +115,7 @@ // write configuration file RecursiveCreateDirectory(_cfg_dir); - _cfg.write(_cfg_path); + _cfg.write_file(_cfg_path); _favorites.write(_favorites_path); } Propchange: trunk/reactos/base/shell/explorer/notifyhook/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 1 23:53:58 2007 @@ -5,3 +5,6 @@ *.ncb *.suo *.sln +Debug +Release +Win32 Propchange: trunk/reactos/base/shell/explorer/res/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 1 23:53:58 2007 @@ -5,3 +5,4 @@ *.ncb *.suo *.sln +Thumbs.db Modified: trunk/reactos/base/shell/explorer/taskbar/favorites.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/favorites.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/favorites.cpp Mon Oct 1 23:53:58 2007 @@ -426,7 +426,7 @@ { XMLDoc xbel; - if (!xbel.read(path)) { + if (!xbel.read_file(path)) { MessageBox(g_Globals._hwndDesktop, xbel._errors.str(), TEXT("ROS Explorer - reading bookmark file"), MB_OK); } @@ -457,7 +457,7 @@ xbel._format._doctype._public = "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"; xbel._format._doctype._system = "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd"; - xbel.write(path); + xbel.write_file(path); } /// import Internet Explorer bookmarks from Favorites folder Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Mon Oct 1 23:53:58 2007 @@ -1,6 +1,6 @@ // - // XML storage classes version 1.2 + // XML storage C++ classes version 1.2 // // Copyright (c) 2004, 2005, 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -44,6 +44,10 @@ //#include "xmlstorage.h" #include <precomp.h> +#ifdef __GNUC__ +#include <alloca.h> +#endif + namespace XMLStorage { @@ -152,129 +156,91 @@ // parse relative path while(*path) { - const char* slash = strchr(path, '/'); - if (slash == path) + node = const_cast<XMLNode*>(node)->get_child_relative(path, false); // get_child_relative() ist const for create==false + + if (!node) return NULL; - size_t l = slash? slash-path: strlen(path); - std::string comp(path, l); - path += l; - - // look for [n] and [@attr_name="attr_value"] expressions in path components - const char* bracket = strchr(comp.c_str(), '['); - l = bracket? bracket-comp.c_str(): comp.length(); - std::string child_name(comp.c_str(), l); - std::string attr_name, attr_value; - - int n = 0; - if (bracket) { - std::string expr = unescape(bracket, '[', ']'); - const char* p = expr.c_str(); - - n = atoi(p); // read index number - - if (n) - n = n - 1; // convert into zero based index - - const char* at = strchr(p, '@'); - - if (at) { - p = at + 1; - const char* equal = strchr(p, '='); - - // read attribute name and value - if (equal) { - attr_name = unescape(p, equal-p); - attr_value = unescape(equal+1); - } + if (*path == '/') + ++path; + } + + return node; +} + +XMLNode* XMLNode::create_relative(const char* path) +{ + XMLNode* node = this; + + // parse relative path + while(*path) { + node = node->get_child_relative(path, true); + + if (*path == '/') + ++path; + } + + return node; +} + +XMLNode* XMLNode::get_child_relative(const char*& path, bool create) +{ + const char* slash = strchr(path, '/'); + if (slash == path) + return NULL; + + size_t l = slash? slash-path: strlen(path); + std::string comp(path, l); + path += l; + + // look for [n] and [@attr_name="attr_value"] expressions in path components + const char* bracket = strchr(comp.c_str(), '['); + l = bracket? bracket-comp.c_str(): comp.length(); + std::string child_name(comp.c_str(), l); + std::string attr_name, attr_value; + + int n = 0; + if (bracket) { + std::string expr = unescape(bracket, '[', ']'); + const char* p = expr.c_str(); + + n = atoi(p); // read index number + + if (n) + n = n - 1; // convert into zero based index + + const char* at = strchr(p, '@'); + + if (at) { + p = at + 1; + const char* equal = strchr(p, '='); + + // read attribute name and value + if (equal) { + attr_name = unescape(p, equal-p); + attr_value = unescape(equal+1); } } - - if (attr_name.empty()) - // search n.th child node with specified name - node = node->find(child_name, n); - else - // search n.th child node with specified name and matching attribute value - node = node->find(child_name, attr_name, attr_value, n); - - if (!node) - return NULL; - - if (*path == '/') - ++path; - } - - return node; -} - -XMLNode* XMLNode::create_relative(const char* path) -{ - XMLNode* node = this; - - // parse relative path - while(*path) { - const char* slash = strchr(path, '/'); - if (slash == path) - return NULL; - - size_t l = slash? slash-path: strlen(path); - std::string comp(path, l); - path += l; - - // look for [n] and [@attr_name="attr_value"] expressions in path components - const char* bracket = strchr(comp.c_str(), '['); - l = bracket? bracket-comp.c_str(): comp.length(); - std::string child_name(comp.c_str(), l); - std::string attr_name, attr_value; - - int n = 0; - if (bracket) { - std::string expr = unescape(bracket, '[', ']'); - const char* p = expr.c_str(); - - n = atoi(p); // read index number - - if (n) - n = n - 1; // convert into zero based index - - const char* at = strchr(p, '@'); - - if (at) { - p = at + 1; - const char* equal = strchr(p, '='); - - // read attribute name and value - if (equal) { - attr_name = unescape(p, equal-p); - attr_value = unescape(equal+1); - } - } - } - - XMLNode* child; - - if (attr_name.empty()) - // search n.th child node with specified name - child = node->find(child_name, n); - else - // search n.th child node with specified name and matching attribute value - child = node->find(child_name, attr_name, attr_value, n); - - if (!child) { - child = new XMLNode(child_name); - node->add_child(child); - - if (!attr_name.empty()) - (*node)[attr_name] = attr_value; - } - - node = child; - - if (*path == '/') - ++path; - } - - return node; + } + + XMLNode* child; + + if (attr_name.empty()) + // search n.th child node with specified name + child = find(child_name, n); + else + // search n.th child node with specified name and matching attribute value + child = find(child_name, attr_name, attr_value, n); + + if (!child && create) { + child = new XMLNode(child_name); + add_child(child); + + if (!attr_name.empty()) + (*this)[attr_name] = attr_value; + } + + return child; } @@ -426,7 +392,7 @@ /// write node with children tree to output stream using original white space -void XMLNode::write_worker(std::ostream& out, int indent) const +void XMLNode::write_worker(std::ostream& out) const { out << _leading << '<' << EncodeXMLString(*this); @@ -437,7 +403,7 @@ out << '>' << _content; for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) - (*it)->write_worker(out, indent+1); + (*it)->write_worker(out); out << _end_leading << "</" << EncodeXMLString(*this) << '>'; } else @@ -455,8 +421,12 @@ for(AttributeMap::const_iterator it=_attributes.begin(); it!=_attributes.end(); ++it) out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; - if (!_children.empty()/*@@ || !_content.empty()*/) { - out << ">"; + // strip leading white space from content + const char* content = _content.c_str(); + while(isspace((unsigned char)*content)) ++content; + + if (!_children.empty() || *content) { + out << ">" << content; for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) (*it)->plain_write_worker(out); @@ -478,8 +448,15 @@ for(AttributeMap::const_iterator it=_attributes.begin(); it!=_attributes.end(); ++it) out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; - if (!_children.empty()/*@@ || !_content.empty()*/) { - out << '>' << format._endl; + // strip leading white space from content + const char* content = _content.c_str(); + while(isspace((unsigned char)*content)) ++content; + + if (!_children.empty() || *content) { + out << '>' << content; + + if (!_children.empty()) + out << format._endl; for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) (*it)->pretty_write_worker(out, format, indent+1); @@ -496,26 +473,34 @@ /// write node with children tree to output stream using smart formating void XMLNode::smart_write_worker(std::ostream& out, const XMLFormat& format, int indent) const { - if (_leading.empty()) + // strip the first line feed from _leading + const char* leading = _leading.c_str(); + if (*leading == '\n') ++leading; + + if (!*leading) for(int i=indent; i--; ) out << XML_INDENT_SPACE; else - out << _leading; + out << leading; out << '<' << EncodeXMLString(*this); for(AttributeMap::const_iterator it=_attributes.begin(); it!=_attributes.end(); ++it) out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; - if (_children.empty() && _content.empty()) + // strip leading white space from content + const char* content = _content.c_str(); + while(isspace((unsigned char)*content)) ++content; + + if (_children.empty() && !*content) out << "/>"; else { out << '>'; - if (_content.empty()) + if (!*content) out << format._endl; else - out << _content; + out << content; Children::const_iterator it = _children.begin(); @@ -523,11 +508,15 @@ for(; it!=_children.end(); ++it) (*it)->smart_write_worker(out, format, indent+1); - if (_end_leading.empty()) + // strip the first line feed from _end_leading + const char* end_leading = _end_leading.c_str(); + if (*end_leading == '\n') ++end_leading; + + if (!*end_leading) for(int i=indent; i--; ) out << XML_INDENT_SPACE; else - out << _end_leading; + out << end_leading; } else out << _end_leading; @@ -710,16 +699,14 @@ /// notifications about XML start tag void XMLReaderBase::StartElementHandler(const XS_String& name, const XMLNode::AttributeMap& attributes) { - // search for end of first line const char* s = _content.c_str(); + const char* e = s + _content.length(); const char* p = s; - const char* e = p + _content.length(); - - for(; p<e; ++p) - if (*p == '\n') { - ++p; + + // search for content end leaving only white space for leading + for(p=e; p>s; --p) + if (!isspace((unsigned char)p[-1])) break; - } if (p != s) if (_pos->_children.empty()) { // no children in last node? @@ -754,29 +741,27 @@ /// notifications about XML end tag void XMLReaderBase::EndElementHandler() { - // search for end of first line const char* s = _content.c_str(); - const char* p = s; - const char* e = p + _content.length(); + const char* e = s + _content.length(); + const char* p; if (!strncmp(s,"<![CDATA[",9) && !strncmp(e-3,"]]>",3)) { s += 9; p = (e-=3); - } else - for(; p<e; ++p) - if (*p == '\n') { - ++p; - break; - } + } else { + // search for content end leaving only white space for _end_leading + for(p=e; p>s; --p) + if (!isspace((unsigned char)p[-1])) + break; + } if (p != s) if (_pos->_children.empty()) // no children in current node? _pos->_content.append(s, p-s); + else if (_last_tag == TAG_START) + _pos->_content.append(s, p-s); else - if (_last_tag == TAG_START) - _pos->_content.append(s, p-s); - else - _pos->_children.back()->_trailing.append(s, p-s); + _pos->_children.back()->_trailing.append(s, p-s); if (p != e) _pos->_end_leading.assign(p, e-p); Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h Mon Oct 1 23:53:58 2007 @@ -1,6 +1,6 @@ // - // XML storage classes version 1.2 + // XML storage C++ classes version 1.2 // // Copyright (c) 2004, 2005, 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -154,6 +154,10 @@ #include <windows.h> // for LPCTSTR #include <tchar.h> #include <malloc.h> + +#ifndef _MSC_VER +#include <stdio.h> // vsnprintf(), snprintf() +#endif #else @@ -476,10 +480,12 @@ #ifdef __GNUC__ #include <ext/stdio_filebuf.h> -typedef __gnu_cxx::stdio_filebuf<char> STDIO_FILEBUF; -#else -typedef std::filebuf STDIO_FILEBUF; -#endif +#define FILE_FILEBUF __gnu_cxx::stdio_filebuf<char> +#elif defined(_MSC_VER) +#define FILE_FILEBUF std::filebuf +#endif + +#ifdef FILE_FILEBUF /// base class for XMLStorage::tifstream and XMLStorage::tofstream struct FileHolder @@ -521,7 +527,7 @@ } protected: - STDIO_FILEBUF _buf; + FILE_FILEBUF _buf; }; /// output file stream with ANSI/UNICODE file names @@ -546,8 +552,36 @@ } protected: - STDIO_FILEBUF _buf; -}; + FILE_FILEBUF _buf; +}; + +#else // FILE_FILEBUF + +#ifdef UNICODE +#error UNICODE not supported for this platform +#endif + +struct tifstream : public std::ifstream +{ + typedef std::ifstream super; + + tifstream(const char* path) + : super(path, std::ios::in|std::ios::binary) + { + } +}; + +struct tofstream : public std::ofstream +{ + typedef std::ofstream super; + + tofstream(const char* path) + : super(path, std::ios::out|std::ios::binary) + { + } +}; + +#endif // write XML files with 2 spaces indenting @@ -902,7 +936,7 @@ _attributes[attr_name] = value; } - /// C++ write access to an attribute + /// index operator write access to an attribute XS_String& operator[](const XS_String& attr_name) { return _attributes[attr_name]; @@ -1023,7 +1057,7 @@ break; case FORMAT_ORIGINAL: - write_worker(out, indent); + write_worker(out); break; default: // FORMAT_SMART @@ -1113,10 +1147,13 @@ /// relative XPath create function XMLNode* create_relative(const char* path); - void write_worker(std::ostream& out, int indent) const; + void write_worker(std::ostream& out) const; void plain_write_worker(std::ostream& out) const; void pretty_write_worker(std::ostream& out, const XMLFormat& format, int indent) const; void smart_write_worker(std::ostream& out, const XMLFormat& format, int indent) const; + +protected: + XMLNode* get_child_relative(const char*& path, bool create); // mutable for create==true }; @@ -1367,7 +1404,7 @@ return *_cur; } - /// C++ access to current node + /// automatic access to current node operator const XMLNode*() const {return _cur;} operator XMLNode*() {return _cur;} @@ -1378,9 +1415,9 @@ XMLNode& operator*() {return *_cur;} /// attribute access - XS_String get(const XS_String& attr_name) const - { - return _cur->get(attr_name); + XS_String get(const XS_String& attr_name, LPCXSSTR def=XS_EMPTY_STR) const + { + return _cur->get(attr_name, def); } /// attribute setting @@ -1389,7 +1426,7 @@ _cur->put(attr_name, value); } - /// C++ attribute access + /// index operator attribute access template<typename T> XS_String get(const T& attr_name) const {return (*_cur)[attr_name];} XS_String& operator[](const XS_String& attr_name) {return (*_cur)[attr_name];} @@ -1564,7 +1601,7 @@ return *_cur; } - /// C++ access to current node + /// automatic access to current node operator const XMLNode*() const {return _cur;} const XMLNode* operator->() const {return _cur;} @@ -1577,7 +1614,7 @@ return _cur->get(attr_name); } - /// C++ attribute access + /// index operator attribute access template<typename T> XS_String get(const T& attr_name) const {return _cur->get(attr_name);} /// go back to previous position @@ -1944,23 +1981,23 @@ }; /// type converter for string data with write access -struct XMStringRef -{ - XMStringRef(XMLNode* node, const XS_String& attr_name, LPCXSSTR def=XS_EMPTY) +struct XMLStringRef +{ + XMLStringRef(XMLNode* node, const XS_String& attr_name, LPCXSSTR def=XS_EMPTY) : _ref((*node)[attr_name]) { if (_ref.empty()) assign(def); } - XMStringRef(XMLNode* node, const XS_String& node_name, const XS_String& attr_name, LPCXSSTR def=XS_EMPTY) + XMLStringRef(const XS_String& node_name, XMLNode* node, const XS_String& attr_name, LPCXSSTR def=XS_EMPTY) : _ref(node->subvalue(node_name, attr_name)) { if (_ref.empty()) assign(def); } - XMStringRef& operator=(const XS_String& value) + XMLStringRef& operator=(const XS_String& value) { assign(value); @@ -2304,11 +2341,11 @@ XMLDoc(LPCTSTR path) : XMLNode("") { - read(path); + read_file(path); } #ifdef XS_USE_XERCES - bool read(LPCTSTR path) + bool read_file(LPCTSTR path) { XMLReader reader(this, path); @@ -2319,7 +2356,7 @@ #endif } - bool read(const char* buffer, size_t len, const std::string& system_id=std::string()) + bool read_buffer(const char* buffer, size_t len, const std::string& system_id=std::string()) { XMLReader reader(this, (const XMLByte*)buffer, len, system_id); @@ -2328,7 +2365,7 @@ #else // XS_USE_XERCES - bool read(LPCTSTR path) + bool read_file(LPCTSTR path) { tifstream in(path); XMLReader reader(this, in); @@ -2340,7 +2377,7 @@ #endif } - bool read(const char* buffer, size_t len, const std::string& system_id=std::string()) + bool read_buffer(const char* buffer, size_t len, const std::string& system_id=std::string()) { std::istringstream in(std::string(buffer, len)); @@ -2377,7 +2414,8 @@ return true; } - /// write XML stream preserving previous white space and comments + /// write XML stream + // FORMAT_SMART: preserving previous white space and comments bool write(std::ostream& out, WRITE_MODE mode=FORMAT_SMART) const { _format.print_header(out, mode!=FORMAT_PLAIN); @@ -2398,7 +2436,7 @@ return write(out, FORMAT_PRETTY); } - bool write(LPCTSTR path, WRITE_MODE mode=FORMAT_SMART) const + bool write_file(LPCTSTR path, WRITE_MODE mode=FORMAT_SMART) const { tofstream out(path); @@ -2454,7 +2492,7 @@ { XMLMessageFromString(const std::string& xml_str, const std::string& system_id=std::string()) { - read(xml_str.c_str(), xml_str.length(), system_id); + read_buffer(xml_str.c_str(), xml_str.length(), system_id); } }; @@ -2465,7 +2503,7 @@ XMLMessageReader(const std::string& xml_str, const std::string& system_id=std::string()) : XMLPos(&_msg) { - _msg.read(xml_str.c_str(), xml_str.length(), system_id); + _msg.read_buffer(xml_str.c_str(), xml_str.length(), system_id); } const XMLDoc& get_document() @@ -2543,7 +2581,7 @@ _stack.top()._attributes[attr_name] = value; } - /// C++ write access to an attribute + /// index operator write access to an attribute XS_String& operator[](const XS_String& attr_name) { if (_stack.empty()) Modified: trunk/reactos/base/shell/explorer/utility/xs-native.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xs-native.cpp (original) +++ trunk/reactos/base/shell/explorer/utility/xs-native.cpp Mon Oct 1 23:53:58 2007 @@ -1,6 +1,6 @@ // - // XML storage classes version 1.2 + // XML storage C++ classes version 1.2 // // Copyright (c) 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -224,7 +224,7 @@ char* _buffer; char* _wptr; size_t _len; - std::string _buffer_str; // UF-8 encoded + std::string _buffer_str; // UTF-8 encoded }; bool XMLReaderBase::parse() @@ -386,7 +386,7 @@ buffer.reset(); } - return true; + return true; //TODO return false on invalid XML } int XMLReaderBase::eat_endl()

1 0

[fireball] 29337: - Forgot to hit "CTRL+S" in the editor :) (add a FIXME comment about small hack).
by fireball＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: fireball Date: Mon Oct 1 23:12:09 2007 New Revision: 29337 URL: http://svn.reactos.org/svn/reactos?rev=29337&view=rev Log: - Forgot to hit "CTRL+S" in the editor :) (add a FIXME comment about small hack). Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Mon Oct 1 23:12:09 2007 @@ -388,6 +388,8 @@ UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); /* Check if this is a direct open */ + /* FIXME: Small hack still exists, because there is probably + a small bug somewhere in vfat */ if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject) && (((DesiredAccess & ~(SYNCHRONIZE |

1 0

[hpoussin] 29336: Autosyncing with Wine HEAD
by hpoussin＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: hpoussin Date: Mon Oct 1 23:09:53 2007 New Revision: 29336 URL: http://svn.reactos.org/svn/reactos?rev=29336&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/browseui/aclmulti.c (with props) trunk/reactos/dll/win32/browseui/browseui.h (with props) trunk/reactos/dll/win32/browseui/browseui.rbuild (with props) trunk/reactos/dll/win32/browseui/browseui.spec (with props) trunk/reactos/dll/win32/browseui/browseui_main.c (with props) trunk/reactos/dll/win32/browseui/browseui_ros.diff (with props) trunk/reactos/dll/win32/browseui/regsvr.c (with props) trunk/reactos/dll/win32/browseui/version.rc (with props) Added: trunk/reactos/dll/win32/browseui/aclmulti.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/aclmult… ============================================================================== --- trunk/reactos/dll/win32/browseui/aclmulti.c (added) +++ trunk/reactos/dll/win32/browseui/aclmulti.c Mon Oct 1 23:09:53 2007 @@ -1,0 +1,331 @@ +/* + * Multisource AutoComplete list + * + * Copyright 2007 Mikolaj Zalewski + * + * 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "shlguid.h" +#include "shlobj.h" + +#include "wine/unicode.h" + +#include "browseui.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +struct ACLMultiSublist { + IUnknown *punk; + IEnumString *pEnum; + IACList *pACL; +}; + +typedef struct tagACLMulti { + const IEnumStringVtbl *vtbl; + const IACListVtbl *aclVtbl; + const IObjMgrVtbl *objmgrVtbl; + LONG refCount; + INT nObjs; + INT currObj; + struct ACLMultiSublist *objs; +} ACLMulti; + +static const IEnumStringVtbl ACLMultiVtbl; +static const IACListVtbl ACLMulti_ACListVtbl; +static const IObjMgrVtbl ACLMulti_ObjMgrVtbl; + +static inline ACLMulti *impl_from_IACList(IACList *iface) +{ + return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, aclVtbl)); +} + +static inline ACLMulti *impl_from_IObjMgr(IObjMgr *iface) +{ + return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, objmgrVtbl)); +} + +static void release_obj(struct ACLMultiSublist *obj) +{ + IUnknown_Release(obj->punk); + if (obj->pEnum) + IEnumString_Release(obj->pEnum); + if (obj->pACL) + IACList_Release(obj->pACL); +} + +HRESULT WINAPI ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + ACLMulti *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = CoTaskMemAlloc(sizeof(ACLMulti)); + if (This == NULL) + return E_OUTOFMEMORY; + ZeroMemory(This, sizeof(*This)); + This->vtbl = &ACLMultiVtbl; + This->aclVtbl = &ACLMulti_ACListVtbl; + This->objmgrVtbl = &ACLMulti_ObjMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + BROWSEUI_refCount++; + return S_OK; +} + +static void WINAPI ACLMulti_Destructor(ACLMulti *This) +{ + int i; + TRACE("destroying %p\n", This); + for (i = 0; i < This->nObjs; i++) + release_obj(&This->objs[i]); + CoTaskMemFree(This->objs); + CoTaskMemFree(This); + BROWSEUI_refCount--; +} + +static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) +{ + ACLMulti *This = (ACLMulti *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumString)) + { + *ppvOut = This; + } + else if (IsEqualIID(iid, &IID_IACList)) + { + *ppvOut = &This->aclVtbl; + } + else if (IsEqualIID(iid, &IID_IObjMgr)) + { + *ppvOut = &This->objmgrVtbl; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ACLMulti_AddRef(IEnumString *iface) +{ + ACLMulti *This = (ACLMulti *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI ACLMulti_Release(IEnumString *iface) +{ + ACLMulti *This = (ACLMulti *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + ACLMulti_Destructor(This); + return ret; +} + +static HRESULT WINAPI ACLMulti_Append(IObjMgr *iface, IUnknown *obj) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + + TRACE("(%p, %p)\n", This, obj); + if (obj == NULL) + return E_FAIL; + + This->objs = CoTaskMemRealloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); + This->objs[This->nObjs].punk = obj; + IUnknown_AddRef(obj); + if (FAILED(IUnknown_QueryInterface(obj, &IID_IEnumString, (LPVOID *)&This->objs[This->nObjs].pEnum))) + This->objs[This->nObjs].pEnum = NULL; + if (FAILED(IUnknown_QueryInterface(obj, &IID_IACList, (LPVOID *)&This->objs[This->nObjs].pACL))) + This->objs[This->nObjs].pACL = NULL; + This->nObjs++; + return S_OK; +} + +static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + int i; + + TRACE("(%p, %p)\n", This, obj); + for (i = 0; i < This->nObjs; i++) + if (This->objs[i].punk == obj) + { + release_obj(&This->objs[i]); + memmove(&This->objs[i], &This->objs[i+1], (This->nObjs-i-1)*sizeof(struct ACLMultiSublist)); + This->nObjs--; + This->objs = CoTaskMemRealloc(This->objs, sizeof(This->objs[0]) * This->nObjs); + return S_OK; + } + + return E_FAIL; +} + +static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) +{ + ACLMulti *This = (ACLMulti *)iface; + + TRACE("(%p, %d, %p, %p)\n", iface, celt, rgelt, pceltFetched); + while (This->currObj < This->nObjs) + { + if (This->objs[This->currObj].pEnum) + { + /* native browseui 6.0 also returns only one element */ + HRESULT ret = IEnumString_Next(This->objs[This->currObj].pEnum, 1, rgelt, pceltFetched); + if (ret != S_FALSE) + return ret; + } + This->currObj++; + } + + if (pceltFetched) + *pceltFetched = 0; + *rgelt = NULL; + return S_FALSE; +} + +static HRESULT WINAPI ACLMulti_Reset(IEnumString *iface) +{ + ACLMulti *This = (ACLMulti *)iface; + int i; + + This->currObj = 0; + for (i = 0; i < This->nObjs; i++) + { + if (This->objs[i].pEnum) + IEnumString_Reset(This->objs[i].pEnum); + } + return S_OK; +} + +static HRESULT WINAPI ACLMulti_Skip(IEnumString *iface, ULONG celt) +{ + /* native browseui 6.0 returns this: */ + return E_NOTIMPL; +} + +static HRESULT WINAPI ACLMulti_Clone(IEnumString *iface, IEnumString **ppOut) +{ + *ppOut = NULL; + /* native browseui 6.0 returns this: */ + return E_OUTOFMEMORY; +} + +static HRESULT WINAPI ACLMulti_Expand(IACList *iface, LPCWSTR wstr) +{ + ACLMulti *This = impl_from_IACList(iface); + HRESULT res = S_OK; + int i; + + for (i = 0; i < This->nObjs; i++) + { + if (!This->objs[i].pACL) + continue; + res = IACList_Expand(This->objs[i].pACL, wstr); + if (res == S_OK) + break; + } + return res; +} + +static const IEnumStringVtbl ACLMultiVtbl = +{ + ACLMulti_QueryInterface, + ACLMulti_AddRef, + ACLMulti_Release, + + ACLMulti_Next, + ACLMulti_Skip, + ACLMulti_Reset, + ACLMulti_Clone +}; + +static HRESULT WINAPI ACLMulti_IObjMgr_QueryInterface(IObjMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + return ACLMulti_QueryInterface((IEnumString *)This, iid, ppvOut); +} + +static ULONG WINAPI ACLMulti_IObjMgr_AddRef(IObjMgr *iface) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + return ACLMulti_AddRef((IEnumString *)This); +} + +static ULONG WINAPI ACLMulti_IObjMgr_Release(IObjMgr *iface) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + return ACLMulti_Release((IEnumString *)This); +} + +static const IObjMgrVtbl ACLMulti_ObjMgrVtbl = +{ + ACLMulti_IObjMgr_QueryInterface, + ACLMulti_IObjMgr_AddRef, + ACLMulti_IObjMgr_Release, + + ACLMulti_Append, + ACLMulti_Remove +}; + +static HRESULT WINAPI ACLMulti_IACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvOut) +{ + ACLMulti *This = impl_from_IACList(iface); + return ACLMulti_QueryInterface((IEnumString *)This, iid, ppvOut); +} + +static ULONG WINAPI ACLMulti_IACList_AddRef(IACList *iface) +{ + ACLMulti *This = impl_from_IACList(iface); + return ACLMulti_AddRef((IEnumString *)This); +} + +static ULONG WINAPI ACLMulti_IACList_Release(IACList *iface) +{ + ACLMulti *This = impl_from_IACList(iface); + return ACLMulti_Release((IEnumString *)This); +} + +static const IACListVtbl ACLMulti_ACListVtbl = +{ + ACLMulti_IACList_QueryInterface, + ACLMulti_IACList_AddRef, + ACLMulti_IACList_Release, + + ACLMulti_Expand +}; Propchange: trunk/reactos/dll/win32/browseui/aclmulti.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.h (added) +++ trunk/reactos/dll/win32/browseui/browseui.h Mon Oct 1 23:09:53 2007 @@ -1,0 +1,28 @@ +/* + * Internal header for browseui.dll + * + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_BROWSEUI_H +#define __WINE_BROWSEUI_H + +extern LONG BROWSEUI_refCount; + +HRESULT WINAPI ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); + +#endif /* __WINE_SHDOCVW_H */ Propchange: trunk/reactos/dll/win32/browseui/browseui.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rbuild (added) +++ trunk/reactos/dll/win32/browseui/browseui.rbuild Mon Oct 1 23:09:53 2007 @@ -1,0 +1,26 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="browseui" type="win32dll" baseaddress="${BASEADDRESS_BROWSEUI}" installbase="system32" installname="browseui.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="Both" /> + <importlibrary definition="browseui.spec.def" /> + <include base="browseui">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <define name="WINVER">0x600</define> + <library>wine</library> + <library>ole32</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> + <file>aclmulti.c</file> + <file>browseui_main.c</file> + <file>regsvr.c</file> + <file>version.rc</file> + <file>browseui.spec</file> +</module> Propchange: trunk/reactos/dll/win32/browseui/browseui.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.spec (added) +++ trunk/reactos/dll/win32/browseui/browseui.spec Mon Oct 1 23:09:53 2007 @@ -1,0 +1,6 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetVersion(ptr) +@ stub DllInstall +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: trunk/reactos/dll/win32/browseui/browseui.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui_main.c (added) +++ trunk/reactos/dll/win32/browseui/browseui_main.c Mon Oct 1 23:09:53 2007 @@ -1,0 +1,211 @@ +/* + * browseui - Internet Explorer / Windows Explorer standard UI + * + * Copyright 2001 John R. Sheets (for CodeWeavers) + * Copyright 2004 Mike McCormack (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 "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" +#include "shlguid.h" + +#include "initguid.h" + +#include "browseui.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +LONG BROWSEUI_refCount = 0; + +HINSTANCE browseui_hinstance = 0; + +typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); + +static const struct { + REFCLSID clsid; + LPFNCONSTRUCTOR ctor; +} ClassesTable[] = { + {&CLSID_ACLMulti, ACLMulti_Constructor}, + {NULL, NULL} +}; + +typedef struct tagClassFactory +{ + const IClassFactoryVtbl *vtbl; + LONG ref; + LPFNCONSTRUCTOR ctor; +} ClassFactory; +static const IClassFactoryVtbl ClassFactoryVtbl; + +static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) +{ + ClassFactory *This = CoTaskMemAlloc(sizeof(ClassFactory)); + This->vtbl = &ClassFactoryVtbl; + This->ref = 1; + This->ctor = ctor; + *ppvOut = (LPVOID)This; + TRACE("Created class factory %p\n", This); + BROWSEUI_refCount++; + return S_OK; +} + +static void ClassFactory_Destructor(ClassFactory *This) +{ + TRACE("Destroying class factory %p\n", This); + CoTaskMemFree(This); + BROWSEUI_refCount--; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) +{ + *ppvOut = NULL; + if (IsEqualIID(riid, &IID_IClassFactory) || IsEqualIID(riid, &IID_IUnknown)) { + IClassFactory_AddRef(iface); + *ppvOut = iface; + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + ULONG ret = InterlockedDecrement(&This->ref); + + if (ret == 0) + ClassFactory_Destructor(This); + return ret; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID iid, LPVOID *ppvOut) +{ + ClassFactory *This = (ClassFactory *)iface; + HRESULT ret; + IUnknown *obj; + + TRACE("(%p, %p, %s, %p)\n", iface, punkOuter, debugstr_guid(iid), ppvOut); + ret = This->ctor(punkOuter, &obj); + if (FAILED(ret)) + return ret; + ret = IUnknown_QueryInterface(obj, iid, ppvOut); + IUnknown_Release(obj); + return ret; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + ClassFactory *This = (ClassFactory *)iface; + + TRACE("(%p)->(%x)\n", This, fLock); + + if(fLock) + InterlockedIncrement(&BROWSEUI_refCount); + else + InterlockedDecrement(&BROWSEUI_refCount); + + return S_OK; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + /* IUnknown */ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + + /* IClassFactory*/ + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +/************************************************************************* + * BROWSEUI DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) +{ + TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + browseui_hinstance = hinst; + break; + } + return TRUE; +} + +/************************************************************************* + * DllCanUnloadNow (BROWSEUI.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return BROWSEUI_refCount ? S_FALSE : S_OK; +} + +/*********************************************************************** + * DllGetVersion (BROWSEUI.@) + */ +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) +{ + if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n"); + + /* this is what IE6 on Windows 98 reports */ + info->dwMajorVersion = 6; + info->dwMinorVersion = 0; + info->dwBuildNumber = 2600; + info->dwPlatformID = DLLVER_PLATFORM_WINDOWS; + + return NOERROR; +} + +/*********************************************************************** + * DllGetClassObject (BROWSEUI.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *ppvOut) +{ + int i; + + *ppvOut = NULL; + if (!IsEqualIID(iid, &IID_IUnknown) && !IsEqualIID(iid, &IID_IClassFactory)) + return E_NOINTERFACE; + + for (i = 0; ClassesTable[i].clsid != NULL; i++) + if (IsEqualCLSID(ClassesTable[i].clsid, clsid)) { + return ClassFactory_Constructor(ClassesTable[i].ctor, ppvOut); + } + FIXME("CLSID %s not supported\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} Propchange: trunk/reactos/dll/win32/browseui/browseui_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui_ros.diff (added) +++ trunk/reactos/dll/win32/browseui/browseui_ros.diff Mon Oct 1 23:09:53 2007 @@ -1,0 +1,15 @@ +Index: browseui.rbuild +=================================================================== +--- browseui.rbuild (revision 23123) ++++ browseui.rbuild (working copy) +@@ -9,8 +9,8 @@ + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> +- <define name="_WIN32_WINNT">0x501</define> +- <define name="WINVER">0x501</define> ++ <define name="_WIN32_WINNT">0x600</define> ++ <define name="WINVER">0x600</define> + <library>wine</library> + <library>ole32</library> + <library>user32</library> Propchange: trunk/reactos/dll/win32/browseui/browseui_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/regsvr.… ============================================================================== --- trunk/reactos/dll/win32/browseui/regsvr.c (added) +++ trunk/reactos/dll/win32/browseui/regsvr.c Mon Oct 1 23:09:53 2007 @@ -1,0 +1,489 @@ +/* + * self-registerable dll functions for browseui.dll + * + * Copyright (C) 2004 Stefan Leichter + * + * 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 <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "winreg.h" +#include "winerror.h" + +#include "ole2.h" +#include "shlguid.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/*********************************************************************** + * interface for self-registering + */ +struct regsvr_interface +{ + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); + +/*********************************************************************** + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + wsprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->progid, NULL, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + + if (list->viprogid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) +{ + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *curver_progid, + char const *name, + char const *extra) +{ + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (curver_progid) { + res = register_key_defvalueA(progid_key, curver_keyname, + curver_progid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (extra) { + HKEY extra_key; + + res = RegCreateKeyExA(progid_key, extra, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &extra_key, NULL); + if (res == ERROR_SUCCESS) + RegCloseKey(extra_key); + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static struct regsvr_coclass const coclass_list[] = { + { + &CLSID_ACLMulti, + "Multiple AutoComplete List Container", + NULL, + "browseui.dll", + "Apartment" + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * interface list + */ + +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * DllRegisterServer (HHCTRL.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (HHCTRL.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + return hr; +} Propchange: trunk/reactos/dll/win32/browseui/regsvr.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/version… ============================================================================== --- trunk/reactos/dll/win32/browseui/version.rc (added) +++ trunk/reactos/dll/win32/browseui/version.rc Mon Oct 1 23:09:53 2007 @@ -1,0 +1,27 @@ +/* + * Copyright 2003 Francois Gouget (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 + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine core dll" +#define WINE_FILENAME_STR "browseui.dll" +#define WINE_FILEVERSION 6,0,2900,2180 +#define WINE_FILEVERSION_STR "6.0.2900.2180" +#define WINE_PRODUCTVERSION 6,0,2900,2180 +#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/browseui/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 29335: Prepare import of browseui.dll
by hpoussin＠svn.reactos.org 01 Oct '07

01 Oct '07

Author: hpoussin Date: Mon Oct 1 23:09:07 2007 New Revision: 29335 URL: http://svn.reactos.org/svn/reactos?rev=29335&view=rev Log: Prepare import of browseui.dll Added: trunk/reactos/dll/win32/browseui/ (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=293… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Mon Oct 1 23:09:07 2007 @@ -37,6 +37,7 @@ <property name="BASEADDRESS_OLEACC" value="0x69640000" /> <property name="BASEADDRESS_WINMM" value="0x697d0000" /> <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> + <property name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> <property name="BASEADDRESS_SHELL32" value="0x6a360000" /> <property name="BASEADDRESS_UNICODE" value="0x6b200000" /> 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 Mon Oct 1 23:09:07 2007 @@ -159,6 +159,7 @@ dll\win32\advpack\advpack.dll 1 dll\win32\aclui\aclui.dll 1 dll\win32\avifil32\avifil32.dll 1 +dll\win32\browseui.dll 1 dll\win32\cabinet\cabinet.dll 1 dll\win32\cards\cards.dll 1 dll\win32\cfgmgr32\cfgmgr32.dll 1 Propchange: trunk/reactos/dll/win32/browseui/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Oct 1 23:09:07 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln 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 Mon Oct 1 23:09:07 2007 @@ -22,6 +22,9 @@ <directory name="beepmidi"> <xi:include href="beepmidi/beepmidi.rbuild" /> </directory> +<directory name="browseui"> + <xi:include href="browseui/browseui.rbuild" /> +</directory> <directory name="cabinet"> <xi:include href="cabinet/cabinet.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 Mon Oct 1 23:09:07 2007 @@ -33,6 +33,7 @@ reactos/dll/win32/advpack # Autosync reactos/dll/win32/avifil32 # Autosync +reactos/dll/win32/browseui # Autosync reactos/dll/win32/cabinet # Autosync reactos/dll/win32/clusapi # Autosync reactos/dll/win32/comcat # Autosync

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