Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[akhaldi] 74087: [MSI] Sync with Wine Staging 2.2. CORE-12823 fe50dbf msi: Do not sign extend after multiplying. c659222 msi: Fix some spec file entries. 167de42 msi: Make reg_get_{multi}sz() stati...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 5 20:45:25 2017 New Revision: 74087 URL: http://svn.reactos.org/svn/reactos?rev=74087&view=rev Log: [MSI] Sync with Wine Staging 2.2. CORE-12823 fe50dbf msi: Do not sign extend after multiplying. c659222 msi: Fix some spec file entries. 167de42 msi: Make reg_get_{multi}sz() static. f5e4dad msi: Fix handling of NULL buffer in MsiGetProductPropertyW() (Coverity). 3b5b3ef msi: Fix MSIREG_OpenUserComponentsKey and MSIREG_DeleteUpgradeCodesKey for Wow64. 5ac0242 msi: Correctly size packagecode as it's an unsquashed guid. Modified: trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/registry.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -3165,13 +3165,13 @@ MSICOSTTREE_SELFONLY, INSTALLSTATE_LOCAL, &each_cost))) { /* each_cost is in 512-byte units */ - total_cost += each_cost * 512; + total_cost += ((LONGLONG)each_cost) * 512; } if (ERROR_SUCCESS == (MSI_GetFeatureCost(dialog->package, feature, MSICOSTTREE_SELFONLY, INSTALLSTATE_ABSENT, &each_cost))) { /* each_cost is in 512-byte units */ - total_cost -= each_cost * 512; + total_cost -= ((LONGLONG)each_cost) * 512; } } return total_cost; Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=74… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -1084,7 +1084,7 @@ MSIINSTALLCONTEXT context = MSIINSTALLCONTEXT_USERUNMANAGED; UINT r = ERROR_UNKNOWN_PROPERTY; HKEY prodkey, userdata, source; - WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE], packagecode[SQUASHED_GUID_SIZE]; + WCHAR *val = NULL, squashed_pc[SQUASHED_GUID_SIZE], packagecode[GUID_SIZE]; BOOL badconfig = FALSE; LONG res; DWORD type = REG_NONE; @@ -2690,16 +2690,16 @@ if (lstrlenW(val) >= *pccbValue) { - lstrcpynW(szValue, val, *pccbValue); - *pccbValue = lstrlenW(val); + if (szValue) lstrcpynW(szValue, val, *pccbValue); r = ERROR_MORE_DATA; } else { - lstrcpyW(szValue, val); - *pccbValue = lstrlenW(val); + if (szValue) lstrcpyW(szValue, val); r = ERROR_SUCCESS; } + + *pccbValue = lstrlenW(val); done: if (view) @@ -3326,7 +3326,7 @@ return MsiUseFeatureExA(szProduct, szFeature, 0, 0); } -WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) +static WCHAR *reg_get_multisz( HKEY hkey, const WCHAR *name ) { WCHAR *ret; DWORD len, type; @@ -3335,7 +3335,7 @@ return ret; } -WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) +static WCHAR *reg_get_sz( HKEY hkey, const WCHAR *name ) { WCHAR *ret; DWORD len, type; Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.spec [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -7,7 +7,7 @@ 11 stdcall MsiConfigureFeatureA(str str long) 12 stub MsiConfigureFeatureFromDescriptorA 13 stub MsiConfigureFeatureFromDescriptorW -14 stdcall MsiConfigureFeatureW(wstr wstr ptr) +14 stdcall MsiConfigureFeatureW(wstr wstr long) 15 stdcall MsiConfigureProductA(str long long) 16 stdcall MsiConfigureProductW(wstr long long) 17 stdcall MsiCreateRecord(long) @@ -60,10 +60,10 @@ 64 stdcall MsiGetMode(long long) 65 stdcall MsiGetProductCodeA(str str) 66 stdcall MsiGetProductCodeW(wstr wstr) -67 stdcall MsiGetProductInfoA(str str ptr long) +67 stdcall MsiGetProductInfoA(str str ptr ptr) 68 stub MsiGetProductInfoFromScriptA 69 stub MsiGetProductInfoFromScriptW -70 stdcall MsiGetProductInfoW(wstr wstr ptr long) +70 stdcall MsiGetProductInfoW(wstr wstr ptr ptr) 71 stdcall MsiGetProductPropertyA(long str ptr ptr) 72 stdcall MsiGetProductPropertyW(long wstr ptr ptr) 73 stdcall MsiGetPropertyA(ptr str ptr ptr) @@ -82,8 +82,8 @@ 86 stub MsiInstallMissingFileW 87 stdcall MsiInstallProductA(str str) 88 stdcall MsiInstallProductW(wstr wstr) -89 stdcall MsiLocateComponentA(str ptr long) -90 stdcall MsiLocateComponentW(wstr ptr long) +89 stdcall MsiLocateComponentA(str ptr ptr) +90 stdcall MsiLocateComponentW(wstr ptr ptr) 91 stdcall MsiOpenDatabaseA(str str ptr) 92 stdcall MsiOpenDatabaseW(wstr wstr ptr) 93 stdcall MsiOpenPackageA(str ptr) Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -637,6 +637,7 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) { WCHAR squashed_cc[SQUASHED_GUID_SIZE], keypath[0x200]; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; UINT ret; if (!squash_guid( szComponent, squashed_cc)) return ERROR_FUNCTION_FAILED; @@ -651,7 +652,7 @@ strcpyW(keypath, szInstaller_Components); strcatW( keypath, squashed_cc ); - return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); + return RegOpenKeyExW( HKEY_LOCAL_MACHINE, keypath, 0, access, key ); } UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create) @@ -926,14 +927,18 @@ UINT MSIREG_DeleteUpgradeCodesKey( const WCHAR *code ) { - WCHAR squashed_code[SQUASHED_GUID_SIZE], keypath[0x200]; + WCHAR squashed_code[SQUASHED_GUID_SIZE]; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; + HKEY hkey; + LONG ret; if (!squash_guid( code, squashed_code )) return ERROR_FUNCTION_FAILED; TRACE( "%s squashed %s\n", debugstr_w(code), debugstr_w(squashed_code) ); - strcpyW( keypath, szInstaller_UpgradeCodes ); - strcatW( keypath, squashed_code ); - return RegDeleteTreeW( HKEY_LOCAL_MACHINE, keypath ); + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, szInstaller_UpgradeCodes, 0, access, &hkey )) return ERROR_SUCCESS; + ret = RegDeleteTreeW( hkey, squashed_code ); + RegCloseKey( hkey ); + return ret; } UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode) 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 [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 20:45:25 2017 @@ -112,7 +112,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 -reactos/dll/win32/msi # Synced to WineStaging-1.9.23 +reactos/dll/win32/msi # Synced to WineStaging-2.2 reactos/dll/win32/msimg32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msimtf # Synced to WineStaging-1.9.23 reactos/dll/win32/msisip # Synced to WineStaging-1.9.11

7 years, 8 months

[akhaldi] 74086: [RPCRT4_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 5 20:43:17 2017 New Revision: 74086 URL: http://svn.reactos.org/svn/reactos?rev=74086&view=rev Log: [RPCRT4_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Removed: trunk/rostests/winetests/rpcrt4/rpc_protseq.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/rpcrt4/testlist.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Mar 5 20:43:17 2017 @@ -14,7 +14,6 @@ ndr_marshall.c rpc.c rpc_async.c - rpc_protseq.c server.c testlist.c ${CMAKE_CURRENT_BINARY_DIR}/server_c.c @@ -28,7 +27,7 @@ add_executable(rpcrt4_winetest ${SOURCE}) target_link_libraries(rpcrt4_winetest uuid wine ${PSEH_LIB}) set_module_type(rpcrt4_winetest win32cui) -add_importlibs(rpcrt4_winetest ole32 rpcrt4 secur32 msvcrt kernel32 ntdll) +add_importlibs(rpcrt4_winetest oleaut32 ole32 rpcrt4 secur32 advapi32 msvcrt kernel32 ntdll) add_rostests_file(TARGET rpcrt4_winetest) if(NOT MSVC) Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Sun Mar 5 20:43:17 2017 @@ -2,6 +2,7 @@ * Unit test suite for rpc functions * * Copyright 2002 Greg Turner + * Copyright 2008-2009 Robert Shearman * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,7 @@ #include <stdarg.h> #include <stdio.h> +#define COBJMACROS #include <ntstatus.h> #define WIN32_NO_STATUS #include "wine/test.h" @@ -28,6 +30,11 @@ #include <winbase.h> #include <winnt.h> #include <winerror.h> +#include <ole2.h> +#include <oleauto.h> +#include <ntsecapi.h> +#include <initguid.h> +#include <netfw.h> #include "rpc.h" #include "rpcdce.h" @@ -907,11 +914,293 @@ ok(status == RPC_S_UNKNOWN_AUTHN_SERVICE, "status = %x\n", status); } +static void test_RpcServerUseProtseq(void) +{ + RPC_STATUS status; + RPC_BINDING_VECTOR *bindings; + ULONG i; + ULONG binding_count_before; + ULONG binding_count_after1; + ULONG binding_count_after2; + ULONG endpoints_registered = 0; + static unsigned char iptcp[] = "ncacn_ip_tcp"; + static unsigned char np[] = "ncacn_np"; + static unsigned char ncalrpc[] = "ncalrpc"; + BOOL iptcp_registered = FALSE, np_registered = FALSE, ncalrpc_registered = FALSE; + + status = RpcServerInqBindings(&bindings); + if (status == RPC_S_NO_BINDINGS) + binding_count_before = 0; + else + { + binding_count_before = bindings->Count; + ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); + for (i = 0; i < bindings->Count; i++) + { + RPC_CSTR str_bind; + status = RpcBindingToStringBindingA(bindings->BindingH[i], &str_bind); + ok(status == RPC_S_OK, "RpcBindingToStringBinding failed with status %d\n", status); + if (lstrlenA((const char *)str_bind) > 12 && !memcmp(str_bind, "ncacn_ip_tcp", 12)) + iptcp_registered = TRUE; + if (lstrlenA((const char *)str_bind) > 8 && !memcmp(str_bind, "ncacn_np", 8)) + np_registered = TRUE; + if (lstrlenA((const char *)str_bind) > 7 && !memcmp(str_bind, "ncalrpc", 7)) + ncalrpc_registered = TRUE; + RpcStringFreeA(&str_bind); + } + RpcBindingVectorFree(&bindings); + } + + /* show that RpcServerUseProtseqEp(..., NULL, ...) is the same as + * RpcServerUseProtseq(...) */ + status = RpcServerUseProtseqEpA(ncalrpc, 0, NULL, NULL); + ok(status == RPC_S_OK || broken(status == RPC_S_INVALID_ENDPOINT_FORMAT), + "RpcServerUseProtseqEp with NULL endpoint failed with status %d\n", + status); + + /* register protocol sequences without explicit endpoints */ + status = RpcServerUseProtseqA(np, 0, NULL); + if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) + win_skip("ncacn_np not supported\n"); + else + ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); + if (status == RPC_S_OK && !np_registered) endpoints_registered++; + + status = RpcServerUseProtseqA(iptcp, 0, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); + if (status == RPC_S_OK && !iptcp_registered) endpoints_registered++; + + status = RpcServerUseProtseqA(ncalrpc, 0, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); + if (status == RPC_S_OK && !ncalrpc_registered) endpoints_registered++; + + status = RpcServerInqBindings(&bindings); + ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); + binding_count_after1 = bindings->Count; + ok(binding_count_after1 == binding_count_before + endpoints_registered, + "wrong binding count - before: %u, after %u, endpoints registered %u\n", + binding_count_before, binding_count_after1, endpoints_registered); + for (i = 0; i < bindings->Count; i++) + { + RPC_CSTR str_bind; + status = RpcBindingToStringBindingA(bindings->BindingH[i], &str_bind); + ok(status == RPC_S_OK, "RpcBindingToStringBinding failed with status %d\n", status); + trace("string binding: %s\n", str_bind); + RpcStringFreeA(&str_bind); + } + RpcBindingVectorFree(&bindings); + + /* re-register - endpoints should be reused */ + status = RpcServerUseProtseqA(np, 0, NULL); + if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) + win_skip("ncacn_np not supported\n"); + else + ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); + + status = RpcServerUseProtseqA(iptcp, 0, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); + + status = RpcServerUseProtseqA(ncalrpc, 0, NULL); + ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); + + status = RpcServerInqBindings(&bindings); + ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); + binding_count_after2 = bindings->Count; + ok(binding_count_after2 == binding_count_after1, + "bindings should have been re-used - after1: %u after2: %u\n", + binding_count_after1, binding_count_after2); + RpcBindingVectorFree(&bindings); +} + +static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address) +{ + static unsigned char annotation[] = "Test annotation string."; + RPC_STATUS status; + RPC_BINDING_VECTOR *binding_vector; + handle_t handle; + unsigned char *binding; + + status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); + ok(status == RPC_S_OK, "%s: RpcServerRegisterIf failed (%u)\n", protseq, status); + + status = RpcServerInqBindings(&binding_vector); + ok(status == RPC_S_OK, "%s: RpcServerInqBindings failed with error %u\n", protseq, status); + + /* register endpoints created in test_RpcServerUseProtseq */ + status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, annotation); + ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); + /* reregister the same endpoint with no annotation */ + status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, NULL); + ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); + + status = RpcStringBindingComposeA(NULL, protseq, address, + NULL, NULL, &binding); + ok(status == RPC_S_OK, "%s: RpcStringBindingCompose failed (%u)\n", protseq, status); + + status = RpcBindingFromStringBindingA(binding, &handle); + ok(status == RPC_S_OK, "%s: RpcBindingFromStringBinding failed (%u)\n", protseq, status); + + RpcStringFreeA(&binding); + + status = RpcBindingReset(handle); + ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); + + status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); + ok(status == RPC_S_OK || broken(status == RPC_S_SERVER_UNAVAILABLE), /* win9x */ + "%s: RpcEpResolveBinding failed with error %u\n", protseq, status); + + status = RpcBindingReset(handle); + ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); + + status = RpcBindingFree(&handle); + ok(status == RPC_S_OK, "%s: RpcBindingFree failed with error %u\n", protseq, status); + + status = RpcServerUnregisterIf(NULL, NULL, FALSE); + ok(status == RPC_S_OK, "%s: RpcServerUnregisterIf failed (%u)\n", protseq, status); + + status = RpcEpUnregister(IFoo_v0_0_s_ifspec, binding_vector, NULL); + ok(status == RPC_S_OK, "%s: RpcEpUnregisterA failed with error %u\n", protseq, status); + + status = RpcBindingVectorFree(&binding_vector); + ok(status == RPC_S_OK, "%s: RpcBindingVectorFree failed with error %u\n", protseq, status); +} + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'r','p','c','r','t','4','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST( rpc ) { + static unsigned char ncacn_np[] = "ncacn_np"; + static unsigned char ncalrpc[] = "ncalrpc"; + static unsigned char np_address[] = "."; + BOOL firewall_enabled = is_firewall_enabled(); + + if (firewall_enabled && !is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + UuidConversionAndComparison(); TestDceErrorInqText(); - test_rpc_ncacn_ip_tcp(); test_towers(); test_I_RpcMapWin32Status(); test_RpcStringBindingParseA(); @@ -922,4 +1211,21 @@ test_RpcBindingFree(); test_RpcServerInqDefaultPrincName(); test_RpcServerRegisterAuthInfo(); -} + + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + + test_rpc_ncacn_ip_tcp(); + test_RpcServerUseProtseq(); + test_endpoint_mapper(ncacn_np, np_address); + test_endpoint_mapper(ncalrpc, NULL); + + if (firewall_enabled) set_firewall(APP_REMOVE); +} Removed: trunk/rostests/winetests/rpcrt4/rpc_protseq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc_prot… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc_protseq.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc_protseq.c (removed) @@ -1,205 +0,0 @@ -/* - * RPC Protocol Sequence Server Tests - * - * Copyright 2008-2009 Robert Shearman - * - * 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 <stdio.h> - -#include "wine/test.h" -#include <windef.h> -#include <winbase.h> -#include <winnt.h> -#include <winerror.h> - -#include "rpc.h" -#include "rpcdce.h" - -static void test_RpcServerUseProtseq(void) -{ - RPC_STATUS status; - RPC_BINDING_VECTOR *bindings; - ULONG i; - ULONG binding_count_before; - ULONG binding_count_after1; - ULONG binding_count_after2; - ULONG endpoints_registered = 0; - static unsigned char iptcp[] = "ncacn_ip_tcp"; - static unsigned char np[] = "ncacn_np"; - static unsigned char ncalrpc[] = "ncalrpc"; - - status = RpcServerInqBindings(&bindings); - if (status == RPC_S_NO_BINDINGS) - binding_count_before = 0; - else - { - binding_count_before = bindings->Count; - ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); - RpcBindingVectorFree(&bindings); - } - - /* show that RpcServerUseProtseqEp(..., NULL, ...) is the same as - * RpcServerUseProtseq(...) */ - status = RpcServerUseProtseqEpA(ncalrpc, 0, NULL, NULL); - ok(status == RPC_S_OK || broken(status == RPC_S_INVALID_ENDPOINT_FORMAT), - "RpcServerUseProtseqEp with NULL endpoint failed with status %d\n", - status); - - /* register protocol sequences without explicit endpoints */ - status = RpcServerUseProtseqA(np, 0, NULL); - if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) - win_skip("ncacn_np not supported\n"); - else - ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); - if (status == RPC_S_OK) endpoints_registered++; - - status = RpcServerUseProtseqA(iptcp, 0, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); - if (status == RPC_S_OK) endpoints_registered++; - - status = RpcServerUseProtseqA(ncalrpc, 0, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); - if (status == RPC_S_OK) endpoints_registered++; - - status = RpcServerInqBindings(&bindings); - ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); - binding_count_after1 = bindings->Count; - ok(binding_count_after1 == binding_count_before + endpoints_registered, - "wrong binding count - before: %u, after %u, endpoints registered %u\n", - binding_count_before, binding_count_after1, endpoints_registered); - for (i = 0; i < bindings->Count; i++) - { - RPC_CSTR str_bind; - status = RpcBindingToStringBindingA(bindings->BindingH[i], &str_bind); - ok(status == RPC_S_OK, "RpcBindingToStringBinding failed with status %d\n", status); - trace("string binding: %s\n", str_bind); - RpcStringFreeA(&str_bind); - } - RpcBindingVectorFree(&bindings); - - /* re-register - endpoints should be reused */ - status = RpcServerUseProtseqA(np, 0, NULL); - if (status == RPC_S_PROTSEQ_NOT_SUPPORTED) - win_skip("ncacn_np not supported\n"); - else - ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_np) failed with status %d\n", status); - - status = RpcServerUseProtseqA(iptcp, 0, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseq(ncacn_ip_tcp) failed with status %d\n", status); - - status = RpcServerUseProtseqA(ncalrpc, 0, NULL); - ok(status == RPC_S_OK, "RpcServerUseProtseqEp(ncalrpc) failed with status %d\n", status); - - status = RpcServerInqBindings(&bindings); - ok(status == RPC_S_OK, "RpcServerInqBindings failed with status %d\n", status); - binding_count_after2 = bindings->Count; - ok(binding_count_after2 == binding_count_after1, - "bindings should have been re-used - after1: %u after2: %u\n", - binding_count_after1, binding_count_after2); - RpcBindingVectorFree(&bindings); -} - -static RPC_DISPATCH_FUNCTION IFoo_table[] = -{ - 0 -}; - -static RPC_DISPATCH_TABLE IFoo_v0_0_DispatchTable = -{ - 0, - IFoo_table -}; - -static const RPC_SERVER_INTERFACE IFoo___RpcServerInterface = -{ - sizeof(RPC_SERVER_INTERFACE), - {{0x00000000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x34}},{0,0}}, - {{0x8a885d04,0x1ceb,0x11c9,{0x9f,0xe8,0x08,0x00,0x2b,0x10,0x48,0x60}},{2,0}}, - &IFoo_v0_0_DispatchTable, - 0, - 0, - 0, - 0, - 0, -}; - -static RPC_IF_HANDLE IFoo_v0_0_s_ifspec = (RPC_IF_HANDLE)& IFoo___RpcServerInterface; - -static void test_endpoint_mapper(RPC_CSTR protseq, RPC_CSTR address) -{ - static unsigned char annotation[] = "Test annotation string."; - RPC_STATUS status; - RPC_BINDING_VECTOR *binding_vector; - handle_t handle; - unsigned char *binding; - - status = RpcServerRegisterIf(IFoo_v0_0_s_ifspec, NULL, NULL); - ok(status == RPC_S_OK, "%s: RpcServerRegisterIf failed (%u)\n", protseq, status); - - status = RpcServerInqBindings(&binding_vector); - ok(status == RPC_S_OK, "%s: RpcServerInqBindings failed with error %u\n", protseq, status); - - /* register endpoints created in test_RpcServerUseProtseq */ - status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, annotation); - ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); - /* reregister the same endpoint with no annotation */ - status = RpcEpRegisterA(IFoo_v0_0_s_ifspec, binding_vector, NULL, NULL); - ok(status == RPC_S_OK, "%s: RpcEpRegisterA failed with error %u\n", protseq, status); - - status = RpcStringBindingComposeA(NULL, protseq, address, - NULL, NULL, &binding); - ok(status == RPC_S_OK, "%s: RpcStringBindingCompose failed (%u)\n", protseq, status); - - status = RpcBindingFromStringBindingA(binding, &handle); - ok(status == RPC_S_OK, "%s: RpcBindingFromStringBinding failed (%u)\n", protseq, status); - - RpcStringFreeA(&binding); - - status = RpcBindingReset(handle); - ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); - - status = RpcEpResolveBinding(handle, IFoo_v0_0_s_ifspec); - ok(status == RPC_S_OK || broken(status == RPC_S_SERVER_UNAVAILABLE), /* win9x */ - "%s: RpcEpResolveBinding failed with error %u\n", protseq, status); - - status = RpcBindingReset(handle); - ok(status == RPC_S_OK, "%s: RpcBindingReset failed with error %u\n", protseq, status); - - status = RpcBindingFree(&handle); - ok(status == RPC_S_OK, "%s: RpcBindingFree failed with error %u\n", protseq, status); - - status = RpcServerUnregisterIf(NULL, NULL, FALSE); - ok(status == RPC_S_OK, "%s: RpcServerUnregisterIf failed (%u)\n", protseq, status); - - status = RpcEpUnregister(IFoo_v0_0_s_ifspec, binding_vector, NULL); - ok(status == RPC_S_OK, "%s: RpcEpUnregisterA failed with error %u\n", protseq, status); - - status = RpcBindingVectorFree(&binding_vector); - ok(status == RPC_S_OK, "%s: RpcBindingVectorFree failed with error %u\n", protseq, status); -} - -START_TEST( rpc_protseq ) -{ - static unsigned char ncacn_np[] = "ncacn_np"; - static unsigned char ncalrpc[] = "ncalrpc"; - static unsigned char np_address[] = "."; - - test_RpcServerUseProtseq(); - test_endpoint_mapper(ncacn_np, np_address); - test_endpoint_mapper(ncalrpc, NULL); -} Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Sun Mar 5 20:43:17 2017 @@ -18,9 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <windows.h> +#include <ole2.h> +#include <oleauto.h> #include <secext.h> #include <rpcdce.h> +#include <netfw.h> #include "wine/test.h" #include "server_s.h" #include "server_defines.h" @@ -1524,6 +1528,15 @@ } ok(level == RPC_C_AUTHN_LEVEL_PKT_PRIVACY, "level unchanged\n"); ok(authnsvc == RPC_C_AUTHN_WINNT, "authnsvc unchanged\n"); + RpcStringFreeA(&principal); + + status = RpcBindingInqAuthClientA(NULL, &privs, &principal, &level, &authnsvc, NULL); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + RpcStringFreeA(&principal); + + status = RpcBindingInqAuthClientExA(NULL, &privs, &principal, &level, &authnsvc, NULL, 0); + ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); + RpcStringFreeA(&principal); status = RpcImpersonateClient(NULL); ok(status == RPC_S_OK, "expected RPC_S_OK got %u\n", status); @@ -1745,13 +1758,141 @@ } } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'r','p','c','r','t','4','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(server) { ULONG size = 0; int argc; char **argv; + BOOL firewall_enabled = is_firewall_enabled(); InitFunctionPointers(); + + if (firewall_enabled && !is_process_elevated()) + { + trace("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } ok(!GetUserNameExA(NameSamCompatible, NULL, &size), "GetUserNameExA\n"); domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); @@ -1773,7 +1914,20 @@ RpcEndExcept } else + { + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + HeapFree(GetProcessHeap(), 0, domain_and_user); + return; + } + } server(); + if (firewall_enabled) set_firewall(APP_REMOVE); + } HeapFree(GetProcessHeap(), 0, domain_and_user); } Modified: trunk/rostests/winetests/rpcrt4/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/testlist… ============================================================================== --- trunk/rostests/winetests/rpcrt4/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/testlist.c [iso-8859-1] Sun Mar 5 20:43:17 2017 @@ -8,7 +8,6 @@ extern void func_ndr_marshall(void); extern void func_rpc(void); extern void func_rpc_async(void); -extern void func_rpc_protseq(void); extern void func_server(void); const struct test winetest_testlist[] = @@ -18,7 +17,6 @@ { "ndr_marshall", func_ndr_marshall }, { "rpc", func_rpc }, { "rpc_async", func_rpc_async }, - { "rpc_protseq", func_rpc_protseq }, { "server", func_server }, { 0, 0 } };

7 years, 8 months

[akhaldi] 74085: [RPCRT4] Sync with Wine Staging 2.2. CORE-12823 b85c2f7 rpcrt4: Fix some spec file entries. 042b41d rpcrt4: Avoid potential overflow in rpcrt4_protseq_ncacn_np_open_endpoint. c32cd...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Mar 5 20:42:41 2017 New Revision: 74085 URL: http://svn.reactos.org/svn/reactos?rev=74085&view=rev Log: [RPCRT4] Sync with Wine Staging 2.2. CORE-12823 b85c2f7 rpcrt4: Fix some spec file entries. 042b41d rpcrt4: Avoid potential overflow in rpcrt4_protseq_ncacn_np_open_endpoint. c32cd11 rpcrt4: Acquire new credential handle for each connection. da05dfd rpcrt4: Store security package name in rpc_server_registered_auth_info. f8450fa rpcrt4: Handle NULL binding in RpcBindingInqAuthClient{,Ex}. Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -1603,11 +1603,15 @@ RPC_WSTR *ServerPrincName, ULONG *AuthnLevel, ULONG *AuthnSvc, ULONG *AuthzSvc, ULONG Flags ) { - RpcBinding *bind = ClientBinding; + RpcBinding *bind; TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, AuthnSvc, AuthzSvc, Flags); + if (!ClientBinding) ClientBinding = I_RpcGetCurrentCallHandle(); + if (!ClientBinding) return RPC_S_INVALID_BINDING; + + bind = ClientBinding; if (!bind->FromConn) return RPC_S_INVALID_BINDING; return rpcrt4_conn_inquire_auth_client(bind->FromConn, Privs, Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_message.c [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -1047,7 +1047,10 @@ auth_data_in->auth_type, cred, exp, max_token, NULL, &conn->AuthInfo); if (status != RPC_S_OK) + { + FreeCredentialsHandle(&cred); return status; + } /* FIXME: should auth_data_in->auth_context_id be checked in the !start case? */ conn->auth_context_id = auth_data_in->auth_context_id; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -1287,12 +1287,10 @@ struct rpc_server_registered_auth_info { struct list entry; - TimeStamp exp; - BOOL cred_acquired; - CredHandle cred; + USHORT auth_type; + WCHAR *package_name; + WCHAR *principal; ULONG max_token; - USHORT auth_type; - WCHAR *principal; }; static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_buf, SecPkgInfoW **ret) @@ -1331,36 +1329,22 @@ { RPC_STATUS status = RPC_S_UNKNOWN_AUTHN_SERVICE; struct rpc_server_registered_auth_info *auth_info; + SECURITY_STATUS sec_status; EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY(auth_info, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { if (auth_info->auth_type == auth_type) { - if (!auth_info->cred_acquired) + sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, auth_info->package_name, + SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, + cred, exp); + if (sec_status != SEC_E_OK) { - SecPkgInfoW *packages, *package; - SECURITY_STATUS sec_status; - - status = find_security_package(auth_info->auth_type, &packages, &package); - if (status != RPC_S_OK) - break; - - sec_status = AcquireCredentialsHandleW((SEC_WCHAR *)auth_info->principal, package->Name, - SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, - &auth_info->cred, &auth_info->exp); - FreeContextBuffer(packages); - if (sec_status != SEC_E_OK) - { - status = RPC_S_SEC_PKG_ERROR; - break; - } - - auth_info->cred_acquired = TRUE; + status = RPC_S_SEC_PKG_ERROR; + break; } - *cred = auth_info->cred; - *exp = auth_info->exp; *max_token = auth_info->max_token; status = RPC_S_OK; break; @@ -1378,8 +1362,7 @@ EnterCriticalSection(&server_auth_info_cs); LIST_FOR_EACH_ENTRY_SAFE(auth_info, cursor2, &server_registered_auth_info, struct rpc_server_registered_auth_info, entry) { - if (auth_info->cred_acquired) - FreeCredentialsHandle(&auth_info->cred); + HeapFree(GetProcessHeap(), 0, auth_info->package_name); HeapFree(GetProcessHeap(), 0, auth_info->principal); HeapFree(GetProcessHeap(), 0, auth_info); } @@ -1415,6 +1398,7 @@ { struct rpc_server_registered_auth_info *auth_info; SecPkgInfoW *packages, *package; + WCHAR *package_name; ULONG max_token; RPC_STATUS status; @@ -1424,20 +1408,27 @@ if (status != RPC_S_OK) return status; + package_name = RPCRT4_strdupW(package->Name); max_token = package->cbMaxToken; FreeContextBuffer(packages); + if (!package_name) + return RPC_S_OUT_OF_RESOURCES; auth_info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*auth_info)); - if (!auth_info) + if (!auth_info) { + HeapFree(GetProcessHeap(), 0, package_name); return RPC_S_OUT_OF_RESOURCES; + } if (ServerPrincName && !(auth_info->principal = RPCRT4_strdupW(ServerPrincName))) { + HeapFree(GetProcessHeap(), 0, package_name); HeapFree(GetProcessHeap(), 0, auth_info); return RPC_S_OUT_OF_RESOURCES; } + auth_info->auth_type = AuthnSvc; + auth_info->package_name = package_name; auth_info->max_token = max_token; - auth_info->auth_type = AuthnSvc; EnterCriticalSection(&server_auth_info_cs); list_add_tail(&server_registered_auth_info, &auth_info->entry); Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -390,7 +390,7 @@ RPC_STATUS r; LPSTR pname; RpcConnection *Connection; - char generated_endpoint[21]; + char generated_endpoint[26]; if (!endpoint) { Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -118,9 +118,9 @@ 118 stdcall NDRSContextMarshall2(ptr ptr ptr ptr ptr long) 119 stdcall NDRSContextMarshall(ptr ptr ptr) 120 stdcall NDRSContextMarshallEx(ptr ptr ptr ptr) -121 stdcall NDRSContextUnmarshall2(ptr ptr ptr ptr long) -122 stdcall NDRSContextUnmarshall(ptr ptr) -123 stdcall NDRSContextUnmarshallEx(ptr ptr ptr) +121 stdcall NDRSContextUnmarshall2(ptr ptr long ptr long) +122 stdcall NDRSContextUnmarshall(ptr long) +123 stdcall NDRSContextUnmarshallEx(ptr ptr long) 124 stub NDRcopy 125 stdcall NdrAllocate(ptr long) 126 varargs NdrAsyncClientCall(ptr ptr) 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 [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Mar 5 20:42:41 2017 @@ -160,7 +160,7 @@ reactos/dll/win32/resutils # Synced to WineStaging-1.9.11 reactos/dll/win32/riched20 # Synced to WineStaging-1.9.23 reactos/dll/win32/riched32 # Synced to WineStaging-1.9.11 -reactos/dll/win32/rpcrt4 # Synced to WineStaging-1.9.23 +reactos/dll/win32/rpcrt4 # Synced to WineStaging-2.2 reactos/dll/win32/rsabase # Synced to WineStaging-1.9.11 reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.11 reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11

7 years, 8 months

[hbelusca] 74084: [INF]: Disable hdaudbus.inf registration, because the driver currently crashes on the demo laptops Dell Latitude D531.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 5 19:43:33 2017 New Revision: 74084 URL: http://svn.reactos.org/svn/reactos?rev=74084&view=rev Log: [INF]: Disable hdaudbus.inf registration, because the driver currently crashes on the demo laptops Dell Latitude D531. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/media/inf/CMakeLists.txt Modified: branches/ReactOS-0.4.4-CLT2017/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/m… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/media/inf/CMakeLists.txt [iso-8859-1] Sun Mar 5 19:43:33 2017 @@ -13,7 +13,7 @@ fdc.inf flpydisk.inf hal.inf - hdaudbus.inf +# hdaudbus.inf hdc.inf input.inf keyboard.inf

7 years, 8 months

[gadamopoulos] 74083: [UXTHME] Implement drawing themed text with shadows.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Mar 5 19:34:01 2017 New Revision: 74083 URL: http://svn.reactos.org/svn/reactos?rev=74083&view=rev Log: [UXTHME] Implement drawing themed text with shadows. Modified: trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Sun Mar 5 19:34:01 2017 @@ -1617,6 +1617,9 @@ return E_NOTIMPL; } +typedef int (WINAPI * DRAWSHADOWTEXT)(HDC hdc, LPCWSTR pszText, UINT cch, RECT *prc, DWORD dwFlags, + COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset); + /*********************************************************************** * DrawThemeText (UXTHEME.@) */ @@ -1630,34 +1633,89 @@ LOGFONTW logfont; COLORREF textColor; COLORREF oldTextColor; + COLORREF shadowColor; + POINT ptShadowOffset; int oldBkMode; RECT rt; - + int iShadowType; + TRACE("%d %d: stub\n", iPartId, iStateId); if(!hTheme) return E_HANDLE; - + hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr)) + { hFont = CreateFontIndirectW(&logfont); if(!hFont) - TRACE("Failed to create font\n"); - } + { + ERR("Failed to create font\n"); + } + } + CopyRect(&rt, pRect); if(hFont) oldFont = SelectObject(hdc, hFont); - + + oldBkMode = SetBkMode(hdc, TRANSPARENT); + if(dwTextFlags2 & DTT_GRAYED) textColor = GetSysColor(COLOR_GRAYTEXT); else { if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTCOLOR, &textColor))) textColor = GetTextColor(hdc); } + + hr = GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_TEXTSHADOWTYPE, &iShadowType); + if (SUCCEEDED(hr)) + { + ERR("Got shadow type %d\n", iShadowType); + + hr = GetThemeColor(hTheme, iPartId, iStateId, TMT_TEXTSHADOWCOLOR, &shadowColor); + if (FAILED(hr)) + { + ERR("GetThemeColor failed\n"); + } + + hr = GetThemePosition(hTheme, iPartId, iStateId, TMT_TEXTSHADOWOFFSET, &ptShadowOffset); + if (FAILED(hr)) + { + ERR("GetThemePosition failed\n"); + } + + if (iShadowType == TST_SINGLE) + { + oldTextColor = SetTextColor(hdc, shadowColor); + OffsetRect(&rt, ptShadowOffset.x, ptShadowOffset.y); + DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + OffsetRect(&rt, -ptShadowOffset.x, -ptShadowOffset.y); + SetTextColor(hdc, oldTextColor); + } + else if (iShadowType == TST_CONTINUOUS) + { + HANDLE hcomctl32 = GetModuleHandleW(L"comctl32.dll"); + DRAWSHADOWTEXT pDrawShadowText; + if (!hcomctl32) + { + hcomctl32 = LoadLibraryW(L"comctl32.dll"); + if (!hcomctl32) + ERR("Failed to load comctl32\n"); + } + + pDrawShadowText = (DRAWSHADOWTEXT)GetProcAddress(hcomctl32, "DrawShadowText"); + if (pDrawShadowText) + { + pDrawShadowText(hdc, pszText, iCharCount, &rt, dwTextFlags, textColor, shadowColor, ptShadowOffset.x, ptShadowOffset.y); + goto cleanup; + } + } + } + oldTextColor = SetTextColor(hdc, textColor); - oldBkMode = SetBkMode(hdc, TRANSPARENT); DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + SetTextColor(hdc, oldTextColor); +cleanup: SetBkMode(hdc, oldBkMode); - SetTextColor(hdc, oldTextColor); if(hFont) { SelectObject(hdc, oldFont); Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sun Mar 5 19:34:01 2017 @@ -136,7 +136,7 @@ oldTextColor = SetTextColor(hdc, textColor); oldBkMode = SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, pszText, iCharCount, &rt, dwTextFlags); + DrawThemeText(hTheme, hdc, iPartId, iStateId, pszText, iCharCount, dwTextFlags, dwTextFlags, pRect); SetBkMode(hdc, oldBkMode); SetTextColor(hdc, oldTextColor);

7 years, 8 months

[hbelusca] 74082: [FREELDR]: HACK: Manually reduce the size of the temporary heap from 32MB down to 10MB, because, in some situations (e.g. Bochs, or real HW, see CORE-12694), FreeLDR fails when cr...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 5 17:03:57 2017 New Revision: 74082 URL: http://svn.reactos.org/svn/reactos?rev=74082&view=rev Log: [FREELDR]: HACK: Manually reduce the size of the temporary heap from 32MB down to 10MB, because, in some situations (e.g. Bochs, or real HW, see CORE-12694), FreeLDR fails when creating the temporary heap with an "out of memory" error. See also r73653 for other details. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/freeldr/freeldr/include/mm.h Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Sun Mar 5 17:03:57 2017 @@ -121,7 +121,7 @@ /* Heap */ #define DEFAULT_HEAP_SIZE (1024 * 1024) -#define TEMP_HEAP_SIZE (32 * 1024 * 1024) +#define TEMP_HEAP_SIZE (10 * 1024 * 1024) extern PVOID FrLdrDefaultHeap; extern PVOID FrLdrTempHeap;

7 years, 8 months

[hbelusca] 74081: [BOOTDATA][FREELDR] - By default, boot the livecd without the kernel debugger enabled, but... - ... augment the FreeLdr "Debugging Mode" option with serial+screen debug ports, so ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 5 17:01:37 2017 New Revision: 74081 URL: http://svn.reactos.org/svn/reactos?rev=74081&view=rev Log: [BOOTDATA][FREELDR] - By default, boot the livecd without the kernel debugger enabled, but... - ... augment the FreeLdr "Debugging Mode" option with serial+screen debug ports, so that, if someone wants to run ReactOS with the kernel debugger on real hardware, without serial port, (s)he still can do it and see the debug output. I do that, until FreeLdr can support run-time editing boot options of existing boot menu entries. Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/freeldr/freeldr/options.c Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Sun Mar 5 17:01:37 2017 @@ -277,5 +277,9 @@ strcat(BootOptions, " /BASEVIDEO"); if (DebuggingMode) +#if 0 strcat(BootOptions, " /DEBUG"); +#else + strcat(BootOptions, " /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /DEBUGPORT=SCREEN /SOS"); +#endif }

7 years, 8 months

[hbelusca] 74080: [BOOTDATA] - Add user-friendly boot menu. [README] - Update the ReadMe.txt for CLT 2017. [WELCOME] - Add the welcome.exe localized customizations for CLT 2017. [VERSION] - Adjust ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 5 16:58:55 2017 New Revision: 74080 URL: http://svn.reactos.org/svn/reactos?rev=74080&view=rev Log: [BOOTDATA] - Add user-friendly boot menu. [README] - Update the ReadMe.txt for CLT 2017. [WELCOME] - Add the welcome.exe localized customizations for CLT 2017. [VERSION] - Adjust version to 0.4.4 CLT 2017. Added: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/de-DE.ini (with props) branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/en-US.ini (with props) Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/hybridcd.ini branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/readme.txt branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/reactos/version.cmake Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/hybridcd.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/hybridcd.ini [iso-8859-1] Sun Mar 5 16:58:55 2017 @@ -1,9 +1,9 @@ [FREELOADER] -DefaultOS=Setup -TimeOut=5 +DefaultOS=LiveCD_RamDisk +TimeOut=20 [Display] -TitleText=ReactOS Hybrid-CD +TitleText=ReactOS 0.4.4 for CLT 2017 StatusBarColor=Cyan StatusBarTextColor=Black BackdropTextColor=White @@ -13,62 +13,33 @@ TitleBoxColor=Red MessageBoxTextColor=White MessageBoxColor=Blue -MenuTextColor=Gray -MenuColor=Black -TextColor=Gray +MenuTextColor=White +MenuColor=Blue +TextColor=Yellow SelectedTextColor=Black SelectedColor=Gray -ShowTime=No -MenuBox=No -CenterMenu=No -MinimalUI=Yes -TimeText=Seconds until highlighted choice will be started automatically: +SpecialEffects=Yes [Operating Systems] -Setup="Setup" -LiveCD="LiveCD" -LiveCD_Debug="LiveCD (Debug)" -LiveCD_Screen="LiveCD (Screen)" -LiveCD_LogFile="LiveCD (Log file)" -LiveCD_RamDisk="LiveCD in RAM" -LiveCD_RamDisk_Debug="LiveCD in RAM (Debug)" -LiveCD_RamDisk_Screen="LiveCD in RAM (Screen)" +Setup="ReactOS Setup" +LiveCD="ReactOS Live" +LiveCD_RamDisk="ReactOS Live in RAM" +HddBoot="Boot from first hard disk" [Setup] BootType=ReactOSSetup -SystemPath=\bootcd +SystemPath=\setup [LiveCD] BootType=Windows2003 -SystemPath=\livecd\reactos +SystemPath=\reactos Options=/MININT - -[LiveCD_Debug] -BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT - -[LiveCD_Screen] -BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT - -[LiveCD_LogFile] -BootType=Windows2003 -SystemPath=\livecd\reactos -Options=/DEBUG /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log /SOS /MININT [LiveCD_RamDisk] BootType=Windows2003 SystemPath=ramdisk(0)\reactos -Options=/MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD +Options=/MININT /RDPATH=livecd.iso /RDEXPORTASCD -[LiveCD_RamDisk_Debug] -BootType=Windows2003 -SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD - -[LiveCD_RamDisk_Screen] -BootType=Windows2003 -SystemPath=ramdisk(0)\reactos -Options=/DEBUG /DEBUGPORT=SCREEN /SOS /MININT /RDPATH=livecd\livecd.iso /RDEXPORTASCD +[HddBoot] +BootType=Drive +BootDrive=hd0 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/readme.txt [iso-8859-1] Sun Mar 5 16:58:55 2017 @@ -1,7 +1,30 @@ -======================== -ReactOS Version 0.4.x -Updated August 31, 2016 -======================== +================================================================================ +ReactOS Version 0.4.4 +für die Chemnitzer Linux-Tage 2017 +================================================================================ + +Willkommen zu ReactOS! + +0. CD-ROM Inhalt +---------------- + +* ReactOS Live-System/Installation +* ReactOS in einer virtuellen QEMU-Maschine +* ReactOS Build Environment (RosBE) +* Quellcode + +Diese CD-ROM sollte unter Windows ein AutoRun-Programm starten. Alternativ +können Sie sich den CD-ROM Inhalt über einen Dateibrowser anschauen. +Die Ordnernamen sollten selbsterklärend sein. + +Der gesamte Quellcode des Betriebssystems lässt sich unter Einsatz des +ReactOS Build Environments sowohl unter Windows als auch unter +Unix-ähnlichen Betriebssystemen wie Linux kompilieren. + +Weitere Informationen über ReactOS finden Sie unter www.reactos.org! + +================================================================================ + 1. What is ReactOS? ------------------- Added: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/de-DE.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/de-DE.ini (added) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/de-DE.ini [iso-8859-1] Sun Mar 5 16:58:55 2017 @@ -0,0 +1,47 @@ + +[Defaults] +AppTitle = "ReactOS 0.4.4 fÃ¼r CLT 2017" +DefaultTopicTitle = "ReactOS" +DefaultTopicDescription = "ReactOS ist ein modernes Open-Source-Betriebssystem, welches auf dem Design von WindowsÂ® XP/2003 basiert. Dazu gehÃ¶rt sowohl die volle KompatibilitÃ¤t mit Windows-Anwendungen und -Treibern als auch eine Ã¤hnliche BenutzeroberflÃ¤che, damit sich die meisten Anwender sofort zurechtfinden. Der Quellcode des gesamten Systems ist frei verfÃ¼gbar und steht grÃ¶Ãtenteils unter der GNU General Public License." + +[Topic0] +Button = "ReactOS installieren" +Title = "ReactOS installieren" +Description = "Installiert ReactOS auf ihrem Computer.\n\nBitte beachten Sie, dass Sie Ihren Computer mit der ReactOS-CD im Laufwerk neu starten mÃ¼ssen, um die Installation zu starten.\n\nAlternativ kÃ¶nnen Sie ReactOS problemlos in einer virtuellen QEMU-Maschine ausprobieren, wenn Sie den entsprechenden MenÃ¼punkt auf der linken Seite wÃ¤hlen." +Action = "<msg>Sie mÃ¼ssen Ihren Computer mit der ReactOS-CD im Laufwerk neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten enthÃ¤lt!" + +[Topic1] +Button = "ReactOS in QEMU ausprobieren" +Title = "ReactOS in QEMU ausprobieren" +Description = "MÃ¶glicherweise mÃ¶chten Sie ein Betriebssystem im Alpha-Stadium nicht auf Ihrem eigenen Computer testen oder es gibt Probleme bei der Installation. Daher haben wir ReactOS auf einer virtuellen QEMU-Maschine vorinstalliert, mit der Sie das Betriebssystem problemlos testen kÃ¶nnen, ohne dass es direkt auf Ihrem Computer installiert werden muss.\n\nEin Klick auf diesen MenÃ¼punkt Ã¶ffnet das QEMU-Paket in 7-Zip." +Action = "\extras\ReactOS on QEMU\ReactOS-044-CLT2017-QEMU.7z" + +[Topic2] +Button = "ReactOS Build Environment installieren" +Title = "ReactOS Build Environment installieren" +Description = "Damit ReactOS so einfach wie mÃ¶glich kompiliert werden kann, wurde das ReactOS Build Environment geschaffen. Dieses enthÃ¤lt die passenden Compiler-Versionen und alle nÃ¶tigen Tools, um den gesamten ReactOS-Quellcode zu kompilieren.\n\nDie Windows-Version des Build Environments ist kompatibel mit Windows XP oder neueren Versionen. Sie wird Ã¼ber diesen MenÃ¼punkt installiert.\nDie CD enthÃ¤lt auch das Build Environment fÃ¼r Unix-Ã¤hnliche Betriebssysteme, wie z.B. Linux oder Mac OS X.\n\nZusÃ¤tzlich befindet sich auf dieser CD der Quellcode dieser ReactOS-Version." +Action = "\extras\ReactOS Build Environment\RosBE-2.1.3.exe" + +[Topic3] +Button = "ReactOS-Quellcodepaket Ã¶ffnen" +Title = "ReactOS-Quellcodepaket Ã¶ffnen" +Description = "Die CD enthÃ¤lt auch den gesamten Quellcode dieser ReactOS-Version, welcher mit dem ReactOS Build Environment kompiliert werden kann.\n\nEin Klick auf diesen MenÃ¼punkt Ã¶ffnet ihn in 7-Zip." +Action = "\extras\ReactOS Source Code\ReactOS-044-CLT2017-Source.7z" + +[Topic4] +Button = "Die ReactOS-Website besuchen" +Title = "Die ReactOS-Website besuchen" +Description = "Die ReactOS-Website liefert viele weitere Informationen Ã¼ber das Projekt. Hier finden Sie die neusten ReactOS-Versionen und Neuigkeiten bezÃ¼glich der Entwicklung." +Action = "https://www.reactos.org/" + +[Topic5] +Button = "Die CD durchsuchen" +Title = "Die CD durchsuchen" +Description = "Durchsuchen Sie den Inhalt dieser CD." +Action = "explorer.exe" + +[Topic6] +Button = "Beenden" +Title = "Beenden" +Description = "Beendet das AutoRun-Programm." +Action = "<exit>" Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/de-DE.ini ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/en-US.ini URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/en-US.ini (added) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/en-US.ini [iso-8859-1] Sun Mar 5 16:58:55 2017 @@ -0,0 +1,47 @@ + +[Defaults] +AppTitle = "ReactOS 0.4.4 for CLT 2017" +DefaultTopicTitle = "ReactOS" +DefaultTopicDescription = "ReactOS is a modern open source operating system based on the design of WindowsÂ® XP/2003. This encompasses full compatibility with Windows applications and drivers as well as a familiar user interface, such that people accustomed to Windows would find using ReactOS straightforward. The source code of the entire system is available for free under several open source licenses, mostly the GNU General Public License." + +[Topic0] +Button = "Install ReactOS" +Title = "Install ReactOS" +Description = "Installs ReactOS on your computer.\n\nPlease note that you have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nAlternatively, you can easily try out ReactOS in a QEMU virtual machine by choosing the respective menu entry on the left side." +Action = "<msg>You have to restart your computer with the ReactOS CD in the drive to start the installation.\n\nPLEASE NOTE: You're highly advised to not install ReactOS on a computer that contains important data!" + +[Topic1] +Button = "Try out ReactOS in QEMU" +Title = "Try out ReactOS in QEMU" +Description = "Perhaps you don't want to try out an alpha-stage operating system on your own computer or you face problems during the installation. For these cases, we have preinstalled ReactOS on a QEMU virtual machine. This way, you can try out the operating system without needing to install it on your computer.\n\nA click on this menu entry opens the QEMU package in 7-Zip." +Action = "\extras\ReactOS on QEMU\ReactOS-044-CLT2017-QEMU.7z" + +[Topic2] +Button = "Install ReactOS Build Environment" +Title = "Install ReactOS Build Environment" +Description = "To make building ReactOS as easy as possible, the ReactOS Build Environment has been created. This contains the right compiler versions and all needed tools to compile the entire ReactOS Source Code.\n\nThe Windows version of the Build Environment is compatible with Windows XP or newer versions. It is installed using this menu entry.\n\nAdditionally, the source code of this ReactOS version is included on this CD." +Action = "\extras\ReactOS Build Environment\RosBE-2.1.3.exe" + +[Topic3] +Button = "Open the ReactOS Source Code Package" +Title = "Open the ReactOS Source Code Package" +Description = "The CD also contains the entire source code of this ReactOS version, which can be compiled using the ReactOS Build Environment.\n\nA click on this menu entry opens it in 7-Zip." +Action = "\extras\ReactOS Source Code\ReactOS-044-CLT2017-Source.7z" + +[Topic4] +Button = "Visit the ReactOS Website" +Title = "Visit the ReactOS Website" +Description = "The ReactOS Website offers many more information about the project. Here you find the latest ReactOS releases and news regarding the development." +Action = "https://www.reactos.org/" + +[Topic5] +Button = "Browse the CD" +Title = "Browse the CD" +Description = "Browse the contents of this CD." +Action = "explorer.exe" + +[Topic6] +Button = "Exit" +Title = "Exit" +Description = "Exits the AutoRun program." +Action = "<exit>" Propchange: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/welcome_config/en-US.ini ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Sun Mar 5 16:58:55 2017 @@ -17,15 +17,15 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "5") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "4") +set(KERNEL_VERSION_PATCH_LEVEL "4") set(COPYRIGHT_YEAR "2017") # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "") +set(KERNEL_VERSION_RELEASE_TYPE "CLT2017") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

7 years, 8 months

[hbelusca] 74079: [BOOTDATA] - Flatten out the ISO layout for hybridcd (otherwise some problems appear for the livecd: see r66114 for more details).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 5 16:38:33 2017 New Revision: 74079 URL: http://svn.reactos.org/svn/reactos?rev=74079&view=rev Log: [BOOTDATA] - Flatten out the ISO layout for hybridcd (otherwise some problems appear for the livecd: see r66114 for more details). Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/CMakeLists.txt branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/CMakeLists.txt branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/autorun-hybridcd.inf branches/ReactOS-0.4.4-CLT2017/reactos/sdk/cmake/CMakeMacros.cmake Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/CMakeLists.txt [iso-8859-1] Sun Mar 5 16:38:33 2017 @@ -131,32 +131,32 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "${CMAKE_CURRENT_BINARY_DIR}/empty\n") # Create the empty Desktop, Favorites, and Start Menu folders. And many more. -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") -file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "livecd/Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Documents/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Documents/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Documents/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/My Documents=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/All Users/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Cookies=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Desktop=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Favorites=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local Settings/Application Data=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local Settings/History=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Local Settings/Temporary Internet Files=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My Music=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My Pictures=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/My Videos=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/NetHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/PrintHood=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Recent=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/SendTo=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start Menu/Programs=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start Menu/Programs/Administrative Tools=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Start Menu/Programs/StartUp=${CMAKE_CURRENT_BINARY_DIR}/empty\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/hybridcd.lst "Profiles/Default User/Templates=${CMAKE_CURRENT_BINARY_DIR}/empty\n") add_custom_target(hybridcd COMMAND native-mkisofs -quiet -o ${REACTOS_BINARY_DIR}/hybridcd.iso -iso-level 4 Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun Mar 5 16:38:33 2017 @@ -32,7 +32,7 @@ # Welcome.exe optional custom configuration (only for HybridCD) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/) # Copy the main configuration file - add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/welcome.ini DESTINATION bootcd/reactos NO_CAB FOR hybridcd) + add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/welcome.ini DESTINATION setup/reactos NO_CAB FOR hybridcd) # Convert the translation files (name format: xx-YY.ini) into UTF-16 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/welcome_config) @@ -43,7 +43,7 @@ add_custom_command(OUTPUT "${_converted_file}" COMMAND native-utf16le "${_source_file}" "${_converted_file}" DEPENDS native-utf16le "${_source_file}") - add_cd_file(TARGET converted_welcome_i18n_files FILE ${_converted_file} DESTINATION bootcd/reactos/welcome NO_CAB NAME_ON_CD ${_file} FOR hybridcd) + add_cd_file(TARGET converted_welcome_i18n_files FILE ${_converted_file} DESTINATION setup/reactos/welcome NO_CAB NAME_ON_CD ${_file} FOR hybridcd) list(APPEND _converted_welcome_i18n_files ${_converted_file}) endforeach(_file) add_custom_target(converted_welcome_i18n_files DEPENDS ${_converted_welcome_i18n_files}) Modified: branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/autorun-hybridcd.inf URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/b… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/autorun-hybridcd.inf [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/boot/bootdata/autorun-hybridcd.inf [iso-8859-1] Sun Mar 5 16:38:33 2017 @@ -1,3 +1,3 @@ [autorun] -open=bootcd\reactos\welcome.exe +open=setup\reactos\welcome.exe icon=icon.ico Modified: branches/ReactOS-0.4.4-CLT2017/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-CLT2017/reactos/s… ============================================================================== --- branches/ReactOS-0.4.4-CLT2017/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/ReactOS-0.4.4-CLT2017/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Sun Mar 5 16:38:33 2017 @@ -318,7 +318,7 @@ set_property(GLOBAL APPEND PROPERTY BOOTCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") # add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "bootcd/${_CD_DESTINATION}/${__file}=${item}") + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "setup/${_CD_DESTINATION}/${__file}=${item}") endif() endforeach() # manage dependency @@ -357,7 +357,7 @@ set_property(GLOBAL APPEND PROPERTY LIVECD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") # add it also into the hybridcd if not specified otherwise if(NOT _CD_NOT_IN_HYBRIDCD) - set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "livecd/${_CD_DESTINATION}/${__file}=${item}") + set_property(GLOBAL APPEND PROPERTY HYBRIDCD_FILE_LIST "${_CD_DESTINATION}/${__file}=${item}") endif() endforeach() endif() #end livecd @@ -437,7 +437,7 @@ add_cd_file( FILE ${CMAKE_CURRENT_BINARY_DIR}/livecd.iso - DESTINATION livecd + DESTINATION root FOR hybridcd) get_property(_filelist GLOBAL PROPERTY BOOTCD_FILE_LIST)

7 years, 8 months

[hbelusca] 74078: Time is passing fast, and CLT 2017 is already coming! Branch for its release.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Mar 5 16:02:45 2017 New Revision: 74078 URL: http://svn.reactos.org/svn/reactos?rev=74078&view=rev Log: Time is passing fast, and CLT 2017 is already coming! Branch for its release. Added: branches/ReactOS-0.4.4-CLT2017/ (props changed) - copied from r74077, trunk/ Propchange: branches/ReactOS-0.4.4-CLT2017/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Mar 5 16:02:45 2017 @@ -0,0 +1 @@ +/branches/colins-printing-for-freedom:67543-68405,68407-68414,68417-70595

7 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2017