Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 33553: Add DCE pointer to window class. Start support for real Class DCEs.
by jimtabor＠svn.reactos.org 17 May '08

17 May '08

Author: jimtabor Date: Sat May 17 06:55:24 2008 New Revision: 33553 URL: http://svn.reactos.org/svn/reactos?rev=33553&view=rev Log: Add DCE pointer to window class. Start support for real Class DCEs. Modified: trunk/reactos/include/reactos/win32k/ntuser.h Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sat May 17 06:55:24 2008 @@ -76,6 +76,7 @@ PCALLPROC CallProcList; INT ClsExtra; INT WndExtra; + PVOID Dce; HINSTANCE hInstance; HANDLE hIcon; /* FIXME - Use pointer! */ HANDLE hIconSm; /* FIXME - Use pointer! */

1 0

[pschweitzer] 33552: Synced urlmon.dll with Wine HEAD. This *does not* fix Downloader, but it now returns an error message.
by pschweitzer＠svn.reactos.org 17 May '08

17 May '08

Author: pschweitzer Date: Sat May 17 05:36:13 2008 New Revision: 33552 URL: http://svn.reactos.org/svn/reactos?rev=33552&view=rev Log: Synced urlmon.dll with Wine HEAD. This *does not* fix Downloader, but it now returns an error message. Modified: trunk/reactos/dll/win32/urlmon/file.c trunk/reactos/dll/win32/urlmon/urlmon.rbuild Modified: trunk/reactos/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re… ============================================================================== --- trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/file.c [iso-8859-1] Sat May 17 05:36:13 2008 @@ -119,6 +119,9 @@ ReleaseBindInfo(&bindinfo); + if(!szUrl || !*szUrl) + return E_INVALIDARG; + if(lstrlenW(szUrl) < sizeof(wszFile)/sizeof(WCHAR) || memcmp(szUrl, wszFile, sizeof(wszFile))) return MK_E_SYNTAX; @@ -153,6 +156,9 @@ break; } } + + if(file_name[1] == '|') + file_name[1] = ':'; This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); Modified: trunk/reactos/dll/win32/urlmon/urlmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.rb… ============================================================================== --- trunk/reactos/dll/win32/urlmon/urlmon.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/urlmon/urlmon.rbuild [iso-8859-1] Sat May 17 05:36:13 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" allowwarnings="true"> +<module name="urlmon" type="win32dll" baseaddress="${BASEADDRESS_URLMON}" installbase="system32" installname="urlmon.dll" allowwarnings="true" entrypoint="0"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="urlmon.spec.def" /> <include base="urlmon">.</include> @@ -28,13 +28,13 @@ <file>rsrc.rc</file> <file>urlmon.spec</file> <library>wine</library> + <library>uuid</library> <library>ole32</library> <library>shlwapi</library> <library>wininet</library> <library>user32</library> <library>advapi32</library> <library>kernel32</library> - <library>uuid</library> <library>ntdll</library> </module> </group>

1 0

[mpiulachs] 33551: Add ROS_BUILDENGINE variable to determine the location of rbuild - Allows using an rbuild executable other than the one found in the same source tree (tools\rbuild)
by mpiulachs＠svn.reactos.org 17 May '08

17 May '08

Author: mpiulachs Date: Sat May 17 04:56:15 2008 New Revision: 33551 URL: http://svn.reactos.org/svn/reactos?rev=33551&view=rev Log: Add ROS_BUILDENGINE variable to determine the location of rbuild - Allows using an rbuild executable other than the one found in the same source tree (tools\rbuild) Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=33551&r1=3355… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Sat May 17 04:56:15 2008 @@ -125,6 +125,9 @@ # # ROS_AUTOMAKE # Alternate name of makefile.auto +# +# ROS_BUILDENGINE +# The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET) # # check for versions of make that don't have features we need... @@ -395,14 +398,19 @@ $(BUILDNO_H) \ $(GENDIB_DIB_FILES) \ $(NCI_SERVICE_FILES) + ifeq ($(ARCH),powerpc) PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS) endif -$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(XMLBUILDFILES) | $(PREAUTO) +ifeq ($(ROS_BUILDENGINE),) +ROS_BUILDENGINE=$(RBUILD_TARGET) +endif + +$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(PREAUTO) ${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw world: all bootcd livecd @@ -435,143 +443,143 @@ $(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml .PHONY: cb -cb: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb +cb: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb .PHONY: msbuild -msbuild: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msbuild +msbuild: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msbuild .PHONY: msbuild_clean -msbuild_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msbuild +msbuild_clean: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msbuild .PHONY: depmap -depmap: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) depmap +depmap: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) depmap .PHONY: vreport -vreport:$(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) vreport +vreport:$(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) vreport .PHONY: msvc -msvc: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msvc +msvc: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msvc .PHONY: msvc6 -msvc6: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs6.00 -voversionconfiguration msvc +msvc6: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs6.00 -voversionconfiguration msvc .PHONY: msvc7 -msvc7: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -voversionconfiguration msvc +msvc7: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -voversionconfiguration msvc .PHONY: msvc71 -msvc71: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -voversionconfiguration msvc +msvc71: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -voversionconfiguration msvc .PHONY: msvc8 -msvc8: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc +msvc8: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc .PHONY: msvc9 -msvc9: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc +msvc9: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc .PHONY: msvc6_clean -msvc6_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc +msvc6_clean: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc .PHONY: msvc7_clean -msvc7_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc +msvc7_clean: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc .PHONY: msvc71_clean -msvc71_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc +msvc71_clean: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc .PHONY: msvc8_clean -msvc8_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc +msvc8_clean: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc .PHONY: msvc9_clean -msvc9_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc +msvc9_clean: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc .PHONY: msvc_clean -msvc_clean: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msvc +msvc_clean: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msvc .PHONY: msvc_clean_all -msvc_clean_all: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.10 -voversionconfiguration msvc +msvc_clean_all: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.10 -voversionconfiguration msvc .PHONY: msvc7_install_debug -msvc7_install_debug: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug -voversionconfiguration msvc +msvc7_install_debug: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug -voversionconfiguration msvc .PHONY: msvc7_install_release -msvc7_install_release: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease -voversionconfiguration msvc +msvc7_install_release: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease -voversionconfiguration msvc .PHONY: msvc7_install_speed -msvc7_install_speed: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed -voversionconfiguration msvc +msvc7_install_speed: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed -voversionconfiguration msvc .PHONY: msvc71_install_debug -msvc71_install_debug: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug -voversionconfiguration msvc +msvc71_install_debug: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug -voversionconfiguration msvc .PHONY: msvc71_install_release -msvc71_install_release: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease -voversionconfiguration msvc +msvc71_install_release: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease -voversionconfiguration msvc .PHONY: msvc71_install_speed -msvc71_install_speed: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed -voversionconfiguration msvc +msvc71_install_speed: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed -voversionconfiguration msvc .PHONY: msvc8_install_debug -msvc8_install_debug: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug -voversionconfiguration msvc +msvc8_install_debug: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug -voversionconfiguration msvc .PHONY: msvc8_install_release -msvc8_install_release: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease -voversionconfiguration msvc +msvc8_install_release: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease -voversionconfiguration msvc .PHONY: msvc8_install_speed -msvc8_install_speed: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed -voversionconfiguration msvc +msvc8_install_speed: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed -voversionconfiguration msvc .PHONY: makefile_auto_clean makefile_auto_clean: @@ -581,6 +589,6 @@ clean: makefile_auto_clean .PHONY: depends -depends: $(RBUILD_TARGET) - $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw +depends: $(ROS_BUILDENGINE) + $(ECHO_RBUILD) + $(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw

1 0

[hpoussin] 33550: Add fusion.idl from Wine
by hpoussin＠svn.reactos.org 17 May '08

17 May '08

Author: hpoussin Date: Sat May 17 04:53:01 2008 New Revision: 33550 URL: http://svn.reactos.org/svn/reactos?rev=33550&view=rev Log: Add fusion.idl from Wine Added: trunk/reactos/include/psdk/fusion.idl (with props) Modified: trunk/reactos/include/psdk/msidefs.h trunk/reactos/include/psdk/psdk.rbuild Added: trunk/reactos/include/psdk/fusion.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/fusion.idl?re… ============================================================================== --- trunk/reactos/include/psdk/fusion.idl (added) +++ trunk/reactos/include/psdk/fusion.idl [iso-8859-1] Sat May 17 04:53:01 2008 @@ -1,0 +1,345 @@ +/* + * Copyright 2008 James Hawkins + * + * 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 + */ + +import "objidl.idl"; + +interface IAssemblyCache; +interface IAssemblyCacheItem; +interface IAssemblyEnum; +interface IAssemblyName; + +typedef enum +{ + ASM_CACHE_ZAP = 0x1, + ASM_CACHE_GAC = 0x2, + ASM_CACHE_DOWNLOAD = 0x4, + ASM_CACHE_ROOT = 0x8 +} ASM_CACHE_FLAGS; + +typedef enum +{ + peNone = 0x00000000, + peMSIL = 0x00000001, + peI386 = 0x00000002, + peIA64 = 0x00000003, + peAMD64 = 0x00000004, + peInvalid = 0xffffffff +} PEKIND; + +typedef enum _tagAssemblyComparisonResult +{ + ACR_Unknown, + ACR_EquivalentFullMatch, + ACR_EquivalentWeakNamed, + ACR_EquivalentFXUnified, + ACR_EquivalentUnified, + ACR_NonEquivalentVersion, + ACR_NonEquivalent, + ACR_EquivalentPartialMatch, + ACR_EquivalentPartialWeakNamed, + ACR_EquivalentPartialUnified, + ACR_EquivalentPartialFXUnified, + ACR_NonEquivalentPartialVersion +} AssemblyComparisonResult; + +[ + local, + object, + uuid(e707dcde-d1cd-11d2-bab9-00c04f8eceae), + pointer_default(unique) +] +interface IAssemblyCache : IUnknown +{ + typedef struct _FUSION_INSTALL_REFERENCE_ + { + DWORD cbSize; + DWORD dwFlags; + GUID guidScheme; + LPCWSTR szIdentifier; + LPCWSTR szNonCannonicalData; + } FUSION_INSTALL_REFERENCE, *LPFUSION_INSTALL_REFERENCE; + + typedef const FUSION_INSTALL_REFERENCE *LPCFUSION_INSTALL_REFERENCE; + + typedef struct _ASSEMBLY_INFO + { + ULONG cbAssemblyInfo; + DWORD dwAssemblyFlags; + ULARGE_INTEGER uliAssemblySizeInKB; + LPWSTR pszCurrentAssemblyPathBuf; + ULONG cchBuf; + } ASSEMBLY_INFO; + + cpp_quote("#define IASSEMBLYCACHE_INSTALL_FLAG_REFRESH 0x00000001") + cpp_quote("#define IASSEMBLYCACHE_INSTALL_FLAG_FORCE_REFRESH 0x00000002") + + cpp_quote("#define IASSEMBLYCACHE_UNINSTALL_DISPOSITION_UNINSTALLED 1") + cpp_quote("#define IASSEMBLYCACHE_UNINSTALL_DISPOSITION_STILL_IN_USE 2") + cpp_quote("#define IASSEMBLYCACHE_UNINSTALL_DISPOSITION_ALREADY_UNINSTALLED 3") + cpp_quote("#define IASSEMBLYCACHE_UNINSTALL_DISPOSITION_DELETE_PENDING 4") + cpp_quote("#define IASSEMBLYCACHE_UNINSTALL_DISPOSITION_HAS_INSTALL_REFERENCES 5") + cpp_quote("#define IASSEMBLYCACHE_UNINSTALL_DISPOSITION_REFERENCE_NOT_FOUND 6") + + cpp_quote("#define QUERYASMINFO_FLAG_VALIDATE 0x00000001") + cpp_quote("#define QUERYASMINFO_FLAG_GETSIZE 0x00000002") + + cpp_quote("#define ASSEMBLYINFO_FLAG_INSTALLED 0x00000001") + cpp_quote("#define ASSEMBLYINFO_FLAG_PAYLOADRESIDENT 0x00000002") + + HRESULT UninstallAssembly( + [in] DWORD dwFlags, + [in] LPCWSTR pszAssemblyName, + [in] LPCFUSION_INSTALL_REFERENCE pRefData, + [out, optional] ULONG *pulDisposition); + + HRESULT QueryAssemblyInfo( + [in] DWORD dwFlags, + [in] LPCWSTR pszAssemblyName, + [in, out] ASSEMBLY_INFO *pAsmInfo); + + HRESULT CreateAssemblyCacheItem( + [in] DWORD dwFlags, + [in] PVOID pvReserved, + [out] IAssemblyCacheItem **ppAsmItem, + [in, optional] LPCWSTR pszAssemblyName); + + HRESULT CreateAssemblyScavenger([out] IUnknown **ppUnkReserved); + + HRESULT InstallAssembly( + [in] DWORD dwFlags, + [in] LPCWSTR pszManifestFilePath, + [in] LPCFUSION_INSTALL_REFERENCE pRefData); +} + +[ + local, + object, + uuid(9e3aaeb4-d1cd-11d2-bab9-00c04f8eceae), + pointer_default(unique) +] +interface IAssemblyCacheItem : IUnknown +{ + cpp_quote("#define STREAM_FORMAT_COMPLIB_MODULE 0") + cpp_quote("#define STREAM_FORMAT_COMPLIB_MANIFEST 1") + cpp_quote("#define STREAM_FORMAT_WIN32_MODULE 2") + cpp_quote("#define STREAM_FORMAT_WIN32_MANIFEST 4") + + cpp_quote("#define IASSEMBLYCACHEITEM_COMMIT_FLAG_REFRESH 0x00000001") + cpp_quote("#define IASSEMBLYCACHEITEM_COMMIT_FLAG_FORCE_REFRESH 0x00000002") + + cpp_quote("#define IASSEMBLYCACHEITEM_COMMIT_DISPOSITION_INSTALLED 1") + cpp_quote("#define IASSEMBLYCACHEITEM_COMMIT_DISPOSITION_REFRESHED 2") + cpp_quote("#define IASSEMBLYCACHEITEM_COMMIT_DISPOSITION_ALREADY_INSTALLED 3") + + HRESULT CreateStream( + [in] DWORD dwFlags, + [in] LPCWSTR pszStreamName, + [in] DWORD dwFormat, + [in] DWORD dwFormatFlags, + [out] IStream **ppIStream, + [in, optional] ULARGE_INTEGER *puliMaxSize); + + HRESULT Commit( + [in] DWORD dwFlags, + [out, optional] ULONG *pulDisposition); + + HRESULT AbortItem(); +} + +[ + local, + object, + uuid(CD193BC0-B4BC-11d2-9833-00C04FC31D2E), + pointer_default(unique) +] +interface IAssemblyName: IUnknown +{ + typedef [unique] IAssemblyName *LPASSEMBLYNAME; + + typedef enum + { + CANOF_PARSE_DISPLAY_NAME = 0x1, + CANOF_SET_DEFAULT_VALUES = 0x2, + CANOF_VERIFY_FRIEND_ASSEMBLYNAME = 0x4, + CANOF_PARSE_FRIEND_DISPLAY_NAME = CANOF_PARSE_DISPLAY_NAME | + CANOF_VERIFY_FRIEND_ASSEMBLYNAME + } CREATE_ASM_NAME_OBJ_FLAGS; + + typedef enum + { + ASM_NAME_PUBLIC_KEY = 0, + ASM_NAME_PUBLIC_KEY_TOKEN, + ASM_NAME_HASH_VALUE, + ASM_NAME_NAME, + ASM_NAME_MAJOR_VERSION, + ASM_NAME_MINOR_VERSION, + ASM_NAME_BUILD_NUMBER, + ASM_NAME_REVISION_NUMBER, + ASM_NAME_CULTURE, + ASM_NAME_PROCESSOR_ID_ARRAY, + ASM_NAME_OSINFO_ARRAY, + ASM_NAME_HASH_ALGID, + ASM_NAME_ALIAS, + ASM_NAME_CODEBASE_URL, + ASM_NAME_CODEBASE_LASTMOD, + ASM_NAME_NULL_PUBLIC_KEY, + ASM_NAME_NULL_PUBLIC_KEY_TOKEN, + ASM_NAME_CUSTOM, + ASM_NAME_NULL_CUSTOM, + ASM_NAME_MVID, + ASM_NAME_FILE_MAJOR_VERSION, + ASM_NAME_FILE_MINOR_VERSION, + ASM_NAME_FILE_BUILD_NUMBER, + ASM_NAME_FILE_REVISION_NUMBER, + ASM_NAME_RETARGET, + ASM_NAME_SIGNATURE_BLOB, + ASM_NAME_CONFIG_MASK, + ASM_NAME_ARCHITECTURE, + ASM_NAME_MAX_PARAMS + } ASM_NAME; + + typedef enum + { + ASM_DISPLAYF_VERSION = 0x1, + ASM_DISPLAYF_CULTURE = 0x2, + ASM_DISPLAYF_PUBLIC_KEY_TOKEN = 0x4, + ASM_DISPLAYF_PUBLIC_KEY = 0x8, + ASM_DISPLAYF_CUSTOM = 0x10, + ASM_DISPLAYF_PROCESSORARCHITECTURE = 0x20, + ASM_DISPLAYF_LANGUAGEID = 0x40, + ASM_DISPLAYF_RETARGET = 0x80, + ASM_DISPLAYF_CONFIG_MASK = 0x100, + ASM_DISPLAYF_MVID = 0x200, + + ASM_DISPLAYF_FULL = ASM_DISPLAYF_VERSION | + ASM_DISPLAYF_CULTURE | + ASM_DISPLAYF_PUBLIC_KEY_TOKEN | + ASM_DISPLAYF_RETARGET | + ASM_DISPLAYF_PROCESSORARCHITECTURE, + } ASM_DISPLAY_FLAGS; + + typedef enum + { + ASM_CMPF_NAME = 0x1, + ASM_CMPF_MAJOR_VERSION = 0x2, + ASM_CMPF_MINOR_VERSION = 0x4, + ASM_CMPF_BUILD_NUMBER = 0x8, + ASM_CMPF_REVISION_NUMBER = 0x10, + ASM_CMPF_VERSION = ASM_CMPF_MAJOR_VERSION | + ASM_CMPF_MINOR_VERSION | + ASM_CMPF_BUILD_NUMBER | + ASM_CMPF_REVISION_NUMBER, + ASM_CMPF_PUBLIC_KEY_TOKEN = 0x20, + ASM_CMPF_CULTURE = 0x40, + ASM_CMPF_CUSTOM = 0x80, + ASM_CMPF_DEFAULT = 0x100, + ASM_CMPF_RETARGET = 0x200, + ASM_CMPF_ARCHITECTURE = 0x400, + ASM_CMPF_CONFIG_MASK = 0x800, + ASM_CMPF_MVID = 0x1000, + ASM_CMPF_SIGNATURE = 0x2000, + ASM_CMPF_IL_ALL = ASM_CMPF_NAME | + ASM_CMPF_VERSION | + ASM_CMPF_PUBLIC_KEY_TOKEN | + ASM_CMPF_CULTURE, + ASM_CMPF_IL_NO_VERSION = ASM_CMPF_NAME | + ASM_CMPF_PUBLIC_KEY_TOKEN | + ASM_CMPF_CULTURE + } ASM_CMP_FLAGS; + + HRESULT SetProperty( + [in] DWORD PropertyId, + [in] LPVOID pvProperty, + [in] DWORD cbProperty); + + HRESULT GetProperty( + [in] DWORD PropertyId, + [out] LPVOID pvProperty, + [in, out] LPDWORD pcbProperty); + + HRESULT Finalize(); + + HRESULT GetDisplayName( + [out] LPOLESTR szDisplayName, + [in, out] LPDWORD pccDisplayName, + [in] DWORD dwDisplayFlags); + + HRESULT Reserved( + [in] REFIID refIID, + [in] IUnknown *pUnkReserved1, + [in] IUnknown *pUnkReserved2, + [in] LPCOLESTR szReserved, + [in] LONGLONG llReserved, + [in] LPVOID pvReserved, + [in] DWORD cbReserved, + [out] LPVOID *ppReserved); + + HRESULT GetName( + [in, out] LPDWORD lpcwBuffer, + [out] WCHAR *pwzName); + + HRESULT GetVersion( + [out] LPDWORD pdwVersionHi, + [out] LPDWORD pdwVersionLow); + + HRESULT IsEqual( + [in] IAssemblyName *pName, + [in] DWORD dwCmpFlags); + + HRESULT Clone([out] IAssemblyName **pName); +} + +[ + local, + object, + uuid(21b8916c-f28e-11d2-a473-00c04f8ef448), + pointer_default(unique) +] +interface IAssemblyEnum : IUnknown +{ + HRESULT GetNextAssembly( + [in] LPVOID pvReserved, + [out] IAssemblyName **ppName, + [in] DWORD dwFlags); + + HRESULT Reset(void); + + HRESULT Clone([out] IAssemblyEnum **ppEnum); +} + +[ + local, + object, + uuid(582dac66-e678-449f-aba6-6faaec8a9394), + pointer_default(unique) +] +interface IInstallReferenceItem : IUnknown +{ + +} + +[ + local, + object, + uuid(56b1a988-7c0c-4aa2-8639-c3eb5a90226f), + pointer_default(unique) +] +interface IInstallReferenceEnum : IUnknown +{ + +} Propchange: trunk/reactos/include/psdk/fusion.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev… ============================================================================== --- trunk/reactos/include/psdk/msidefs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/msidefs.h [iso-8859-1] Sat May 17 04:53:01 2008 @@ -203,6 +203,12 @@ enum msidbMoveFileOptions { msidbMoveFileOptionsMove = 0x00000001, +}; + +enum msidbAssemblyAttributes +{ + msidbAssemblyAttributesURT = 0x00000000, + msidbAssemblyAttributesWin32 = 0x00000001, }; /* Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sat May 17 04:53:01 2008 @@ -7,6 +7,7 @@ <file>dispex.idl</file> <file>docobj.idl</file> <file>downloadmgr.idl</file> + <file>fusion.idl</file> <file>hlink.idl</file> <file>htiframe.idl</file> <file>iads.idl</file>

1 0

[pschweitzer] 33549: Limit introduction string to 256 letters (no more, not less)
by pschweitzer＠svn.reactos.org 17 May '08

17 May '08

Author: pschweitzer Date: Sat May 17 04:45:13 2008 New Revision: 33549 URL: http://svn.reactos.org/svn/reactos?rev=33549&view=rev Log: Limit introduction string to 256 letters (no more, not less) Modified: trunk/rosapps/magnify/lang/fr-FR.rc Modified: trunk/rosapps/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/magnify/lang/fr-FR.rc?rev=… ============================================================================== --- trunk/rosapps/magnify/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/magnify/lang/fr-FR.rc [iso-8859-1] Sat May 17 04:45:13 2008 @@ -54,7 +54,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "La loupe a été réalisée pour fournir un niveau minimum de fonctionnalités pour les utilisateurs souffrants de problèmes déficiences visuelles. La majorité de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalités pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 + LTEXT "La loupe a été réalisée pour fournir quelques fonctionnalités aux utilisateurs souffrants de déficiences visuelles. La majorité de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalités pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 CONTROL "Ne plus montrer ce message",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END

1 0

[hpoussin] 33548: IDL headers should be dependencies, not libraries
by hpoussin＠svn.reactos.org 17 May '08

17 May '08

Author: hpoussin Date: Sat May 17 04:40:19 2008 New Revision: 33548 URL: http://svn.reactos.org/svn/reactos?rev=33548&view=rev Log: IDL headers should be dependencies, not libraries Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=33548&r1=… ============================================================================== --- trunk/tools/wineimport.cmd [iso-8859-1] (original) +++ trunk/tools/wineimport.cmd [iso-8859-1] Sat May 17 04:40:19 2008 @@ -190,7 +190,7 @@ FOR %%j IN (%WINE_IDL_GEN_I_SRCS%) DO ( SET WINE_SHORT_NAME=%%j SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! - ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header" type="idlheader" allowwarnings="true"^> + ECHO ^<module name="%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header" type="idlheader"^> ECHO ^<file^>%%j^</file^> ECHO ^</module^> ) @@ -246,7 +246,7 @@ ) ELSE IF "%WINE_VARTYPE%" == "4" ( SET WINE_SHORT_NAME=%%j SET WINE_SHORT_NAME=!WINE_SHORT_NAME:~0,-4! - SET WINE_LIBRARIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header !WINE_LIBRARIES! + SET WINE_DEPENDENCIES=%WINE_MODULE_NAME%_!WINE_SHORT_NAME!_header !WINE_DEPENDENCIES! SET WINE_IDL_GEN_I_SRCS=!WINE_IDL_GEN_I_SRCS! %%j ) ELSE IF "%WINE_VARTYPE%" == "5" ( SET WINE_SHORT_NAME=%%j @@ -280,7 +280,7 @@ ) ELSE IF "%1" == "CTESTS" ( SET WINE_VARTYPE=1 ) ELSE IF "%1" == "IDL_H_SRCS" ( - SET WINE_VARTYPE=1 + SET WINE_VARTYPE=4 SET WINE_HAS_IDL=1 ) ELSE IF "%1" == "IDL_C_SRCS" ( SET WINE_VARTYPE=5

1 0

[cfinck] 33547: Make 100% sure that the correct "regedit.exe" is launched by using GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on ros-dev.
by cfinck＠svn.reactos.org 17 May '08

17 May '08

Author: cfinck Date: Sat May 17 04:39:36 2008 New Revision: 33547 URL: http://svn.reactos.org/svn/reactos?rev=33547&view=rev Log: Make 100% sure that the correct "regedit.exe" is launched by using GetWindowsDirectory and appending "\regedit.exe" as suggested by Alex on ros-dev. Modified: trunk/reactos/base/applications/regedt32/regedt32.c Modified: trunk/reactos/base/applications/regedt32/regedt32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… ============================================================================== --- trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedt32/regedt32.c [iso-8859-1] Sat May 17 04:39:36 2008 @@ -5,7 +5,12 @@ int WINAPI _tWinMain(HINSTANCE hCurInst, HINSTANCE hPrevInst, LPTSTR lpsCmdLine, int nCmdShow) { - ShellExecute(NULL, NULL, _T("regedit.exe"), lpsCmdLine, NULL, nCmdShow); + TCHAR szPath[MAX_PATH]; + + GetWindowsDirectory(szPath, MAX_PATH); + _tcscat(szPath, _T("\\regedit.exe")); + + ShellExecute(NULL, NULL, szPath, lpsCmdLine, NULL, nCmdShow); return 0; }

1 0

[cfinck] 33546: Revert the _T('x') to 'x' changes from my previous commit. Although both methods work properly, _T('x') seems to be the more convenient method used throughout cmd.
by cfinck＠svn.reactos.org 17 May '08

17 May '08

Author: cfinck Date: Sat May 17 04:23:21 2008 New Revision: 33546 URL: http://svn.reactos.org/svn/reactos?rev=33546&view=rev Log: Revert the _T('x') to 'x' changes from my previous commit. Although both methods work properly, _T('x') seems to be the more convenient method used throughout cmd. Modified: trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sat May 17 04:23:21 2008 @@ -626,18 +626,18 @@ /* check for options anywhere in command line */ for (i = 0; i < args; i++) { - if (*arg[i] == '/') + if (*arg[i] == _T('/')) { /*found a command, but check to make sure it has something after it*/ if (_tcslen (arg[i]) == 2) { ch = _totupper (arg[i][1]); - if (ch == 'S') + if (ch == _T('S')) { RD_SUB = TRUE; } - else if (ch == 'Q') + else if (ch == _T('Q')) { RD_QUIET = TRUE; } @@ -650,7 +650,7 @@ } } - if (dir[0] == '\0') + if (dir[0] == _T('\0')) { /* No folder to remove */ ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); @@ -661,8 +661,8 @@ GetFullPathName(dir,MAX_PATH,szFullPath,NULL); /* remove trailing \ if any, but ONLY if dir is not the root dir */ - if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == '\\') - szFullPath[_tcslen(szFullPath) - 1] = '\0'; + if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\')) + szFullPath[_tcslen(szFullPath) - 1] = _T('\0'); if(RD_SUB) { @@ -702,7 +702,7 @@ FindClose (hFile); } /* reovme the \\* */ - szFullPath[_tcslen(szFullPath) - 2] = '\0'; + szFullPath[_tcslen(szFullPath) - 2] = _T('\0'); } if (!DeleteFolder(szFullPath))

1 0

[cfinck] 33545: - Fix some warnings spotted by MSVC - Define cmd_exit to ExitProcess if _DEBUG_MEM is not defined. Fixes compilation, when _DEBUG_MEM is turned off.
by cfinck＠svn.reactos.org 17 May '08

17 May '08

Author: cfinck Date: Sat May 17 03:49:39 2008 New Revision: 33545 URL: http://svn.reactos.org/svn/reactos?rev=33545&view=rev Log: - Fix some warnings spotted by MSVC - Define cmd_exit to ExitProcess if _DEBUG_MEM is not defined. Fixes compilation, when _DEBUG_MEM is turned off. Modified: trunk/reactos/base/shell/cmd/cmddbg.h trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/cmddbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmddbg.h?re… ============================================================================== --- trunk/reactos/base/shell/cmd/cmddbg.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmddbg.h [iso-8859-1] Sat May 17 03:49:39 2008 @@ -31,5 +31,6 @@ #define cmd_free(ptr) free(ptr) #define cmd_dup(str) _tcsdup(str) #define cmd_checkbuffer(ptr) +#define cmd_exit(code) ExitProcess(code) #endif Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sat May 17 03:49:39 2008 @@ -518,7 +518,7 @@ else { LPCTSTR last = PeekHistory(-1); - if (last && charcount < _tcslen (last)) + if (last && charcount < (INT)_tcslen (last)) { PreviousChar = last[current]; ConOutChar(PreviousChar); Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sat May 17 03:49:39 2008 @@ -1849,7 +1849,7 @@ prev_volume[0] = _T('\0'); - for(loop = 0; loop < entries; loop++) + for(loop = 0; loop < (UINT)entries; loop++) { if (CheckCtrlBreak(BREAK_INPUT)) { Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Sat May 17 03:49:39 2008 @@ -483,8 +483,9 @@ } } - int __cdecl compare(const void *arg1,const void *arg2) - { + +int __cdecl compare(const void *arg1,const void *arg2) +{ FileName * File1; FileName * File2; INT ret; @@ -503,7 +504,7 @@ cmd_free(File1); cmd_free(File2); return ret; - } +} VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor) { Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/internal.c [iso-8859-1] Sat May 17 03:49:39 2008 @@ -591,7 +591,7 @@ INT cmd_rmdir (LPTSTR cmd, LPTSTR param) { TCHAR dir[MAX_PATH]; /* pointer to the directory to change to */ - char ch; + TCHAR ch; INT args; LPTSTR *arg = NULL; INT i; @@ -622,20 +622,22 @@ } dir[0] = 0; + /* check for options anywhere in command line */ for (i = 0; i < args; i++) { - if (*arg[i] == _T('/')) + if (*arg[i] == '/') { /*found a command, but check to make sure it has something after it*/ if (_tcslen (arg[i]) == 2) { ch = _totupper (arg[i][1]); - if (ch == _T('S')) + + if (ch == 'S') { RD_SUB = TRUE; } - else if (ch == _T('Q')) + else if (ch == 'Q') { RD_QUIET = TRUE; } @@ -648,7 +650,7 @@ } } - if (dir[0] == _T('\0')) + if (dir[0] == '\0') { /* No folder to remove */ ConErrResPuts(STRING_ERROR_REQ_PARAM_MISSING); @@ -657,9 +659,10 @@ } GetFullPathName(dir,MAX_PATH,szFullPath,NULL); + /* remove trailing \ if any, but ONLY if dir is not the root dir */ - if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == _T('\\')) - szFullPath[_tcslen(szFullPath) - 1] = _T('\0'); + if (_tcslen (szFullPath) >= 2 && szFullPath[_tcslen (szFullPath) - 1] == '\\') + szFullPath[_tcslen(szFullPath) - 1] = '\0'; if(RD_SUB) { @@ -695,11 +698,11 @@ FindClose (hFile); nErrorLevel = 1; return 1; - }while (FindNextFile (hFile, &f)); + } while (FindNextFile (hFile, &f)); FindClose (hFile); } /* reovme the \\* */ - szFullPath[_tcslen(szFullPath) - 2] = _T('\0'); + szFullPath[_tcslen(szFullPath) - 2] = '\0'; } if (!DeleteFolder(szFullPath))

1 0

[pschweitzer] 33544: Apply the same fix to dwnl
by pschweitzer＠svn.reactos.org 17 May '08

17 May '08

Author: pschweitzer Date: Sat May 17 03:20:32 2008 New Revision: 33544 URL: http://svn.reactos.org/svn/reactos?rev=33544&view=rev Log: Apply the same fix to dwnl Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c Modified: trunk/reactos/base/applications/network/dwnl/dwnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/dwnl/dwnl.c [iso-8859-1] Sat May 17 03:20:32 2008 @@ -304,11 +304,9 @@ { CBindStatusCallback *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (This == NULL) return NULL; - - ZeroMemory(This, sizeof(*This)); This->lpIBindStatusCallbackVtbl = &vtblIBindStatusCallback; This->ref = 1;

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