Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 55052: [BOOTDATA] Register CLSIDs for MSI
by pschweitzer＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: pschweitzer Date: Sat Jan 21 17:57:39 2012 New Revision: 55052 URL: http://svn.reactos.org/svn/reactos?rev=55052&view=rev Log: [BOOTDATA] Register CLSIDs for MSI Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Sat Jan 21 17:57:39 2012 @@ -280,6 +280,10 @@ HKCR,"AVIFile\shell\open\command","",0x00020000,"%SystemRoot%\system32\mplay32.exe %1" HKCR,"CLSID",,0x00000012 + +; For msi.dll +HKCR, "CLSID\{000C101D-0000-0000-C000-000000000046}", "DllVersion", "3.1.4000" +HKCR, "CLSID\{000C1090-0000-0000-C000-000000000046}", "InProcHandler32", "ole32.dll" ; For Shell32.dll HKCR,"CLSID\{1F4DE370-D627-11D1-BA4F-00A0C91EEDBA}","",0x00000000,"Computer Search Results Folder"

1 0

[pschweitzer] 55051: [PSDK] Sync rpcproxy.h with Wine head
by pschweitzer＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: pschweitzer Date: Sat Jan 21 17:46:22 2012 New Revision: 55051 URL: http://svn.reactos.org/svn/reactos?rev=55051&view=rev Log: [PSDK] Sync rpcproxy.h with Wine head Modified: trunk/reactos/include/psdk/rpcproxy.h Modified: trunk/reactos/include/psdk/rpcproxy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcproxy.h?re… ============================================================================== --- trunk/reactos/include/psdk/rpcproxy.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcproxy.h [iso-8859-1] Sat Jan 21 17:46:22 2012 @@ -203,6 +203,9 @@ RPCRTAPI HRESULT RPC_ENTRY NdrDllUnregisterProxy( HMODULE hDll, const ProxyFileInfo **pProxyFileList, const CLSID *pclsid ); +HRESULT __wine_register_resources( HMODULE module ) DECLSPEC_HIDDEN; +HRESULT __wine_unregister_resources( HMODULE module ) DECLSPEC_HIDDEN; + #define CSTDSTUBBUFFERRELEASE(pFactory) \ ULONG WINAPI CStdStubBuffer_Release(IRpcStubBuffer *This) \ { return NdrCStdStubBuffer_Release(This, (IPSFactoryBuffer *)pFactory); } @@ -285,6 +288,15 @@ # define DLLCANUNLOADNOW_ENTRY DllCanUnloadNow #endif +#ifdef WINE_REGISTER_DLL +# define WINE_DO_REGISTER_DLL(pfl, clsid) return __wine_register_resources( hProxyDll ) +# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return __wine_unregister_resources( hProxyDll ) +#else +# define WINE_DO_REGISTER_DLL(pfl, clsid) return NdrDllRegisterProxy( hProxyDll, (pfl), (clsid) ) +# define WINE_DO_UNREGISTER_DLL(pfl, clsid) return NdrDllUnregisterProxy( hProxyDll, (pfl), (clsid) ) +#endif + + #define DLLDATA_GETPROXYDLLINFO(pfl, rclsid) \ void RPC_ENTRY GetProxyDllInfo(const ProxyFileInfo ***ppProxyFileInfo, \ const CLSID **ppClsid) DECLSPEC_HIDDEN; \ @@ -329,16 +341,16 @@ HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) \ { \ - return NdrDllRegisterProxy(hProxyDll, (pfl), (factory_clsid)); \ + WINE_DO_REGISTER_DLL( (pfl), (factory_clsid) ); \ } \ \ HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) DECLSPEC_HIDDEN; \ HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) \ { \ - return NdrDllUnregisterProxy(hProxyDll, (pfl), (factory_clsid)); \ + WINE_DO_UNREGISTER_DLL( (pfl), (factory_clsid) ); \ } -#ifdef REGISTER_PROXY_DLL +#if defined(REGISTER_PROXY_DLL) || defined(WINE_REGISTER_DLL) # define DLLREGISTRY_ROUTINES(pfl, factory_clsid) \ REGISTER_PROXY_DLL_ROUTINES(pfl, factory_clsid) #else

1 0

[pschweitzer] 55050: [IMAGEHLP] Fix CMake build (will be that way after sync) [MSI] Allow warnings for the moment This should fix CMake build~
by pschweitzer＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: pschweitzer Date: Sat Jan 21 17:41:53 2012 New Revision: 55050 URL: http://svn.reactos.org/svn/reactos?rev=55050&view=rev Log: [IMAGEHLP] Fix CMake build (will be that way after sync) [MSI] Allow warnings for the moment This should fix CMake build~ Modified: trunk/reactos/dll/win32/imagehlp/modify.c trunk/reactos/dll/win32/msi/CMakeLists.txt Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Sat Jan 21 17:41:53 2012 @@ -45,7 +45,7 @@ * BindImageEx (IMAGEHLP.@) */ BOOL IMAGEAPI BindImageEx( - DWORD Flags, LPSTR ImageName, LPSTR DllPath, LPSTR SymbolPath, + DWORD Flags, LPCSTR ImageName, LPCSTR DllPath, LPCSTR SymbolPath, PIMAGEHLP_STATUS_ROUTINE StatusRoutine) { FIXME("(%d, %s, %s, %s, %p): stub\n", Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sat Jan 21 17:41:53 2012 @@ -97,6 +97,8 @@ add_pch(msi msipriv.h) add_cd_file(TARGET msi DESTINATION reactos/system32 FOR all) +allow_warnings(msi) + endif(NOT MSVC) add_importlib_target(msi.spec)

1 0

[janderwald] 55049: [HIDCLASS] - Remove asserts which are hit during shutdown
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 17:32:59 2012 New Revision: 55049 URL: http://svn.reactos.org/svn/reactos?rev=55049&view=rev Log: [HIDCLASS] - Remove asserts which are hit during shutdown Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c [iso-8859-1] Sat Jan 21 17:32:59 2012 @@ -117,7 +117,6 @@ IN PDRIVER_OBJECT DriverObject) { UNIMPLEMENTED - ASSERT(FALSE); } NTSTATUS @@ -848,7 +847,6 @@ IN PIRP Irp) { UNIMPLEMENTED - ASSERT(FALSE); return STATUS_NOT_IMPLEMENTED; }

1 0

[pschweitzer] 55048: [PSDK] Fix CMake msi.dll build?
by pschweitzer＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: pschweitzer Date: Sat Jan 21 17:29:25 2012 New Revision: 55048 URL: http://svn.reactos.org/svn/reactos?rev=55048&view=rev Log: [PSDK] Fix CMake msi.dll build? Modified: trunk/reactos/include/psdk/imagehlp.h Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Sat Jan 21 17:29:25 2012 @@ -268,7 +268,7 @@ BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32); BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32,DWORD); BOOL IMAGEAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); -BOOL IMAGEAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE); +BOOL IMAGEAPI BindImageEx(IN DWORD,IN LPCSTR,IN LPCSTR,IN LPCSTR,IN PIMAGEHLP_STATUS_ROUTINE); BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG_PTR*, OUT ULONG*, IN OUT ULONG_PTR*, IN ULONG); PLOADED_IMAGE IMAGEAPI ImageLoad(LPSTR,LPSTR);

1 0

[pschweitzer] 55047: [MSI_WINETEST] Sync msi_winetest.exe with Wine head
by pschweitzer＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: pschweitzer Date: Sat Jan 21 17:21:57 2012 New Revision: 55047 URL: http://svn.reactos.org/svn/reactos?rev=55047&view=rev Log: [MSI_WINETEST] Sync msi_winetest.exe with Wine head Added: trunk/rostests/winetests/msi/action.c (with props) Modified: trunk/rostests/winetests/msi/CMakeLists.txt trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/format.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/msi.rbuild trunk/rostests/winetests/msi/package.c trunk/rostests/winetests/msi/patch.c trunk/rostests/winetests/msi/record.c trunk/rostests/winetests/msi/source.c trunk/rostests/winetests/msi/suminfo.c trunk/rostests/winetests/msi/testlist.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/CMakeLists.… Added: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=55… Modified: trunk/rostests/winetests/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/format.c?re… Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=5… Modified: trunk/rostests/winetests/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.rbuild?… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r… Modified: trunk/rostests/winetests/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/patch.c?rev… Modified: trunk/rostests/winetests/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/record.c?re… Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… Modified: trunk/rostests/winetests/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/suminfo.c?r… Modified: trunk/rostests/winetests/msi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/testlist.c?…

1 0

[pschweitzer] 55046: [MSI] Sync msi.dll with Wine head
by pschweitzer＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: pschweitzer Date: Sat Jan 21 17:19:12 2012 New Revision: 55046 URL: http://svn.reactos.org/svn/reactos?rev=55046&view=rev Log: [MSI] Sync msi.dll with Wine head Added: trunk/reactos/dll/win32/msi/msiserver.h (with props) trunk/reactos/dll/win32/msi/patch.c (with props) Removed: trunk/reactos/dll/win32/msi/helpers.c trunk/reactos/dll/win32/msi/preview.c trunk/reactos/dll/win32/msi/regsvr.c Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/alter.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/assembly.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/classes.c trunk/reactos/dll/win32/msi/cond.tab.c trunk/reactos/dll/win32/msi/create.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/delete.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/distinct.c trunk/reactos/dll/win32/msi/events.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/font.c trunk/reactos/dll/win32/msi/format.c trunk/reactos/dll/win32/msi/handle.c trunk/reactos/dll/win32/msi/insert.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rbuild trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msi_main.c trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/msiquery.c trunk/reactos/dll/win32/msi/msiserver.idl trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/query.h trunk/reactos/dll/win32/msi/record.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/select.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/sql.y trunk/reactos/dll/win32/msi/storages.c trunk/reactos/dll/win32/msi/streams.c trunk/reactos/dll/win32/msi/string.c trunk/reactos/dll/win32/msi/suminfo.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/dll/win32/msi/tokenize.c trunk/reactos/dll/win32/msi/update.c trunk/reactos/dll/win32/msi/upgrade.c trunk/reactos/dll/win32/msi/where.c trunk/reactos/include/psdk/msi.h trunk/reactos/include/psdk/msidefs.h trunk/reactos/include/psdk/msiquery.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/alter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/alter.c?rev=… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r… Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… Modified: trunk/reactos/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/classes.c?re… Modified: trunk/reactos/dll/win32/msi/cond.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/cond.tab.c?r… Modified: trunk/reactos/dll/win32/msi/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/create.c?rev… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… Modified: trunk/reactos/dll/win32/msi/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/delete.c?rev… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/distinct.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/distinct.c?r… Modified: trunk/reactos/dll/win32/msi/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/events.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/font.c?rev=5… Modified: trunk/reactos/dll/win32/msi/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/format.c?rev… Modified: trunk/reactos/dll/win32/msi/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/handle.c?rev… Removed: trunk/reactos/dll/win32/msi/helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/helpers.c?re… Modified: trunk/reactos/dll/win32/msi/insert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/insert.c?rev… Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=55… Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… Modified: trunk/reactos/dll/win32/msi/msi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_main.c?r… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/msiquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?r… Added: trunk/reactos/dll/win32/msi/msiserver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.h?… Modified: trunk/reactos/dll/win32/msi/msiserver.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.id… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Added: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=… Removed: trunk/reactos/dll/win32/msi/preview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/preview.c?re… Modified: trunk/reactos/dll/win32/msi/query.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/query.h?rev=… Modified: trunk/reactos/dll/win32/msi/record.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/record.c?rev… Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… Removed: trunk/reactos/dll/win32/msi/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/regsvr.c?rev… Modified: trunk/reactos/dll/win32/msi/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/select.c?rev… Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re… Modified: trunk/reactos/dll/win32/msi/sql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.y?rev=55… Modified: trunk/reactos/dll/win32/msi/storages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/storages.c?r… Modified: trunk/reactos/dll/win32/msi/streams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/streams.c?re… Modified: trunk/reactos/dll/win32/msi/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/string.c?rev… Modified: trunk/reactos/dll/win32/msi/suminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/suminfo.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/dll/win32/msi/tokenize.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/tokenize.c?r… Modified: trunk/reactos/dll/win32/msi/update.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/update.c?rev… Modified: trunk/reactos/dll/win32/msi/upgrade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/upgrade.c?re… Modified: trunk/reactos/dll/win32/msi/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/where.c?rev=… Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=550… Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev… Modified: trunk/reactos/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msiquery.h?re…

1 0

[janderwald] 55045: [USBHUB] - Silence traces
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 17:07:01 2012 New Revision: 55045 URL: http://svn.reactos.org/svn/reactos?rev=55045&view=rev Log: [USBHUB] - Silence traces Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sat Jan 21 17:07:01 2012 @@ -191,7 +191,7 @@ // // Set the real device handle // - DPRINT("UsbdDeviceHandle %x, ChildDeviceHandle %x\n", Urb->UrbHeader.UsbdDeviceHandle, ChildDeviceExtension->UsbDeviceHandle); + //DPRINT("UsbdDeviceHandle %x, ChildDeviceHandle %x\n", Urb->UrbHeader.UsbdDeviceHandle, ChildDeviceExtension->UsbDeviceHandle); Urb->UrbHeader.UsbdDeviceHandle = ChildDeviceExtension->UsbDeviceHandle; Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Sat Jan 21 17:07:01 2012 @@ -155,7 +155,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("Usbhub: DispatchInternalDeviceControl\n"); + //DPRINT1("Usbhub: DispatchInternalDeviceControl\n"); if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) return USBHUB_IrpStub(DeviceObject, Irp); else

1 0

[janderwald] 55044: [HIDCLASS] - Fix typo
by janderwald＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: janderwald Date: Sat Jan 21 17:02:16 2012 New Revision: 55044 URL: http://svn.reactos.org/svn/reactos?rev=55044&view=rev Log: [HIDCLASS] - Fix typo Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Sat Jan 21 17:02:16 2012 @@ -184,8 +184,8 @@ // // single tlc device // - Offset = swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; - Offset += swprintf(&Buffer[Offset], L"HID\\Vix_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; } //

1 0

[rharabien] 55043: [USER32] - Fix loading of MENUEX resources
by rharabien＠svn.reactos.org 21 Jan '12

21 Jan '12

Author: rharabien Date: Sat Jan 21 13:55:09 2012 New Revision: 55043 URL: http://svn.reactos.org/svn/reactos?rev=55043&view=rev Log: [USER32] - Fix loading of MENUEX resources Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sat Jan 21 13:55:09 2012 @@ -2068,14 +2068,15 @@ * Parse an extended menu resource and add items to the menu. * Return a pointer to the end of the resource. */ -static LPCSTR MENUEX_ParseResource( LPCSTR res, HMENU hMenu) +static LPCSTR MENUEX_ParseResource(LPCSTR res, HMENU hMenu) { WORD resinfo; - do { - MENUITEMINFOW mii; - + MENUITEMINFOW mii; + + do + { mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STATE | MIIM_ID | MIIM_FTYPE; + mii.fMask = MIIM_STATE | MIIM_ID | MIIM_TYPE; mii.fType = GET_DWORD(res); res += sizeof(DWORD); mii.fState = GET_DWORD(res); @@ -2086,7 +2087,8 @@ res += sizeof(WORD); /* Align the text on a word boundary. */ res += (~((UINT_PTR)res - 1)) & 1; - mii.dwTypeData = (LPWSTR) res; + mii.dwTypeData = (LPWSTR)res; + mii.cch = strlenW(mii.dwTypeData); res += (1 + strlenW(mii.dwTypeData)) * sizeof(WCHAR); /* Align the following fields on a dword boundary. */ res += (~((UINT_PTR)res - 1)) & 3; @@ -2094,25 +2096,32 @@ TRACE("Menu item: [%08x,%08x,%04x,%04x,%S]\n", mii.fType, mii.fState, mii.wID, resinfo, mii.dwTypeData); - if (resinfo & 1) { /* Pop-up? */ - /* DWORD helpid = GET_DWORD(res); FIXME: use this. */ + if (resinfo & 1) /* Pop-up? */ + { + /* DWORD helpid = GET_DWORD(res); FIXME: use this. */ res += sizeof(DWORD); mii.hSubMenu = CreatePopupMenu(); if (!mii.hSubMenu) + { + ERR("CreatePopupMenu failed\n"); return NULL; - if (!(res = MENUEX_ParseResource(res, mii.hSubMenu))) { + } + + if (!(res = MENUEX_ParseResource(res, mii.hSubMenu))) + { + ERR("MENUEX_ParseResource failed\n"); DestroyMenu(mii.hSubMenu); return NULL; } mii.fMask |= MIIM_SUBMENU; mii.fType |= MF_POPUP; - mii.wID = (UINT) mii.hSubMenu; - } - else if(!*mii.dwTypeData && !(mii.fType & MF_SEPARATOR)) - { + mii.wID = (UINT)mii.hSubMenu; + } + else if (!mii.dwTypeData[0]) mii.fType |= MF_SEPARATOR; - } - InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii); + + if (!InsertMenuItemW(hMenu, -1, MF_BYPOSITION, &mii)) + ERR("InsertMenuItemW failed\n"); } while (!(resinfo & MF_END)); return res; } @@ -4807,7 +4816,7 @@ } return hMenu; default: - DbgPrint("LoadMenuIndirectW(): version %d not supported.\n", version); + ERR("Menu template version %d not supported.\n", version); return 0; } }

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