Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[akhaldi] 61238: [RPCRT4_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 6 23:30:49 2013 New Revision: 61238 URL: http://svn.reactos.org/svn/reactos?rev=61238&view=rev Log: [RPCRT4_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/testlist.c Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… ============================================================================== --- trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] Fri Dec 6 23:30:49 2013 @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - #define _WIN32_WINNT 0x0500 #define NTDDI_WIN2K 0x05000000 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */ + +#include <stdarg.h> #include "wine/test.h" #include <windef.h> 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] Fri Dec 6 23:30:49 2013 @@ -28,10 +28,12 @@ #include <winbase.h> #include <winnt.h> #include <winerror.h> -#include <ntsecapi.h> #include "rpc.h" #include "rpcdce.h" +#include "secext.h" + +typedef long NTSTATUS; typedef unsigned int unsigned32; typedef struct twr_t @@ -814,6 +816,7 @@ if (version == 1) { UUID guid2; + char buf[39]; if (!ret) { @@ -821,7 +824,8 @@ * address in the uuid: */ ok(!(guid1.Data4[2] & 0x01), - "GUID does not appear to contain a MAC address\n"); + "GUID does not appear to contain a MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid1)); } else { @@ -829,7 +833,8 @@ * address in the uuid: */ ok((guid1.Data4[2] & 0x01), - "GUID does not appear to contain a multicast MAC address\n"); + "GUID does not appear to contain a multicast MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid1)); } /* Generate another GUID, and make sure its MAC address matches the * first. @@ -840,7 +845,8 @@ version = (guid2.Data3 & 0xf000) >> 12; ok(version == 1, "unexpected version %d\n", version); ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), - "unexpected value in MAC address\n"); + "unexpected value in MAC address: %s\n", + printGuid(buf, sizeof(buf), &guid2)); } } @@ -853,6 +859,59 @@ ok(status == RPC_S_INVALID_BINDING, "RpcBindingFree should have returned RPC_S_INVALID_BINDING instead of %d\n", status); +} + +static void test_RpcServerInqDefaultPrincName(void) +{ + RPC_STATUS ret; + RPC_CSTR principal, saved_principal; + BOOLEAN (WINAPI *pGetUserNameExA)(EXTENDED_NAME_FORMAT,LPSTR,PULONG); + char *username; + ULONG len = 0; + + pGetUserNameExA = (void *)GetProcAddress( LoadLibraryA("secur32.dll"), "GetUserNameExA" ); + if (!pGetUserNameExA) + { + win_skip( "GetUserNameExA not exported\n" ); + return; + } + pGetUserNameExA( NameSamCompatible, NULL, &len ); + username = HeapAlloc( GetProcessHeap(), 0, len ); + pGetUserNameExA( NameSamCompatible, username, &len ); + + ret = RpcServerInqDefaultPrincNameA( 0, NULL ); + ok( ret == RPC_S_UNKNOWN_AUTHN_SERVICE, "got %u\n", ret ); + + ret = RpcServerInqDefaultPrincNameA( RPC_C_AUTHN_DEFAULT, NULL ); + ok( ret == RPC_S_UNKNOWN_AUTHN_SERVICE, "got %u\n", ret ); + + principal = (RPC_CSTR)0xdeadbeef; + ret = RpcServerInqDefaultPrincNameA( RPC_C_AUTHN_DEFAULT, &principal ); + ok( ret == RPC_S_UNKNOWN_AUTHN_SERVICE, "got %u\n", ret ); + ok( principal == (RPC_CSTR)0xdeadbeef, "got unexpected principal\n" ); + + saved_principal = (RPC_CSTR)0xdeadbeef; + ret = RpcServerInqDefaultPrincNameA( RPC_C_AUTHN_WINNT, &saved_principal ); + ok( ret == RPC_S_OK, "got %u\n", ret ); + ok( saved_principal != (RPC_CSTR)0xdeadbeef, "expected valid principal\n" ); + ok( !strcmp( (const char *)saved_principal, username ), "got \'%s\'\n", saved_principal ); + trace("%s\n", saved_principal); + + ret = RpcServerRegisterAuthInfoA( (RPC_CSTR)"wine\\test", RPC_C_AUTHN_WINNT, NULL, NULL ); + ok( ret == RPC_S_OK, "got %u\n", ret ); + + principal = (RPC_CSTR)0xdeadbeef; + ret = RpcServerInqDefaultPrincNameA( RPC_C_AUTHN_WINNT, &principal ); + ok( ret == RPC_S_OK, "got %u\n", ret ); + ok( principal != (RPC_CSTR)0xdeadbeef, "expected valid principal\n" ); + ok( !strcmp( (const char *)principal, username ), "got \'%s\'\n", principal ); + RpcStringFree( &principal ); + + ret = RpcServerRegisterAuthInfoA( saved_principal, RPC_C_AUTHN_WINNT, NULL, NULL ); + ok( ret == RPC_S_OK, "got %u\n", ret ); + + RpcStringFree( &saved_principal ); + HeapFree( GetProcessHeap(), 0, username ); } START_TEST( rpc ) @@ -868,4 +927,5 @@ test_UuidCreate(); test_UuidCreateSequential(); test_RpcBindingFree(); -} + test_RpcServerInqDefaultPrincName(); +} 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] Fri Dec 6 23:30:49 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_cstub(void); extern void func_generated(void);

11 years

[akhaldi] 61237: [RPCRT4] * Sync with Wine 1.7.1. [PSDK] * Update rpcdce.h, rpcdcep.h and rpcndr.h. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 6 23:26:11 2013 New Revision: 61237 URL: http://svn.reactos.org/svn/reactos?rev=61237&view=rev Log: [RPCRT4] * Sync with Wine 1.7.1. [PSDK] * Update rpcdce.h, rpcdcep.h and rpcndr.h. CORE-7469 Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/ndr_es.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h 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/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff trunk/reactos/include/psdk/rpcdce.h trunk/reactos/include/psdk/rpcdcep.h trunk/reactos/include/psdk/rpcndr.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/cstub.c [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -375,7 +375,7 @@ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IRpcStubBuffer, riid)) { - IUnknown_AddRef(iface); + IRpcStubBuffer_AddRef(iface); *obj = iface; return S_OK; } Modified: trunk/reactos/dll/win32/rpcrt4/ndr_es.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_es.c?… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_es.c [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -351,9 +351,9 @@ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; - stack_size = pProcHeader->stack_size; - pEsMsg->ProcNumber = pProcHeader->proc_num; + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + stack_size = header_rpc->stack_size; + pEsMsg->ProcNumber = header_rpc->proc_num; pFormat += sizeof(NDR_PROC_HEADER_RPC); } else Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -1179,7 +1179,8 @@ while (pFormat[0] != RPC_FC_END) { switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; @@ -1259,7 +1260,8 @@ TRACE("pFormat[0] = 0x%x\n", pFormat[0]); switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; @@ -1333,7 +1335,8 @@ while (pFormat[0] != RPC_FC_END) { switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; @@ -1405,7 +1408,8 @@ while (pFormat[0] != RPC_FC_END) { switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; @@ -1463,7 +1467,8 @@ while (pFormat[0] != RPC_FC_END) { switch (pFormat[0]) { default: - FIXME("unknown repeat type %d\n", pFormat[0]); + FIXME("unknown repeat type %d; assuming no repeat\n", pFormat[0]); + /* fallthrough */ case RPC_FC_NO_REPEAT: rep = 1; stride = 0; Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -152,6 +152,15 @@ DWORD size; switch(*pFormat) { + case RPC_FC_RP: + if (pFormat[1] & RPC_FC_P_SIMPLEPOINTER) + { + FIXME("Simple reference pointer (type %#x).\n", pFormat[2]); + size = sizeof(void *); + break; + } + size = calc_arg_size(pStubMsg, &pFormat[2] + *(const SHORT*)&pFormat[2]); + break; case RPC_FC_STRUCT: case RPC_FC_PSTRUCT: size = *(const WORD*)(pFormat + 2); @@ -206,7 +215,7 @@ default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */ - case RPC_FC_RP: + case RPC_FC_IP: size = sizeof(void *); break; } @@ -620,9 +629,9 @@ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; - stack_size = pProcHeader->stack_size; - procedure_number = pProcHeader->proc_num; + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + stack_size = header_rpc->stack_size; + procedure_number = header_rpc->proc_num; pFormat += sizeof(NDR_PROC_HEADER_RPC); } else @@ -809,7 +818,7 @@ } } - /* convert strings, floating point values and endianess into our + /* convert strings, floating point values and endianness into our * preferred format */ if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) NdrConvert(&stubMsg, pFormat); @@ -847,7 +856,7 @@ if (comm_fault_offsets->FaultOffset == -1) fault_status = (ULONG *)&RetVal; else if (comm_fault_offsets->FaultOffset >= 0) - fault_status = *(ULONG **)ARG_FROM_OFFSET(stubMsg.StackTop, comm_fault_offsets->CommOffset); + fault_status = *(ULONG **)ARG_FROM_OFFSET(stubMsg.StackTop, comm_fault_offsets->FaultOffset); else fault_status = NULL; @@ -1226,8 +1235,8 @@ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; - stack_size = pProcHeader->stack_size; + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + stack_size = header_rpc->stack_size; pFormat += sizeof(NDR_PROC_HEADER_RPC); } @@ -1341,7 +1350,7 @@ NdrCorrCache, sizeof(NdrCorrCache), &number_of_params ); } - /* convert strings, floating point values and endianess into our + /* convert strings, floating point values and endianness into our * preferred format */ if ((pRpcMsg->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) NdrConvert(&stubMsg, pFormat); @@ -1514,9 +1523,9 @@ if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_RPCFLAGS) { - const NDR_PROC_HEADER_RPC *pProcHeader = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; - async_call_data->stack_size = pProcHeader->stack_size; - procedure_number = pProcHeader->proc_num; + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + async_call_data->stack_size = header_rpc->stack_size; + procedure_number = header_rpc->proc_num; pFormat += sizeof(NDR_PROC_HEADER_RPC); } else Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -79,6 +79,7 @@ list_init(&assoc->free_connection_pool); list_init(&assoc->context_handle_list); InitializeCriticalSection(&assoc->cs); + assoc->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcAssoc.cs"); assoc->Protseq = RPCRT4_strdupA(Protseq); assoc->NetworkAddr = RPCRT4_strdupA(NetworkAddr); assoc->Endpoint = RPCRT4_strdupA(Endpoint); @@ -207,7 +208,7 @@ LIST_FOR_EACH_ENTRY_SAFE(Connection, cursor2, &assoc->free_connection_pool, RpcConnection, conn_pool_entry) { list_remove(&Connection->conn_pool_entry); - RPCRT4_DestroyConnection(Connection); + RPCRT4_ReleaseConnection(Connection); } LIST_FOR_EACH_ENTRY_SAFE(context_handle, context_handle_cursor, &assoc->context_handle_list, RpcContextHandle, entry) @@ -218,6 +219,7 @@ HeapFree(GetProcessHeap(), 0, assoc->NetworkAddr); HeapFree(GetProcessHeap(), 0, assoc->Protseq); + assoc->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&assoc->cs); HeapFree(GetProcessHeap(), 0, assoc); @@ -392,7 +394,7 @@ RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, - RpcQualityOfService *QOS, RpcConnection **Connection) + RpcQualityOfService *QOS, LPCWSTR CookieAuth, RpcConnection **Connection) { RpcConnection *NewConnection; RPC_STATUS status; @@ -405,7 +407,7 @@ status = RPCRT4_CreateConnection(&NewConnection, FALSE /* is this a server connection? */, assoc->Protseq, assoc->NetworkAddr, assoc->Endpoint, assoc->NetworkOptions, - AuthInfo, QOS); + AuthInfo, QOS, CookieAuth); if (status != RPC_S_OK) return status; @@ -413,14 +415,14 @@ status = RPCRT4_OpenClientConnection(NewConnection); if (status != RPC_S_OK) { - RPCRT4_DestroyConnection(NewConnection); + RPCRT4_ReleaseConnection(NewConnection); return status; } status = RpcAssoc_BindConnection(assoc, NewConnection, InterfaceId, TransferSyntax); if (status != RPC_S_OK) { - RPCRT4_DestroyConnection(NewConnection); + RPCRT4_ReleaseConnection(NewConnection); return status; } Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -47,7 +47,9 @@ } RpcAssoc; RPC_STATUS RPCRT4_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAssoc **assoc) DECLSPEC_HIDDEN; -RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, RpcQualityOfService *QOS, RpcConnection **Connection) DECLSPEC_HIDDEN; +RPC_STATUS RpcAssoc_GetClientConnection(RpcAssoc *assoc, const RPC_SYNTAX_IDENTIFIER *InterfaceId, + const RPC_SYNTAX_IDENTIFIER *TransferSyntax, RpcAuthInfo *AuthInfo, RpcQualityOfService *QOS, + LPCWSTR CookieAuth, RpcConnection **Connection) DECLSPEC_HIDDEN; void RpcAssoc_ReleaseIdleConnection(RpcAssoc *assoc, RpcConnection *Connection) DECLSPEC_HIDDEN; ULONG RpcAssoc_Release(RpcAssoc *assoc) DECLSPEC_HIDDEN; RPC_STATUS RpcServerAssoc_GetAssociation(LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, ULONG assoc_gid, RpcAssoc **assoc_out) DECLSPEC_HIDDEN; 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] Fri Dec 6 23:26:11 2013 @@ -266,6 +266,7 @@ RPCRT4_strfree(Binding->NetworkAddr); RPCRT4_strfree(Binding->Protseq); HeapFree(GetProcessHeap(), 0, Binding->NetworkOptions); + HeapFree(GetProcessHeap(), 0, Binding->CookieAuth); if (Binding->AuthInfo) RpcAuthInfo_Release(Binding->AuthInfo); if (Binding->QOS) RpcQualityOfService_Release(Binding->QOS); HeapFree(GetProcessHeap(), 0, Binding); @@ -280,7 +281,7 @@ if (!Binding->server) { return RpcAssoc_GetClientConnection(Binding->Assoc, InterfaceId, - TransferSyntax, Binding->AuthInfo, Binding->QOS, Connection); + TransferSyntax, Binding->AuthInfo, Binding->QOS, Binding->CookieAuth, Connection); } else { /* we already have a connection with acceptable binding, so use it */ if (Binding->FromConn) { @@ -301,7 +302,7 @@ /* don't destroy a connection that is cached in the binding */ if (Binding->FromConn == Connection) return RPC_S_OK; - return RPCRT4_DestroyConnection(Connection); + return RPCRT4_ReleaseConnection(Connection); } else { RpcAssoc_ReleaseIdleConnection(Binding->Assoc, Connection); @@ -854,10 +855,16 @@ if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingA(&bind, FALSE, (char*)Protseq); - if (ret != RPC_S_OK) return ret; - ret = RPCRT4_SetBindingObject(bind, &Uuid); - if (ret == RPC_S_OK) - ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); + if (ret == RPC_S_OK) { + ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret == RPC_S_OK) + ret = RPCRT4_CompleteBindingA(bind, (char*)NetworkAddr, (char*)Endpoint, (char*)Options); + + if (ret == RPC_S_OK) + *Binding = (RPC_BINDING_HANDLE)bind; + else + RPCRT4_ReleaseBinding(bind); + } RpcStringFreeA(&Options); RpcStringFreeA(&Endpoint); @@ -865,11 +872,6 @@ RpcStringFreeA(&Protseq); RpcStringFreeA(&ObjectUuid); - if (ret == RPC_S_OK) - *Binding = (RPC_BINDING_HANDLE)bind; - else - RPCRT4_ReleaseBinding(bind); - return ret; } @@ -893,21 +895,22 @@ if (ret == RPC_S_OK) ret = RPCRT4_CreateBindingW(&bind, FALSE, Protseq); - if (ret != RPC_S_OK) return ret; - ret = RPCRT4_SetBindingObject(bind, &Uuid); - if (ret == RPC_S_OK) - ret = RPCRT4_CompleteBindingW(bind, NetworkAddr, Endpoint, Options); + if (ret == RPC_S_OK) { + ret = RPCRT4_SetBindingObject(bind, &Uuid); + if (ret == RPC_S_OK) + ret = RPCRT4_CompleteBindingW(bind, NetworkAddr, Endpoint, Options); + + if (ret == RPC_S_OK) + *Binding = (RPC_BINDING_HANDLE)bind; + else + RPCRT4_ReleaseBinding(bind); + } RpcStringFreeW(&Options); RpcStringFreeW(&Endpoint); RpcStringFreeW(&NetworkAddr); RpcStringFreeW(&Protseq); RpcStringFreeW(&ObjectUuid); - - if (ret == RPC_S_OK) - *Binding = (RPC_BINDING_HANDLE)bind; - else - RPCRT4_ReleaseBinding(bind); return ret; } @@ -1003,6 +1006,7 @@ DestBinding->NetworkAddr = RPCRT4_strndupA(SrcBinding->NetworkAddr, -1); DestBinding->Endpoint = RPCRT4_strndupA(SrcBinding->Endpoint, -1); DestBinding->NetworkOptions = RPCRT4_strdupW(SrcBinding->NetworkOptions); + DestBinding->CookieAuth = RPCRT4_strdupW(SrcBinding->CookieAuth); if (SrcBinding->Assoc) SrcBinding->Assoc->refs++; DestBinding->Assoc = SrcBinding->Assoc; @@ -1415,7 +1419,18 @@ if (http_credentials1->AuthenticationTarget != http_credentials2->AuthenticationTarget) return FALSE; - /* authentication schemes and server certificate subject not currently used */ + if (http_credentials1->NumberOfAuthnSchemes != http_credentials2->NumberOfAuthnSchemes) + return FALSE; + + if ((!http_credentials1->AuthnSchemes && http_credentials2->AuthnSchemes) || + (http_credentials1->AuthnSchemes && !http_credentials2->AuthnSchemes)) + return FALSE; + + if (memcmp(http_credentials1->AuthnSchemes, http_credentials2->AuthnSchemes, + http_credentials1->NumberOfAuthnSchemes * sizeof(http_credentials1->AuthnSchemes[0]))) + return FALSE; + + /* server certificate subject not currently used */ if (http_credentials1->TransportCredentials != http_credentials2->TransportCredentials) { @@ -1653,12 +1668,13 @@ const RPC_SECURITY_QOS_V2_A *SecurityQos2 = (const RPC_SECURITY_QOS_V2_A *)SecurityQos; TRACE(", AdditionalSecurityInfoType=%d", SecurityQos2->AdditionalSecurityInfoType); if (SecurityQos2->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) - TRACE(", { %p, 0x%x, %d, %d, %p, %s }", + TRACE(", { %p, 0x%x, %d, %d, %p(%u), %s }", SecurityQos2->u.HttpCredentials->TransportCredentials, SecurityQos2->u.HttpCredentials->Flags, SecurityQos2->u.HttpCredentials->AuthenticationTarget, SecurityQos2->u.HttpCredentials->NumberOfAuthnSchemes, SecurityQos2->u.HttpCredentials->AuthnSchemes, + SecurityQos2->u.HttpCredentials->AuthnSchemes ? *SecurityQos2->u.HttpCredentials->AuthnSchemes : 0, SecurityQos2->u.HttpCredentials->ServerCertificateSubject); } TRACE("}\n"); @@ -1730,7 +1746,7 @@ if (r == RPC_S_OK) { new_auth_info->server_principal_name = RPCRT4_strdupAtoW((char *)ServerPrincName); - if (new_auth_info->server_principal_name) + if (!ServerPrincName || new_auth_info->server_principal_name) { if (bind->AuthInfo) RpcAuthInfo_Release(bind->AuthInfo); bind->AuthInfo = new_auth_info; @@ -1783,12 +1799,13 @@ const RPC_SECURITY_QOS_V2_W *SecurityQos2 = (const RPC_SECURITY_QOS_V2_W *)SecurityQos; TRACE(", AdditionalSecurityInfoType=%d", SecurityQos2->AdditionalSecurityInfoType); if (SecurityQos2->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) - TRACE(", { %p, 0x%x, %d, %d, %p, %s }", + TRACE(", { %p, 0x%x, %d, %d, %p(%u), %s }", SecurityQos2->u.HttpCredentials->TransportCredentials, SecurityQos2->u.HttpCredentials->Flags, SecurityQos2->u.HttpCredentials->AuthenticationTarget, SecurityQos2->u.HttpCredentials->NumberOfAuthnSchemes, SecurityQos2->u.HttpCredentials->AuthnSchemes, + SecurityQos2->u.HttpCredentials->AuthnSchemes ? *SecurityQos2->u.HttpCredentials->AuthnSchemes : 0, debugstr_w(SecurityQos2->u.HttpCredentials->ServerCertificateSubject)); } TRACE("}\n"); @@ -1911,6 +1928,27 @@ */ RPC_STATUS WINAPI RpcBindingSetOption(RPC_BINDING_HANDLE BindingHandle, ULONG Option, ULONG_PTR OptionValue) { - FIXME("(%p, %d, %ld): stub\n", BindingHandle, Option, OptionValue); + TRACE("(%p, %d, %ld)\n", BindingHandle, Option, OptionValue); + + switch (Option) + { + case RPC_C_OPT_COOKIE_AUTH: + { + RPC_C_OPT_COOKIE_AUTH_DESCRIPTOR *cookie = (RPC_C_OPT_COOKIE_AUTH_DESCRIPTOR *)OptionValue; + RpcBinding *binding = BindingHandle; + int len = MultiByteToWideChar(CP_ACP, 0, cookie->Buffer, cookie->BufferSize, NULL, 0); + WCHAR *str; + + if (!(str = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) return ERROR_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, cookie->Buffer, cookie->BufferSize, str, len); + str[len] = 0; + HeapFree(GetProcessHeap(), 0, binding->CookieAuth); + binding->CookieAuth = str; + break; + } + default: + FIXME("option %u not supported\n", Option); + break; + } return RPC_S_OK; } Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -61,6 +61,7 @@ typedef struct _RpcConnection { + LONG ref; BOOL server; LPSTR NetworkAddr; LPSTR Endpoint; @@ -77,6 +78,7 @@ ULONG encryption_auth_len; ULONG signature_auth_len; RpcQualityOfService *QOS; + LPWSTR CookieAuth; /* client-only */ struct list conn_pool_entry; @@ -133,6 +135,7 @@ /* authentication */ RpcAuthInfo *AuthInfo; RpcQualityOfService *QOS; + LPWSTR CookieAuth; } RpcBinding; LPSTR RPCRT4_strndupA(LPCSTR src, INT len) DECLSPEC_HIDDEN; @@ -152,8 +155,11 @@ ULONG RpcQualityOfService_Release(RpcQualityOfService *qos) DECLSPEC_HIDDEN; BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQualityOfService *qos2) DECLSPEC_HIDDEN; -RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS) DECLSPEC_HIDDEN; -RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; +RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, + LPCSTR NetworkAddr, LPCSTR Endpoint, LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, + RpcQualityOfService *QOS, LPCWSTR CookieAuth) DECLSPEC_HIDDEN; +RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) DECLSPEC_HIDDEN; +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_OpenClientConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_CloseConnection(RpcConnection* Connection) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -179,11 +179,8 @@ } } -/*********************************************************************** - * RpcEpRegisterA (RPCRT4.@) - */ -RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, - UUID_VECTOR *UuidVector, RPC_CSTR Annotation ) +static RPC_STATUS epm_register( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, + UUID_VECTOR *UuidVector, RPC_CSTR Annotation, BOOL replace ) { PRPC_SERVER_INTERFACE If = IfSpec; ULONG i; @@ -192,7 +189,7 @@ ept_entry_t *entries; handle_t handle; - TRACE("(%p,%p,%p,%s)\n", IfSpec, BindingVector, UuidVector, debugstr_a((char*)Annotation)); + TRACE("(%p,%p,%p,%s) replace=%d\n", IfSpec, BindingVector, UuidVector, debugstr_a((char*)Annotation), replace); TRACE(" ifid=%s\n", debugstr_guid(&If->InterfaceId.SyntaxGUID)); for (i=0; i<BindingVector->Count; i++) { RpcBinding* bind = BindingVector->BindingH[i]; @@ -246,7 +243,7 @@ __TRY { ept_insert(handle, BindingVector->Count * (UuidVector ? UuidVector->Count : 1), - entries, TRUE, &status2); + entries, replace, &status2); } __EXCEPT(rpc_filter) { @@ -280,6 +277,24 @@ } /*********************************************************************** + * RpcEpRegisterA (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, + UUID_VECTOR *UuidVector, RPC_CSTR Annotation ) +{ + return epm_register(IfSpec, BindingVector, UuidVector, Annotation, TRUE); +} + +/*********************************************************************** + * RpcEpRegisterNoReplaceA (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcEpRegisterNoReplaceA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, + UUID_VECTOR *UuidVector, RPC_CSTR Annotation ) +{ + return epm_register(IfSpec, BindingVector, UuidVector, Annotation, FALSE); +} + +/*********************************************************************** * RpcEpRegisterW (RPCRT4.@) */ RPC_STATUS WINAPI RpcEpRegisterW( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, @@ -288,7 +303,22 @@ LPSTR annA = RPCRT4_strdupWtoA(Annotation); RPC_STATUS status; - status = RpcEpRegisterA(IfSpec, BindingVector, UuidVector, (RPC_CSTR)annA); + status = epm_register(IfSpec, BindingVector, UuidVector, (RPC_CSTR)annA, TRUE); + + HeapFree(GetProcessHeap(), 0, annA); + return status; +} + +/*********************************************************************** + * RpcEpRegisterNoReplaceW (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcEpRegisterNoReplaceW( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, + UUID_VECTOR *UuidVector, RPC_WSTR Annotation ) +{ + LPSTR annA = RPCRT4_strdupWtoA(Annotation); + RPC_STATUS status; + + status = epm_register(IfSpec, BindingVector, UuidVector, (RPC_CSTR)annA, FALSE); HeapFree(GetProcessHeap(), 0, annA); return status; 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] Fri Dec 6 23:26:11 2013 @@ -342,7 +342,7 @@ (payload) += sizeof(UUID); \ } while (0) -RpcPktHdr *RPCRT4_BuildHttpConnectHeader(unsigned short flags, int out_pipe, +RpcPktHdr *RPCRT4_BuildHttpConnectHeader(int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) @@ -355,7 +355,7 @@ if (!out_pipe) size += 8 + 4 + sizeof(UUID); - header = RPCRT4_BuildHttpHeader(NDR_LOCAL_DATA_REPRESENTATION, flags, + header = RPCRT4_BuildHttpHeader(NDR_LOCAL_DATA_REPRESENTATION, 0, out_pipe ? 4 : 6, size); if (!header) return NULL; payload = (char *)(&header->http+1); @@ -1877,7 +1877,7 @@ fail: RPCRT4_FreeHeader(hdr); - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); pMsg->ReservedForRuntime = NULL; return status; } Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_message.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_message.h [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -31,7 +31,7 @@ RpcPktHdr *RPCRT4_BuildBindNackHeader(ULONG DataRepresentation, unsigned char RpcVersion, unsigned char RpcVersionMinor, unsigned short RejectReason) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildBindAckHeader(ULONG DataRepresentation, unsigned short MaxTransmissionSize, unsigned short MaxReceiveSize, ULONG AssocGroupId, LPCSTR ServerAddress, unsigned char ResultCount, const RpcResult *Results) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildHttpHeader(ULONG DataRepresentation, unsigned short flags, unsigned short num_data_items, unsigned int payload_size) DECLSPEC_HIDDEN; -RpcPktHdr *RPCRT4_BuildHttpConnectHeader(unsigned short flags, int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) DECLSPEC_HIDDEN; +RpcPktHdr *RPCRT4_BuildHttpConnectHeader(int out_pipe, const UUID *connection_uuid, const UUID *pipe_uuid, const UUID *association_uuid) DECLSPEC_HIDDEN; RpcPktHdr *RPCRT4_BuildHttpFlowControlHeader(BOOL server, ULONG bytes_transmitted, ULONG flow_control_increment, const UUID *pipe_uuid) DECLSPEC_HIDDEN; VOID RPCRT4_FreeHeader(RpcPktHdr *Header) DECLSPEC_HIDDEN; RPC_STATUS RPCRT4_Send(RpcConnection *Connection, RpcPktHdr *Header, void *Buffer, unsigned int BufferLength) DECLSPEC_HIDDEN; 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] Fri Dec 6 23:26:11 2013 @@ -46,6 +46,7 @@ #include "rpc_message.h" //#include "rpc_defs.h" #include "ncastatus.h" +#include <secext.h> WINE_DEFAULT_DEBUG_CHANNEL(rpc); @@ -541,6 +542,7 @@ RpcPacket *pkt = the_arg; RPCRT4_process_packet(pkt->conn, pkt->hdr, pkt->msg, pkt->auth_data, pkt->auth_length); + RPCRT4_ReleaseConnection(pkt->conn); HeapFree(GetProcessHeap(), 0, pkt); return 0; } @@ -587,7 +589,7 @@ HeapFree(GetProcessHeap(), 0, auth_data); goto exit; } - packet->conn = conn; + packet->conn = RPCRT4_GrabConnection( conn ); packet->hdr = hdr; packet->msg = msg; packet->auth_data = auth_data; @@ -623,7 +625,7 @@ } } exit: - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); return 0; } @@ -633,7 +635,7 @@ if (!thread) { DWORD err = GetLastError(); ERR("failed to create thread, error=%08x\n", err); - RPCRT4_DestroyConnection(conn); + RPCRT4_ReleaseConnection(conn); } /* we could set conn->thread, but then we'd have to make the io_thread wait * for that, otherwise the thread might finish, destroy the connection, and @@ -933,6 +935,7 @@ (*ps)->MaxCalls = 0; (*ps)->conn = NULL; InitializeCriticalSection(&(*ps)->cs); + (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); (*ps)->is_listening = FALSE; (*ps)->mgr_mutex = NULL; (*ps)->server_ready_event = NULL; @@ -948,6 +951,7 @@ static void destroy_serverprotoseq(RpcServerProtseq *ps) { RPCRT4_strfree(ps->Protseq); + ps->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ps->cs); CloseHandle(ps->mgr_mutex); CloseHandle(ps->server_ready_event); @@ -1073,9 +1077,15 @@ EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY_SAFE(cps, cursor2, &protseqs, RpcServerProtseq, entry) { +#ifndef __REACTOS__ + if (listen_count != 0) + RPCRT4_sync_with_server_thread(cps); +#endif destroy_serverprotoseq(cps); } LeaveCriticalSection(&server_cs); + DeleteCriticalSection(&server_cs); + DeleteCriticalSection(&listen_cs); } /*********************************************************************** @@ -1319,6 +1329,7 @@ HeapFree(GetProcessHeap(), 0, auth_info); } LeaveCriticalSection(&server_auth_info_cs); + DeleteCriticalSection(&server_auth_info_cs); } /*********************************************************************** @@ -1451,6 +1462,45 @@ return RPC_S_OK; } +/****************************************************************************** + * RpcServerInqDefaultPrincNameA (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincNameA(ULONG AuthnSvc, RPC_CSTR *PrincName) +{ + RPC_STATUS ret; + RPC_WSTR principalW; + + TRACE("%u, %p\n", AuthnSvc, PrincName); + + if ((ret = RpcServerInqDefaultPrincNameW( AuthnSvc, &principalW )) == RPC_S_OK) + { + if (!(*PrincName = (RPC_CSTR)RPCRT4_strdupWtoA( principalW ))) return RPC_S_OUT_OF_MEMORY; + RpcStringFreeW( &principalW ); + } + return ret; +} + +/****************************************************************************** + * RpcServerInqDefaultPrincNameW (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincNameW(ULONG AuthnSvc, RPC_WSTR *PrincName) +{ + ULONG len = 0; + + FIXME("%u, %p\n", AuthnSvc, PrincName); + + if (AuthnSvc != RPC_C_AUTHN_WINNT) return RPC_S_UNKNOWN_AUTHN_SERVICE; + + GetUserNameExW( NameSamCompatible, NULL, &len ); + if (GetLastError() != ERROR_MORE_DATA) return RPC_S_INTERNAL_ERROR; + + if (!(*PrincName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + return RPC_S_OUT_OF_MEMORY; + + GetUserNameExW( NameSamCompatible, *PrincName, &len ); + return RPC_S_OK; +} + /*********************************************************************** * RpcServerListen (RPCRT4.@) */ @@ -1617,8 +1667,14 @@ */ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) { - FIXME("(%p): stub\n", Binding); - return RPC_S_INVALID_BINDING; + RPC_STATUS status = RPC_S_NOT_LISTENING; + + TRACE("(%p)\n", Binding); + + EnterCriticalSection(&listen_cs); + if (manual_listen_count > 0) status = RPC_S_OK; + LeaveCriticalSection(&listen_cs); + return status; } /*********************************************************************** 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] Fri Dec 6 23:26:11 2013 @@ -121,7 +121,7 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) { - RpcConnection_np *npc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_np)); + RpcConnection_np *npc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_np)); if (npc) { npc->pipe = NULL; @@ -290,7 +290,7 @@ } r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL, - endpoint, NULL, NULL, NULL); + endpoint, NULL, NULL, NULL, NULL); if (r != RPC_S_OK) return r; @@ -362,7 +362,7 @@ } r = RPCRT4_CreateConnection(&Connection, TRUE, protseq->Protseq, NULL, - endpoint, NULL, NULL, NULL); + endpoint, NULL, NULL, NULL, NULL); if (r != RPC_S_OK) return r; @@ -1373,6 +1373,7 @@ if (getsockname(sock, (struct sockaddr *)&sa, &sa_len)) { WARN("getsockname() failed: %s\n", strerror(errno)); + closesocket(sock); status = RPC_S_CANT_CREATE_ENDPOINT; continue; } @@ -1383,13 +1384,14 @@ if (ret) { WARN("getnameinfo failed: %s\n", gai_strerror(ret)); + closesocket(sock); status = RPC_S_CANT_CREATE_ENDPOINT; continue; } create_status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE, protseq->Protseq, NULL, - service, NULL, NULL, NULL); + service, NULL, NULL, NULL, NULL); if (create_status != RPC_S_OK) { closesocket(sock); @@ -1402,7 +1404,7 @@ if (ret < 0) { WARN("listen failed: %s\n", strerror(errno)); - RPCRT4_DestroyConnection(&tcpc->common); + RPCRT4_ReleaseConnection(&tcpc->common); status = RPC_S_OUT_OF_RESOURCES; continue; } @@ -1415,7 +1417,7 @@ if (ret < 0) { WARN("couldn't make socket non-blocking, error %d\n", ret); - RPCRT4_DestroyConnection(&tcpc->common); + RPCRT4_ReleaseConnection(&tcpc->common); status = RPC_S_OUT_OF_RESOURCES; continue; } @@ -1872,9 +1874,8 @@ { LONG refs; HANDLE completion_event; + WORD async_result; INTERNET_BUFFERSA inet_buffers; - void *destination_buffer; /* the address that inet_buffers.lpvBuffer will be - * copied into when the call completes */ CRITICAL_SECTION cs; } RpcHttpAsyncData; @@ -1891,10 +1892,47 @@ TRACE("destroying async data %p\n", data); CloseHandle(data->completion_event); HeapFree(GetProcessHeap(), 0, data->inet_buffers.lpvBuffer); + data->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&data->cs); HeapFree(GetProcessHeap(), 0, data); } return refs; +} + +static void prepare_async_request(RpcHttpAsyncData *async_data) +{ + ResetEvent(async_data->completion_event); + RpcHttpAsyncData_AddRef(async_data); +} + +static RPC_STATUS wait_async_request(RpcHttpAsyncData *async_data, BOOL call_ret, HANDLE cancel_event) +{ + HANDLE handles[2] = { async_data->completion_event, cancel_event }; + DWORD res; + + if(call_ret) { + RpcHttpAsyncData_Release(async_data); + return RPC_S_OK; + } + + if(GetLastError() != ERROR_IO_PENDING) { + RpcHttpAsyncData_Release(async_data); + ERR("Request failed with error %d\n", GetLastError()); + return RPC_S_SERVER_UNAVAILABLE; + } + + res = WaitForMultipleObjects(2, handles, FALSE, DEFAULT_NCACN_HTTP_TIMEOUT); + if(res != WAIT_OBJECT_0) { + TRACE("Cancelled\n"); + return RPC_S_CALL_CANCELLED; + } + + if(async_data->async_result) { + ERR("Async request failed with error %d\n", async_data->async_result); + return RPC_S_SERVER_UNAVAILABLE; + } + + return RPC_S_OK; } typedef struct _RpcConnection_http @@ -1932,8 +1970,8 @@ httpc->async_data->refs = 1; httpc->async_data->inet_buffers.dwStructSize = sizeof(INTERNET_BUFFERSA); httpc->async_data->inet_buffers.lpvBuffer = NULL; - httpc->async_data->destination_buffer = NULL; InitializeCriticalSection(&httpc->async_data->cs); + httpc->async_data->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcHttpAsyncData.cs"); return &httpc->common; } @@ -1980,7 +2018,7 @@ timeout = rpcrt4_http_timer_calc_timeout(data.last_sent_time)) { /* are we too soon after last send? */ - if (GetTickCount() - HTTP_IDLE_TIME < *data.last_sent_time) + if (GetTickCount() - *data.last_sent_time < HTTP_IDLE_TIME) continue; rpcrt4_http_keep_connection_active_timer_proc(data.timer_param, TRUE); } @@ -2004,20 +2042,9 @@ TRACE("INTERNET_STATUS_REQUEST_COMPLETED\n"); if (async_data) { - if (async_data->inet_buffers.lpvBuffer) - { - EnterCriticalSection(&async_data->cs); - if (async_data->destination_buffer) - { - memcpy(async_data->destination_buffer, - async_data->inet_buffers.lpvBuffer, - async_data->inet_buffers.dwBufferLength); - async_data->destination_buffer = NULL; - } - LeaveCriticalSection(&async_data->cs); - } - HeapFree(GetProcessHeap(), 0, async_data->inet_buffers.lpvBuffer); - async_data->inet_buffers.lpvBuffer = NULL; + INTERNET_ASYNC_RESULT *async_result = lpvStatusInformation; + + async_data->async_result = async_result->dwResult ? ERROR_SUCCESS : async_result->dwError; SetEvent(async_data->completion_event); RpcHttpAsyncData_Release(async_data); } @@ -2040,7 +2067,7 @@ ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &status_code, &size, &index); if (!ret) return GetLastError(); - if (status_code < 400) + if (status_code == HTTP_STATUS_OK) return RPC_S_OK; index = 0; size = sizeof(buf); @@ -2067,7 +2094,7 @@ LPWSTR password = NULL; LPWSTR servername = NULL; const WCHAR *option; - INTERNET_PORT port = INTERNET_INVALID_PORT_NUMBER; /* use default port */ + INTERNET_PORT port; if (httpc->common.QOS && (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP)) @@ -2142,6 +2169,8 @@ { HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); + HeapFree(GetProcessHeap(), 0, servername); ERR("InternetOpenW failed with error %d\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } @@ -2156,16 +2185,23 @@ { HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); return RPC_S_OUT_OF_RESOURCES; } MultiByteToWideChar(CP_ACP, 0, httpc->common.NetworkAddr, -1, servername, strlen(httpc->common.NetworkAddr) + 1); } + + port = (httpc->common.QOS && + (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && + (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL)) ? + INTERNET_DEFAULT_HTTPS_PORT : INTERNET_DEFAULT_HTTP_PORT; httpc->session = InternetConnectW(httpc->app_info, servername, port, user, password, INTERNET_SERVICE_HTTP, 0, 0); HeapFree(GetProcessHeap(), 0, password); HeapFree(GetProcessHeap(), 0, user); + HeapFree(GetProcessHeap(), 0, proxy); HeapFree(GetProcessHeap(), 0, servername); if (!httpc->session) @@ -2177,61 +2213,54 @@ return RPC_S_OK; } +static RPC_STATUS send_echo_request(HINTERNET req, RpcHttpAsyncData *async_data, HANDLE cancel_event) +{ + DWORD bytes_read; + BYTE buf[20]; + BOOL ret; + RPC_STATUS status; + + prepare_async_request(async_data); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + status = wait_async_request(async_data, ret, cancel_event); + if (status != RPC_S_OK) return status; + + status = rpcrt4_http_check_response(req); + if (status != RPC_S_OK) return status; + + InternetReadFile(req, buf, sizeof(buf), &bytes_read); + /* FIXME: do something with retrieved data */ + + return RPC_S_OK; +} + /* prepare the in pipe for use by RPC packets */ -static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, +static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsyncData *async_data, HANDLE cancel_event, const UUID *connection_uuid, const UUID *in_pipe_uuid, const UUID *association_uuid) { - BYTE packet[44]; BOOL ret; RPC_STATUS status; RpcPktHdr *hdr; INTERNET_BUFFERSW buffers_in; - DWORD bytes_read, bytes_written; + DWORD bytes_written; /* prepare in pipe */ - ResetEvent(async_data->completion_event); - RpcHttpAsyncData_AddRef(async_data); - ret = HttpSendRequestW(in_request, NULL, 0, NULL, 0); - if (!ret) - { - if (GetLastError() == ERROR_IO_PENDING) - WaitForSingleObject(async_data->completion_event, INFINITE); - else - { - RpcHttpAsyncData_Release(async_data); - ERR("HttpSendRequestW failed with error %d\n", GetLastError()); - return RPC_S_SERVER_UNAVAILABLE; - } - } - status = rpcrt4_http_check_response(in_request); + status = send_echo_request(in_request, async_data, cancel_event); if (status != RPC_S_OK) return status; - - InternetReadFile(in_request, packet, 20, &bytes_read); - /* FIXME: do something with retrieved data */ memset(&buffers_in, 0, sizeof(buffers_in)); buffers_in.dwStructSize = sizeof(buffers_in); /* FIXME: get this from the registry */ buffers_in.dwBufferTotal = 1024 * 1024 * 1024; /* 1Gb */ - ResetEvent(async_data->completion_event); - RpcHttpAsyncData_AddRef(async_data); + prepare_async_request(async_data); ret = HttpSendRequestExW(in_request, &buffers_in, NULL, 0, 0); - if (!ret) - { - if (GetLastError() == ERROR_IO_PENDING) - WaitForSingleObject(async_data->completion_event, INFINITE); - else - { - RpcHttpAsyncData_Release(async_data); - ERR("HttpSendRequestExW failed with error %d\n", GetLastError()); - return RPC_S_SERVER_UNAVAILABLE; - } - } + status = wait_async_request(async_data, ret, cancel_event); + if (status != RPC_S_OK) return status; TRACE("sending HTTP connect header to server\n"); - hdr = RPCRT4_BuildHttpConnectHeader(0, FALSE, connection_uuid, in_pipe_uuid, association_uuid); + hdr = RPCRT4_BuildHttpConnectHeader(FALSE, connection_uuid, in_pipe_uuid, association_uuid); if (!hdr) return RPC_S_OUT_OF_RESOURCES; ret = InternetWriteFile(in_request, hdr, hdr->common.frag_len, &bytes_written); RPCRT4_FreeHeader(hdr); @@ -2292,57 +2321,30 @@ /* prepare the out pipe for use by RPC packets */ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsyncData *async_data, + HANDLE cancel_event, const UUID *connection_uuid, const UUID *out_pipe_uuid, ULONG *flow_control_increment) { - BYTE packet[20]; BOOL ret; RPC_STATUS status; RpcPktHdr *hdr; - DWORD bytes_read; BYTE *data_from_server; RpcPktHdr pkt_from_server; ULONG field1, field3; - ResetEvent(async_data->completion_event); - RpcHttpAsyncData_AddRef(async_data); - ret = HttpSendRequestW(out_request, NULL, 0, NULL, 0); - if (!ret) - { - if (GetLastError() == ERROR_IO_PENDING) - WaitForSingleObject(async_data->completion_event, INFINITE); - else - { - RpcHttpAsyncData_Release(async_data); - ERR("HttpSendRequestW failed with error %d\n", GetLastError()); - return RPC_S_SERVER_UNAVAILABLE; - } - } - status = rpcrt4_http_check_response(out_request); + status = send_echo_request(out_request, async_data, cancel_event); if (status != RPC_S_OK) return status; - InternetReadFile(out_request, packet, 20, &bytes_read); - /* FIXME: do something with retrieved data */ - - hdr = RPCRT4_BuildHttpConnectHeader(0, TRUE, connection_uuid, out_pipe_uuid, NULL); + hdr = RPCRT4_BuildHttpConnectHeader(TRUE, connection_uuid, out_pipe_uuid, NULL); if (!hdr) return RPC_S_OUT_OF_RESOURCES; - ResetEvent(async_data->completion_event); - RpcHttpAsyncData_AddRef(async_data); + + prepare_async_request(async_data); ret = HttpSendRequestW(out_request, NULL, 0, hdr, hdr->common.frag_len); - if (!ret) - { - if (GetLastError() == ERROR_IO_PENDING) - WaitForSingleObject(async_data->completion_event, INFINITE); - else - { - RpcHttpAsyncData_Release(async_data); - ERR("HttpSendRequestW failed with error %d\n", GetLastError()); - RPCRT4_FreeHeader(hdr); - return RPC_S_SERVER_UNAVAILABLE; - } - } + status = wait_async_request(async_data, ret, cancel_event); RPCRT4_FreeHeader(hdr); + if (status != RPC_S_OK) return status; + status = rpcrt4_http_check_response(out_request); if (status != RPC_S_OK) return status; @@ -2355,9 +2357,22 @@ if (status != RPC_S_OK) return status; TRACE("received (%d) from first prepare header\n", field1); - status = rpcrt4_http_read_http_packet(out_request, &pkt_from_server, - &data_from_server); - if (status != RPC_S_OK) return status; + for (;;) + { + status = rpcrt4_http_read_http_packet(out_request, &pkt_from_server, + &data_from_server); + if (status != RPC_S_OK) return status; + if (pkt_from_server.http.flags != 0x0001) break; + + TRACE("http idle packet, waiting for real packet\n"); + HeapFree(GetProcessHeap(), 0, data_from_server); + if (pkt_from_server.http.num_data_items != 0) + { + ERR("HTTP idle packet should have no data items instead of %d\n", + pkt_from_server.http.num_data_items); + return RPC_S_PROTOCOL_ERROR; + } + } status = RPCRT4_ParseHttpPrepareHeader2(&pkt_from_server, data_from_server, &field1, flow_control_increment, &field3); @@ -2366,6 +2381,122 @@ TRACE("received (0x%08x 0x%08x %d) from second prepare header\n", field1, *flow_control_increment, field3); return RPC_S_OK; +} + +static UINT encode_base64(const char *bin, unsigned int len, WCHAR *base64) +{ + static char enc[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + UINT i = 0, x; + + while (len > 0) + { + /* first 6 bits, all from bin[0] */ + base64[i++] = enc[(bin[0] & 0xfc) >> 2]; + x = (bin[0] & 3) << 4; + + /* next 6 bits, 2 from bin[0] and 4 from bin[1] */ + if (len == 1) + { + base64[i++] = enc[x]; + base64[i++] = '='; + base64[i++] = '='; + break; + } + base64[i++] = enc[x | ((bin[1] & 0xf0) >> 4)]; + x = (bin[1] & 0x0f) << 2; + + /* next 6 bits 4 from bin[1] and 2 from bin[2] */ + if (len == 2) + { + base64[i++] = enc[x]; + base64[i++] = '='; + break; + } + base64[i++] = enc[x | ((bin[2] & 0xc0) >> 6)]; + + /* last 6 bits, all from bin [2] */ + base64[i++] = enc[bin[2] & 0x3f]; + bin += 3; + len -= 3; + } + base64[i] = 0; + return i; +} + +static RPC_STATUS insert_authorization_header(HINTERNET request, RpcQualityOfService *qos) +{ + static const WCHAR basicW[] = + {'A','u','t','h','o','r','i','z','a','t','i','o','n',':',' ','B','a','s','i','c',' '}; + RPC_HTTP_TRANSPORT_CREDENTIALS_W *creds; + SEC_WINNT_AUTH_IDENTITY_W *id; + int len, datalen, userlen, passlen; + WCHAR *header, *ptr; + char *data; + RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; + + if (!qos || qos->qos->AdditionalSecurityInfoType != RPC_C_AUTHN_INFO_TYPE_HTTP) + return RPC_S_OK; + + creds = qos->qos->u.HttpCredentials; + if (creds->AuthenticationTarget != RPC_C_HTTP_AUTHN_TARGET_SERVER || !creds->NumberOfAuthnSchemes) + return RPC_S_OK; + + if (creds->AuthnSchemes[0] != RPC_C_HTTP_AUTHN_SCHEME_BASIC) + { + FIXME("scheme %u not supported\n", creds->AuthnSchemes[0]); + return RPC_S_OK; + } + id = creds->TransportCredentials; + if (!id->User || !id->Password) return RPC_S_OK; + + userlen = WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, NULL, 0, NULL, NULL); + passlen = WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, NULL, 0, NULL, NULL); + + datalen = userlen + passlen + 1; + if (!(data = HeapAlloc(GetProcessHeap(), 0, datalen))) return RPC_S_OUT_OF_MEMORY; + + WideCharToMultiByte(CP_UTF8, 0, id->User, id->UserLength, data, userlen, NULL, NULL); + data[userlen] = ':'; + WideCharToMultiByte(CP_UTF8, 0, id->Password, id->PasswordLength, data + userlen + 1, passlen, NULL, NULL); + + len = ((datalen + 2) * 4) / 3; + if ((header = HeapAlloc(GetProcessHeap(), 0, sizeof(basicW) + (len + 2) * sizeof(WCHAR)))) + { + memcpy(header, basicW, sizeof(basicW)); + ptr = header + sizeof(basicW) / sizeof(basicW[0]); + len = encode_base64(data, datalen, ptr); + ptr[len++] = '\r'; + ptr[len++] = '\n'; + ptr[len] = 0; + if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_ADD_IF_NEW))) status = RPC_S_OK; + HeapFree(GetProcessHeap(), 0, header); + } + HeapFree(GetProcessHeap(), 0, data); + return status; +} + +static RPC_STATUS insert_cookie_header(HINTERNET request, const WCHAR *value) +{ + static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + WCHAR *header, *ptr; + int len; + RPC_STATUS status = RPC_S_SERVER_UNAVAILABLE; + + if (!value) return RPC_S_OK; + + len = strlenW(value); + if ((header = HeapAlloc(GetProcessHeap(), 0, sizeof(cookieW) + (len + 3) * sizeof(WCHAR)))) + { + memcpy(header, cookieW, sizeof(cookieW)); + ptr = header + sizeof(cookieW) / sizeof(cookieW[0]); + memcpy(ptr, value, len * sizeof(WCHAR)); + ptr[len++] = '\r'; + ptr[len++] = '\n'; + ptr[len] = 0; + if ((HttpAddRequestHeadersW(request, header, -1, HTTP_ADDREQ_FLAG_ADD_IF_NEW))) status = RPC_S_OK; + HeapFree(GetProcessHeap(), 0, header); + } + return status; } static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) @@ -2377,6 +2508,7 @@ static const WCHAR wszColon[] = {':',0}; static const WCHAR wszAcceptType[] = {'a','p','p','l','i','c','a','t','i','o','n','/','r','p','c',0}; LPCWSTR wszAcceptTypes[] = { wszAcceptType, NULL }; + DWORD flags; WCHAR *url; RPC_STATUS status; BOOL secure; @@ -2416,27 +2548,45 @@ (httpc->common.QOS->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) && (httpc->common.QOS->qos->u.HttpCredentials->Flags & RPC_C_HTTP_FLAG_USE_SSL); - httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, - wszAcceptTypes, - (secure ? INTERNET_FLAG_SECURE : 0)|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_PRAGMA_NOCACHE, - (DWORD_PTR)httpc->async_data); + flags = INTERNET_FLAG_KEEP_CONNECTION | INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_NO_CACHE_WRITE | + INTERNET_FLAG_NO_AUTO_REDIRECT; + if (secure) flags |= INTERNET_FLAG_SECURE; + + httpc->in_request = HttpOpenRequestW(httpc->session, wszVerbIn, url, NULL, NULL, wszAcceptTypes, + flags, (DWORD_PTR)httpc->async_data); if (!httpc->in_request) + { + ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, url); + return RPC_S_SERVER_UNAVAILABLE; + } + status = insert_authorization_header(httpc->in_request, httpc->common.QOS); + if (status != RPC_S_OK) + return status; + + status = insert_cookie_header(httpc->in_request, Connection->CookieAuth); + if (status != RPC_S_OK) + return status; + + httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, + flags, (DWORD_PTR)httpc->async_data); + HeapFree(GetProcessHeap(), 0, url); + if (!httpc->out_request) { ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } - httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, - wszAcceptTypes, - (secure ? INTERNET_FLAG_SECURE : 0)|INTERNET_FLAG_KEEP_CONNECTION|INTERNET_FLAG_PRAGMA_NOCACHE, - (DWORD_PTR)httpc->async_data); - if (!httpc->out_request) - { - ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); - return RPC_S_SERVER_UNAVAILABLE; - } + status = insert_authorization_header(httpc->out_request, httpc->common.QOS); + if (status != RPC_S_OK) + return status; + + status = insert_cookie_header(httpc->out_request, Connection->CookieAuth); + if (status != RPC_S_OK) + return status; status = rpcrt4_http_prepare_in_pipe(httpc->in_request, httpc->async_data, + httpc->cancel_event, &httpc->connection_uuid, &httpc->in_pipe_uuid, &Connection->assoc->http_uuid); @@ -2445,6 +2595,7 @@ status = rpcrt4_http_prepare_out_pipe(httpc->out_request, httpc->async_data, + httpc->cancel_event, &httpc->connection_uuid, &httpc->out_pipe_uuid, &httpc->flow_control_increment); @@ -2484,61 +2635,38 @@ { RpcConnection_http *httpc = (RpcConnection_http *) Connection; char *buf = buffer; - BOOL ret = TRUE; + BOOL ret; unsigned int bytes_left = count; - - ResetEvent(httpc->async_data->completion_event); + RPC_STATUS status = RPC_S_OK; + + httpc->async_data->inet_buffers.lpvBuffer = HeapAlloc(GetProcessHeap(), 0, count); + while (bytes_left) { - RpcHttpAsyncData_AddRef(httpc->async_data); httpc->async_data->inet_buffers.dwBufferLength = bytes_left; - httpc->async_data->inet_buffers.lpvBuffer = HeapAlloc(GetProcessHeap(), 0, bytes_left); - httpc->async_data->destination_buffer = buf; + prepare_async_request(httpc->async_data); ret = InternetReadFileExA(httpc->out_request, &httpc->async_data->inet_buffers, IRF_ASYNC, 0); - if (ret) - { - /* INTERNET_STATUS_REQUEST_COMPLETED won't be sent, so release our - * async ref now */ - RpcHttpAsyncData_Release(httpc->async_data); - memcpy(buf, httpc->async_data->inet_buffers.lpvBuffer, - httpc->async_data->inet_buffers.dwBufferLength); - HeapFree(GetProcessHeap(), 0, httpc->async_data->inet_buffers.lpvBuffer); - httpc->async_data->inet_buffers.lpvBuffer = NULL; - httpc->async_data->destination_buffer = NULL; - } - else - { - if (GetLastError() == ERROR_IO_PENDING) - { - HANDLE handles[2] = { httpc->async_data->completion_event, httpc->cancel_event }; - DWORD result = WaitForMultipleObjects(2, handles, FALSE, DEFAULT_NCACN_HTTP_TIMEOUT); - if (result == WAIT_OBJECT_0) - ret = TRUE; - else - { - TRACE("call cancelled\n"); - EnterCriticalSection(&httpc->async_data->cs); - httpc->async_data->destination_buffer = NULL; - LeaveCriticalSection(&httpc->async_data->cs); - break; - } - } - else - { - HeapFree(GetProcessHeap(), 0, httpc->async_data->inet_buffers.lpvBuffer); - httpc->async_data->inet_buffers.lpvBuffer = NULL; - httpc->async_data->destination_buffer = NULL; - RpcHttpAsyncData_Release(httpc->async_data); - break; - } - } - if (!httpc->async_data->inet_buffers.dwBufferLength) + status = wait_async_request(httpc->async_data, ret, httpc->cancel_event); + if(status != RPC_S_OK) { + if(status == RPC_S_CALL_CANCELLED) + TRACE("call cancelled\n"); break; + } + + if(!httpc->async_data->inet_buffers.dwBufferLength) + break; + memcpy(buf, httpc->async_data->inet_buffers.lpvBuffer, + httpc->async_data->inet_buffers.dwBufferLength); + bytes_left -= httpc->async_data->inet_buffers.dwBufferLength; buf += httpc->async_data->inet_buffers.dwBufferLength; } - TRACE("%p %p %u -> %s\n", httpc->out_request, buffer, count, ret ? "TRUE" : "FALSE"); - return ret ? count : -1; + + HeapFree(GetProcessHeap(), 0, httpc->async_data->inet_buffers.lpvBuffer); + httpc->async_data->inet_buffers.lpvBuffer = NULL; + + TRACE("%p %p %u -> %u\n", httpc->out_request, buffer, count, status); + return status == RPC_S_OK ? count : -1; } static RPC_STATUS rpcrt4_ncacn_http_receive_fragment(RpcConnection *Connection, RpcPktHdr **Header, void **Payload) @@ -2746,39 +2874,15 @@ static int rpcrt4_ncacn_http_wait_for_incoming_data(RpcConnection *Connection) { + RpcConnection_http *httpc = (RpcConnection_http *) Connection; BOOL ret; - RpcConnection_http *httpc = (RpcConnection_http *) Connection; - - RpcHttpAsyncData_AddRef(httpc->async_data); + RPC_STATUS status; + + prepare_async_request(httpc->async_data); ret = InternetQueryDataAvailable(httpc->out_request, &httpc->async_data->inet_buffers.dwBufferLength, IRF_ASYNC, 0); - if (ret) - { - /* INTERNET_STATUS_REQUEST_COMPLETED won't be sent, so release our - * async ref now */ - RpcHttpAsyncData_Release(httpc->async_data); - } - else - { - if (GetLastError() == ERROR_IO_PENDING) - { - HANDLE handles[2] = { httpc->async_data->completion_event, httpc->cancel_event }; - DWORD result = WaitForMultipleObjects(2, handles, FALSE, DEFAULT_NCACN_HTTP_TIMEOUT); - if (result != WAIT_OBJECT_0) - { - TRACE("call cancelled\n"); - return -1; - } - } - else - { - RpcHttpAsyncData_Release(httpc->async_data); - return -1; - } - } - - /* success */ - return 0; + status = wait_async_request(httpc->async_data, ret, httpc->cancel_event); + return status == RPC_S_OK ? 0 : -1; } static size_t rpcrt4_ncacn_http_get_top_of_tower(unsigned char *tower_data, @@ -2958,7 +3062,7 @@ RPC_STATUS RPCRT4_CreateConnection(RpcConnection** Connection, BOOL server, LPCSTR Protseq, LPCSTR NetworkAddr, LPCSTR Endpoint, - LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS) + LPCWSTR NetworkOptions, RpcAuthInfo* AuthInfo, RpcQualityOfService *QOS, LPCWSTR CookieAuth) { static LONG next_id; const struct connection_ops *ops; @@ -2972,6 +3076,7 @@ } NewConnection = ops->alloc(); + NewConnection->ref = 1; NewConnection->Next = NULL; NewConnection->server_binding = NULL; NewConnection->server = server; @@ -2979,6 +3084,7 @@ NewConnection->NetworkAddr = RPCRT4_strdupA(NetworkAddr); NewConnection->Endpoint = RPCRT4_strdupA(Endpoint); NewConnection->NetworkOptions = RPCRT4_strdupW(NetworkOptions); + NewConnection->CookieAuth = RPCRT4_strdupW(CookieAuth); NewConnection->MaxTransmissionSize = RPC_MAX_PACKET_SIZE; memset(&NewConnection->ActiveInterface, 0, sizeof(NewConnection->ActiveInterface)); NewConnection->NextCallId = 1; @@ -3007,24 +3113,31 @@ { RPC_STATUS err; - err = RPCRT4_CreateConnection(Connection, OldConnection->server, - rpcrt4_conn_get_name(OldConnection), - OldConnection->NetworkAddr, - OldConnection->Endpoint, NULL, - OldConnection->AuthInfo, OldConnection->QOS); + err = RPCRT4_CreateConnection(Connection, OldConnection->server, rpcrt4_conn_get_name(OldConnection), + OldConnection->NetworkAddr, OldConnection->Endpoint, NULL, + OldConnection->AuthInfo, OldConnection->QOS, OldConnection->CookieAuth); if (err == RPC_S_OK) rpcrt4_conn_handoff(OldConnection, *Connection); return err; } -RPC_STATUS RPCRT4_DestroyConnection(RpcConnection* Connection) -{ - TRACE("connection: %p\n", Connection); +RpcConnection *RPCRT4_GrabConnection( RpcConnection *conn ) +{ + InterlockedIncrement( &conn->ref ); + return conn; +} + +RPC_STATUS RPCRT4_ReleaseConnection(RpcConnection* Connection) +{ + if (InterlockedDecrement( &Connection->ref ) > 0) return RPC_S_OK; + + TRACE("destroying connection %p\n", Connection); RPCRT4_CloseConnection(Connection); RPCRT4_strfree(Connection->Endpoint); RPCRT4_strfree(Connection->NetworkAddr); HeapFree(GetProcessHeap(), 0, Connection->NetworkOptions); + HeapFree(GetProcessHeap(), 0, Connection->CookieAuth); if (Connection->AuthInfo) RpcAuthInfo_Release(Connection->AuthInfo); if (Connection->QOS) RpcQualityOfService_Release(Connection->QOS); @@ -3169,7 +3282,7 @@ if (*protseqs) { - int i; + unsigned int i; for (i = 0; i < (*protseqs)->Count; i++) HeapFree(GetProcessHeap(), 0, (*protseqs)->Protseq[i]); HeapFree(GetProcessHeap(), 0, *protseqs); @@ -3187,7 +3300,7 @@ if (*protseqs) { - int i; + unsigned int i; for (i = 0; i < (*protseqs)->Count; i++) HeapFree(GetProcessHeap(), 0, (*protseqs)->Protseq[i]); HeapFree(GetProcessHeap(), 0, *protseqs); @@ -3202,7 +3315,7 @@ RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ) { RPC_PROTSEQ_VECTORW *pvector; - int i = 0; + unsigned int i; RPC_STATUS status = RPC_S_OUT_OF_MEMORY; TRACE("(%p)\n", protseqs); @@ -3235,7 +3348,7 @@ RPC_STATUS WINAPI RpcNetworkInqProtseqsA(RPC_PROTSEQ_VECTORA** protseqs) { RPC_PROTSEQ_VECTORA *pvector; - int i = 0; + unsigned int i; RPC_STATUS status = RPC_S_OUT_OF_MEMORY; TRACE("(%p)\n", protseqs); 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] Fri Dec 6 23:26:11 2013 @@ -369,19 +369,19 @@ @ stub RpcCertGeneratePrincipalNameW @ stdcall RpcCompleteAsyncCall(ptr ptr) RpcAsyncCompleteCall @ stdcall RpcEpRegisterA(ptr ptr ptr str) -@ stub RpcEpRegisterNoReplaceA -@ stub RpcEpRegisterNoReplaceW +@ stdcall RpcEpRegisterNoReplaceA(ptr ptr ptr str) +@ stdcall RpcEpRegisterNoReplaceW(ptr ptr ptr wstr) @ stdcall RpcEpRegisterW(ptr ptr ptr wstr) @ stdcall RpcEpResolveBinding(ptr ptr) @ stdcall RpcEpUnregister(ptr ptr ptr) @ stub RpcErrorAddRecord # wxp @ stub RpcErrorClearInformation # wxp -@ stub RpcErrorEndEnumeration # wxp -@ stub RpcErrorGetNextRecord # wxp -@ stub RpcErrorLoadErrorInfo # wxp +@ stdcall RpcErrorEndEnumeration(ptr) +@ stdcall RpcErrorGetNextRecord(ptr long ptr) +@ stdcall RpcErrorLoadErrorInfo(ptr long ptr) @ stub RpcErrorNumberOfRecords # wxp @ stub RpcErrorResetEnumeration # wxp -@ stub RpcErrorSaveErrorInfo # wxp +@ stdcall RpcErrorSaveErrorInfo(ptr ptr ptr) @ stdcall RpcErrorStartEnumeration(ptr) @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @@ -427,8 +427,8 @@ @ stdcall RpcServerInqBindings(ptr) @ stub RpcServerInqCallAttributesA # wxp @ stub RpcServerInqCallAttributesW # wxp -@ stub RpcServerInqDefaultPrincNameA -@ stub RpcServerInqDefaultPrincNameW +@ stdcall RpcServerInqDefaultPrincNameA(long ptr) +@ stdcall RpcServerInqDefaultPrincNameW(long ptr) @ stub RpcServerInqIf @ stdcall RpcServerListen(long long long) @ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr) Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -128,6 +128,7 @@ list_remove(&tdata->entry); LeaveCriticalSection(&threaddata_cs); + tdata->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&tdata->cs); if (tdata->connection) ERR("tdata->connection should be NULL but is still set to %p\n", tdata->connection); @@ -138,8 +139,11 @@ break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; /* do nothing if process is shutting down */ RPCRT4_destroy_all_protseqs(); RPCRT4_ServerFreeAllRegisteredAuthInfo(); + DeleteCriticalSection(&uuid_cs); + DeleteCriticalSection(&threaddata_cs); break; } @@ -872,6 +876,42 @@ } /****************************************************************************** + * RpcErrorEndEnumeration (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorEndEnumeration(RPC_ERROR_ENUM_HANDLE* EnumHandle) +{ + FIXME("(%p): stub\n", EnumHandle); + return RPC_S_OK; +} + +/****************************************************************************** + * RpcErrorSaveErrorInfo (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorSaveErrorInfo(RPC_ERROR_ENUM_HANDLE *EnumHandle, void **ErrorBlob, SIZE_T *BlobSize) +{ + FIXME("(%p %p %p): stub\n", EnumHandle, ErrorBlob, BlobSize); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * RpcErrorLoadErrorInfo (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorLoadErrorInfo(void *ErrorBlob, SIZE_T BlobSize, RPC_ERROR_ENUM_HANDLE *EnumHandle) +{ + FIXME("(%p %lu %p): stub\n", ErrorBlob, BlobSize, EnumHandle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * RpcErrorGetNextRecord (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorGetNextRecord(RPC_ERROR_ENUM_HANDLE *EnumHandle, BOOL CopyStrings, RPC_EXTENDED_ERROR_INFO *ErrorInfo) +{ + FIXME("(%p %x %p): stub\n", EnumHandle, CopyStrings, ErrorInfo); + return RPC_S_ENTRY_NOT_FOUND; +} + +/****************************************************************************** * RpcMgmtSetCancelTimeout (rpcrt4.@) */ RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG Timeout) @@ -889,6 +929,7 @@ if (!tdata) return NULL; InitializeCriticalSection(&tdata->cs); + tdata->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threaddata.cs"); tdata->thread_id = GetCurrentThreadId(); EnterCriticalSection(&threaddata_cs); Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -1,21 +1,19 @@ -Index: epm_towers.h -=================================================================== ---- epm_towers.h (working copy) -+++ epm_towers.h (working copy) +diff -prudN e:\Wine\dlls\rpcrt4/epm_towers.h e:\reactos\dll\win32\rpcrt4/epm_towers.h +--- e:\Wine\dlls\rpcrt4/epm_towers.h 2011-09-16 23:22:37.031828000 +0100 ++++ e:\reactos\dll\win32\rpcrt4/epm_towers.h 2013-01-25 14:13:03.257632500 +0100 @@ -19,7 +19,7 @@ * */ -#include "epm.h" -+#include "epm_c.h" ++#include <epm_c.h> #define EPM_PROTOCOL_DNET_NSP 0x04 #define EPM_PROTOCOL_OSI_TP4 0x05 -Index: ndr_marshall.c -=================================================================== ---- ndr_marshall.c (working copy) -+++ ndr_marshall.c (working copy) -@@ -1210,7 +1210,7 @@ +diff -prudN e:\Wine\dlls\rpcrt4/ndr_marshall.c e:\reactos\dll\win32\rpcrt4/ndr_marshall.c +--- e:\Wine\dlls\rpcrt4/ndr_marshall.c 2012-04-02 20:39:58.270363100 +0100 ++++ e:\reactos\dll\win32\rpcrt4/ndr_marshall.c 2013-12-06 20:04:02.897835300 +0100 +@@ -1211,7 +1211,7 @@ static unsigned char * EmbeddedPointerMa unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; unsigned char *saved_memory = pStubMsg->Memory; @@ -24,7 +22,7 @@ PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; } -@@ -1362,7 +1362,7 @@ +@@ -1365,7 +1365,7 @@ static void EmbeddedPointerBufferSize(PM unsigned char *memptr = membase + *(const SHORT*)&info[0]; unsigned char *saved_memory = pStubMsg->Memory; @@ -33,46 +31,10 @@ PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); pStubMsg->Memory = saved_memory; } -@@ -6159,6 +6159,7 @@ static LONG unmarshall_discriminant(PMID - case RPC_FC_WCHAR: - case RPC_FC_SHORT: - case RPC_FC_USHORT: -+ case RPC_FC_ENUM16: - { - USHORT d; - align_pointer(&pStubMsg->Buffer, sizeof(USHORT)); -Index: ndr_stubless.c -=================================================================== ---- ndr_stubless.c (working copy) -+++ ndr_stubless.c (working copy) -@@ -981,11 +981,12 @@ __declspec(naked) LONG_PTR __cdecl call_ - __asm - { - push ebp -+ mov ebp, esp - push edi ; Save registers - push esi -- mov ebp, esp - mov eax, [ebp+16] ; Get stack size - sub esp, eax ; Make room in stack for arguments -+ and esp, 0xFFFFFFF0 - mov edi, esp - mov ecx, eax - mov esi, [ebp+12] -Index: rpc_epmap.c -=================================================================== ---- rpc_epmap.c (working copy) -+++ rpc_epmap.c (working copy) -@@ -32,7 +32,7 @@ - #include "wine/exception.h" - - #include "rpc_binding.h" --#include "epm.h" -+#include "epm_c.h" - #include "epm_towers.h" - - WINE_DEFAULT_DEBUG_CHANNEL(ole); -@@ -162,7 +162,7 @@ static RPC_STATUS get_epm_handle_server( +diff -prudN e:\Wine\dlls\rpcrt4/rpc_epmap.c e:\reactos\dll\win32\rpcrt4/rpc_epmap.c +--- e:\Wine\dlls\rpcrt4/rpc_epmap.c 2013-03-02 14:18:00.736492500 +0100 ++++ e:\reactos\dll\win32\rpcrt4/rpc_epmap.c 2013-12-06 20:28:21.361553600 +0100 +@@ -162,7 +169,7 @@ static RPC_STATUS get_epm_handle_server( static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) { @@ -81,24 +43,113 @@ { case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION: -Index: rpc_server.c -=================================================================== ---- rpc_server.c (working copy) -+++ rpc_server.c (working copy) -@@ -1071,8 +1071,6 @@ void RPCRT4_destroy_all_protseqs(void) +diff -prudN e:\Wine\dlls\rpcrt4/rpc_server.c e:\reactos\dll\win32\rpcrt4/rpc_server.c +--- e:\Wine\dlls\rpcrt4/rpc_server.c 2012-12-09 09:57:02.680308600 +0100 ++++ e:\reactos\dll\win32\rpcrt4/rpc_server.c 2013-12-06 23:50:04.564226300 +0100 +@@ -1075,8 +1077,10 @@ void RPCRT4_destroy_all_protseqs(void) EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY_SAFE(cps, cursor2, &protseqs, RpcServerProtseq, entry) { -- if (listen_count != 0) -- RPCRT4_sync_with_server_thread(cps); ++#ifndef __REACTOS__ + if (listen_count != 0) + RPCRT4_sync_with_server_thread(cps); ++#endif destroy_serverprotoseq(cps); } LeaveCriticalSection(&server_cs); -Index: rpc_transport.c -=================================================================== ---- rpc_transport.c (working copy) -+++ rpc_transport.c (working copy) -@@ -224,6 +224,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( +diff -prudN e:\Wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_transport.c +--- e:\Wine\dlls\rpcrt4/rpc_transport.c 2013-12-06 20:10:59.302378700 +0100 ++++ e:\reactos\dll\win32\rpcrt4/rpc_transport.c 2013-12-06 23:39:38.664465200 +0100 +@@ -111,31 +115,41 @@ typedef struct _RpcConnection_np + { + RpcConnection common; + HANDLE pipe; +- HANDLE listen_thread; ++ OVERLAPPED ovl; + BOOL listening; + } RpcConnection_np; + + static RpcConnection *rpcrt4_conn_np_alloc(void) + { + RpcConnection_np *npc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcConnection_np)); ++ if (npc) ++ { ++ npc->pipe = NULL; ++ memset(&npc->ovl, 0, sizeof(npc->ovl)); ++ npc->listening = FALSE; ++ } + return &npc->common; + } + +-static DWORD CALLBACK listen_thread(void *arg) ++static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) + { +- RpcConnection_np *npc = arg; ++ if (npc->listening) ++ return RPC_S_OK; ++ ++ npc->listening = TRUE; + for (;;) + { +- if (ConnectNamedPipe(npc->pipe, NULL)) ++ if (ConnectNamedPipe(npc->pipe, &npc->ovl)) + return RPC_S_OK; + + switch(GetLastError()) + { + case ERROR_PIPE_CONNECTED: ++ SetEvent(npc->ovl.hEvent); ++ return RPC_S_OK; ++ case ERROR_IO_PENDING: ++ /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ + return RPC_S_OK; +- case ERROR_HANDLES_CLOSED: +- /* connection closed during listen */ +- return RPC_S_NO_CONTEXT_AVAILABLE; + case ERROR_NO_DATA_DETECTED: + /* client has disconnected, retry */ + DisconnectNamedPipe( npc->pipe ); +@@ -148,28 +162,12 @@ static DWORD CALLBACK listen_thread(void + } + } + +-static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) +-{ +- if (npc->listening) +- return RPC_S_OK; +- +- npc->listening = TRUE; +- npc->listen_thread = CreateThread(NULL, 0, listen_thread, npc, 0, NULL); +- if (!npc->listen_thread) +- { +- npc->listening = FALSE; +- ERR("Couldn't create listen thread (error was %d)\n", GetLastError()); +- return RPC_S_OUT_OF_RESOURCES; +- } +- return RPC_S_OK; +-} +- + static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) + { + RpcConnection_np *npc = (RpcConnection_np *) Connection; + TRACE("listening on %s\n", pname); + +- npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX, ++ npc->pipe = CreateNamedPipeA(pname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, + PIPE_UNLIMITED_INSTANCES, + RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); +@@ -181,6 +179,9 @@ static RPC_STATUS rpcrt4_conn_create_pip + return RPC_S_CANT_CREATE_ENDPOINT; + } + ++ memset(&npc->ovl, 0, sizeof(npc->ovl)); ++ npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); ++ + /* Note: we don't call ConnectNamedPipe here because it must be done in the + * server thread as the thread must be alertable */ + return RPC_S_OK; +@@ -227,6 +228,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( if (err == ERROR_PIPE_BUSY) { TRACE("connection failed, error=%x\n", err); return RPC_S_SERVER_TOO_BUSY; @@ -108,7 +159,19 @@ } if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { err = GetLastError(); -@@ -305,18 +308,32 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc +@@ -236,9 +240,11 @@ static RPC_STATUS rpcrt4_conn_open_pipe( + } + + /* success */ ++ memset(&npc->ovl, 0, sizeof(npc->ovl)); + /* pipe is connected; change to message-read mode. */ + dwMode = PIPE_READMODE_MESSAGE; + SetNamedPipeHandleState(pipe, &dwMode, NULL, NULL); ++ npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->pipe = pipe; + + return RPC_S_OK; +@@ -306,18 +312,32 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -145,7 +208,19 @@ I_RpcFree(pname); return r; -@@ -412,11 +429,17 @@ static int rpcrt4_conn_np_read(RpcConnec +@@ -366,9 +386,9 @@ static void rpcrt4_conn_np_handoff(RpcCo + * to the child, then reopen the server binding to continue listening */ + + new_npc->pipe = old_npc->pipe; +- new_npc->listen_thread = old_npc->listen_thread; ++ new_npc->ovl = old_npc->ovl; + old_npc->pipe = 0; +- old_npc->listen_thread = 0; ++ memset(&old_npc->ovl, 0, sizeof(old_npc->ovl)); + old_npc->listening = FALSE; + } + +@@ -413,11 +433,17 @@ static int rpcrt4_conn_np_read(RpcConnec char *buf = buffer; BOOL ret = TRUE; unsigned int bytes_left = count; @@ -164,7 +239,7 @@ if (!ret && GetLastError() == ERROR_MORE_DATA) ret = TRUE; if (!ret || !bytes_read) -@@ -424,6 +447,7 @@ static int rpcrt4_conn_np_read(RpcConnec +@@ -425,6 +451,7 @@ static int rpcrt4_conn_np_read(RpcConnec bytes_left -= bytes_read; buf += bytes_read; } @@ -172,7 +247,7 @@ return ret ? count : -1; } -@@ -434,16 +458,23 @@ static int rpcrt4_conn_np_write(RpcConne +@@ -435,16 +462,23 @@ static int rpcrt4_conn_np_write(RpcConne const char *buf = buffer; BOOL ret = TRUE; unsigned int bytes_left = count; @@ -197,19 +272,61 @@ return ret ? count : -1; } -Index: rpcrt4.spec -=================================================================== ---- rpcrt4.spec (working copy) -+++ rpcrt4.spec (working copy) -@@ -53,7 +53,7 @@ - @ stub I_RpcIfInqTransferSyntaxes - @ stub I_RpcLogEvent - @ stdcall I_RpcMapWin32Status(long) --@ stub I_RpcNegotiateTransferSyntax # wxp -+@ stdcall I_RpcNegotiateTransferSyntax(ptr) - @ stub I_RpcNsBindingSetEntryName - @ stub I_RpcNsBindingSetEntryNameA - @ stub I_RpcNsBindingSetEntryNameW +@@ -456,9 +490,9 @@ static int rpcrt4_conn_np_close(RpcConne + CloseHandle(npc->pipe); + npc->pipe = 0; + } +- if (npc->listen_thread) { +- CloseHandle(npc->listen_thread); +- npc->listen_thread = 0; ++ if (npc->ovl.hEvent) { ++ CloseHandle(npc->ovl.hEvent); ++ npc->ovl.hEvent = 0; + } + return 0; + } +@@ -662,7 +696,7 @@ static void *rpcrt4_protseq_np_get_wait_ + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { + rpcrt4_conn_listen_pipe(conn); +- if (conn->listen_thread) ++ if (conn->ovl.hEvent) + (*count)++; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } +@@ -683,7 +717,7 @@ static void *rpcrt4_protseq_np_get_wait_ + *count = 1; + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { +- if ((objs[*count] = conn->listen_thread)) ++ if ((objs[*count] = conn->ovl.hEvent)) + (*count)++; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } +@@ -730,18 +764,12 @@ static int rpcrt4_protseq_np_wait_for_ne + EnterCriticalSection(&protseq->cs); + conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); + while (conn) { +- if (b_handle == conn->listen_thread) break; ++ if (b_handle == conn->ovl.hEvent) break; + conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); + } + cconn = NULL; + if (conn) +- { +- DWORD exit_code; +- if (GetExitCodeThread(conn->listen_thread, &exit_code) && exit_code == RPC_S_OK) +- RPCRT4_SpawnConnection(&cconn, &conn->common); +- CloseHandle(conn->listen_thread); +- conn->listen_thread = 0; +- } ++ RPCRT4_SpawnConnection(&cconn, &conn->common); + else + ERR("failed to locate connection for handle %p\n", b_handle); + LeaveCriticalSection(&protseq->cs); +diff -prudN e:\Wine\dlls\rpcrt4/rpcrt4.spec e:\reactos\dll\win32\rpcrt4/rpcrt4.spec +--- e:\Wine\dlls\rpcrt4/rpcrt4.spec 2012-09-09 19:47:53.677232900 +0100 ++++ e:\reactos\dll\win32\rpcrt4/rpcrt4.spec 2013-12-06 20:29:09.804227500 +0100 @@ -266,7 +266,7 @@ @ stdcall NdrRangeUnmarshall(ptr ptr ptr long) @ stub NdrRpcSmClientAllocate Modified: trunk/reactos/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdce.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcdce.h [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -85,6 +85,20 @@ ULONG Stats[1]; } RPC_STATS_VECTOR; +typedef struct _RPC_PROTSEQ_VECTORA +{ + unsigned int Count; + unsigned char *Protseq[1]; +} RPC_PROTSEQ_VECTORA; + +typedef struct _RPC_PROTSEQ_VECTORW +{ + unsigned int Count; + unsigned short *Protseq[1]; +} RPC_PROTSEQ_VECTORW; + +DECL_WINELIB_TYPE_AW(RPC_PROTSEQ_VECTOR) + typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_EP_ALL_ELTS 0 @@ -279,18 +293,6 @@ } u; } RPC_SECURITY_QOS_V2_A, *PRPC_SECURITY_QOS_V2_A; -typedef struct _RPC_PROTSEQ_VECTORA -{ - unsigned int Count; - unsigned char __RPC_FAR * Protseq[1]; -} RPC_PROTSEQ_VECTORA; - -typedef struct _RPC_PROTSEQ_VECTORW -{ - unsigned int Count; - unsigned short __RPC_FAR * Protseq[1]; -} RPC_PROTSEQ_VECTORW; - #define _SEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(_SEC_WINNT_AUTH_IDENTITY_) #define SEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(SEC_WINNT_AUTH_IDENTITY_) #define PSEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(PSEC_WINNT_AUTH_IDENTITY_) @@ -302,16 +304,6 @@ #define RPC_SECURITY_QOS_V2 WINELIB_NAME_AW(RPC_SECURITY_QOS_V2_) #define PRPC_SECURITY_QOS_V2 WINELIB_NAME_AW(PRPC_SECURITY_QOS_V2_) #define _RPC_SECURITY_QOS_V2 WINELIB_NAME_AW(_RPC_SECURITY_QOS_V2_) - -#define RPC_PROTSEQ_VECTOR WINELIB_NAME_AW(RPC_PROTSEQ_VECTOR) -#define _RPC_PROTSEQ_VECTOR WINELIB_NAME_AW(_RPC_PROTSEQ_VECTOR) - -typedef int -(__RPC_API * RPC_MGMT_AUTHORIZATION_FN) ( - IN RPC_BINDING_HANDLE ClientBinding, - IN unsigned long RequestedMgmtOperation, - OUT RPC_STATUS __RPC_FAR * Status - ); /* SEC_WINNT_AUTH Flags */ #define SEC_WINNT_AUTH_IDENTITY_ANSI 0x1 @@ -332,7 +324,7 @@ RPCRTAPI DECLSPEC_NORETURN void RPC_ENTRY RpcRaiseException( RPC_STATUS exception ); - + RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingCopy( RPC_BINDING_HANDLE SourceBinding, RPC_BINDING_HANDLE* DestinationBinding ); @@ -414,6 +406,10 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtEnableIdleCleanup( void ); + +typedef int (__RPC_API *RPC_MGMT_AUTHORIZATION_FN)( RPC_BINDING_HANDLE, ULONG, RPC_STATUS * ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetAuthorizationFn( RPC_MGMT_AUTHORIZATION_FN ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG); @@ -564,6 +560,18 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidW( RPC_WSTR protseq ); #define RpcNetworkIsProtseqValid WINELIB_NAME_AW(RpcNetworkIsProtseqValid) + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcNetworkInqProtseqsA( RPC_PROTSEQ_VECTORA** protseqs ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW** protseqs ); +#define RpcNetworkInqProtseqs WINELIB_NAME_AW(RpcNetworkInqProtseqs) + +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcProtseqVectorFreeA( RPC_PROTSEQ_VECTORA** protseqs ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcProtseqVectorFreeW( RPC_PROTSEQ_VECTORW** protseqs ); +#define RpcProtseqVectorFree WINELIB_NAME_AW(RpcProtseqVectorFree) RPCRTAPI RPC_STATUS RPC_ENTRY RpcRevertToSelf( void ); @@ -603,6 +611,12 @@ RPCRTAPI int RPC_ENTRY UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcServerInqDefaultPrincNameA( ULONG AuthnSvc, RPC_CSTR *PrincName ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcServerInqDefaultPrincNameW( ULONG AuthnSvc, RPC_WSTR *PrincName ); +#define RpcServerInqDefaultPrincName WINELIB_NAME_AW(RpcServerInqDefaultPrincName) + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/rpcdcep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcdcep.h?rev… ============================================================================== --- trunk/reactos/include/psdk/rpcdcep.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcdcep.h [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -124,6 +124,14 @@ unsigned int Flags; } RPC_CLIENT_INTERFACE, *PRPC_CLIENT_INTERFACE; +#define RPC_C_OPT_COOKIE_AUTH 7 + +typedef struct _RPC_C_OPT_COOKIE_AUTH_DESCRIPTOR +{ + ULONG BufferSize; + char *Buffer; +} RPC_C_OPT_COOKIE_AUTH_DESCRIPTOR; + #define TRANSPORT_TYPE_CN 0x01 #define TRANSPORT_TYPE_DG 0x02 #define TRANSPORT_TYPE_LPC 0x04 Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] Fri Dec 6 23:26:11 2013 @@ -45,19 +45,19 @@ /* stupid #if can't handle casts... this __stupidity is just a workaround for that limitation */ -#define __NDR_CHAR_REP_MASK 0x000fL -#define __NDR_INT_REP_MASK 0x00f0L -#define __NDR_FLOAT_REP_MASK 0xff00L - -#define __NDR_IEEE_FLOAT 0x0000L -#define __NDR_VAX_FLOAT 0x0100L -#define __NDR_IBM_FLOAT 0x0300L - -#define __NDR_ASCII_CHAR 0x0000L -#define __NDR_EBCDIC_CHAR 0x0001L - -#define __NDR_LITTLE_ENDIAN 0x0010L -#define __NDR_BIG_ENDIAN 0x0000L +#define __NDR_CHAR_REP_MASK 0x000f +#define __NDR_INT_REP_MASK 0x00f0 +#define __NDR_FLOAT_REP_MASK 0xff00 + +#define __NDR_IEEE_FLOAT 0x0000 +#define __NDR_VAX_FLOAT 0x0100 +#define __NDR_IBM_FLOAT 0x0300 + +#define __NDR_ASCII_CHAR 0x0000 +#define __NDR_EBCDIC_CHAR 0x0001 + +#define __NDR_LITTLE_ENDIAN 0x0010 +#define __NDR_BIG_ENDIAN 0x0000 /* Mac's are special */ #if defined(__RPC_MAC__) 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] Fri Dec 6 23:26:11 2013 @@ -165,7 +165,7 @@ reactos/dll/win32/resutils # Synced to Wine-1.7.1 reactos/dll/win32/riched20 # Synced to Wine-1.7.1 reactos/dll/win32/riched32 # Synced to Wine-1.7.1 -reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 +reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.1 reactos/dll/win32/rsabase # Synced to Wine-1.7.1 reactos/dll/win32/rsaenh # Synced to Wine-1.7.1 reactos/dll/win32/sccbase # Synced to Wine-1.7.1

11 years

[akhaldi] 61236: [ADVAPI32/CRED] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 6 15:38:38 2013 New Revision: 61236 URL: http://svn.reactos.org/svn/reactos?rev=61236&view=rev Log: [ADVAPI32/CRED] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Fri Dec 6 15:38:38 2013 @@ -186,7 +186,6 @@ else if (ret != ERROR_SUCCESS) return ret; credential->CredentialBlobSize = count; - buffer += count; } /* FIXME: Attributes */ @@ -269,6 +268,7 @@ if (!user_name_present) { WARN("no kSecAccountItemAttr for item\n"); + SecKeychainItemFreeAttributesAndData(attr_list, cred_blob); return ERROR_NOT_FOUND; } @@ -420,7 +420,6 @@ str_len = MultiByteToWideChar(CP_UTF8, 0, cred_blob, cred_blob_len, (LPWSTR)buffer, 0xffff); credential->CredentialBlobSize = str_len * sizeof(WCHAR); - buffer += str_len * sizeof(WCHAR); *len += str_len * sizeof(WCHAR); } else @@ -470,10 +469,10 @@ GetSystemTimeAsFileTime(&LastWritten); - ret = RegSetValueExW(hkey, wszFlagsValue, 0, REG_DWORD, (LPVOID)&credential->Flags, + ret = RegSetValueExW(hkey, wszFlagsValue, 0, REG_DWORD, (const BYTE*)&credential->Flags, sizeof(credential->Flags)); if (ret != ERROR_SUCCESS) return ret; - ret = RegSetValueExW(hkey, wszTypeValue, 0, REG_DWORD, (LPVOID)&credential->Type, + ret = RegSetValueExW(hkey, wszTypeValue, 0, REG_DWORD, (const BYTE*)&credential->Type, sizeof(credential->Type)); if (ret != ERROR_SUCCESS) return ret; ret = RegSetValueExW(hkey, NULL, 0, REG_SZ, (LPVOID)credential->TargetName, @@ -488,7 +487,7 @@ ret = RegSetValueExW(hkey, wszLastWrittenValue, 0, REG_BINARY, (LPVOID)&LastWritten, sizeof(LastWritten)); if (ret != ERROR_SUCCESS) return ret; - ret = RegSetValueExW(hkey, wszPersistValue, 0, REG_DWORD, (LPVOID)&credential->Persist, + ret = RegSetValueExW(hkey, wszPersistValue, 0, REG_DWORD, (const BYTE*)&credential->Persist, sizeof(credential->Persist)); if (ret != ERROR_SUCCESS) return ret; /* FIXME: Attributes */ @@ -619,6 +618,8 @@ HeapFree(GetProcessHeap(), 0, password); /* FIXME: set TargetAlias attribute */ CFRelease(keychain_item); + if (status != noErr) + return ERROR_GEN_FAILURE; return ERROR_SUCCESS; } #endif @@ -710,7 +711,7 @@ return key_name; } -static BOOL credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) +static BOOL registry_credential_matches_filter(HKEY hkeyCred, LPCWSTR filter) { LPWSTR target_name; DWORD ret; @@ -750,7 +751,7 @@ static DWORD registry_enumerate_credentials(HKEY hkeyMgr, LPCWSTR filter, LPWSTR target_name, - DWORD target_name_len, BYTE key_data[KEY_SIZE], + DWORD target_name_len, const BYTE key_data[KEY_SIZE], PCREDENTIALW *credentials, char **buffer, DWORD *len, DWORD *count) { @@ -766,18 +767,12 @@ break; } else if (ret != ERROR_SUCCESS) - { - ret = ERROR_SUCCESS; continue; - } TRACE("target_name = %s\n", debugstr_w(target_name)); ret = RegOpenKeyExW(hkeyMgr, target_name, 0, KEY_QUERY_VALUE, &hkeyCred); if (ret != ERROR_SUCCESS) - { - ret = ERROR_SUCCESS; continue; - } - if (!credential_matches_filter(hkeyCred, filter)) + if (!registry_credential_matches_filter(hkeyCred, filter)) { RegCloseKey(hkeyCred); continue; @@ -801,6 +796,30 @@ } #ifdef __APPLE__ +static BOOL mac_credential_matches_filter(void *data, UInt32 data_len, const WCHAR *filter) +{ + int len; + WCHAR *target_name; + const WCHAR *p; + BOOL ret; + + if (!filter) return TRUE; + + len = MultiByteToWideChar(CP_UTF8, 0, data, data_len, NULL, 0); + if (!(target_name = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, data, data_len, target_name, len); + target_name[len] = 0; + + TRACE("comparing filter %s to target name %s\n", debugstr_w(filter), debugstr_w(target_name)); + + p = strchrW(filter, '*'); + ret = CompareStringW(GetThreadLocale(), 0, filter, + (p && !p[1] ? p - filter : -1), target_name, + (p && !p[1] ? p - filter : -1)) == CSTR_EQUAL; + HeapFree(GetProcessHeap(), 0, target_name); + return ret; +} + static DWORD mac_enumerate_credentials(LPCWSTR filter, PCREDENTIALW *credentials, char *buffer, DWORD *len, DWORD *count) { @@ -821,6 +840,8 @@ SecKeychainAttributeInfo info; SecKeychainAttributeList *attr_list; UInt32 info_tags[] = { kSecServerItemAttr }; + BOOL match; + info.count = sizeof(info_tags)/sizeof(info_tags[0]); info.tag = info_tags; info.format = NULL; @@ -837,10 +858,15 @@ } else *len += sizeof(CREDENTIALW); - if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr) continue; + if (attr_list->count != 1 || attr_list->attr[0].tag != kSecServerItemAttr) + { + SecKeychainItemFreeAttributesAndData(attr_list, NULL); + continue; + } TRACE("server item: %.*s\n", (int)attr_list->attr[0].length, (char *)attr_list->attr[0].data); - /* FIXME: filter based on attr_list->attr[0].data */ + match = mac_credential_matches_filter(attr_list->attr[0].data, attr_list->attr[0].length, filter); SecKeychainItemFreeAttributesAndData(attr_list, NULL); + if (!match) continue; ret = mac_read_credential_from_item(item, FALSE, buffer ? credentials[*count] : NULL, buffer ? buffer + sizeof(CREDENTIALW) : NULL, @@ -921,7 +947,7 @@ * */ -static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, INT len) +static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, DWORD len) { char *buffer; INT string_len; @@ -1578,7 +1604,8 @@ DWORD Flags, DWORD *Size, PCREDENTIALA **Credentials) { PCREDENTIAL_TARGET_INFORMATIONW TargetInformationW; - INT len, i; + INT len; + DWORD i; WCHAR *buffer, *end; BOOL ret; PCREDENTIALW* CredentialsW; @@ -1671,8 +1698,8 @@ if (TargetInformation->PackageName) { TargetInformationW->PackageName = buffer; - buffer += MultiByteToWideChar(CP_ACP, 0, TargetInformation->PackageName, -1, - TargetInformationW->PackageName, end - buffer); + MultiByteToWideChar(CP_ACP, 0, TargetInformation->PackageName, -1, + TargetInformationW->PackageName, end - buffer); } else TargetInformationW->PackageName = NULL; @@ -1804,13 +1831,19 @@ return FALSE; } + TRACE("Credential->Flags = 0x%08x\n", Credential->Flags); + TRACE("Credential->Type = %u\n", Credential->Type); TRACE("Credential->TargetName = %s\n", debugstr_w(Credential->TargetName)); + TRACE("Credential->Comment = %s\n", debugstr_w(Credential->Comment)); + TRACE("Credential->Persist = %u\n", Credential->Persist); + TRACE("Credential->TargetAlias = %s\n", debugstr_w(Credential->TargetAlias)); TRACE("Credential->UserName = %s\n", debugstr_w(Credential->UserName)); if (Credential->Type == CRED_TYPE_DOMAIN_PASSWORD) { if (!Credential->UserName || - (!strchrW(Credential->UserName, '\\') && !strchrW(Credential->UserName, '@'))) + (Credential->Persist == CRED_PERSIST_ENTERPRISE && + (!strchrW(Credential->UserName, '\\') && !strchrW(Credential->UserName, '@')))) { ERR("bad username %s\n", debugstr_w(Credential->UserName)); SetLastError(ERROR_BAD_USERNAME); @@ -1879,7 +1912,7 @@ /****************************************************************************** * CredGetSessionTypes [ADVAPI32.@] */ -BOOL WINAPI CredGetSessionTypes(DWORD persistCount, LPDWORD persists) +WINADVAPI BOOL WINAPI CredGetSessionTypes(DWORD persistCount, LPDWORD persists) { TRACE("(%u, %p)\n", persistCount, persists); @@ -2010,24 +2043,25 @@ return TRUE; } -BOOL -WINAPI -CredWriteDomainCredentialsW(PCREDENTIAL_TARGET_INFORMATIONW TargetInfo, - PCREDENTIALW Credential, - DWORD Flags) -{ - WARN("Not implemented\n"); - return FALSE; -} - -BOOL -WINAPI -CredWriteDomainCredentialsA(PCREDENTIAL_TARGET_INFORMATIONA TargetInfo, - PCREDENTIALA Credential, - DWORD Flags) -{ - WARN("Not implemented\n"); - return FALSE; +/****************************************************************************** + * CredUnmarshalCredentialA [ADVAPI32.@] + */ +BOOL WINAPI CredUnmarshalCredentialA( LPCSTR cred, PCRED_MARSHAL_TYPE type, PVOID *out ) +{ + BOOL ret; + WCHAR *credW = NULL; + + TRACE("%s, %p, %p\n", debugstr_a(cred), type, out); + + if (cred) + { + int len = MultiByteToWideChar( CP_ACP, 0, cred, -1, NULL, 0 ); + if (!(credW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_ACP, 0, cred, -1, credW, len ); + } + ret = CredUnmarshalCredentialW( credW, type, out ); + HeapFree( GetProcessHeap(), 0, credW ); + return ret; } static inline char char_decode( WCHAR c ) @@ -2157,28 +2191,6 @@ } return TRUE; } - -/****************************************************************************** - * CredUnmarshalCredentialA [ADVAPI32.@] - */ -BOOL WINAPI CredUnmarshalCredentialA( LPCSTR cred, PCRED_MARSHAL_TYPE type, PVOID *out ) -{ - BOOL ret; - WCHAR *credW = NULL; - - TRACE("%s, %p, %p\n", debugstr_a(cred), type, out); - - if (cred) - { - int len = MultiByteToWideChar( CP_ACP, 0, cred, -1, NULL, 0 ); - if (!(credW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return FALSE; - MultiByteToWideChar( CP_ACP, 0, cred, -1, credW, len ); - } - ret = CredUnmarshalCredentialW( credW, type, out ); - HeapFree( GetProcessHeap(), 0, credW ); - return ret; -} - /****************************************************************************** * CredIsMarshaledCredentialW [ADVAPI32.@] 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] Fri Dec 6 15:38:38 2013 @@ -250,7 +250,7 @@ advapi32 - reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.1 - reactos/dll/win32/advapi32/sec/cred.c # Out of Sync + reactos/dll/win32/advapi32/sec/cred.c # Synced to Wine-1.7.1 reactos/dll/win32/advapi32/sec/sid.c # Out of Sync gdi32 -

11 years

[akhaldi] 61235: [TRANSLATIONS] * Add Albanian translations to all the base/system folder. Brought to you by Ardit Dani. CORE-7675 #resolve #comment Committed in r61235. Thanks !

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 6 15:21:08 2013 New Revision: 61235 URL: http://svn.reactos.org/svn/reactos?rev=61235&view=rev Log: [TRANSLATIONS] * Add Albanian translations to all the base/system folder. Brought to you by Ardit Dani. CORE-7675 #resolve #comment Committed in r61235. Thanks ! Added: trunk/reactos/base/system/diskpart/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/format/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/system/format/lang/en-US.rc trunk/reactos/base/system/regsvr32/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/system/regsvr32/lang/en-US.rc trunk/reactos/base/system/rundll32/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/system/rundll32/lang/en-US.rc trunk/reactos/base/system/runonce/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/system/runonce/lang/en-US.rc trunk/reactos/base/system/subst/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/system/subst/lang/en-US.rc trunk/reactos/base/system/userinit/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/system/userinit/lang/en-US.rc trunk/reactos/base/system/winlogon/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/system/winlogon/lang/en-US.rc Modified: trunk/reactos/base/system/diskpart/diskpart.rc trunk/reactos/base/system/format/format.rc trunk/reactos/base/system/regsvr32/regsvr32.rc trunk/reactos/base/system/rundll32/rundll32.rc trunk/reactos/base/system/runonce/runonce.rc trunk/reactos/base/system/subst/subst.rc trunk/reactos/base/system/userinit/userinit.rc trunk/reactos/base/system/winlogon/winlogon.rc Modified: trunk/reactos/base/system/diskpart/diskpart.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -17,3 +17,6 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif Copied: trunk/reactos/base/system/diskpart/lang/sq-AL.rc (from r61195, trunk/reactos/base/system/diskpart/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -1,4 +1,8 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL /* Basic application information */ STRINGTABLE @@ -9,29 +13,29 @@ /S filename\tRuns the given script.\n\ /T timeout\tTimeout in seconds to prevent diskpart usage overlap.\n\ /?\t\tDisplay this help message.\n\n" - IDS_APP_LICENSE "Licensed under the GNU GPLv2\n" - IDS_APP_CURR_COMPUTER "On computer: %s\n\n" - IDS_APP_LEAVING "\nLeaving DiskPart...\n" - IDS_APP_PROMPT "DISKPART> " + IDS_APP_LICENSE, "LiÃ§ensuar mbi GNU GPLv2\n" + IDS_APP_CURR_COMPUTER, "NÃ« kompjuter: %s\n\n" + IDS_APP_LEAVING, "\nDil DiskPart...\n" + IDS_APP_PROMPT, "DISKPART> " END /* Disk Information Labels */ STRINGTABLE BEGIN IDS_DETAIL_INFO_DISK_ID "Disk" - IDS_DETAIL_INFO_TYPE "Type" - IDS_DETAIL_INFO_STATUS "Status" - IDS_DETAIL_INFO_PATH "Path" - IDS_DETAIL_INFO_TARGET "Target" + IDS_DETAIL_INFO_TYPE "Tipi" + IDS_DETAIL_INFO_STATUS "Gjendja" + IDS_DETAIL_INFO_PATH "RrugÃ«" + IDS_DETAIL_INFO_TARGET "Objektivi" IDS_DETAIL_INFO_LUN_ID "LUN ID" - IDS_DETAIL_INFO_LOC_PATH "Location Path" - IDS_DETAIL_INFO_CURR_RO_STATE "Current Read-only State" + IDS_DETAIL_INFO_LOC_PATH "Rruga e vendndodhjes" + IDS_DETAIL_INFO_CURR_RO_STATE "Read-only Gjendja aktuale" IDS_DETAIL_INFO_RO "Read-only" IDS_DETAIL_INFO_BOOT_DSK "Boot Disk" - IDS_DETAIL_INFO_PAGE_FILE_DSK "Pagefile Disk" - IDS_DETAIL_INFO_HIBER_FILE_DSK "Hibernation File Disk" - IDS_DETAIL_INFO_CRASH_DSK "Crashdump Disk" - IDS_DETAIL_INFO_CLST_DSK "Clustered Disk" + IDS_DETAIL_INFO_PAGE_FILE_DSK "Faqja dokumenteve Disk" + IDS_DETAIL_INFO_HIBER_FILE_DSK "Hibernimi i dokumeteve Disk" + IDS_DETAIL_INFO_CRASH_DSK "Hedhja e te dhenave Disk" + IDS_DETAIL_INFO_CLST_DSK "Grupimet ne Disk" END /* Detail header titles */ @@ -45,322 +49,322 @@ /* Disk Status */ STRINGTABLE BEGIN - IDS_STATUS_YES "Yes" - IDS_STATUS_NO "No" - IDS_STATUS_DISK_HEALTHY "Healthy" - IDS_STATUS_DISK_SICK "Sick" - IDS_STATUS_UNAVAILABLE "UNAVAILABLE" + IDS_STATUS_YES "Po" + IDS_STATUS_NO "Jo" + IDS_STATUS_DISK_HEALTHY "ShÃ«ndetshem" + IDS_STATUS_DISK_SICK "SÃ«mur" + IDS_STATUS_UNAVAILABLE "I PADISPONUESHEM" IDS_STATUS_ONLINE "Online" IDS_STATUS_OFFLINE "Offline" - IDS_STATUS_NO_MEDIA "No Media" + IDS_STATUS_NO_MEDIA "Ska Media" END /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_CURRENT_DSK_STATUS "is now the selected disk." - IDS_MSG_NO_DISK "There is no disk currently selected.\nPlease select a disk and try again." - IDS_MSG_ARG_SYNTAX_ERROR "The argument(s) specified for this command are not valid.\nFor more information on the command type:" + IDS_MSG_CURRENT_DSK_STATUS "Ã«shtÃ« disku i pÃ«rzgjedhur." + IDS_MSG_NO_DISK "Nuk ka disk tÃ« pÃ«rzgjedhur.\nJu lutem zgjidhni njÃ« disk dhe provoni pÃ«rsÃ«ri." + IDS_MSG_ARG_SYNTAX_ERROR "Argumente(t) e specifikuara per kete komande nuk jane tÃ« vlefshme.\nPÃ«r mÃ« shume informacione mbi komanden shkruani:" END /* Help Command Descripions */ STRINGTABLE BEGIN - IDS_HELP_CMD_DESC_ACTIVE "ACTIVE\t\t- Mark the selected partition as active.\n" - IDS_HELP_CMD_DESC_ADD "ADD\t\t- Add a mirror to a simple volume.\n" - IDS_HELP_CMD_DESC_ASSIGN "ASSIGN\t\t- Assign a drive letter or mount point to the selected volume.\n" - IDS_HELP_CMD_DESC_ATTACH "ATTACH\t\t- Attaches a virtual disk file.\n" - IDS_HELP_CMD_DESC_ATTRIBUTES "ATTRIBUTES\t- Manipulate volume or disk attributes.\n" - IDS_HELP_CMD_DESC_AUTOMOUNT "AUTOMOUNT\t- Enable and Disable automatic mounting of basic volumes.\n" - IDS_HELP_CMD_DESC_BREAK "BREAK\t\t- Break a mirror set.\n" - IDS_HELP_CMD_DESC_CLEAN "CLEAN\t\t- Clear the configuration information, or all information, off\n\t\t the disk.\n" - IDS_HELP_CMD_DESC_COMPACT "COMPACT\t\t- Attempts to reduce the physical size of the file.\n" - IDS_HELP_CMD_DESC_CONVERT "CONVERT\t\t- Convert between different disk formats.\n" - IDS_HELP_CMD_DESC_CREATE "CREATE\t\t- Create a volume, partition, or virtual disk.\n" - IDS_HELP_CMD_DESC_DELETE "DELETE\t\t- Delete an object.\n" - IDS_HELP_CMD_DESC_DETACH "DETACH\t\t- Detaches a virtual disk file.\n" - IDS_HELP_CMD_DESC_DETAIL "DETAIL\t\t- Provide details about an object.\n" - IDS_HELP_CMD_DESC_EXIT "EXIT\t\t- Exit DiskPart.\n" - IDS_HELP_CMD_DESC_EXPAND "EXPAND\t\t- Expands the maximum size available on a virtual disk.\n" - IDS_HELP_CMD_DESC_EXTEND "EXTEND\t\t- Extend a volume.\n" - IDS_HELP_CMD_DESC_FS "FILESYSTEMS\t- Display current and supported file systems on the volume.\n" - IDS_HELP_CMD_DESC_FORMAT "FORMAT\t\t- Format the volume or partition.\n" - IDS_HELP_CMD_DESC_GPT "GPT\t\t- Assign attributes to the selected GPT partition.\n" - IDS_HELP_CMD_DESC_HELP "HELP\t\t- Display a list of commands.\n" - IDS_HELP_CMD_DESC_IMPORT "IMPORT\t\t- Import a disk group.\n" + IDS_HELP_CMD_DESC_ACTIVE "ACTIVE\t\t- ShÃ«non particionin ndarjen zgjedhur si aktive.\n" + IDS_HELP_CMD_DESC_ADD "ADD\t\t- Shto njÃ« pasqyrÃ« tÃ« njÃ« vÃ«llim tÃ« thjeshtÃ«.\n" + IDS_HELP_CMD_DESC_ASSIGN "ASSIGN\t\t- TÃ« caktojÃ« njÃ« letÃ«r driverit apo pikÃ«n e ngarkimit pÃ«r vÃ«llimin e pÃ«rzgjedhur.\n" + IDS_HELP_CMD_DESC_ATTACH "ATTACH\t\t- Bashkangjet njÃ« dokument diskut virtual.\n" + IDS_HELP_CMD_DESC_ATTRIBUTES "ATTRIBUTES\t- Manipulon volumet ose atributet e diskut.\n" + IDS_HELP_CMD_DESC_AUTOMOUNT "AUTOMOUNT\t- Mundeson ose heq ngarkimin automatik e volumeve fillestar.\n" + IDS_HELP_CMD_DESC_BREAK "BREAK\t\t- Thyen nje sere lidhjesh.\n" + IDS_HELP_CMD_DESC_CLEAN "CLEAN\t\t- Pastron iformacionet e konfigurimit, ose tÃ« gjitha informacionet, e\n\t\t diskut.\n" + IDS_HELP_CMD_DESC_COMPACT "COMPACT\t\t- Tenton te ul masen fizike te dokumentit.\n" + IDS_HELP_CMD_DESC_CONVERT "CONVERT\t\t- Konverton formatet e ndryshme ne disk.\n" + IDS_HELP_CMD_DESC_CREATE "CREATE\t\t- Krijon njÃ« volum, particion, ose disk virtual.\n" + IDS_HELP_CMD_DESC_DELETE "DELETE\t\t- Fshin njÃ« objekt.\n" + IDS_HELP_CMD_DESC_DETACH "DETACH\t\t- Heq nga lidhja nje dokument nga disku virtual.\n" + IDS_HELP_CMD_DESC_DETAIL "DETAIL\t\t- Shfaq detaje mbi njÃ« objekt.\n" + IDS_HELP_CMD_DESC_EXIT "EXIT\t\t- Dil DiskPart.\n" + IDS_HELP_CMD_DESC_EXPAND "EXPAND\t\t- Zgjeron masen maksimale te mundshme ne diskun virtual.\n" + IDS_HELP_CMD_DESC_EXTEND "EXTEND\t\t- Zgjeron njÃ« volum.\n" + IDS_HELP_CMD_DESC_FS "FILESYSTEMS\t- Shfaq dokumentet e sistemit ne volum te suportuara aktualisht.\n" + IDS_HELP_CMD_DESC_FORMAT "FORMAT\t\t- Formato volumin ose particionin.\n" + IDS_HELP_CMD_DESC_GPT "GPT\t\t- Cakton atributet particionet GPT te perzgjedhur.\n" + IDS_HELP_CMD_DESC_HELP "HELP\t\t- Shfaq njÃ« listÃ« komandash.\n" + IDS_HELP_CMD_DESC_IMPORT "IMPORT\t\t- Importon njÃ« disk grup.\n" IDS_HELP_CMD_DESC_INACTIVE "INACTIVE\t- Mark the selected partition as inactive.\n" - IDS_HELP_CMD_DESC_LIST "LIST\t\t- Display a list of objects.\n" - IDS_HELP_CMD_DESC_MERGE "MERGE\t\t- Merges a child disk with its parents.\n" - IDS_HELP_CMD_DESC_OFFLINE "OFFLINE\t\t- Offline an object that is currently marked as online.\n" - IDS_HELP_CMD_DESC_ONLINE "ONLINE\t\t- Online an object that is currently marked as offline.\n" - IDS_HELP_CMD_DESC_RECOVER "RECOVER\t\t- Refreshes the state of all disks in the invalid pack,\n\t\t and resynchronizes mirrored volumes and RAID5 volumes\n\t\t that have stale plex or parity data.\n" - IDS_HELP_CMD_DESC_REM "REM\t\t- Does nothing. This is used to comment scripts.\n" - IDS_HELP_CMD_DESC_REMOVE "REMOVE\t\t- Remove a drive letter or mount point assignment.\n" - IDS_HELP_CMD_DESC_REPAIR "REPAIR\t\t- Repair a RAID-5 volume with a failed member.\n" - IDS_HELP_CMD_DESC_RESCAN "RESCAN\t\t- Rescan the computer looking for disks and volumes.\n" - IDS_HELP_CMD_DESC_RETAIN "RETAIN\t\t- Place a retained partition under a simple volume.\n" - IDS_HELP_CMD_DESC_SAN "SAN\t\t- Display or set the SAN policy for the currently booted OS.\n" - IDS_HELP_CMD_DESC_SELECT "SELECT\t\t- Shift the focus to an object.\n" - IDS_HELP_CMD_DESC_SETID "SETID\t\t- Change the partition type.\n" - IDS_HELP_CMD_DESC_SHRINK "SHRINK\t\t- Reduce the size of the selected volume.\n" - IDS_HELP_CMD_DESC_UNIQUEID "UNIQUEID\t- Displays or sets the GUID partition table (GPT) identifier\n\t\t or master boot record (MBR) signature of a disk." + IDS_HELP_CMD_DESC_LIST "LIST\t\t- Shfaq njÃ« listÃ« objektesh.\n" + IDS_HELP_CMD_DESC_MERGE "MERGE\t\t- Shkrin nje disk dytesor tek kryesori.\n" + IDS_HELP_CMD_DESC_OFFLINE "OFFLINE\t\t- Offline njÃ« objekt qÃ« Ã«shtÃ« momentalish i markuar si online.\n" + IDS_HELP_CMD_DESC_ONLINE "ONLINE\t\t- Online njÃ« objekt qÃ« Ã«shtÃ« momentalish i markuar si offline.\n" + IDS_HELP_CMD_DESC_RECOVER "RECOVER\t\t- Rifreskon gjendjen e tÃ« gjith disqeve nÃ« paketen invalide,\n\t\t dhe risinkronizon volumet mirror dhe volumet RAID5\n\t\t qÃ« kanÃ« laster plex ose bazari ne data.\n" + IDS_HELP_CMD_DESC_REM "REM\t\t- Mos bÃ«j gjÃ«. Kjo pÃ«rdoret pÃ«r komente nÃ« skripta.\n" + IDS_HELP_CMD_DESC_REMOVE "REMOVE\t\t- Hiq njÃ« germÃ« nga driveri ose monto njÃ« pike tÃ« caktuar.\n" + IDS_HELP_CMD_DESC_REPAIR "REPAIR\t\t- Riparo njÃ« volum RAID-5 me njÃ« antar tÃ« dÃ«shtuar.\n" + IDS_HELP_CMD_DESC_RESCAN "RESCAN\t\t- Skano pÃ«rsÃ«ri kompjuterin pÃ« disqe dhe volume.\n" + IDS_HELP_CMD_DESC_RETAIN "RETAIN\t\t- VÃ«ndos njÃ« particion tÃ« mbajtur nÃ«n njÃ« volum tÃ« thjesht.\n" + IDS_HELP_CMD_DESC_SAN "SAN\t\t- Shfaq ose vendos SAN policy pÃ«r OS'n qÃ« ndizet momentalisht.\n" + IDS_HELP_CMD_DESC_SELECT "SELECT\t\t- Zhvendeso fokusin tek njÃ« objekt.\n" + IDS_HELP_CMD_DESC_SETID "SETID\t\t- Ndrysho tipin e particionit.\n" + IDS_HELP_CMD_DESC_SHRINK "SHRINK\t\t- Ul masen e volumit tÃ« pÃ«rzgjedhur.\n" + IDS_HELP_CMD_DESC_UNIQUEID "UNIQUEID\t- Shfaq ose vendos tabelen e particionit GUID - (GPT) identifikues\n\t\t ose master boot record (MBR) firmen e njÃ« disku." END /* Common Error Messages */ STRINGTABLE BEGIN - IDS_ERROR_MSG_NO_SCRIPT "Error opening script: %s\n" - IDS_ERROR_MSG_BAD_ARG "Error processing argument: %s\n" + IDS_ERROR_MSG_NO_SCRIPT "Error nÃ« hapjen e skriptes: %s\n" + IDS_ERROR_MSG_BAD_ARG "Error argumenti i procesimit: %s\n" END /* Active help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_ACTIVE "\n\ -<Add active command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«activeÂ»>\n\n" END /* Add help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_ADD "\n\ -<Add add command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«addÂ»>\n\n" END /* Assign help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_ASSIGN "\n\ -<Add assign command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«assignÂ»>\n\n" END /* Attach help description */ STRINGTABLE BEGIN IDS_HELP_CMD_ATTACH "\n\ -<Add attach command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«attachÂ»>\n\n" END /* Attributes Command Messages */ STRINGTABLE BEGIN IDS_HELP_CMD_ATTRIBUTES "\n\ -<Add attributes command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«attributesÂ»>\n\n" END /* Automount help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_AUTOMOUNT "\n\ -<Add automount command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«automountÂ»>\n\n" END /* Break help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_BREAK "\n\ -<Add break command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«breakÂ»>\n\n" END /* Clean help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_CLEAN "\n\ -<Add clean command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«cleanÂ»>\n\n" END /* Compact help description */ STRINGTABLE BEGIN IDS_HELP_CMD_COMPACT "\n\ -<Add compact command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«compactÂ»>\n\n" END /* Convert help description */ STRINGTABLE BEGIN IDS_HELP_CMD_CONVERT "\n\ -<Add convert command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«convertÂ»>\n\n" END /* Convert help description */ STRINGTABLE BEGIN IDS_HELP_CMD_CREATE "\n\ -<Add create command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«createÂ»>\n\n" END /* Delete help description */ STRINGTABLE BEGIN IDS_HELP_CMD_DELETE "\n\ -<Add delete command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«deleteÂ»>\n\n" END /* Delete help description */ STRINGTABLE BEGIN IDS_HELP_CMD_DETAIL "\n\ -<Add detail command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«detailÂ»>\n\n" END /* Detach help description */ STRINGTABLE BEGIN IDS_HELP_CMD_DETACH "\n\ -<Add detach command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«detachÂ»>\n\n" END /* Expand help description */ STRINGTABLE BEGIN IDS_HELP_CMD_EXPAND "\n\ -<Add expand command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«expandÂ»>\n\n" END /* Extend help description */ STRINGTABLE BEGIN IDS_HELP_CMD_EXTEND "\n\ -<Add extend command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«extendÂ»>\n\n" END /* Filesystems help description */ STRINGTABLE BEGIN IDS_HELP_CMD_FILESYSTEMS "\n\ -<Add filesystems command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«filesystemsÂ»>\n\n" END /* Format help description */ STRINGTABLE BEGIN IDS_HELP_CMD_FORMAT "\n\ -<Add format command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«formatÂ»>\n\n" END /* GPT help description */ STRINGTABLE BEGIN IDS_HELP_CMD_GPT "\n\ -<Add gpt command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«gptÂ»>\n\n" END /* Help help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_HELP "\n\ -<Add help command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«helpÂ»>\n\n" END /* Import help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_IMPORT "\n\ -<Add import command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«importÂ»>\n\n" END /* Inactive help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_INACTIVE "\n\ -<Add inactive command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«inactiveÂ»>\n\n" END /* List help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_LIST "\n\ -<Add list command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«listÂ»>\n\n" END /* Merge help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_MERGE "\n\ -<Add merge command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«mergeÂ»>\n\n" END /* Offline help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_OFFLINE "\n\ -<Add OFFLINE command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«OFFLINEÂ»>\n\n" END /* Online help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_ONLINE "\n\ -<Add ONLINE command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«ONLINEÂ»>\n\n" END /* Recover help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_RECOVER "\n\ -<Add RECOVER command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«RECOVERÂ»>\n\n" END /* Remove help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_REMOVE "\n\ -<Add REMOVE command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«REMOVEÂ»>\n\n" END /* Repair help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_REPAIR "\n\ -<Add REPAIR command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«REPAIRÂ»>\n\n" END /* Rescan help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_RESCAN "\n\ -<Add RESCAN command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«RESCANÂ»>\n\n" END /* Retain help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_RETAIN "\n\ -<Add RETAIN command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«RETAINÂ»>\n\n" END /* San help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_SAN "\n\ -<Add SAN command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«SANÂ»>\n\n" END /* Select help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_SELECT "\n\ -<Add SELECT command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«SELECTÂ»>\n\n" END /* Setid help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_SETID "\n\ -<Add SETID command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«SETIDÂ»>\n\n" END /* Setid help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_SHRINK "\n\ -<Add SHRINK command help text here>\n\n" +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«SHRINKÂ»>\n\n" END /* Uniqueid help descriptions */ STRINGTABLE BEGIN IDS_HELP_CMD_UNIQUEID "\n\ -<Add UNIQUEID command help text here>\n\n" -END +<Shto tekstin e ndihmes pÃ«r komandÃ«n Â«UNIQUEIDÂ»>\n\n" +END Modified: trunk/reactos/base/system/format/format.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -61,6 +61,9 @@ #ifdef LANGUAGE_SK_SK #include "lang/sk-SK.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Copied: trunk/reactos/base/system/format/lang/sq-AL.rc (from r61195, trunk/reactos/base/system/format/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/sq… ============================================================================== --- trunk/reactos/base/system/format/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -1,43 +1,47 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_HELP "Usage: %s drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ - [drive:] Specifies the drive to format.\n\ - -FS:file-system Specifies the type of file system (%s).\n\ - -V:label Specifies volume label.\n\ - -Q Performs a quick format.\n\ - -A:size Overrides the default allocation unit size. Default settings\n\ - are strongly recommended for general use\n\ - NTFS supports 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ - FAT supports 8192, 16K, 32K, 64K, 128K, 256K.\n\ - NTFS compression is not supported for allocation unit sizes\n\ - above 4096.\n\ - -C Files created on the new volume will be compressed by\n\ - default.\n\n" - STRING_COMPLETE "%lu percent completed.\r" - STRING_FORMAT_FAIL "FormatEx was unable to complete successfully.\n\n" - STRING_NO_SUPPORT "Operation Not Supported" - STRING_FMIFS_FAIL "Could not located FMIFS entry points.\n\n" - STRING_UNKNOW_ARG "Unknown argument: %s\n" - STRING_DRIVE_PARM "Required drive parameter is missing.\n\n" - STRING_ERROR_DRIVE_TYPE "Could not get drive type" - STRING_INSERT_DISK "Insert a new floppy in drive %C:\nand press Enter when ready..." - STRING_NO_VOLUME "Could not query volume" - STRING_NO_VOLUME_SIZE "Could not query volume size" - STRING_FILESYSTEM "The type of the file system is %s.\n" - STRING_LABEL_NAME_EDIT "Enter current volume label for drive %C: " - STRING_ERROR_LABEL "An incorrect volume label was entered for this drive.\n" - STRING_YN_FORMAT "\nWARNING, ALL DATA ON NON_REMOVABLE DISK\n\ -DRIVE %C: WILL BE LOST!\nProceed with Format (Y/N)? " - STRING_YES_NO_FAQ "YN" - STRING_VERIFYING "Verifying" - STRING_FAST_FMT "QuickFormatting" - STRING_CREATE_FSYS "Creating file system structures.\n" - STRING_FMT_COMPLETE "Format complete.\n" - STRING_VOL_COMPRESS "Volume does not support compression.\n" - STRING_ENTER_LABEL "Volume Label (11 characters, Enter for none)? " - STRING_NO_LABEL "Could not label volume" - STRING_FREE_SPACE "\n%I64d bytes total disk space.\n%I64d bytes available on disk.\n" - STRING_SERIAL_NUMBER "\nVolume Serial Number is %04X-%04X\n" + STRING_HELP "PÃ«rdorim: %s drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C]\n\n\ + [drive:] Specifiko driverin per te formatuar.\n\ + -FS:file-system Specifiko tipin e sistemit te dokumentave (%s).\n\ + -V:label Specifiko etiketen e volumit.\n\ + -Q Performon njÃ« formatim tÃ« shpejte.\n\ + -A:size Mbishkruan alokimin e parazgjedhur te mases per njesi. Konfigurimet e parazgjedhura\n\ + janÃ« tÃ« rekomanduara per perdorim te pergjithshem\n\ + NTFS suporton 512, 1024, 2048, 4096, 8192, 16K, 32K, 64K.\n\ + FAT suporton 8192, 16K, 32K, 64K, 128K, 256K.\n\ + NTFS kompresimi nuk suportohet alokimet e mases per njesi\n\ + mbi 4096.\n\ + -C Dokumentat e krijuar ne volumin e ri do te kompresohen me\n\ + parazgjedhje.\n\n" + STRING_COMPLETE "%lu pÃ«rgjindja e kompletuar.\r" + STRING_FORMAT_FAIL "FormatEx ishte e pamundur te mbaroje me sukses.\n\n" + STRING_NO_SUPPORT "Nuk suportohet" + STRING_FMIFS_FAIL "Nuk alokohet FMIFS pika hyrjes.\n\n" + STRING_UNKNOW_ARG "Argument i panjohur: %s\n" + STRING_DRIVE_PARM "Parametra e duhura te driverit mungojne.\n\n" + STRING_ERROR_DRIVE_TYPE "Nuk dihet tipi i driverit" + STRING_INSERT_DISK "Fusni nje floppy ne drive %C:\nadhe shtypni Enter kur te jeni gati..." + STRING_NO_VOLUME "Nuk mund te pyesi nje volum" + STRING_NO_VOLUME_SIZE "Nuk mund te pyesi masen e nje volumi" + STRING_FILESYSTEM "Tipi i dokumentave te sistemit eshte %s.\n" + STRING_LABEL_NAME_EDIT "Futu ne etiketimin e volumit aktual per drive %C: " + STRING_ERROR_LABEL "NjÃ« emÃ«rtim vÃ«llimi i pasaktÃ« u futur pÃ«r kÃ«tÃ« drive.\n" + STRING_YN_FORMAT "\nKUJDES, TÃ GJITHA TÃ DHÃNAT MBI DISKUN JO_TE_LEVIZSHEM\n\ +DRIVE %C: DO TÃ HUMBASIN!\nVazhdo ne formatimin (P/J)? " + STRING_YES_NO_FAQ "PJ" + STRING_VERIFYING "Verifiko" + STRING_FAST_FMT "Format i Shpejte" + STRING_CREATE_FSYS "Krijo nje strukture te sistemit.\n" + STRING_FMT_COMPLETE "Formatimi mbaroj.\n" + STRING_VOL_COMPRESS "Volumi nuk suporton ngjeshje.\n" + STRING_ENTER_LABEL "Etiketa e Volumit (11 karaktere, Enter per anje)? " + STRING_NO_LABEL "Nuk gjindet etiketa e volumit" + STRING_FREE_SPACE "\n%I64d bytes totale ne hapesiren e diskut.\n%I64d bytes te disponushme ne disk.\n" + STRING_SERIAL_NUMBER "\nNumri Serial i Volumit Ã«shtÃ« %04X-%04X\n" END Copied: trunk/reactos/base/system/regsvr32/lang/sq-AL.rc (from r61195, trunk/reactos/base/system/regsvr32/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… ============================================================================== --- trunk/reactos/base/system/regsvr32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -1,19 +1,23 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_UsageMessage "%s\n\nUsage: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ -/u - Unregister server\n\ -/s - Silent; display no message boxes\n\ -/c - Console output\n\ -/i - Call DllInstall passing it an optional [cmdline]; when used with /u calls dll uninstall\n\ -/n - Do not call DllRegisterServer; this option must be used with /i" - IDS_NoDllSpecified "No DLL name specified." - IDS_InvalidFlag "Unrecognized flag: %s" - IDS_SwitchN_NoI "Unrecognized flag: /n must be used with the /i switch" - IDS_DllNotLoaded "LoadLibrary('%s') failed.\nGetLastError returns 0x%08x." - IDS_MissingEntry "%s was loaded, but the %s entry point was not found.\n\n\ -%s may not be exported, or a corrupt version of %s may be in memory. Consider using PView to detect and remove it." - IDS_FailureMessage "%s in %s failed.\nReturn code was: 0x%08x" - IDS_SuccessMessage "%s in %s succeeded." + IDS_UsageMessage "%s\n\nPÃ«rdorimi: regsvr32 [/u] [/s] [/c] [/n] [/i[:cmdline]] dllname\n\ +/u - Q'rregjistro serverin\n\ +/s - Qetesi; mos shfaq mesazhe ne kuti\n\ +/c - Mesazhi ne konsol\n\ +/i - Thirr DllInstall kalim opsional [cmdline]; kur perdoret me /u therret dll q'instalo\n\ +/n - Mos thirr DllRegisterServer; ky opsion duhet te perdoret me/i" + IDS_NoDllSpecified "Emer jo i specifikuar DLL'je." + IDS_InvalidFlag "Flamur i panjohur: %s" + IDS_SwitchN_NoI "Flamur i panjohur: /n duhet te perdoret me prapashtesen /i" + IDS_DllNotLoaded "LoadLibrary('%s') deshtoj.\nGetLastError kthen 0x%08x." + IDS_MissingEntry "%s u ngarkua, por %s pika e hyrjes nuk u gjend.\n\n\ +%s nuk mund te eksportohet, ose nje version i korruptuar i %s mund te jete ne memorie. Konsidero perdorimin e PView per ta gjetur dhe fshire." + IDS_FailureMessage "%s nÃ« %s deshtoj.\nKodi i kthimit ishte: 0x%08x" + IDS_SuccessMessage "%s nÃ« %s me sukses." END Modified: trunk/reactos/base/system/regsvr32/regsvr32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… ============================================================================== --- trunk/reactos/base/system/regsvr32/regsvr32.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/regsvr32/regsvr32.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -61,6 +61,9 @@ #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Copied: trunk/reactos/base/system/rundll32/lang/sq-AL.rc (from r61195, trunk/reactos/base/system/rundll32/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… ============================================================================== --- trunk/reactos/base/system/rundll32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -1,7 +1,11 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_DllNotLoaded "LoadLibrary failed to load '%s'" - IDS_MissingEntry "Missing entry point:%s\nIn %s" + IDS_DllNotLoaded "LoadLibrary deshtoj ne ngarkim '%s'" + IDS_MissingEntry "Mungon pika hyrese:%s\nNÃ« %s" END Modified: trunk/reactos/base/system/rundll32/rundll32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… ============================================================================== --- trunk/reactos/base/system/rundll32/rundll32.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/rundll32/rundll32.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -73,6 +73,9 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Copied: trunk/reactos/base/system/runonce/lang/sq-AL.rc (from r61195, trunk/reactos/base/system/runonce/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/s… ============================================================================== --- trunk/reactos/base/system/runonce/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -1,11 +1,15 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL IDD_RUNONCE_DLG DIALOG 0, 0, 239, 170 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Konfigurimi i ReactOS" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS is now setting up the following items:", -1, 38, 8, 196, 18 + LTEXT "ReactOS po ngarkon artikujt ne vazhdim:", -1, 38, 8, 196, 18 LISTBOX IDC_COMP_LIST, 36, 32, 197, 131, LBS_OWNERDRAWVARIABLE | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP ICON IDI_ICON, -1, 5, 6, 21, 20 END Modified: trunk/reactos/base/system/runonce/runonce.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/runonc… ============================================================================== --- trunk/reactos/base/system/runonce/runonce.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/runonce/runonce.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -51,6 +51,9 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Copied: trunk/reactos/base/system/subst/lang/sq-AL.rc (from r61195, trunk/reactos/base/system/subst/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/sq-… ============================================================================== --- trunk/reactos/base/system/subst/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -1,17 +1,21 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_INCORRECT_PARAMETER_COUNT "Incorrect number of parameters - %s\n" - IDS_INVALID_PARAMETER "Incorrect number of parameters - %s\n" - IDS_INVALID_PARAMETER2 "Invalid parameter - %s\n" - IDS_DRIVE_ALREADY_SUBSTED "Drive already SUBSTed\n" - IDS_FAILED_WITH_ERRORCODE "Failed with error code 0x%x: %s\n" - IDS_USAGE "Associates a path with a drive letter.\n\n\ + IDS_INCORRECT_PARAMETER_COUNT "Numri i parametrave jo i sakte - %s\n" + IDS_INVALID_PARAMETER "Numri i parametrave jo i sakte - %s\n" + IDS_INVALID_PARAMETER2 "Parameter i gabuar - %s\n" + IDS_DRIVE_ALREADY_SUBSTED "Drive tashme i SUBSTed\n" + IDS_FAILED_WITH_ERRORCODE "Deshtoj me error kode 0x%x: %s\n" + IDS_USAGE "Perputh rrugen e driverit me germÃ«n.\n\n\ SUBST [drive1: [drive2:]path]\n\ SUBST drive1: /D\n\n\ - drive1: Specifies a virtual drive to which you want to assign a path.\n\ - [drive2:]path Specifies a physical drive and path you want to assign to\n a virtual drive.\n\ - /D Deletes a substituted (virtual) drive.\n\n\ -Type SUBST with no parameters to display a list of current virtual drives.\n" + drive1: PÃ«rcakton njÃ« drive virtual pÃ«r tÃ« cilÃ«n ju doni tÃ« caktojÃ« njÃ« rrugÃ«.\n\ + [drive2:]path PÃ«rcakton njÃ« drive fizik dhe rrugen qe doni te percaktoni\nnje driveri virtual.\n\ + /D Fshin njÃ« zÃ«vendesus (virtual) drive.\n\n\ +Shkruaj SUBST pa parametra per te shfaqur njÃ« liste e drivera virtual aktual.\n" END Modified: trunk/reactos/base/system/subst/subst.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/subst.rc… ============================================================================== --- trunk/reactos/base/system/subst/subst.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/subst.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -31,6 +31,9 @@ #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Copied: trunk/reactos/base/system/userinit/lang/sq-AL.rc (from r61195, trunk/reactos/base/system/userinit/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… ============================================================================== --- trunk/reactos/base/system/userinit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -1,6 +1,10 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_USERINIT_FAIL "Userinit failed to start the shell!\n" + STRING_USERINIT_FAIL "Userinit dÃ«shtuar pÃ«r tÃ« filluar shell'in!\n" END Modified: trunk/reactos/base/system/userinit/userinit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -79,6 +79,9 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Copied: trunk/reactos/base/system/winlogon/lang/sq-AL.rc (from r61195, trunk/reactos/base/system/winlogon/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -1,44 +1,48 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Shutdown Computer" +CAPTION "Fik kompjuterin" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It is now safe to turn off your computer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + LTEXT "Tani Ã«shtÃ« e sigurt pÃ«r tÃ« fikur kompjuterin tuaj.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Restart", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 + DEFPUSHBUTTON "&Rifillo", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "User Interface Failure" +CAPTION "DÃ«shtimi NdÃ«rfaqja e PÃ«rdoruesit" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "The Logon User Interface DLL %s failed to load.", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Contact your system administrator to replace the DLL, or restore the original DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Restart", 1, 80, 91, 68, 14 + LTEXT "Hyrja e Nderfaqes se perdoruesit DLL %s deshtoj ne ngarkim.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Kontaktoni administratorin e sistemit per te zevendesuar DLL, ose te ktheje origjinalin e DLL.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Rifillo", 1, 80, 91, 68, 14 END STRINGTABLE BEGIN - IDS_PREPARENETWORKCONNECTIONS "Preparing network connections..." - IDS_APPLYINGCOMPUTERSETTINGS "Applying computer settings..." - IDS_RUNNINGSTARTUPSCRIPTS "Running startup scripts..." - IDS_RUNNINGSHUTDOWNSCRIPTS "Running shutdown scripts..." - IDS_APPLYINGYOURPERSONALSETTINGS "Applying your personal settings..." - IDS_RUNNINGLOGOFFSCRIPTS "Running logoff scripts..." - IDS_RUNNINGLOGONSCRIPTS "Running logon scripts..." - IDS_LOADINGYOURPERSONALSETTINGS "Loading your personal settings..." - IDS_CLOSINGNETWORKCONNECTIONS "Closing network connections..." - IDS_REACTOSISSHUTTINGDOWN "ReactOS is shutting down..." - IDS_PREPARETOSTANDBY "Preparing to Standby..." - IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." - IDS_SAVEYOURSETTINGS "Saving your settings..." - IDS_REACTOSISSTARTINGUP "ReactOS is starting up..." + IDS_PREPARENETWORKCONNECTIONS "Pergatit lidhjen e networkut..." + IDS_APPLYINGCOMPUTERSETTINGS "Aplikon konfigurimet e kompjuterit..." + IDS_RUNNINGSTARTUPSCRIPTS "Nis skriptet e fillimit..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Nis skriptet e fikjes..." + IDS_APPLYINGYOURPERSONALSETTINGS "Apliko konfigurimet personale..." + IDS_RUNNINGLOGOFFSCRIPTS "Nis skriptet e daljes..." + IDS_RUNNINGLOGONSCRIPTS "Nis skriptet e hyrjes..." + IDS_LOADINGYOURPERSONALSETTINGS "Ngarkon konfigurimet personale..." + IDS_CLOSINGNETWORKCONNECTIONS "Mbyll lidhjet e networkut..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS po fiket..." + IDS_PREPARETOSTANDBY "Pergatitja e gadishmerise..." + IDS_PREPARETOHIBERNATE "Pergatitet per letargji..." + IDS_SAVEYOURSETTINGS "Ruan konfigurimin tuaj..." + IDS_REACTOSISSTARTINGUP "ReactOS po fillon..." END STRINGTABLE BEGIN - IDS_FAILEDACTIVATEUSERSHELL "Winlogon failed to activate user shell!" + IDS_FAILEDACTIVATEUSERSHELL "Winlogon deshtoj te aktivizoj shell'in e perdoruesit!" END Modified: trunk/reactos/base/system/winlogon/winlogon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.rc [iso-8859-1] Fri Dec 6 15:21:08 2013 @@ -83,6 +83,9 @@ #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif

11 years

[akhaldi] 61234: [ADVAPI32/CRYPT] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 6 15:04:04 2013 New Revision: 61234 URL: http://svn.reactos.org/svn/reactos?rev=61234&view=rev Log: [ADVAPI32/CRYPT] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c trunk/reactos/dll/win32/advapi32/crypt/crypt.h trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c trunk/reactos/dll/win32/advapi32/misc/sysfunc.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Fri Dec 6 15:04:04 2013 @@ -24,6 +24,7 @@ * - Thread-safing */ +#define WINE_STRICT_PROTOTYPES #include <advapi32.h> WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -44,7 +45,7 @@ } while (--longs); } -static HWND crypt_hWindow ; +static HWND crypt_hWindow; #define CRYPT_Alloc(size) (LocalAlloc(LMEM_ZEROINIT, size)) #define CRYPT_Free(buffer) (LocalFree(buffer)) @@ -102,33 +103,38 @@ return keyname; } -/* CRYPT_UnicodeTOANSI +/* CRYPT_UnicodeToANSI * wstr - unicode string - * str - pointer to ANSI string - * strsize - size of buffer pointed to by str or -1 if we have to do the allocation + * str - pointer to ANSI string or pointer to null pointer if we have to do the allocation + * strsize - size of buffer pointed to by str * * returns TRUE if unsuccessful, FALSE otherwise. * if wstr is NULL, returns TRUE and sets str to NULL! Value of str should be checked after call */ static inline BOOL CRYPT_UnicodeToANSI(LPCWSTR wstr, LPSTR* str, int strsize) { - int count; - if (!wstr) { *str = NULL; return TRUE; } - count = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); - if (strsize == -1) - *str = CRYPT_Alloc(count * sizeof(CHAR)); - else - count = min( count, strsize ); + + if (!*str) + { + strsize = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); + *str = CRYPT_Alloc(strsize * sizeof(CHAR)); + } + else if (strsize < 0) + { + strsize = INT_MAX; /* windows will pretend that the buffer is infinitely long */ + } + if (*str) { - WideCharToMultiByte(CP_ACP, 0, wstr, -1, *str, count, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, wstr, -1, *str, strsize, NULL, NULL); return TRUE; } + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -175,12 +181,9 @@ return TRUE; } -static BOOL CALLBACK CRYPT_ReturnhWnd(HWND *phWnd) -{ - if (!phWnd) - return FALSE; - *phWnd = crypt_hWindow; - return TRUE; +static void CALLBACK CRYPT_ReturnhWnd(HWND *phWnd) +{ + if (phWnd) *phWnd = crypt_hWindow; } #define CRYPT_GetProvFunc(name) \ @@ -233,7 +236,7 @@ /* FIXME: Not sure what the pbContextInfo field is for. * Does it need memory allocation? - */ + */ provider->pVTable->Version = 3; provider->pVTable->FuncVerifyImage = CRYPT_VerifyImage; provider->pVTable->FuncReturnhWnd = CRYPT_ReturnhWnd; @@ -477,13 +480,13 @@ goto error; } pProv->pVTable->dwProvType = dwProvType; - if(!CRYPT_UnicodeToANSI(provname, &provnameA, -1)) + if(!CRYPT_UnicodeToANSI(provname, &provnameA, 0)) { /* CRYPT_UnicodeToANSI calls SetLastError */ goto error; } pProv->pVTable->pszProvName = provnameA; - if(!CRYPT_UnicodeToANSI(pszContainer, &pszContainerA, -1)) + if(!CRYPT_UnicodeToANSI(pszContainer, &pszContainerA, 0)) { /* CRYPT_UnicodeToANSI calls SetLastError */ goto error; @@ -541,8 +544,8 @@ PWSTR pProvider = NULL, pContainer = NULL; BOOL ret = FALSE; - TRACE("(%p, %s, %s, %d, %08x)\n", phProv, pszContainer, - pszProvider, dwProvType, dwFlags); + TRACE("(%p, %s, %s, %d, %08x)\n", phProv, debugstr_a(pszContainer), + debugstr_a(pszProvider), dwProvType, dwFlags); if ( !CRYPT_ANSIToUnicode(pszContainer, &pContainer, -1) ) { @@ -716,12 +719,8 @@ TRACE("(0x%lx, 0x%x, 0x%lx, %08x, %p)\n", hProv, Algid, hKey, dwFlags, phHash); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!phHash || prov->dwMagic != MAGIC_CRYPTPROV) + if (!prov || !phHash || prov->dwMagic != MAGIC_CRYPTPROV || + (key && key->dwMagic != MAGIC_CRYPTKEY)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -738,7 +737,7 @@ } hash->pProvider = prov; - + hash->dwMagic = MAGIC_CRYPTHASH; if (prov->pFuncs->pCPCreateHash(prov->hPrivate, Algid, key ? key->hPrivate : 0, 0, &hash->hPrivate)) { @@ -747,6 +746,7 @@ } /* CSP error! */ + hash->dwMagic = 0; CRYPT_Free(hash); *phHash = 0; return FALSE; @@ -779,7 +779,9 @@ TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen); - if (!key || !pbData || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!key || !pbData || !pdwDataLen || + !key->pProvider || key->dwMagic != MAGIC_CRYPTKEY || + key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -820,7 +822,7 @@ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!phKey || prov->dwMagic != MAGIC_CRYPTPROV) + if (!phKey || prov->dwMagic != MAGIC_CRYPTPROV || hash->dwMagic != MAGIC_CRYPTHASH) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -832,6 +834,7 @@ } key->pProvider = prov; + key->dwMagic = MAGIC_CRYPTKEY; if (prov->pFuncs->pCPDeriveKey(prov->hPrivate, Algid, hash->hPrivate, dwFlags, &key->hPrivate)) { *phKey = (HCRYPTKEY)key; @@ -839,6 +842,7 @@ } /* CSP error! */ + key->dwMagic = 0; CRYPT_Free(key); *phKey = 0; return FALSE; @@ -870,7 +874,8 @@ return FALSE; } - if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH || + hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -878,6 +883,7 @@ prov = hash->pProvider; ret = prov->pFuncs->pCPDestroyHash(prov->hPrivate, hash->hPrivate); + hash->dwMagic = 0; CRYPT_Free(hash); return ret; } @@ -908,7 +914,8 @@ return FALSE; } - if (!key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!key->pProvider || key->dwMagic != MAGIC_CRYPTKEY || + key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -916,6 +923,7 @@ prov = key->pProvider; ret = prov->pFuncs->pCPDestroyKey(prov->hPrivate, key->hPrivate); + key->dwMagic = 0; CRYPT_Free(key); return ret; } @@ -944,8 +952,8 @@ TRACE("(0x%lx, %p, %08x, %p)\n", hHash, pdwReserved, dwFlags, phHash); orghash = (PCRYPTHASH)hHash; - if (!orghash || pdwReserved || !phHash || !orghash->pProvider || - orghash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!orghash || pdwReserved || !phHash || !orghash->pProvider || + orghash->dwMagic != MAGIC_CRYPTHASH || orghash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -965,11 +973,13 @@ } newhash->pProvider = prov; + newhash->dwMagic = MAGIC_CRYPTHASH; if (prov->pFuncs->pCPDuplicateHash(prov->hPrivate, orghash->hPrivate, pdwReserved, dwFlags, &newhash->hPrivate)) { *phHash = (HCRYPTHASH)newhash; return TRUE; } + newhash->dwMagic = 0; CRYPT_Free(newhash); return FALSE; } @@ -997,7 +1007,8 @@ TRACE("(0x%lx, %p, %08x, %p)\n", hKey, pdwReserved, dwFlags, phKey); orgkey = (PCRYPTKEY)hKey; - if (!orgkey || pdwReserved || !phKey || !orgkey->pProvider || + if (!orgkey || pdwReserved || !phKey || !orgkey->pProvider || + orgkey->dwMagic != MAGIC_CRYPTKEY || orgkey->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1018,11 +1029,13 @@ } newkey->pProvider = prov; + newkey->dwMagic = MAGIC_CRYPTKEY; if (prov->pFuncs->pCPDuplicateKey(prov->hPrivate, orgkey->hPrivate, pdwReserved, dwFlags, &newkey->hPrivate)) { *phKey = (HCRYPTKEY)newkey; return TRUE; } + newkey->dwMagic = 0; CRYPT_Free(newkey); return FALSE; } @@ -1059,7 +1072,8 @@ TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p, %d)\n", hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen); - if (!key || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!key || !pdwDataLen || !key->pProvider || + key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1189,7 +1203,7 @@ { PWSTR str = NULL; DWORD bufsize; - BOOL ret; /* = FALSE; */ + BOOL ret; TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); @@ -1276,19 +1290,24 @@ if (dwIndex >= numkeys) { SetLastError(ERROR_NO_MORE_ITEMS); + RegCloseKey(hKey); return FALSE; } keylen++; if ( !(keyname = CRYPT_Alloc(keylen*sizeof(WCHAR))) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); + RegCloseKey(hKey); return FALSE; } if ( RegEnumKeyW(hKey, dwIndex, keyname, keylen) ) { CRYPT_Free(keyname); + RegCloseKey(hKey); return FALSE; } RegOpenKeyW(hKey, keyname, &hSubkey); + RegCloseKey(hKey); + ch = keyname + strlenW(keyname); /* Convert "Type 000" to 0, etc/ */ *pdwProvType = *(--ch) - '0'; @@ -1300,11 +1319,11 @@ if (result) { SetLastError(result); + RegCloseKey(hSubkey); return FALSE; } RegCloseKey(hSubkey); - RegCloseKey(hKey); return TRUE; } @@ -1375,7 +1394,8 @@ TRACE("(0x%lx, 0x%lx, %d, %08x, %p, %p)\n", hKey, hExpKey, dwBlobType, dwFlags, pbData, pdwDataLen); - if (!key || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!key || !pdwDataLen || !key->pProvider || + key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1408,11 +1428,6 @@ TRACE("(0x%lx, %d, %08x, %p)\n", hProv, Algid, dwFlags, phKey); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } if (!phKey || !prov || prov->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); @@ -1425,7 +1440,7 @@ } key->pProvider = prov; - + key->dwMagic = MAGIC_CRYPTKEY; if (prov->pFuncs->pCPGenKey(prov->hPrivate, Algid, dwFlags, &key->hPrivate)) { *phKey = (HCRYPTKEY)key; @@ -1433,6 +1448,7 @@ } /* CSP error! */ + key->dwMagic = 0; CRYPT_Free(key); return FALSE; } @@ -1494,6 +1510,8 @@ CRYPT_Free(keyname); result = RegQueryValueExW(hKey, nameW, NULL, NULL, (LPBYTE)pszProvName, pcbProvName); + RegCloseKey(hKey); + if (result) { if (result != ERROR_MORE_DATA) @@ -1504,7 +1522,6 @@ return FALSE; } - RegCloseKey(hKey); return TRUE; } @@ -1518,7 +1535,7 @@ { PWSTR str = NULL; DWORD bufsize; - BOOL ret = FALSE; + BOOL ret; TRACE("(%d, %p, %08x, %p, %p)\n", dwProvType, pdwReserved, dwFlags, pszProvName, pcbProvName); @@ -1571,7 +1588,8 @@ TRACE("(0x%lx, %d, %p, %p, %08x)\n", hHash, dwParam, pbData, pdwDataLen, dwFlags); - if (!hash || !pdwDataLen || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!hash || !pdwDataLen || !hash->pProvider || + hash->dwMagic != MAGIC_CRYPTHASH || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1609,7 +1627,8 @@ TRACE("(0x%lx, %d, %p, %p, %08x)\n", hKey, dwParam, pbData, pdwDataLen, dwFlags); - if (!key || !pdwDataLen || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!key || !pdwDataLen || !key->pProvider || + key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1693,7 +1712,7 @@ } key->pProvider = prov; - + key->dwMagic = MAGIC_CRYPTKEY; if (prov->pFuncs->pCPGetUserKey(prov->hPrivate, dwKeySpec, &key->hPrivate)) { *phUserKey = (HCRYPTKEY)key; @@ -1701,6 +1720,7 @@ } /* CSP Error */ + key->dwMagic = 0; CRYPT_Free(key); *phUserKey = 0; return FALSE; @@ -1733,7 +1753,8 @@ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH || + hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1771,7 +1792,8 @@ return FALSE; } - if (!hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH || + hash->pProvider->dwMagic != MAGIC_CRYPTPROV || key->dwMagic != MAGIC_CRYPTKEY) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1806,7 +1828,9 @@ TRACE("(0x%lx, %p, %d, 0x%lx, %08x, %p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); - if (!prov || !pbData || !dwDataLen || !phKey || prov->dwMagic != MAGIC_CRYPTPROV) + if (!prov || !pbData || !dwDataLen || !phKey || + prov->dwMagic != MAGIC_CRYPTPROV || + (pubkey && pubkey->dwMagic != MAGIC_CRYPTKEY)) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1819,6 +1843,7 @@ } importkey->pProvider = prov; + importkey->dwMagic = MAGIC_CRYPTKEY; if (prov->pFuncs->pCPImportKey(prov->hPrivate, pbData, dwDataLen, pubkey ? pubkey->hPrivate : 0, dwFlags, &importkey->hPrivate)) { @@ -1826,6 +1851,7 @@ return TRUE; } + importkey->dwMagic = 0; CRYPT_Free(importkey); return FALSE; } @@ -1866,7 +1892,8 @@ SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!pdwSigLen || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!pdwSigLen || !hash->pProvider || hash->dwMagic != MAGIC_CRYPTHASH || + hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1920,7 +1947,8 @@ TRACE("(0x%lx, %d, %p, %08x)\n", hHash, dwParam, pbData, dwFlags); - if (!hash || !pbData || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!hash || !pbData || !hash->pProvider || + hash->dwMagic != MAGIC_CRYPTHASH || hash->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1953,7 +1981,8 @@ TRACE("(0x%lx, %d, %p, %08x)\n", hKey, dwParam, pbData, dwFlags); - if (!key || !pbData || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!key || !pbData || !key->pProvider || + key->dwMagic != MAGIC_CRYPTKEY || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -2189,7 +2218,7 @@ TRACE("(0x%lx, %p, %d, 0x%lx, %s, %08x)\n", hHash, pbSignature, dwSigLen, hPubKey, debugstr_w(sDescription), dwFlags); - if (!hash || !key || + if (!hash || !key || key->dwMagic != MAGIC_CRYPTKEY || hash->dwMagic != MAGIC_CRYPTHASH || !hash->pProvider || hash->pProvider->dwMagic != MAGIC_CRYPTPROV || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { @@ -2222,3 +2251,132 @@ return result; } + +#ifndef __REACTOS__ +/****************************************************************************** + * SystemFunction030 (ADVAPI32.@) + * + * Tests if two blocks of 16 bytes are equal + * + * PARAMS + * b1,b2 [I] block of 16 bytes + * + * RETURNS + * TRUE if blocks are the same + * FALSE if blocks are different + */ +BOOL WINAPI SystemFunction030(LPCVOID b1, LPCVOID b2) +{ + return !memcmp(b1, b2, 0x10); +} + +/****************************************************************************** + * SystemFunction035 (ADVAPI32.@) + * + * Described here: +http://disc.server.com/discussion.cgi?disc=148775;article=942;title=Coding%2FASM%2FSystem + * + * NOTES + * Stub, always return TRUE. + */ +BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) +{ + FIXME("%s: stub\n", debugstr_a(lpszDllFilePath)); + return TRUE; +} + +/****************************************************************************** + * SystemFunction036 (ADVAPI32.@) + * + * MSDN documents this function as RtlGenRandom and declares it in ntsecapi.h + * + * PARAMS + * pbBufer [O] Pointer to memory to receive random bytes. + * dwLen [I] Number of random bytes to fetch. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ + +BOOLEAN WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen) +{ + int dev_random; + + dev_random = open("/dev/urandom", O_RDONLY); + if (dev_random != -1) + { + if (read(dev_random, pbBuffer, dwLen) == (ssize_t)dwLen) + { + close(dev_random); + return TRUE; + } + close(dev_random); + } + else + FIXME("couldn't open /dev/urandom\n"); + SetLastError(NTE_FAIL); + return FALSE; +} + +/* + These functions have nearly identical prototypes to CryptProtectMemory and CryptUnprotectMemory, + in crypt32.dll. + */ + +/****************************************************************************** + * SystemFunction040 (ADVAPI32.@) + * + * MSDN documents this function as RtlEncryptMemory and declares it in ntsecapi.h. + * + * PARAMS + * memory [I/O] Pointer to memory to encrypt. + * length [I] Length of region to encrypt in bytes. + * flags [I] Control whether other processes are able to decrypt the memory. + * RTL_ENCRYPT_OPTION_SAME_PROCESS + * RTL_ENCRYPT_OPTION_CROSS_PROCESS + * RTL_ENCRYPT_OPTION_SAME_LOGON + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: NTSTATUS error code + * + * NOTES + * length must be a multiple of RTL_ENCRYPT_MEMORY_SIZE. + * If flags are specified when encrypting, the same flag value must be given + * when decrypting the memory. + */ +NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags) +{ + FIXME("(%p, %x, %x): stub [RtlEncryptMemory]\n", memory, length, flags); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction041 (ADVAPI32.@) + * + * MSDN documents this function as RtlDecryptMemory and declares it in ntsecapi.h. + * + * PARAMS + * memory [I/O] Pointer to memory to decrypt. + * length [I] Length of region to decrypt in bytes. + * flags [I] Control whether other processes are able to decrypt the memory. + * RTL_ENCRYPT_OPTION_SAME_PROCESS + * RTL_ENCRYPT_OPTION_CROSS_PROCESS + * RTL_ENCRYPT_OPTION_SAME_LOGON + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: NTSTATUS error code + * + * NOTES + * length must be a multiple of RTL_ENCRYPT_MEMORY_SIZE. + * If flags are specified when encrypting, the same flag value must be given + * when decrypting the memory. + */ +NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) +{ + FIXME("(%p, %x, %x): stub [RtlDecryptMemory]\n", memory, length, flags); + return STATUS_SUCCESS; +} +#endif /* !__REACTOS __ */ Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.h [iso-8859-1] Fri Dec 6 15:04:04 2013 @@ -57,6 +57,8 @@ } PROVFUNCS, *PPROVFUNCS; #define MAGIC_CRYPTPROV 0xA39E741F +#define MAGIC_CRYPTKEY 0xA39E741E +#define MAGIC_CRYPTHASH 0xA39E741D typedef struct tagCRYPTPROV { @@ -70,12 +72,14 @@ typedef struct tagCRYPTKEY { + DWORD dwMagic; PCRYPTPROV pProvider; HCRYPTKEY hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ } CRYPTKEY, *PCRYPTKEY; typedef struct tagCRYPTHASH { + DWORD dwMagic; PCRYPTPROV pProvider; HCRYPTHASH hPrivate; /*CSP's handle - Should not be given to application under any circumstances!*/ } CRYPTHASH, *PCRYPTHASH; @@ -83,9 +87,9 @@ #define MAXPROVTYPES 999 extern unsigned char *CRYPT_DEShash( unsigned char *dst, const unsigned char *key, - const unsigned char *src ); + const unsigned char *src ) DECLSPEC_HIDDEN; extern unsigned char *CRYPT_DESunhash( unsigned char *dst, const unsigned char *key, - const unsigned char *src ); + const unsigned char *src ) DECLSPEC_HIDDEN; void byteReverse(unsigned char *buf, unsigned longs); struct ustring { @@ -111,7 +115,6 @@ VOID WINAPI MD4Final(MD4_CTX *ctx); void arc4_init(arc4_info *a4i, const BYTE *key, unsigned int keyLen); void arc4_ProcessString(arc4_info *a4i, BYTE *inoutString, unsigned int length); -NTSTATUS WINAPI SystemFunction032(struct ustring *data, struct ustring *key); - +NTSTATUS WINAPI SystemFunction032(struct ustring *data, const struct ustring *key); #endif /* __WINE_CRYPT_H_ */ Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_arc4.c [iso-8859-1] Fri Dec 6 15:04:04 2013 @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + /* http://cryptopp.sourceforge.net/docs/ref521/arc4_8cpp-source.html */ #include <advapi32.h> @@ -65,3 +66,30 @@ a4i->y = y; } +#ifndef __REACTOS__ +/****************************************************************************** + * SystemFunction032 [ADVAPI32.@] + * + * Encrypts a string data using ARC4 + * + * PARAMS + * data [I/O] data to encrypt + * key [I] key data + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + * NOTES + * see http://web.it.kth.se/~rom/ntsec.html#crypto-strongavail + */ +NTSTATUS WINAPI SystemFunction032(struct ustring *data, const struct ustring *key) +{ + arc4_info a4i; + + arc4_init(&a4i, key->Buffer, key->Length); + arc4_ProcessString(&a4i, data->Buffer, data->Length); + + return STATUS_SUCCESS; +} +#endif Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_lmhash.c [iso-8859-1] Fri Dec 6 15:04:04 2013 @@ -45,3 +45,355 @@ return STATUS_SUCCESS; } + +#ifndef __REACTOS__ +/****************************************************************************** + * SystemFunction008 [ADVAPI32.@] + * + * Creates a LM response from a challenge and a password hash + * + * PARAMS + * challenge [I] Challenge from authentication server + * hash [I] NTLM hash (from SystemFunction006) + * response [O] response to send back to the server + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + * NOTES + * see http://davenport.sourceforge.net/ntlm.html#theLmResponse + * + */ +NTSTATUS WINAPI SystemFunction008(const BYTE *challenge, const BYTE *hash, LPBYTE response) +{ + BYTE key[7*3]; + + if (!challenge || !response) + return STATUS_UNSUCCESSFUL; + + memset(key, 0, sizeof key); + memcpy(key, hash, 0x10); + + CRYPT_DEShash(response, key, challenge); + CRYPT_DEShash(response+8, key+7, challenge); + CRYPT_DEShash(response+16, key+14, challenge); + + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction009 [ADVAPI32.@] + * + * Seems to do the same as SystemFunction008 ... + */ +NTSTATUS WINAPI SystemFunction009(const BYTE *challenge, const BYTE *hash, LPBYTE response) +{ + return SystemFunction008(challenge, hash, response); +} + +/****************************************************************************** + * SystemFunction001 [ADVAPI32.@] + * + * Encrypts a single block of data using DES + * + * PARAMS + * data [I] data to encrypt (8 bytes) + * key [I] key data (7 bytes) + * output [O] the encrypted data (8 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + */ +NTSTATUS WINAPI SystemFunction001(const BYTE *data, const BYTE *key, LPBYTE output) +{ + if (!data || !output) + return STATUS_UNSUCCESSFUL; + CRYPT_DEShash(output, key, data); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction002 [ADVAPI32.@] + * + * Decrypts a single block of data using DES + * + * PARAMS + * data [I] data to decrypt (8 bytes) + * key [I] key data (7 bytes) + * output [O] the decrypted data (8 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + */ +NTSTATUS WINAPI SystemFunction002(const BYTE *data, const BYTE *key, LPBYTE output) +{ + if (!data || !output) + return STATUS_UNSUCCESSFUL; + CRYPT_DESunhash(output, key, data); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction003 [ADVAPI32.@] + * + * Hashes a key using DES and a fixed datablock + * + * PARAMS + * key [I] key data (7 bytes) + * output [O] hashed key (8 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + */ +NTSTATUS WINAPI SystemFunction003(const BYTE *key, LPBYTE output) +{ + if (!output) + return STATUS_UNSUCCESSFUL; + CRYPT_DEShash(output, key, CRYPT_LMhash_Magic); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction004 [ADVAPI32.@] + * + * Encrypts a block of data with DES in ECB mode, preserving the length + * + * PARAMS + * data [I] data to encrypt + * key [I] key data (up to 7 bytes) + * output [O] buffer to receive encrypted data + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_BUFFER_TOO_SMALL if the output buffer is too small + * Failure: STATUS_INVALID_PARAMETER_2 if the key is zero length + * + * NOTES + * Encrypt buffer size should be input size rounded up to 8 bytes + * plus an extra 8 bytes. + */ +NTSTATUS WINAPI SystemFunction004(const struct ustring *in, + const struct ustring *key, + struct ustring *out) +{ + union { + unsigned char uc[8]; + unsigned int ui[2]; + } data; + unsigned char deskey[7]; + unsigned int crypt_len, ofs; + + if (key->Length<=0) + return STATUS_INVALID_PARAMETER_2; + + crypt_len = ((in->Length+7)&~7); + if (out->MaximumLength < (crypt_len+8)) + return STATUS_BUFFER_TOO_SMALL; + + data.ui[0] = in->Length; + data.ui[1] = 1; + + if (key->Length<sizeof deskey) + { + memset(deskey, 0, sizeof deskey); + memcpy(deskey, key->Buffer, key->Length); + } + else + memcpy(deskey, key->Buffer, sizeof deskey); + + CRYPT_DEShash(out->Buffer, deskey, data.uc); + + for(ofs=0; ofs<(crypt_len-8); ofs+=8) + CRYPT_DEShash(out->Buffer+8+ofs, deskey, in->Buffer+ofs); + + memset(data.uc, 0, sizeof data.uc); + memcpy(data.uc, in->Buffer+ofs, in->Length +8-crypt_len); + CRYPT_DEShash(out->Buffer+8+ofs, deskey, data.uc); + + out->Length = crypt_len+8; + + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction005 [ADVAPI32.@] + * + * Decrypts a block of data with DES in ECB mode + * + * PARAMS + * data [I] data to decrypt + * key [I] key data (up to 7 bytes) + * output [O] buffer to receive decrypted data + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_BUFFER_TOO_SMALL if the output buffer is too small + * Failure: STATUS_INVALID_PARAMETER_2 if the key is zero length + * + */ +NTSTATUS WINAPI SystemFunction005(const struct ustring *in, + const struct ustring *key, + struct ustring *out) +{ + union { + unsigned char uc[8]; + unsigned int ui[2]; + } data; + unsigned char deskey[7]; + unsigned int ofs, crypt_len; + + if (key->Length<=0) + return STATUS_INVALID_PARAMETER_2; + + if (key->Length<sizeof deskey) + { + memset(deskey, 0, sizeof deskey); + memcpy(deskey, key->Buffer, key->Length); + } + else + memcpy(deskey, key->Buffer, sizeof deskey); + + CRYPT_DESunhash(data.uc, deskey, in->Buffer); + + if (data.ui[1] != 1) + return STATUS_UNKNOWN_REVISION; + + crypt_len = data.ui[0]; + if (crypt_len > out->MaximumLength) + return STATUS_BUFFER_TOO_SMALL; + + for (ofs=0; (ofs+8)<crypt_len; ofs+=8) + CRYPT_DESunhash(out->Buffer+ofs, deskey, in->Buffer+ofs+8); + + if (ofs<crypt_len) + { + CRYPT_DESunhash(data.uc, deskey, in->Buffer+ofs+8); + memcpy(out->Buffer+ofs, data.uc, crypt_len-ofs); + } + + out->Length = crypt_len; + + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction012 [ADVAPI32.@] + * SystemFunction014 [ADVAPI32.@] + * SystemFunction016 [ADVAPI32.@] + * SystemFunction018 [ADVAPI32.@] + * SystemFunction020 [ADVAPI32.@] + * SystemFunction022 [ADVAPI32.@] + * + * Encrypts two DES blocks with two keys + * + * PARAMS + * data [I] data to encrypt (16 bytes) + * key [I] key data (two lots of 7 bytes) + * output [O] buffer to receive encrypted data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL if the input or output buffer is NULL + */ +NTSTATUS WINAPI SystemFunction012(const BYTE *in, const BYTE *key, LPBYTE out) +{ + if (!in || !out) + return STATUS_UNSUCCESSFUL; + + CRYPT_DEShash(out, key, in); + CRYPT_DEShash(out+8, key+7, in+8); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction013 [ADVAPI32.@] + * SystemFunction015 [ADVAPI32.@] + * SystemFunction017 [ADVAPI32.@] + * SystemFunction019 [ADVAPI32.@] + * SystemFunction021 [ADVAPI32.@] + * SystemFunction023 [ADVAPI32.@] + * + * Decrypts two DES blocks with two keys + * + * PARAMS + * data [I] data to decrypt (16 bytes) + * key [I] key data (two lots of 7 bytes) + * output [O] buffer to receive decrypted data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL if the input or output buffer is NULL + */ +NTSTATUS WINAPI SystemFunction013(const BYTE *in, const BYTE *key, LPBYTE out) +{ + if (!in || !out) + return STATUS_UNSUCCESSFUL; + + CRYPT_DESunhash(out, key, in); + CRYPT_DESunhash(out+8, key+7, in+8); + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction024 [ADVAPI32.@] + * + * Encrypts two DES blocks with a 32 bit key... + * + * PARAMS + * data [I] data to encrypt (16 bytes) + * key [I] key data (4 bytes) + * output [O] buffer to receive encrypted data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + */ +NTSTATUS WINAPI SystemFunction024(const BYTE *in, const BYTE *key, LPBYTE out) +{ + BYTE deskey[0x10]; + + memcpy(deskey, key, 4); + memcpy(deskey+4, key, 4); + memcpy(deskey+8, key, 4); + memcpy(deskey+12, key, 4); + + CRYPT_DEShash(out, deskey, in); + CRYPT_DEShash(out+8, deskey+7, in+8); + + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction025 [ADVAPI32.@] + * + * Decrypts two DES blocks with a 32 bit key... + * + * PARAMS + * data [I] data to encrypt (16 bytes) + * key [I] key data (4 bytes) + * output [O] buffer to receive encrypted data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + */ +NTSTATUS WINAPI SystemFunction025(const BYTE *in, const BYTE *key, LPBYTE out) +{ + BYTE deskey[0x10]; + + memcpy(deskey, key, 4); + memcpy(deskey+4, key, 4); + memcpy(deskey+8, key, 4); + memcpy(deskey+12, key, 4); + + CRYPT_DESunhash(out, deskey, in); + CRYPT_DESunhash(out+8, deskey+7, in+8); + + return STATUS_SUCCESS; +} +#endif /* !__REACTOS__ */ Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_md4.c [iso-8859-1] Fri Dec 6 15:04:04 2013 @@ -34,6 +34,124 @@ */ #include <advapi32.h> + +static void MD4Transform( unsigned int buf[4], unsigned int const in[16] ); + +/* + * Start MD4 accumulation. Set bit count to 0 and buffer to mysterious + * initialization constants. + */ +VOID WINAPI MD4Init( MD4_CTX *ctx ) +{ + ctx->buf[0] = 0x67452301; + ctx->buf[1] = 0xefcdab89; + ctx->buf[2] = 0x98badcfe; + ctx->buf[3] = 0x10325476; + + ctx->i[0] = ctx->i[1] = 0; +} + +/* + * Update context to reflect the concatenation of another buffer full + * of bytes. + */ +VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ) +{ + register unsigned int t; + + /* Update bitcount */ + t = ctx->i[0]; + + if ((ctx->i[0] = t + (len << 3)) < t) + ctx->i[1]++; /* Carry from low to high */ + + ctx->i[1] += len >> 29; + t = (t >> 3) & 0x3f; + + /* Handle any leading odd-sized chunks */ + if (t) + { + unsigned char *p = (unsigned char *)ctx->in + t; + t = 64 - t; + + if (len < t) + { + memcpy( p, buf, len ); + return; + } + + memcpy( p, buf, t ); + byteReverse( ctx->in, 16 ); + + MD4Transform( ctx->buf, (unsigned int *)ctx->in ); + + buf += t; + len -= t; + } + + /* Process data in 64-byte chunks */ + while (len >= 64) + { + memcpy( ctx->in, buf, 64 ); + byteReverse( ctx->in, 16 ); + + MD4Transform( ctx->buf, (unsigned int *)ctx->in ); + + buf += 64; + len -= 64; + } + + /* Handle any remaining bytes of data. */ + memcpy( ctx->in, buf, len ); +} + +/* + * Final wrapup - pad to 64-byte boundary with the bit pattern + * 1 0* (64-bit count of bits processed, MSB-first) + */ +VOID WINAPI MD4Final( MD4_CTX *ctx ) +{ + unsigned int count; + unsigned char *p; + + /* Compute number of bytes mod 64 */ + count = (ctx->i[0] >> 3) & 0x3F; + + /* Set the first char of padding to 0x80. This is safe since there is + always at least one byte free */ + p = ctx->in + count; + *p++ = 0x80; + + /* Bytes of padding needed to make 64 bytes */ + count = 64 - 1 - count; + + /* Pad out to 56 mod 64 */ + if (count < 8) + { + /* Two lots of padding: Pad the first block to 64 bytes */ + memset( p, 0, count ); + byteReverse( ctx->in, 16 ); + MD4Transform( ctx->buf, (unsigned int *)ctx->in ); + + /* Now fill the next block with 56 bytes */ + memset( ctx->in, 0, 56 ); + } + else + { + /* Pad block to 56 bytes */ + memset( p, 0, count - 8 ); + } + + byteReverse( ctx->in, 14 ); + + /* Append length in bits and transform */ + ((unsigned int *)ctx->in)[14] = ctx->i[0]; + ((unsigned int *)ctx->in)[15] = ctx->i[1]; + + MD4Transform( ctx->buf, (unsigned int *)ctx->in ); + byteReverse( (unsigned char *)ctx->buf, 4 ); + memcpy( ctx->digest, ctx->buf, 16 ); +} /* The three core functions */ @@ -125,118 +243,58 @@ buf[3] += d; } -/* - * Start MD4 accumulation. Set bit count to 0 and buffer to mysterious - * initialization constants. - */ -VOID WINAPI MD4Init( MD4_CTX *ctx ) -{ - ctx->buf[0] = 0x67452301; - ctx->buf[1] = 0xefcdab89; - ctx->buf[2] = 0x98badcfe; - ctx->buf[3] = 0x10325476; - - ctx->i[0] = ctx->i[1] = 0; -} - -/* - * Update context to reflect the concatenation of another buffer full - * of bytes. - */ -VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ) -{ - register unsigned int t; - - /* Update bitcount */ - t = ctx->i[0]; - - if ((ctx->i[0] = t + (len << 3)) < t) - ctx->i[1]++; /* Carry from low to high */ - - ctx->i[1] += len >> 29; - t = (t >> 3) & 0x3f; - - /* Handle any leading odd-sized chunks */ - if (t) - { - unsigned char *p = (unsigned char *)ctx->in + t; - t = 64 - t; - - if (len < t) - { - memcpy( p, buf, len ); - return; - } - - memcpy( p, buf, t ); - byteReverse( ctx->in, 16 ); - - MD4Transform( ctx->buf, (unsigned int *)ctx->in ); - - buf += t; - len -= t; - } - - /* Process data in 64-byte chunks */ - while (len >= 64) - { - memcpy( ctx->in, buf, 64 ); - byteReverse( ctx->in, 16 ); - - MD4Transform( ctx->buf, (unsigned int *)ctx->in ); - - buf += 64; - len -= 64; - } - - /* Handle any remaining bytes of data. */ - memcpy( ctx->in, buf, len ); -} - -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -VOID WINAPI MD4Final( MD4_CTX *ctx ) -{ - unsigned int count; - unsigned char *p; - - /* Compute number of bytes mod 64 */ - count = (ctx->i[0] >> 3) & 0x3F; - - /* Set the first char of padding to 0x80. This is safe since there is - always at least one byte free */ - p = ctx->in + count; - *p++ = 0x80; - - /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; - - /* Pad out to 56 mod 64 */ - if (count < 8) - { - /* Two lots of padding: Pad the first block to 64 bytes */ - memset( p, 0, count ); - byteReverse( ctx->in, 16 ); - MD4Transform( ctx->buf, (unsigned int *)ctx->in ); - - /* Now fill the next block with 56 bytes */ - memset( ctx->in, 0, 56 ); - } - else - { - /* Pad block to 56 bytes */ - memset( p, 0, count - 8 ); - } - - byteReverse( ctx->in, 14 ); - - /* Append length in bits and transform */ - ((unsigned int *)ctx->in)[14] = ctx->i[0]; - ((unsigned int *)ctx->in)[15] = ctx->i[1]; - - MD4Transform( ctx->buf, (unsigned int *)ctx->in ); - byteReverse( (unsigned char *)ctx->buf, 4 ); - memcpy( ctx->digest, ctx->buf, 16 ); -} +#ifndef __REACTOS__ +/****************************************************************************** + * SystemFunction007 [ADVAPI32.@] + * + * MD4 hash a unicode string + * + * PARAMS + * string [I] the string to hash + * output [O] the md4 hash of the string (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + */ +NTSTATUS WINAPI SystemFunction007(const UNICODE_STRING *string, LPBYTE hash) +{ + MD4_CTX ctx; + + MD4Init( &ctx ); + MD4Update( &ctx, (const BYTE *)string->Buffer, string->Length ); + MD4Final( &ctx ); + memcpy( hash, ctx.digest, 0x10 ); + + return STATUS_SUCCESS; +} + +/****************************************************************************** + * SystemFunction010 [ADVAPI32.@] + * SystemFunction011 [ADVAPI32.@] + * + * MD4 hashes 16 bytes of data + * + * PARAMS + * unknown [] seems to have no effect on the output + * data [I] pointer to data to hash (16 bytes) + * output [O] the md4 hash of the data (16 bytes) + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: STATUS_UNSUCCESSFUL + * + */ +NTSTATUS WINAPI SystemFunction010(LPVOID unknown, const BYTE *data, LPBYTE hash) +{ + MD4_CTX ctx; + + MD4Init( &ctx ); + MD4Update( &ctx, data, 0x10 ); + MD4Final( &ctx ); + memcpy( hash, ctx.digest, 0x10 ); + + return STATUS_SUCCESS; +} +#endif /* !__REACTOS__ */ Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt_md5.c [iso-8859-1] Fri Dec 6 15:04:04 2013 @@ -43,6 +43,123 @@ unsigned char digest[16]; } MD5_CTX; +static void MD5Transform( unsigned int buf[4], const unsigned int in[16] ); + +/* + * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious + * initialization constants. + */ +VOID WINAPI MD5Init( MD5_CTX *ctx ) +{ + ctx->buf[0] = 0x67452301; + ctx->buf[1] = 0xefcdab89; + ctx->buf[2] = 0x98badcfe; + ctx->buf[3] = 0x10325476; + + ctx->i[0] = ctx->i[1] = 0; +} + +/* + * Update context to reflect the concatenation of another buffer full + * of bytes. + */ +VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ) +{ + register unsigned int t; + + /* Update bitcount */ + t = ctx->i[0]; + + if ((ctx->i[0] = t + (len << 3)) < t) + ctx->i[1]++; /* Carry from low to high */ + + ctx->i[1] += len >> 29; + t = (t >> 3) & 0x3f; + + /* Handle any leading odd-sized chunks */ + if (t) + { + unsigned char *p = (unsigned char *)ctx->in + t; + t = 64 - t; + + if (len < t) + { + memcpy( p, buf, len ); + return; + } + + memcpy( p, buf, t ); + byteReverse( ctx->in, 16 ); + + MD5Transform( ctx->buf, (unsigned int *)ctx->in ); + + buf += t; + len -= t; + } + + /* Process data in 64-byte chunks */ + while (len >= 64) + { + memcpy( ctx->in, buf, 64 ); + byteReverse( ctx->in, 16 ); + + MD5Transform( ctx->buf, (unsigned int *)ctx->in ); + + buf += 64; + len -= 64; + } + + /* Handle any remaining bytes of data. */ + memcpy( ctx->in, buf, len ); +} + +/* + * Final wrapup - pad to 64-byte boundary with the bit pattern + * 1 0* (64-bit count of bits processed, MSB-first) + */ +VOID WINAPI MD5Final( MD5_CTX *ctx ) +{ + unsigned int count; + unsigned char *p; + + /* Compute number of bytes mod 64 */ + count = (ctx->i[0] >> 3) & 0x3F; + + /* Set the first char of padding to 0x80. This is safe since there is + always at least one byte free */ + p = ctx->in + count; + *p++ = 0x80; + + /* Bytes of padding needed to make 64 bytes */ + count = 64 - 1 - count; + + /* Pad out to 56 mod 64 */ + if (count < 8) + { + /* Two lots of padding: Pad the first block to 64 bytes */ + memset( p, 0, count ); + byteReverse( ctx->in, 16 ); + MD5Transform( ctx->buf, (unsigned int *)ctx->in ); + + /* Now fill the next block with 56 bytes */ + memset( ctx->in, 0, 56 ); + } + else + { + /* Pad block to 56 bytes */ + memset( p, 0, count - 8 ); + } + + byteReverse( ctx->in, 14 ); + + /* Append length in bits and transform */ + ((unsigned int *)ctx->in)[14] = ctx->i[0]; + ((unsigned int *)ctx->in)[15] = ctx->i[1]; + + MD5Transform( ctx->buf, (unsigned int *)ctx->in ); + byteReverse( (unsigned char *)ctx->buf, 4 ); + memcpy( ctx->digest, ctx->buf, 16 ); +} /* The four core functions - F1 is optimized somewhat */ @@ -143,119 +260,3 @@ buf[2] += c; buf[3] += d; } - -/* - * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious - * initialization constants. - */ -VOID WINAPI MD5Init( MD5_CTX *ctx ) -{ - ctx->buf[0] = 0x67452301; - ctx->buf[1] = 0xefcdab89; - ctx->buf[2] = 0x98badcfe; - ctx->buf[3] = 0x10325476; - - ctx->i[0] = ctx->i[1] = 0; -} - -/* - * Update context to reflect the concatenation of another buffer full - * of bytes. - */ -VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ) -{ - register unsigned int t; - - /* Update bitcount */ - t = ctx->i[0]; - - if ((ctx->i[0] = t + (len << 3)) < t) - ctx->i[1]++; /* Carry from low to high */ - - ctx->i[1] += len >> 29; - t = (t >> 3) & 0x3f; - - /* Handle any leading odd-sized chunks */ - if (t) - { - unsigned char *p = (unsigned char *)ctx->in + t; - t = 64 - t; - - if (len < t) - { - memcpy( p, buf, len ); - return; - } - - memcpy( p, buf, t ); - byteReverse( ctx->in, 16 ); - - MD5Transform( ctx->buf, (unsigned int *)ctx->in ); - - buf += t; - len -= t; - } - - /* Process data in 64-byte chunks */ - while (len >= 64) - { - memcpy( ctx->in, buf, 64 ); - byteReverse( ctx->in, 16 ); - - MD5Transform( ctx->buf, (unsigned int *)ctx->in ); - - buf += 64; - len -= 64; - } - - /* Handle any remaining bytes of data. */ - memcpy( ctx->in, buf, len ); -} - -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -VOID WINAPI MD5Final( MD5_CTX *ctx ) -{ - unsigned int count; - unsigned char *p; - - /* Compute number of bytes mod 64 */ - count = (ctx->i[0] >> 3) & 0x3F; - - /* Set the first char of padding to 0x80. This is safe since there is - always at least one byte free */ - p = ctx->in + count; - *p++ = 0x80; - - /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; - - /* Pad out to 56 mod 64 */ - if (count < 8) - { - /* Two lots of padding: Pad the first block to 64 bytes */ - memset( p, 0, count ); - byteReverse( ctx->in, 16 ); - MD5Transform( ctx->buf, (unsigned int *)ctx->in ); - - /* Now fill the next block with 56 bytes */ - memset( ctx->in, 0, 56 ); - } - else - { - /* Pad block to 56 bytes */ - memset( p, 0, count - 8 ); - } - - byteReverse( ctx->in, 14 ); - - /* Append length in bits and transform */ - ((unsigned int *)ctx->in)[14] = ctx->i[0]; - ((unsigned int *)ctx->in)[15] = ctx->i[1]; - - MD5Transform( ctx->buf, (unsigned int *)ctx->in ); - byteReverse( (unsigned char *)ctx->buf, 4 ); - memcpy( ctx->digest, ctx->buf, 16 ); -} Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] Fri Dec 6 15:04:04 2013 @@ -477,7 +477,7 @@ * FALSE if blocks are different */ BOOL -WINAPI SystemFunction030(PVOID b1, PVOID b2) +WINAPI SystemFunction030(LPCVOID b1, LPCVOID b2) { return !memcmp(b1, b2, 0x10); } @@ -500,7 +500,7 @@ * see http://web.it.kth.se/~rom/ntsec.html#crypto-strongavail */ NTSTATUS -WINAPI SystemFunction032(struct ustring *data, struct ustring *key) +WINAPI SystemFunction032(struct ustring *data, const struct ustring *key) { arc4_info a4i; @@ -540,15 +540,19 @@ } -/********************************************************************** - * - * @unimplemented - */ -BOOL -WINAPI -SystemFunction035(LPCSTR lpszDllFilePath) -{ - return TRUE; +/****************************************************************************** + * SystemFunction035 (ADVAPI32.@) + * + * Described here: +http://disc.server.com/discussion.cgi?disc=148775;article=942;title=Coding%2FASM%2FSystem + * + * NOTES + * Stub, always return TRUE. + */ +BOOL WINAPI SystemFunction035(LPCSTR lpszDllFilePath) +{ + //FIXME("%s: stub\n", debugstr_a(lpszDllFilePath)); + return TRUE; } /****************************************************************************** @@ -616,32 +620,56 @@ /****************************************************************************** * SystemFunction040 (ADVAPI32.@) * - * PARAMS: - * memory : pointer to memory to encrypt - * length : length of region to encrypt, in bytes. must be multiple of RTL_ENCRYPT_MEMORY_SIZE - * flags : RTL_ENCRYPT_OPTION_SAME_PROCESS | RTL_ENCRYPT_OPTION_CROSS_PROCESS, | RTL_ENCRYPT_OPTION_SAME_LOGON - * control whether other processes are able to decrypt the memory. The same value must be given - * when decrypting the memory. - */ -NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags) /* RtlEncryptMemory */ -{ - //FIXME("(%p, %lx, %lx): stub [RtlEncryptMemory]\n", memory, length, flags); + * MSDN documents this function as RtlEncryptMemory and declares it in ntsecapi.h. + * + * PARAMS + * memory [I/O] Pointer to memory to encrypt. + * length [I] Length of region to encrypt in bytes. + * flags [I] Control whether other processes are able to decrypt the memory. + * RTL_ENCRYPT_OPTION_SAME_PROCESS + * RTL_ENCRYPT_OPTION_CROSS_PROCESS + * RTL_ENCRYPT_OPTION_SAME_LOGON + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: NTSTATUS error code + * + * NOTES + * length must be a multiple of RTL_ENCRYPT_MEMORY_SIZE. + * If flags are specified when encrypting, the same flag value must be given + * when decrypting the memory. + */ +NTSTATUS WINAPI SystemFunction040(PVOID memory, ULONG length, ULONG flags) +{ + //FIXME("(%p, %x, %x): stub [RtlEncryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; } /****************************************************************************** * SystemFunction041 (ADVAPI32.@) * - * PARAMS: - * memory : pointer to memory to decrypt - * length : length of region to decrypt, in bytes. must be multiple of RTL_ENCRYPT_MEMORY_SIZE - * flags : RTL_ENCRYPT_OPTION_SAME_PROCESS | RTL_ENCRYPT_OPTION_CROSS_PROCESS, | RTL_ENCRYPT_OPTION_SAME_LOGON - * control whether other processes are able to decrypt the memory. The same value must be given - * when encrypting the memory. - */ -NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) /* RtlDecryptMemory */ -{ - //FIXME("(%p, %lx, %lx): stub [RtlDecryptMemory]\n", memory, length, flags); + * MSDN documents this function as RtlDecryptMemory and declares it in ntsecapi.h. + * + * PARAMS + * memory [I/O] Pointer to memory to decrypt. + * length [I] Length of region to decrypt in bytes. + * flags [I] Control whether other processes are able to decrypt the memory. + * RTL_ENCRYPT_OPTION_SAME_PROCESS + * RTL_ENCRYPT_OPTION_CROSS_PROCESS + * RTL_ENCRYPT_OPTION_SAME_LOGON + * + * RETURNS + * Success: STATUS_SUCCESS + * Failure: NTSTATUS error code + * + * NOTES + * length must be a multiple of RTL_ENCRYPT_MEMORY_SIZE. + * If flags are specified when encrypting, the same flag value must be given + * when decrypting the memory. + */ +NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) +{ + //FIXME("(%p, %x, %x): stub [RtlDecryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; } 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] Fri Dec 6 15:04:04 2013 @@ -249,7 +249,7 @@ reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.1 advapi32 - - reactos/dll/win32/advapi32/crypt/*.c # Unknown + reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.1 reactos/dll/win32/advapi32/sec/cred.c # Out of Sync reactos/dll/win32/advapi32/sec/sid.c # Out of Sync

11 years

[akhaldi] 61233: [CMD][EXPLORER_NEW] * Add Albanian translation. By Ardit Dani. CORE-7674

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 6 15:00:40 2013 New Revision: 61233 URL: http://svn.reactos.org/svn/reactos?rev=61233&view=rev Log: [CMD][EXPLORER_NEW] * Add Albanian translation. By Ardit Dani. CORE-7674 Added: trunk/reactos/base/shell/cmd/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/explorer-new/lang/sq-AL.rc - copied, changed from r61195, trunk/reactos/base/shell/explorer-new/lang/en-US.rc Modified: trunk/reactos/base/shell/cmd/cmd.rc trunk/reactos/base/shell/explorer-new/explorer.rc Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.rc [iso-8859-1] Fri Dec 6 15:00:40 2013 @@ -74,6 +74,9 @@ #ifdef LANGUAGE_SV_SE #include "lang/sv-SE.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Copied: trunk/reactos/base/shell/cmd/lang/sq-AL.rc (from r61195, trunk/reactos/base/shell/cmd/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:00:40 2013 @@ -1,542 +1,546 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - STRING_ASSOC_HELP "Modify file extension associations.\n\n\ + STRING_ASSOC_HELP "Ndrysho zgjatjen e dokumenteve.\n\n\ assoc [.ext[=[FileType]]]\n\ \n\ -assoc (print all associations)\n\ -assoc .ext (print specific association)\n\ -assoc .ext= (remove specific association)\n\ -assoc .ext=FileType (add new association)\n" - STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ +assoc (shfaq tÃ« gjith asociacionet)\n\ +assoc .ext (shfaq asociacionet specifike)\n\ +assoc .ext= (hiq acosiacionet specifike)\n\ +assoc .ext=FileType (shto asociacione te reja)\n" + STRING_ATTRIB_HELP "Shfaq ose ndryshu atributet e dokumentave.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ - + Sets an attribute\n\ - - Clears an attribute\n\ - R Read-only file attribute\n\ - A Archive file attribute\n\ - S System file attribute\n\ - H Hidden file attribute\n\ - /S Processes matching files in the current directory\n\ - and all subdirectories\n\ - /D Processes directories as well\n\n\ -Type ATTRIB without a parameter to display the attributes of all files.\n" - STRING_ALIAS_HELP "Sets, removes or shows aliases.\n\n\ -ALIAS [alias=[command]]\n\n\ - alias Name for an alias.\n\ - command Text to be substituted for an alias.\n\n\ -To list all aliases:\n\ + + Vendos nje atribute\n\ + - Pastron njÃ« atribute\n\ + R Lexo-vetem atributet e dokumentave\n\ + A Atributet e dokumentave nÃ« arkiv\n\ + S Atributet e dokumentave tÃ« sistemit\n\ + H Atributet e dokumentave te fshehur\n\ + /S Procesi i pÃ«rputhjes sÃ« dokumentave ne skedÃ«n aktuale\n\ + dhe tÃ« gjitha nÃ«nskedat\n\ + /D ProÃ§eso skedat gjithashtu\n\n\ +Shkruaj ATTRIB pa njÃ« parameter pÃ«r tÃ« shfaque atributet e tÃ« gjithÃ« dokumentave.\n" + STRING_ALIAS_HELP "VÃ«ndos, hew ose shfaq pseudonimin.\n\n\ +ALIAS [alias=[Komande]]\n\n\ + alias Emri i pseudonimit.\n\ + KomandÃ« Texti pÃ«r tu zÃ«vendÃ«suar pÃ«r njÃ« pseudonim.\n\n\ +Shfaq tÃ« gjithe pseudonimet:\n\ ALIAS\n\n\ -To set a new or replace an existing alias:\n\ +TÃ« shfaq njÃ« tÃ« ri ose ndryshok njÃ« pseudonim ekzistues:\n\ ALIAS da=dir a:\n\n\ -To remove an alias from the alias list:\n\ +PÃ«r tÃ« hequr njÃ« pseudonim nga pseudonimi:\n\ ALIAS da=" - STRING_BEEP_HELP "Beep the speaker.\n\nBEEP\n" - STRING_CALL_HELP "Calls one batch program from another.\n\n\ -CALL [drive:][path]filename [batch-parameter]\n\n\ - batch-parameter Specifies any command-line information required by the\n\ - batch program." - STRING_CD_HELP "Changes the current directory or displays it's name\n\n\ -CHDIR [/D][drive:][path]\n\ + STRING_BEEP_HELP "Sinjali akustic.\n\nBEEP\n" + STRING_CALL_HELP "ThÃ«rret nje program batch nga njÃ« tjetÃ«r.\n\n\ +CALL [drive:][path]emri [batch-parameter]\n\n\ + batch-parameter Specifikon ndonjÃ« informacion qe kÃ«rkohen nga programi batch nÃ«\n\ + linjÃ«n e komandes." + STRING_CD_HELP "Ndryshon ose shfaq emrin e skedÃ«s aktuale\n\n\ +CHDIR [/D][drive:][rrugÃ«]\n\ CHDIR[..|.]\n\ CD [/D][drive:][path]\n\ CD[..|.]\n\n\ - .. parent directory\n\ - . current directory\n\ - /D Will change current drive and current directory.\n\n\ -Type CD drive: to display the current directory on the specified drive.\n\ -Type CD without a parameter to display the current drive and directory.\n" - STRING_CHCP_HELP "Displays or sets the active code page number.\n\n\ + .. skeda mÃ«mÃ«\n\ + . skeda aktuale\n\ + /D Do tÃ« ndryshojÃ« drivin aktual dhe dosjen aktuale.\n\n\ +Shkruaj CD drive: pÃ«r tÃ« shfaqur dosjen aktuale nÃ« harddiskun e specifikuar.\n\ +Shkruaj CD pa asnjÃ« parameter pÃ«r tÃ« shfaque harddikun aktual dhe dosjet e tij.\n" + STRING_CHCP_HELP "Shfaq ose cakto kodin dhe numrin e faqes aktive.\n\n\ CHCP [nnn]\n\n\ - nnn Specifies the active code page number.\n\n\ -Type CHCP without a parameter to display the active code page number.\n" - STRING_CHOICE_HELP "Waits for the user to choose one of a set of choices.\n\n\ -CHOICE [/C[:]choices][/N][/S][/T[:]c,nn][text]\n\n\ - /C[:]choices Specifies allowable keys. Default is YN.\n\ - /N Do not display choices and ? at the end of the prompt string.\n\ + nnn Specifikon kodin dhe numrin aktiv te faqes.\n\n\ +Shkruaj CHCP pa anjÃ« parameter pÃ«r tÃ« shfaqur kodin dhe numrin e faqes aktive.\n" + STRING_CHOICE_HELP "Pret pÃ«r pÃ«rdoruesit pÃ«r tÃ« zgjedhur njÃ« nga njÃ« sÃ«rÃ« zgjedhjesh.\n\n\ +CHOICE [/C[:]zgjedhje][/N][/S][/T[:]c,nn][tekst]\n\n\ + /C[:]zgjedhje PÃ«rcakton Ã§elÃ«sat e lejueshme. Parazgjedhuri Ã«shtÃ« YN.\n\ + /N Mos e shfaq zgjedhje dhe ? nÃ« fund tÃ« vargut tÃ« shpejtÃ«.\n\ /S Treat choice keys as case sensitive.\n\ - /T[:]c,nn Default choice to c after nn seconds.\n\ - text Prompt string to display.\n\n\ -ERRORLEVEL is set to offset of key user presses in choices.\n" - STRING_CLS_HELP "Clears the screen.\n\nCLS\n" - STRING_CMD_HELP1 "\nInternal commands available:\n" - STRING_CMD_HELP2 "\nFeatures available:" - STRING_CMD_HELP3 " [aliases]" - STRING_CMD_HELP4 " [history]" - STRING_CMD_HELP5 " [unix filename completion]" - STRING_CMD_HELP6 " [directory stack]" - STRING_CMD_HELP7 " [redirections and piping]" - STRING_CMD_HELP8 "Starts a new instance of the ReactOS command line interpreter.\n\n\ -CMD [/[C|K] command][/P][/Q][/T:bf]\n\n\ - /C command Runs the specified command and terminates.\n\ - /K command Runs the specified command and remains.\n\ - /P CMD becomes permanent and runs autoexec.bat\n\ - (cannot be terminated).\n\ - /T:bf Sets the background/foreground color (see COLOR command).\n" - STRING_COLOR_HELP1 "Sets the default foreground and background colors.\n\n\ + /T[:]c,nn Trajto Ã§elÃ«sat zgjedhje si rasti tÃ« ndjeshme.\n\ + text Shfaq string nÃ« ekran.\n\n\ +ERRORLEVEL Ã«shtÃ« vendosur pÃ«r tÃ« kompensuar e shtyn pÃ«rdoruesit kryesorÃ« nÃ« zgjedhje.\n" + STRING_CLS_HELP "Pastron ekranin.\n\nCLS\n" + STRING_CMD_HELP1 "\nKomandat e brendshme nÃ« dispozicion:\n" + STRING_CMD_HELP2 "\nTiparet nÃ« dispozicion:" + STRING_CMD_HELP3 " [pseudonimet]" + STRING_CMD_HELP4 " [historia]" + STRING_CMD_HELP5 " [PÃ«rfundimi i dokumentave tÃ« sistemit unix]" + STRING_CMD_HELP6 " [raftet e skedave]" + STRING_CMD_HELP7 " [drejtimi i ri dhe udherrefyesi]" + STRING_CMD_HELP8 "Fillon njÃ« shembull tÃ« ri tÃ« pÃ«rkthyesit sÃ« Komandave tÃ« ReactOS.\n\n\ +CMD [/[C|K] komande][/P][/Q][/T:bf]\n\n\ + /C KomandÃ« Ekzekuton komanda e pÃ«rcaktuar dhe pÃ«rfundon.\n\ + /K KomandÃ« Ekzekuton komanda e pÃ«rcaktuar dhe mbetet.\n\ + /P CMD bÃ«het e pÃ«rhershme dhe shkon autoexec.bat\n\ + (nuk mund tÃ« ndÃ«rpritet).\n\ + /T:bf PÃ«rcakton ngjyrÃ«n e sfondit/parasfondin(shih NGJYRAT e komandave).\n" + STRING_COLOR_HELP1 "VÃ« parazgjedhjene e ngjyrave tÃ« sfondit dhe parasfondit.\n\n\ COLOR [attr [/-F]] \n\n\ - attr Specifies color attribute of console output\n\ - /-F Does not fill the console blank space with color attribute\n\n\ -There are three ways to specify the colors:\n\ -1) [bright] name on [bright] name (only the first three letters are required)\n\ -2) decimal on decimal\n\ -3) two hex digits\n\n\ -Colors are:\n\ -dec hex name dec hex name\n\ -0 0 Black 8 8 Gray(Bright black)\n\ -1 1 Blue 9 9 Bright Blue\n\ -2 2 Green 10 A Bright Green\n\ -3 3 Cyan 11 B Bright Cyan\n\ -4 4 Red 12 C Bright Red\n\ -5 5 Magenta 13 D Bright Magenta\n\ -6 6 Yellow 14 E Bright Yellow\n\ -7 7 White 15 F Bright White\n" - STRING_COPY_HELP1 "Overwrite %s (Yes/No/All)? " - STRING_COPY_HELP2 "Copies one or more files to another location.\n\n\ -COPY [/V][/Y|/-Y][/A|/B] source [/A|/B]\n\ - [+ source [/A|/B] [+ ...]] [destination [/A|/B]]\n\n\ - source Specifies the file or files to be copied.\n\ - /A Indicates an ASCII text file.\n\ - /B Indicates a binary file.\n\ - destination Specifies the directory and/or filename for the new file(s).\n\ - /V Verifies that new files are written correctly.\n\ - /Y Suppresses prompting to confirm you want to overwrite an\n\ - existing destination file.\n\ - /-Y Causes prompting to confirm you want to overwrite an\n\ - existing destination file.\n\n\ -The switch /Y may be present in the COPYCMD environment variable.\n\ + attr PÃ«rcakton atributin e ngjyrave tÃ« prodhimit nga konsoli\n\ + /-F Nuk e mbush hapÃ«sirÃ«n bosh tÃ« konsolit me atribute ngjyrash\n\n\ +Ka tre mÃ«nyra pÃ«r tÃ« specifikuar ngjyrat:\n\ +1) [e ndritshem] emri [e ndritshem] emri (vetÃ«m tre letrat e para janÃ« tÃ« nevojshme)\n\ +2) decimal nÃ« decimal\n\ +3) dy shifrat hex\n\n\ +Ngjyrat janÃ«:\n\ +dec hex Emri dec hex emri\n\ +0 0 E zeze 8 8 Gri(E ndritshÃ«m zezÃ«)\n\ +1 1 Blu 9 9 E ndritshÃ«m Blu\n\ +2 2 Jeshil 10 A E ndritshÃ«m jeshil\n\ +3 3 Cyan 11 B E ndritshÃ«m Cyan\n\ +4 4 E kuqe 12 C E ndritshÃ«m Kuqe\n\ +5 5 E purpurtÃ« 13 D E ndritshÃ«m e purpurt\n\ +6 6 E verdhÃ« 14 E E ndritshÃ«m e verdhÃ«\n\ +7 7 E bardhÃ« 15 F E ndritshÃ«m e bardhÃ«\n" + STRING_COPY_HELP1 "Mbishkruaj %s (Po/Jo/TÃ« Gjith)? " + STRING_COPY_HELP2 "Kopjon njÃ« ose mÃ« shumÃ« dokumenta nÃ« njÃ« vÃ«ndndodhje tjetÃ«r.\n\n\ +COPY [/V][/Y|/-Y][/A|/B] burimi [/A|/B]\n\ + [+ burimi [/A|/B] [+ ...]] [destinacioni [/A|/B]]\n\n\ + burimi PÃ«rcakton dokumentin ose dokumentet qÃ« do kopjohen.\n\ + /A Tregon dokumentet me tekst ASCII.\n\ + /B Tregon nje dokument nÃ« formatin binary.\n\ + destination Specifikon njÃ« skedÃ« dhe/ose dokument pÃ«r njÃ« dokumentÃ«t e ri.\n\ + /V Verifikon se dokumentet e ri janÃ« shkruar saktÃ«.\n\ + /Y Shfaq tabelen pÃ«r ta konfirmuar qÃ« ju doni tÃ« mbishkruani nÃ« njÃ«\n\ + destinacion dokumenti ekzistues.\n\ + /-Y Shfaq tabelen pÃ«r ta konfirmuar qÃ« ju doni tÃ« mbishkruani nÃ« njÃ«\n\ + destinacion dokumenti ekzistues.\n\n\ +Parametri /Y mund tÃ« jetÃ« prezent nÃ« variabÃ«lat e mjedisit COPYCMD.\n\ ...\n" - STRING_DATE_HELP1 "\nEnter new date (mm%cdd%cyyyy): " - STRING_DATE_HELP2 "\nEnter new date (dd%cmm%cyyyy): " - STRING_DATE_HELP3 "\nEnter new date (yyyy%cmm%cdd): " - STRING_DATE_HELP4 "Displays or sets the date.\n\n\ -DATE [/T][date]\n\n\ - /T display only\n\n\ -Type DATE without parameters to display the current date setting and\n\ -a prompt for a new one. Press ENTER to keep the same date.\n" - STRING_DEL_HELP1 "Deletes one or more files.\n\n\ + STRING_DATE_HELP1 "\nShkruani datÃ«n e re (mm%cdd%cyyyy): " + STRING_DATE_HELP2 "\nShkruani datÃ«n e re (dd%cmm%cyyyy): " + STRING_DATE_HELP3 "\nShkruani datÃ«n e re (yyyy%cmm%cdd): " + STRING_DATE_HELP4 "Shfaq ose ndrysho datÃ«n.\n\n\ +DATE [/T][datÃ«]\n\n\ + /T vetÃ«m shfaq\n\n\ +Shkruaj DATEN pa paramatra dhe pa shfaqur konfigurimet dhe daten aktuale dhe\n\ +hap dritare pÃ«r njÃ« tÃ« re. Kliko ENTER pÃ«r tÃ« mabjtur te njÃ«jtÃ«n datÃ«.\n" + STRING_DEL_HELP1 "Fshij njÃ« ose mÃ« shumÃ« dokumenta.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ - file Specifies the file(s) to delete.\n\n\ - /N Nothing.\n\ - /P Prompt. Ask before deleting each file.\n\ - /T Total. Display total number of deleted files and freed disk space.\n\ - /Q Quiet.\n\ - /W Wipe. Overwrite the file with random numbers before deleting it.\n\ - /Y Yes. Kill even *.* without asking.\n\ - /F Force Delete hidden, read-only and system files.\n\ - /S Delete file from all sub directory\n\ - /A Select files to be deleted based on attributes.\n\ - attributes\n\ - R Read Only files\n\ - S System files\n\ - A Archiveable files\n\ - H Hidden Files\n\ - - prefix meaning not\n" - STRING_DEL_HELP2 "All files in the directory will be deleted!\nAre you sure (Y/N)?" - STRING_DEL_HELP3 " %lu file deleted\n" - STRING_DEL_HELP4 " %lu files deleted\n" - STRING_DELAY_HELP "pause for n seconds or milliseconds\n\ + file Specifikon dokuemtant pÃ« tu fshirÃ«.\n\n\ + /N AsgjÃ«.\n\ + /P Prompt. Pyet para se tÃ« fshih ndonjÃ« dokument.\n\ + /T Total. Shfaq numrin e dosjeve tÃ« fshihra dhe liro hapÃ«sirÃ« âânÃ« disk.\n\ + /Q Dil.\n\ + /W Wipe. Mbishkruaj dokumentin me numra tÃ« rastÃ«sishem para fshirjes sÃ« tyre.\n\ + /Y Yes. Vrit edhe *.* pa pyetur.\n\ + /F Fshij me force dokumentet e fshehura, vetem te lexueshem dhe dokumenta tÃ« sistemit.\n\ + /S Fshij dokumentat nga tÃ« gjitha nÃ«n-directorite\n\ + /A Zgjidh dokumetnat tÃ« fshihen nÃ« bazÃ« tÃ« atributeve.\n\ + atributet\n\ + R Vetem lexo\n\ + S Sistemi\n\ + A Arkivat\n\ + H TÃ« fshehur\n\ + - kuptimi parashtesÃ« nuk\n" + STRING_DEL_HELP2 "TÃ« gjitha dokumentet nÃ« skedare do tÃ« fshihen!\nJeni i sigurtÃ« (P/J)?" + STRING_DEL_HELP3 " %lu u fshi\n" + STRING_DEL_HELP4 " %lu u fshinÃ«\n" + STRING_DELAY_HELP "pauzÃ« pÃ«r sekonda ose milisekonda\n\ DELAY [/m]n\n\n\ - /m specifiy than n are milliseconds\n\ - otherwise n are seconds\n" - STRING_DIR_HELP1 "DIR [drive:][path][filename] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ - [/O[[:]sortorder]] [/P] [/Q] [/S] [/T[[:]timefield]] [/W] [/X] [/4]\n\n\ - [drive:][path][filename]\n\ - Specifies drive, directory, and/or files to list.\n\n\ - /A Displays files with specified attributes.\n\ - attributes D Directories R Read-only files\n\ - H Hidden files A Files ready for archiving\n\ - S System files - Prefix meaning not\n\ - /B Uses bare format (no heading information or summary).\n\ - /C Display the thousand separator in file sizes. This is the\n\ - default. Use /-C to disable display of separator.\n\ - /D Same as wide but files are list sorted by column.\n\ - /L Uses lowercase.\n\ - /N New long list format where filenames are on the far right.\n\ - /O List by files in sorted order.\n\ - sortorder N By name (alphabetic) S By size (smallest first)\n\ - E By extension (alphabetic) D By date/time (oldest first)\n\ - G Group directories first - Prefix to reverse order\n\ - /P Pauses after each screenful of information.\n\ - /Q Display the owner of the file.\n\ - /S Displays files in specified directory and all subdirectories.\n\ - /T Controls which time field displayed or used for sorting\n\ - timefield C Creation\n\ - A Last Access\n\ - W Last Written\n\ - /W Uses wide list format.\n\ - /X This displays the short names generated for non-8dot3 file\n\ - names. The format is that of /N with the short name inserted\n\ - before the long name. If no short name is present, blanks are\n\ - displayed in its place.\n\ - /4 Displays four-digit years\n\n\ -Switches may be preset in the DIRCMD environment variable. Override\n\ -preset switches by prefixing any switch with - (hyphen)--for example, /-W.\n" - STRING_DIR_HELP2 " Volume in drive %c is %s\n" - STRING_DIR_HELP3 " Volume in drive %c has no label.\n" - STRING_DIR_HELP4 " Volume Serial Number is %04X-%04X\n" - STRING_DIR_HELP5 "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" + /m specifikoni se n janÃ« millisekonda\n\ + ndryshe n janÃ« sekonda\n" + STRING_DIR_HELP1 "DIR [drive:][rrugÃ«][emer] [/A[[:]attributes]] [/B] [/C] [/D] [/L] [/N]\n\ + [/O[[:]radhitje]] [/P] [/Q] [/S] [/T[[:]koha]] [/W] [/X] [/4]\n\n\ + [drive:][rrugÃ«][emer]\n\ + PÃ«rcakton, Drejtorin, dhe / ose dokumentin nÃ« listÃ«.\n\n\ + /A Shfaq dokumentat me atributet e specifikuara.\n\ + atributet D Direktorite R Vetem-lexues\n\ + H Dokumenta e fshehur A Arkivuar\n\ + S Dokumentat e sistemit - kuptimi parashtesÃ« nuk\n\ + /B Formati i PÃ«rdoruesit i zhveshur (asnjÃ« titull informacioni apo pÃ«rmbledhje).\n\ + /C Shfaq ndarÃ«s me mbatje mijÃ« nÃ« madhÃ«sive tÃ« skedarÃ«ve. Kjo Ã«shtÃ« e\n\ + paarzgjedhur. PÃ«rdot /-C pÃ«r tÃ« Ã§aktivizuar shfaqjen e ndarÃ«sit.\n\ + /D TÃ« njÃ«jtÃ« si e gjerÃ«, por dokumentat janÃ« listuar dhe renditur sipas kolonÃ«s.\n\ + /L PÃ«rdor shkronja tÃ« vogla.\n\ + /N Format e gjatÃ« dhe i ri ku lista e dokumentÃ«ve janÃ« mÃ« shumÃ« nÃ« tÃ« djathtÃ«.\n\ + /O Listo dokumentet nÃ« mÃ«nyrÃ« tÃ« renditur.\n\ + sortorder N Nga emer (alfabetik) S Nga madhÃ«sia (TÃ« voglat fillimisht)\n\ + E Nga shtesa (alfabetik) D Nga data/ora (TÃ« vjetrat fillimisht)\n\ + G Grupi skedave se pari - Parashtese tÃ« kthejÃ« renditjen\n\ + /P Pauzo pas Ã§do informacioni nÃ« ekran.\n\ + /Q Shfaq zotÃ«ruesin e dosjes.\n\ + /S Shfaq dokumentet nÃ« skedÃ«n e specifikuar dhe tÃ« gjitha nÃ«n-skedat.\n\ + /T Kontrollon secilen fushÃ« kohohore e shfaqura ose e pÃ«rdorur pÃ«r klasifikimin\n\ + timefield C Krijim\n\ + A Aksesi i Fundit\n\ + W Shkrim i Fundit\n\ + /W PÃ«rdor format tÃ« gjerÃ« liste.\n\ + /X Kjo shfaq emrat e shkurtÃ«r te krijuara pÃ«r qÃ«llime jo-8dot3 tÃ« emrave tÃ«\n\ + dokumentave. Formati Ã«shtÃ« se e / N me emrin e shkurtÃ«r ifutur\n\ + pÃ«rpara emrave te gjate. NÃ«se njÃ« emer i shkurtÃ«r nuk Ã«shtÃ« i pranishÃ«m, boshlleqet janÃ«\n\ + shfaqur ne vend te tyre.\n\ + /4 Shfaqje katÃ«r-shifrore vjeÃ§are\n\n\ +Ndryshimet mund tÃ« jenÃ« paraprakisht nÃ« variablin e mjedisit DIRCMD. Mbishkruaj\n\ +ndryshimet prezente duke vÃ«nÃ« pÃ«rpara njÃ« ndryshim me - (hyphen)--pÃ«r shembull, /-W.\n" + STRING_DIR_HELP2 " Volumi nÃ« drive %c is %s\n" + STRING_DIR_HELP3 " Volumi nÃ« drive %c has no label.\n" + STRING_DIR_HELP4 " Volumi Serial dhe Numberi Ã«shtÃ« %04X-%04X\n" + STRING_DIR_HELP5 "\n Lista e dokumentave total:\n%16i File(s)% 14s bytes\n" STRING_DIR_HELP6 "%16i Dir(s)% 15s bytes free\n" STRING_DIR_HELP7 "\n Directory of %s\n\n" STRING_DIR_HELP8 "%16i File(s)% 14s bytes\n" - STRING_DIRSTACK_HELP1 "Stores the current directory for use by the POPD command, then\n\ -changes to the specified directory.\n\n\ -PUSHD [path | ..]\n\n\ - path Specifies the directory to make the current directory\n" - STRING_DIRSTACK_HELP2 "Changes to the directory stored by the PUSHD command.\n\nPOPD" - STRING_DIRSTACK_HELP3 "Prints the contents of the directory stack.\n\nDIRS" - STRING_DIRSTACK_HELP4 "Directory stack empty" - STRING_ECHO_HELP1 "Display a messages without trailing carriage return and line feed.\n\n\ - ECHOS message" - STRING_ECHO_HELP2 "Displays a message to the standard error output.\n\n\ - ECHOERR message\n\ - ECHOERR. prints an empty line" - STRING_ECHO_HELP3 "Prints a messages to standard error output without trailing carriage return and line feed.\n\n\ - ECHOSERR message" - STRING_ECHO_HELP4 "Displays a message or switches command echoing on or off.\n\n\ + STRING_DIRSTACK_HELP1 "Ndryshimet mund tÃ« jenÃ« paraprakisht nÃ« variablin e mjedisit DIRCMD\n\ +dhe skedes specifike.\n\n\ +PUSHD [rrugÃ« | ..]\n\n\ + rrugÃ« PÃ«rcakton skeden pÃ«r tÃ« bÃ«rÃ« skeden aktuale\n" + STRING_DIRSTACK_HELP2 "Ndryshimet nÃ« skeden e depozituar nga komanda PUSHD.\n\nPOPD" + STRING_DIRSTACK_HELP3 "Printon pÃ«rmbajtjen e skedes nÃ« rafte.\n\nDIRS" + STRING_DIRSTACK_HELP4 "Rafte skede bosh" + STRING_ECHO_HELP1 "Shfaq njÃ« mesazhe zvarritÃ«s pa kthim informacioni dhe permbajtjeje.\n\n\ + ECHOS mesazgÃ«" + STRING_ECHO_HELP2 "Tregon njÃ« mesazh gabimi me standard.\n\n\ + ECHOERR mesazhÃ«\n\ + ECHOERR. printon njÃ« vijÃ« e zbrazÃ«t" + STRING_ECHO_HELP3 "Printon njÃ« mesazhe gabimi nÃ« prodhim standard zvarritÃ«s pa kthim informacioni dhe permbajtjeje.\n\n\ + ECHOSERR mesazhe" + STRING_ECHO_HELP4 "Shfaq nje mesazh ose ndryshon komande duke pÃ«rsÃ«ritur ndezur ose fikur.\n\n\ ECHO [ON | OFF]\n\ - ECHO [message]\n\ - ECHO. prints an empty line\n\n\ -Type ECHO without a parameter to display the current ECHO setting." - STRING_ECHO_HELP5 "ECHO is %s\n" - STRING_EXIT_HELP "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ - /B Exits a batch file only. \n\ - If run outside of a batch file it will exit cmd.exe\n\ - ExitCode This value will be assigned to ERRORLEVEL on exit\n" - STRING_FOR_HELP1 "Runs a specified command for each file in a set of files\n\n\ + ECHO [mesazhe\n\ + ECHO. printon njÃ« vijÃ« e zbrazÃ«t\n\n\ +Shkruaj ECHO pa parametra qe shfaqin konfigurimin aktual te ECHO." + STRING_ECHO_HELP5 "ECHO Ã«shtÃ« %s\n" + STRING_EXIT_HELP "Dalje nga interpretuesi komandues i linjes.\n\nEXIT [/b] [ExitCode]\n\n\ + /B Dalje nga batch vetÃ«m. \n\ + NÃ«se drejtuar jashtÃ« nga njÃ« skedar batch do tÃ« dalÃ« nga cmd.exe\n\ + ExitCode Kjo vlerÃ« do tÃ« caktohet pÃ«r ERRORLEVEL nÃ« dalje\n" + STRING_FOR_HELP1 "Ekzekuto njÃ« komandÃ« tÃ« specifikuar pÃ«r secilÃ«n dokument nÃ« njÃ« grupim dokumentesh\n\n\ FOR %variable IN (set) DO command [parameters]\n\n\ - %variable Specifies a replaceable parameter.\n\ - (set) Specifies a set of one or more files. Wildcards may be used.\n\ - command Specifies the command to carry out for each file.\n\ - parameters Specifies parameters or switches for the specified command.\n\n\ -To use the FOR command in a batch program, specify %%variable instead of\n\ + %variable Specifikon njÃ« parametÃ«r zÃ«vndÃ«sueshme.\n\ + (set) PÃ«rcakton njÃ« grup tÃ« njÃ« ose mÃ« shumÃ« dosjeve. Jokeri mund tÃ« pÃ«rdoret.\n\ + command PÃ«rcakton komandÃ«n pÃ«r ta rrealizuar pÃ«r Ã§do skedar.\n\ + parameters PÃ«rcakton parametrat apo Ã§elsin pÃ«r komandÃ«n e specifikuar.\n\n\ +PÃ«r tÃ« pÃ«rdorur komanden FOR nÃ« njÃ« program batch, specifiko %%variablet nÃ« vÃ«nd tÃ«\n\ %variable.\n" - STRING_FREE_HELP1 "\nVolume in drive %s is %-11s\n\ - Serial number is %s\n\ - %16s bytes total disk space\n\ - %16s bytes used\n\ - %16s bytes free\n" - STRING_FREE_HELP2 "Displays drive information.\n\nFREE [drive: ...]\n" - STRING_GOTO_HELP1 "Directs CMD to a labeled line in a batch script.\n\n\ -GOTO label\n\n\ - label Specifies a text string used in a batch script as a label.\n\n\ -You type a label on a line by itself, beginning with a colon." - STRING_IF_HELP1 "Performs conditional processing in batch programs.\n\n\ - IF [NOT] ERRORLEVEL number command\n\ - IF [NOT] string1==string2 command\n\ - IF [NOT] EXIST filename command\n\ - IF [NOT] DEFINED variable command\n\n\ -NOT Specifies that CMD should carry out the command only if\n\ - the condition is false\n\ -ERRORLEVEL number Specifies a true condition if the last program run returned\n\ - an exit code equal or greater than the number specified.\n\ -command Specifies the command to carry out if the condition is met.\n\ -string1==string2 Specifies a true condition if the specified text strings\n\ - match.\n\ -EXIST filename Specifies a true condition if the specified filename exists.\n\ -DEFINED variable Specifies a true condition if the specified variable is\n\ - defined.\n" - STRING_LABEL_HELP1 "Displays or changes drive label.\n\nLABEL [drive:][label]\n" - STRING_LABEL_HELP2 "Volume in drive %c: is %s\n" - STRING_LABEL_HELP3 "Volume in drive %c: has no label\n" - STRING_LABEL_HELP4 "Volume Serial Number is %04X-%04X\n" + STRING_FREE_HELP1 "\nVolume nÃ« drive %s is %-11s\n\ + Nummeri Serial Ã«shtÃ« %s\n\ + %16s bytes total nÃ« disk\n\ + %16s bytes pÃ«rdorur\n\ + %16s bytes e lirÃ«\n" + STRING_FREE_HELP2 "Shfaq informacionet e diskut.\n\nE LIRE [drive: ...]\n" + STRING_GOTO_HELP1 "Drejton CMD nÃ« njÃ« linjÃ« tÃ« etiketuar nÃ« njÃ« batch skript.\n\n\ +GOTO etiketa\n\n\ + label PÃ«rcakton njÃ« varg teksti tÃ« pÃ«rdorur nÃ« njÃ« batch skript, si njÃ« etiketÃ«.\n\n\ +Ju mund tÃ« shkruani njÃ« etiketÃ« nÃ« njÃ« linjÃ« nÃ« vetvete, duke filluar me njÃ« rradhÃ«." + STRING_IF_HELP1 "Kryen pÃ«rpunimin e kushtÃ«zuar nÃ« programet batch.\n\n\ + IF [NOT] ERRORLEVEL komanda e numrit\n\ + IF [NOT] string1==string2 komande\n\ + IF [NOT] EXIST emri komandes\n\ + IF [NOT] DEFINED komanda te variushme\n\n\ +NOT Specifikon se CMF duhet tÃ« kryejnÃ« urdhrin vetÃ«m nÃ«se\n\ + kondicioni eshte i rremÃ«\n\ +ERRORLEVEL number PÃ«rcakton njÃ« kusht tÃ« vÃ«rtetÃ« nÃ«se programi i fundit kthye ekzekutimin\n\ + njÃ« kod dalje tÃ« barabartÃ« ose mÃ« i madh se numri i specifikuar.\n\ +command PÃ«rcakton komandÃ«n pÃ«r tÃ« kryer nÃ«se kushti Ã«shtÃ« plotÃ«suar.\n\ +string1==string2 PÃ«rcakton njÃ« kusht tÃ« vÃ«rtetÃ« nÃ«se vargjet e specifikuara tÃ« tekstit\n\ + pÃ«rputhen.\n\ +EXIST filename PÃ«rcakton njÃ« kusht tÃ« vÃ«rtetÃ«, nÃ«se ekziston dokumenti i specifikuar.\n\ +DEFINED variable PÃ«rcakton njÃ« kusht tÃ« vÃ«rtetÃ« nÃ«se variabli Ã«shtÃ« specifikuar\n\ + dhe karakterizuar.\n" + STRING_LABEL_HELP1 "Shfaq ose ndrysho etiketÃ«n e driverit.\n\nLABEL [drive:][etikete]\n" + STRING_LABEL_HELP2 "Volumi nÃ« drive %c: is %s\n" + STRING_LABEL_HELP3 "Volumi nÃ« drive %c: has no label\n" + STRING_LABEL_HELP4 "Numri Serial i Volumit Ã«shtÃ« %04X-%04X\n" STRING_LABEL_HELP5 "Drive label (11 Characters, ENTER if none)? " - STRING_LOCALE_HELP1 "Current time is" - STRING_MKDIR_HELP "Creates a directory.\n\n\ -MKDIR [drive:]path\nMD [drive:]path" - STRING_MKLINK_HELP "Creates a filesystem link object.\n\n\ -MKLINK [/D | /H | /J] linkname target\n\n\ - /D Indicates that the symbolic link target is a directory.\n\ - /H Create a hard link.\n\ - /J Create a directory junction.\n\n\ -If neither /H or /J is specified, a symbolic link is created." - STRING_MEMMORY_HELP1 "Displays the amount of system memory.\n\nMEMORY" - STRING_MEMMORY_HELP2 "\n %12s%% memory load.\n\n\ - %13s bytes total physical RAM.\n\ - %13s bytes available physical RAM.\n\n\ - %13s bytes total page file.\n\ - %13s bytes available page file.\n\n\ - %13s bytes total virtual memory.\n\ - %13s bytes available virtual memory.\n" - STRING_MISC_HELP1 "Press a key to continue...\n" - STRING_MOVE_HELP1 "Overwrite %s (Yes/No/All)? " - STRING_MOVE_HELP2 "Moves files and renames files and directories.\n\n\ -To move one or more files:\n\ -MOVE [/N][drive:][path]filename1[,...] destination\n\n\ -To rename a directory:\n\ -MOVE [/N][drive:][path]dirname1 dirname2\n\n\ - [drive:][path]filename1 Specifies the location and name of the file\n\ - or files you want to move.\n\ - /N Nothing. Do everything but move files or directories.\n\n\ -Current limitations:\n\ - - You can't move a file or directory from one drive to another.\n" - STRING_MSGBOX_HELP "display a message box and return user responce\n\n\ -MSGBOX type ['title'] prompt\n\n\ -type button displayed\n\ - possible values are: OK, OKCANCEL,\n\ - YESNO, YESNOCANCEL\n\ -title title of message box\n\ -prompt text displayed by the message box\n\n\n\ -ERRORLEVEL is set according the button pressed:\n\n\ -YES : 10 | NO : 11\n\ -OK : 10 | CANCEL : 12\n" - STRING_PATH_HELP1 "Displays or sets a search path for executable files.\n\n\ -PATH [[drive:]path[;...]]\nPATH ;\n\n\ -Type PATH ; to clear all search-path settings and direct the command shell\n\ -to search only in the current directory.\n\ -Type PATH without parameters to display the current path.\n" - STRING_PROMPT_HELP1 "Changes the command prompt.\n\n\ -PROMPT [text]\n\n\ - text Specifies a new command prompt.\n\n\ -Prompt can be made up of normal characters and the following special codes:\n\n\ + STRING_LOCALE_HELP1 "Koha e tanishme Ã«shtÃ«" + STRING_MKDIR_HELP "Krijon njÃ« skedÃ«.\n\n\ +MKDIR [drive:]rrugÃ«\nMD [drive:]rrugÃ«" + STRING_MKLINK_HELP "Krijon njÃ« lidhje objekti nÃ« dokumentat e sistemit.\n\n\ +MKLINK [/D | /H | /J] objektivi i lidhjes sÃ« emrit\n\n\ + /D Tregon se objektivi simbolik Ã«shtÃ« njÃ« skedÃ«.\n\ + /H Krijon njÃ« lidhjÃ« tÃ« fortÃ«.\n\ + /J Krijo njÃ« kryqÃ«zim nÃ« skedÃ«.\n\n\ +NÃ«se anjÃ«ra nga /H ose /J nuk speficikohet, njÃ« lidhje simboli do tÃ« krijohet." + STRING_MEMMORY_HELP1 "Paraqet sasinÃ« e memories sÃ« sistemit.\n\nMEMORIA" + STRING_MEMMORY_HELP2 "\n %12s%% ngarkimi i memories.\n\n\ + %13s bytes totali i RAM'it fizik.\n\ + %13s bytes RAM'i fizik ne dispozicion.\n\n\ + %13s bytes totali i faqeve i dokumentave.\n\ + %13s bytes dokumentat dhe faqet ne dispozicion.\n\n\ + %13s bytes memoria totale virtuale.\n\ + %13s bytes memoria virtuale ne dispozicion.\n" + STRING_MISC_HELP1 "Shtypni njÃ« buton pÃ«r tÃ« vazhduar...\n" + STRING_MOVE_HELP1 "Mbishkruaj %s (Po/Jo/TÃ« Gjith)? " + STRING_MOVE_HELP2 "LÃ«viz dokumentet dhe emero ato dhe skedat.\n\n\ +PÃ«r tÃ« lÃ«vizur njÃ« ose mÃ« shumÃ« dokumenta:\n\ +MOVE [/N][drive:][rrugÃ«]emri1[,...] destinacioni\n\n\ +TÃ« emerosh skedat:\n\ +MOVE [/N][drive:][rrugÃ«]dirname1 dirname2\n\n\ + [drive:][rrugÃ«]emri1 PÃ«rcakton vendndodhjen dhe emrin e skedÃ«s\n\ + ose dokumentave qÃ« ju dÃ«shironi pÃ«r tÃ« lÃ«vizur.\n\ + /N AsgjÃ«. BÃ«ni gjithÃ§ka perveq zhvendosjen e dokumenta ose direktorives.\n\n\ +kufizimet aktuale:\n\ + - Ju nuk mund tÃ« lÃ«vizÃ« njÃ« dokument apo directori nga njÃ« drive nÃ« njÃ« tjetÃ«r.\n" + STRING_MSGBOX_HELP "shfaq njÃ« kuti mesazhi dhe pÃ«rgjigjen e userit\n\n\ +MSGBOX tipi ['titull'] prompt\n\n\ +tipi shfaq butonin\n\ + vlerat e mundshme jane: PO, POANULO,\n\ + POJO, POJOANULO\n\ +Titulli titulli i mesazhit\n\ +prompt teksti i shfaqur nga kutia e mesazhit\n\n\n\ +ERRORLEVEL Ã«shtÃ« pÃ«rzgjedhur sipas shtypjes se butonit:\n\n\ +YES : 10 | JO : 11\n\ +OK : 10 | ANULOL : 12\n" + STRING_PATH_HELP1 "Shfaq ose cakton njÃ« rrugÃ« kÃ«rkimi pÃ«r dokumentat e ekzekutueshem.\n\n\ +rrugÃ« [[drive:]rrugÃ«[;...]]\nrrugÃ« ;\n\n\ +Tipi rrugÃ« ; tÃ« pastrosh tÃ« gjitha kÃ«rkimet-rrugÃ«n nÃ« parametra dhe tÃ« drejtojÃ« komanden shell\n\ +qÃ« tÃ« kÃ«rkoj ne direktorine aktuale.\n\ +Shkruaj RRUGE pa parametra qÃ« shfaqin rrugen aktuale.\n" + STRING_PROMPT_HELP1 "Ndryshimet nÃ« komandÃ«n e shpejtÃ«.\n\n\ +PROMPT [teksti]\n\n\ + tekst Specifiko njÃ« dritare tÃ« re komande.\n\n\ +Komanda mund tÃ« pÃ«rbÃ«het nga karaktere normale dhe Kodet e mÃ«poshtme tÃ« veÃ§anta:\n\n\ $A & (Ampersand)\n\ $B | (pipe)\n\ - $C ( (Left parenthesis)\n\ - $D Current date\n\ - $E Escape code (ASCII code 27)\n\ - $F ) (Right parenthesis)\n\ - $G > (greater-than sign)\n\ - $H Backspace (erases previous character)\n\ - $I Information line\n\ - $L < (less-than sign)\n\ - $N Current drive\n\ - $P Current drive and path\n\ - $Q = (equal sign)\n\ - $S (space)\n\ - $T Current time\n\ - $V OS version number\n\ - $_ Carriage return and linefeed\n\ - $$ $ (dollar sign)\n" - STRING_PAUSE_HELP1 "Stops the execution of a batch file and shows the following message:\n\ -'Press any key to continue...' or a user defined message.\n\n\ -PAUSE [message]" - STRING_PROMPT_HELP2 " $+ Displays the current depth of the directory stack" - STRING_PROMPT_HELP3 "\nType PROMPT without parameters to reset the prompt to the default setting." - STRING_REM_HELP "Starts a comment line in a batch file.\n\nREM [Comment]" - STRING_RMDIR_HELP "Removes a directory.\n\n\ -RMDIR [drive:]path\nRD [drive:]path\n\ -/S Deletes all files and folders within target\n\ -/Q Doesn't prompt for user\n" - STRING_RMDIR_HELP2 "Directory is not empty!\n" - STRING_REN_HELP1 "Renames a file/directory or files/directories.\n\n\ -RENAME [/E /N /P /Q /S /T] old_name ... new_name\n\ -REN [/E /N /P /Q /S /T] old_name ... new_name\n\n\ - /E No error messages.\n\ - /N Nothing.\n\ - /P Prompts for confirmation before renaming each file.\n\ - (Not implemented yet!)\n\ - /Q Quiet.\n\ - /S Rename subdirectories.\n\ - /T Display total number of renamed files.\n\n\ -Note that you cannot specify a new drive or path for your destination. Use\n\ -the MOVE command for that purpose.\n" - STRING_REN_HELP2 " %lu file renamed\n" - STRING_REN_HELP3 " %lu files renamed\n" - STRING_REPLACE_HELP1 "Replaces files.\n\n\ -REPLACE [drive1:][path1]filename [drive2:][path2] [/A] [/P] [/R] [/W]\n\ -REPLACE [drive1:][path1]filename [drive2:][path2] [/P] [/R] [/S] [/W] [/U]\n\n\ - [drive1:][path1]filename Specifies the source file or files.\n\ - [drive2:][path2] Specifies the directory where files are to be\n\ - replaced.\n\ - /A Adds new files to destination directory. Cannot\n\ - use with /S or /U switches.\n\ - /P Prompts for confirmation before replacing a file or\n\ - adding a source file.\n\ - /R Replaces read-only files as well as unprotected\n\ - files.\n\ - /S Replaces files in all subdirectories of the\n\ - destination directory. Cannot use with the /A\n\ - switch.\n\ - /W Waits for you to insert a disk before beginning.\n\ - /U Replaces (updates) only files that are older than\n\ - source files. Cannot use with the /A switch.\n" - STRING_REPLACE_HELP2 "Source path required\n" - STRING_REPLACE_HELP3 "No files replaced\n" - STRING_REPLACE_HELP4 "%lu file(s) replaced\n" - STRING_REPLACE_HELP5 "Replacing %s\n" - STRING_REPLACE_HELP6 "Replace %s\n" - STRING_REPLACE_HELP7 "No files added\n" - STRING_REPLACE_HELP8 "%lu file(s) added\n" - STRING_REPLACE_HELP9 "Add %s (Y/N) " - STRING_REPLACE_HELP10 "Replace %s (Y/N) " - STRING_REPLACE_HELP11 "Adding %s\n" - STRING_SHIFT_HELP "Changes the position of replaceable parameters in a batch file.\n\n\ + $C ( (kllapÃ« majtas)\n\ + $D Data aktuale\n\ + $E Kodi daljes (ASCII kodi 27)\n\ + $F ) (kllapÃ« djathtas)\n\ + $G > (mÃ« e madhe se)\n\ + $H Hapesire (fshin karakterin e mÃ«parshem)\n\ + $I Linja e informacionit\n\ + $L < (mÃ« pak se)\n\ + $N Driveri aktual\n\ + $P Driveri dhe rruga aktuale\n\ + $Q = (barazim)\n\ + $S (hapesirÃ«)\n\ + $T Koha aktuale\n\ + $V Versioni i OS\n\ + $_ Rikthimi i perzgjedhjeve dhe informacionit\n\ + $$ $ (Shenja e dollarit)\n" + STRING_PAUSE_HELP1 "Ndalon ekzekutimin e njÃ« dokumenti batch dhe trego mesazhin nÃ« vazhdim:\n\ +'Shtypni njÃ« buton pÃ«r tÃ« vazhduar...' ose njÃ« mesazh tÃ« pÃ«rcaktuar pÃ«r pÃ«rdoruesin.\n\n\ +PAUZE [mesazhi]" + STRING_PROMPT_HELP2 " $+ Shfaq thellÃ«sinÃ« aktuale tÃ« directorive nÃ« rafte" + STRING_PROMPT_HELP3 "\nSHFAQ pa parametra pÃ«r tÃ« resetuar ne konfigurimet e automatizuara." + STRING_REM_HELP "Nis njÃ« linjÃ« koment nÃ« njÃ« dokument batch.\n\nREM [Koment" + STRING_RMDIR_HELP "Heq njÃ« direktori.\n\n\ +RMDIR [drive:]rrugÃ«\nRD [drive:]rrugÃ«\n\ +/S Fshin tÃ« gjitha dokumentat dhe dosjet brenda objektivit\n\ +/Q Nuk e shfaq pÃ«r pÃ«rdoruesin\n" + STRING_RMDIR_HELP2 "Direktoria nuk Ã«shtÃ« e zbrazÃ«t!\n" + STRING_REN_HELP1 "Emeron nje dokument/directori ose dokument/skedÃ«.\n\n\ +RENAME [/E /N /P /Q /S /T] emrin_e_vjetÃ«r ... emrin_e_ri\n\ +REN [/E /N /P /Q /S /T] emrin_e_vjeter ... emrin_e_ri\n\n\ + /E Nuk ka mesazhe errori.\n\ + /N AsgjÃ«.\n\ + /P Shfaq pÃ«r tÃ« konfirmuar para merimit pÃ«r secilin dokument.\n\ + (Jo e implementuar ende!)\n\ + /Q Dil.\n\ + /S Emero nÃ«n-direktorite.\n\ + /T Shfaq numrin total tÃ« dosjeve tÃ« riemÃ«ruar.\n\n\ +Vini re se ju nuk mund tÃ« specifikoni njÃ« drive tÃ« ri ose rrugÃ«n pÃ«r nÃ« destinacionin tuaj. PÃ«rdor\n\ +komandÃ«n MOVE pÃ«r kÃ«tÃ« qÃ«llim.\n" + STRING_REN_HELP2 " %lu dokumenti u rimÃ«rua\n" + STRING_REN_HELP3 " %lu dokumenti u rimÃ«rua\n" + STRING_REPLACE_HELP1 "zÃ«vendÃ«son dokumentat.\n\n\ +REPLACE [drive1:][rrugÃ«1]emri [drive2:][rrugÃ«2] [/A] [/P] [/R] [/W]\n\ +REPLACE [drive1:][rrugÃ«1]emri [drive2:][rrugÃ«2] [/P] [/R] [/S] [/W] [/U]\n\n\ + [drive1:][rrugÃ«1]emri Specifikon e dokumentit ose dokumentÃ«ve.\n\ + [drive2:][rrugÃ«2] Specifikon directorine ku dokumentet do tÃ«\n\ + zÃ«vendÃ«sohen.\n\ + /A Shton dokumente tÃ« reja tek directoria e destinacionit. Nuk\n\ + pÃ«rdoret me /S ose /U.\n\ + /P Shfaw konfirmimim para se tÃ« zÃ«vendÃ«sosh njÃ« dokument apo\n\ + shtimit tÃ« burimit tÃ« dokumentit.\n\ + /R ZÃ«vendÃ«so dokumentat vetÃ«m-lexohet, si dhe dokumentet e\n\ + pambrojtur.\n\ + /S ZÃ«vendÃ«son dokumentet nÃ« tÃ« gjitha nÃ«n-direktoritÃ« e\n\ + directorite. Nuk mund tÃ« pÃ«rdorÃ« me/A\n\ + parametra.\n\ + /W Pret pÃ«r ju pÃ«r tÃ« futur njÃ« disk para fillimit tÃ«.\n\ + /U ZÃ«vendÃ«so (update) vetem dokumenta qÃ« janÃ« mÃ« tÃ« vjetÃ«r se\n\ + dokumentat e burimit. Nuk mund ta pÃ«rdorÃ«sh me /A.\n" + STRING_REPLACE_HELP2 "Rruga e Burimi kÃ«rkohet\n" + STRING_REPLACE_HELP3 "Nuk zÃ«vendÃ«sohen dokumentat\n" + STRING_REPLACE_HELP4 "%lu dokumenta(t) zÃ«vendÃ«sohen\n" + STRING_REPLACE_HELP5 "ZÃ«vendÃ«sohen %s\n" + STRING_REPLACE_HELP6 "ZÃ«vendÃ«soh %s\n" + STRING_REPLACE_HELP7 "S'ka dokumentat te shtuar\n" + STRING_REPLACE_HELP8 "%lu dokumenta(t) u shtuan\n" + STRING_REPLACE_HELP9 "Shto %s (P/J) " + STRING_REPLACE_HELP10 "ZÃ«vendÃ«so %s (P/J) " + STRING_REPLACE_HELP11 "Shtim %s\n" + STRING_SHIFT_HELP "Ndryshon pozitÃ«n e parametrave nÃ« njÃ« dokument batch.\n\n\ SHIFT [DOWN]" - STRING_SCREEN_HELP "move cursor and optionally print text\n\n\ -SCREEN row col [text]\n\n\ - row row to which move the cursor\n\ - col column to which move the cursor" - STRING_SET_HELP "Displays, sets, or removes environment variables.\n\n\ + STRING_SCREEN_HELP "lÃ«vizin kursorin opsionale dhe printoni tekstin\n\n\ +SCREEN row col [tekst]\n\n\ + row rreshti pÃ«r tÃ« cilat lÃ«vizin kursorin\n\ + col Kolona tÃ« cilat lÃ«vizin kursorin" + STRING_SET_HELP "Shfaq, vendos, ose hiq variablat e mjedisit.\n\n\ SET [variable[=][string]]\n\n\ - variable Specifies the environment-variable name.\n\ - string Specifies a series of characters to assign to the variable.\n\n\ -Type SET without parameters to display the current environment variables.\n" - STRING_START_HELP1 "Starts a command.\n\n\ -START command\n\n\ - command Specifies the command to run.\n\n\ -At the moment all commands are started asynchronously.\n" - STRING_TITLE_HELP "Sets the window title for the command prompt window.\n\n\ + variable Specifikon emrin e variablave te mjedisit.\n\ + string Specifikon njÃ« seri karakteresh qÃ« i pÃ«rkasim variablave.\n\n\ +Shkuaj SET pa parametra te paraqitura ne ekran pÃ«r variablet e mjedisit.\n" + STRING_START_HELP1 "Fillon nÃ« komandÃ«.\n\n\ +START komande\n\n\ + command Specifiko komandÃ«n pÃ«r tÃ« filluar.\n\n\ +NÃ« kÃ«tÃ« moment tÃ« gjithÃ« komandat janÃ« nisur sipas sinkronizimit.\n" + STRING_TITLE_HELP "Vendos titullin e dritares pÃ«r dritaren e komandÃ«ns se shpejtÃ«.\n\n\ TITLE [string]\n\n\ -string Specifies the title for the command prompt window.\n" - STRING_TIME_HELP1 "Displays or sets the system time.\n\n\ -TIME [/T][time]\n\n\ - /T display only\n\n\ -Type TIME with no parameters to display the current time setting and a prompt\n\ -for a new one. Press ENTER to keep the same time.\n" - STRING_TIME_HELP2 "Enter new time: " - STRING_TIMER_HELP1 "Elapsed %d msecs\n" - STRING_TIMER_HELP2 "Elapsed %02d%c%02d%c%02d%c%02d\n" - STRING_TIMER_HELP3 "allow the use of ten stopwatches.\n\n\ +string Specifikon titullin e dritares pÃ«r dritaren e komandÃ«ns se shpejtÃ«.\n" + STRING_TIME_HELP1 "Shfaq ose vendos oren e sistemit.\n\n\ +TIME [/T][ora]\n\n\ + /T vÃ«tem shfaq\n\n\ +Shkruaj TIME pa parametra qÃ« tÃ« shfaqesh nÃ« ekran oren dhe konfigurimet aktuale\n\ +pÃ«r njÃ« tÃ« re. Kliko ENTER tÃ« mbash tÃ« njÃ«jtÃ« orÃ«.\n" + STRING_TIME_HELP2 "Shkruaj orÃ«n e re: " + STRING_TIMER_HELP1 "Kaluar %d milisekonda\n" + STRING_TIMER_HELP2 "Kaluar %02d%c%02d%c%02d%c%02d\n" + STRING_TIMER_HELP3 "tÃ« lejojÃ« pÃ«rdorimin e dhjetÃ« kronometrave.\n\n\ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n\ - ON set stopwatch ON\n\ - OFF set stopwatch OFF\n\ - /S Split time. Return stopwatch split\n\ - time without changing its value\n\ - /n Specifiy the stopwatch number.\n\ - Stopwatches available are 0 to 9\n\ - If it is not specified default is 1\n\ - /Fn Format for output\n\ - n can be:\n\ - 0 milliseconds\n\ + ON Nis kronometrin\n\ + OFF Ndalo kronometrin\n\ + /S Ndaj kohen. Kthe ndarjen e kohes se\n\ + kronometrit pa ndryshuar vlerat\n\ + /n Specifiko numrin e kronometrit.\n\ + Kronometret ne dispozicion janÃ« 0 deri nÃ« 9\n\ + NÃ«se nuk specifikohen automatizimi Ã«shtÃ« 1\n\ + /Fn Formatimi pÃ«r tÃ« dhÃ«nat\n\ + n mund te jetÃ«:\n\ + 0 millisekonda\n\ 1 hh%cmm%css%cdd\n\n\ -if none of ON, OFF or /S is specified the command\n\ -will toggle stopwatch state\n\n" - STRING_TYPE_HELP1 "Displays the contents of text files.\n\nTYPE [drive:][path]filename \n\ - /P Shows one screen of output at a time.\n" - STRING_VERIFY_HELP1 "This command is just a dummy!!\n\ -Sets whether to verify that your files are written correctly to a\n\ +NÃ«se nuk konfigurohen ON, OFF ose /S Ã«shtÃ« specifikimi i komandave\n\ +qÃ« do tÃ« tregojÃ« gjendjen e kronometrit\n\n" + STRING_TYPE_HELP1 "Shfaq pÃ«rmbajtjen e tekstit tÃ« dosjeve.\n\nTIPI [drive:][rrugÃ«]emri \n\ + /P Tregon njÃ« ekran informacionin nÃ« njÃ« kohÃ«.\n" + STRING_VERIFY_HELP1 "Kjo komandÃ« Ã«shtÃ« kot!!\n\ +Vendos nÃ«se tÃ« verifikoje qÃ« dosjet tuaja janÃ« shkruar saktÃ« pÃ«r njÃ«\n\ disk.\n\n\ VERIFY [ON | OFF]\n\n\ -Type VERIFY without a parameter to display the current VERIFY setting.\n" - STRING_VERIFY_HELP2 "VERIFY is %s.\n" - STRING_VERIFY_HELP3 "Must specify ON or OFF." - STRING_VERSION_HELP1 "Displays shell version information\n\n\ +Shkruaj VERIFY pa parametra tÃ« shfaqen konfigurimet aktuale te verifikimit.\n" + STRING_VERIFY_HELP2 "VERIFY Ã«shtÃ« %s.\n" + STRING_VERIFY_HELP3 "Duhet specifikuar ON ose OFF." + STRING_VERSION_HELP1 "Shfaq infromacionet e versionit te shell\n\n\ VER [/C][/R][/W]\n\n\ - /C Displays credits.\n\ - /R Displays redistribution information.\n\ - /W Displays warranty information." - STRING_VERSION_HELP2 " comes with ABSOLUTELY NO WARRANTY; for details\n\ -type: `ver /w'. This is free software, and you are welcome to redistribute\n\ -it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n\ -listing of credits." - STRING_VERSION_HELP3 "\n This program is distributed in the hope that it will be useful,\n\ - but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ - GNU General Public License for more details." - STRING_VERSION_HELP4 "\n This program is free software; you can redistribute it and/or modify\n\ - it under the terms of the GNU General Public License as published by\n\ - the Free Software Foundation; either version 2 of the License, or\n\ - (at your option) any later version.\n" - STRING_VERSION_HELP5 "\nSend bug reports to <ros-dev(a)reactos.org>.\n\ -Updates are available at: http://www.reactos.org" - STRING_VERSION_HELP6 "\nFreeDOS version written by:\n" - STRING_VERSION_HELP7 "\nReactOS version written by:\n" - STRING_VOL_HELP1 " Volume in drive %c is %s\n" - STRING_VOL_HELP2 " Volume in drive %c has no label.\n" - STRING_VOL_HELP3 " Volume Serial Number is %04X-%04X\n" - STRING_VOL_HELP4 "Displays the disk volume label and serial number, if they exist.\n\nVOL [drive:]" - STRING_WINDOW_HELP1 "change console window aspect\n\n\ + /C Shfaq nderimet.\n\ + /R Shfaq informacionet e distribuimit.\n\ + /W Shfaq informacionet e garancise." + STRING_VERSION_HELP2 " vjen me absolutisht JO GARANCIE; PÃ«r detaje\n\ +shkruaj: `ver /w'. Ky software Ã«shtÃ« i falas, dhe ju jeni tÃ« mirÃ«pritur pÃ«r tÃ« rishpÃ«rndarÃ«\n\ +nÃ«n kushte tÃ« caktuara; shkruaj `ver /r' pÃ«r detaje. Shkruaj `ver /c' pÃ«r njÃ«\n\ +listÃ« tÃ« nderimeve." + STRING_VERSION_HELP3 "\n Ky program shpÃ«rndahet me shpresÃ«n se do tÃ« jetÃ« e dobishme,\n\ +por PA ASNJÃ GARANCI; madje edhe pa garancinÃ« e shprehur tÃ«\n\ + TREGTUESHMÃRISÃ apo tÃ« PÃRDORIMIT PÃR NJÃ QÃLLIM TÃ CAKTUAR. Shih\n\ + GNU General Public LiÃ§ense pÃ«r detaje." + STRING_VERSION_HELP4 "\n Ky program Ã«shtÃ« software falas; ju mund t'a rishpÃ«rndani dhe / ose modifikoni\n\ + nÃ«n kushtet e LiÃ§encÃ«s Publike tÃ« PÃ«rgjithshme GNU sikurse publikuar nga\n\ + Free Software Foundation; ose version 2 tÃ« LiÃ§enses, ose\n\ + (nÃ« opsionin tuaj) Ã§farÃ«do versioni tÃ« mÃ«vonshÃ«m.\n" + STRING_VERSION_HELP5 "\nDÃ«rgo raportime tÃ« metash nÃ«<ros-dev(a)reactos.org>.\n\ +Updates janÃ« nÃ« dispozicion nÃ«: http://www.reactos.org" + STRING_VERSION_HELP6 "\nVersion FreeDOS shkruar nga:\n" + STRING_VERSION_HELP7 "\nVersion FreeDOS shkruar nga:\n" + STRING_VOL_HELP1 " Volumi Ã«shtÃ« drive %c Ã«shtÃ« %s\n" + STRING_VOL_HELP2 " Volumi Ã«shtÃ« drive %c nuk ka etikete.\n" + STRING_VOL_HELP3 " Numri Serial i Volumit Ã«shtÃ« %04X-%04X\n" + STRING_VOL_HELP4 "Shfaq etiketa e volumeve tÃ« diskut, nÃ«se ekzistojne.\n\nVOL [drive:]" + STRING_WINDOW_HELP1 "ndrysho aspektin e dritares se konsolit\n\n\ WINDOW [/POS[=]left,top,width,heigth]\n\ - [MIN|MAX|RESTORE] ['title']\n\n\ -/POS specify window placement and dimensions\n\ -MIN minimize the window\n\ -MAX maximize the window\n\ -RESTORE restore the window" - STRING_WINDOW_HELP2 "change console window aspect\n\n\ + [MIN|MAX|RESTORE] ['titulli']\n\n\ +/POS specifikojÃ« vendosje e dritares dhe dimensionet\n\ +MIN minimizo dritaren\n\ +MAX rrit dritaren\n\ +RESTORE riktheni dritaren" + STRING_WINDOW_HELP2 "ndrysho aspektin e dritares se konsolit\n\n\ ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ -window tile of window on which perform actions\n\ -/POS specify window placement and dimensions\n\ -MIN minimize the window\n\ -MAX maximize the window\n\ -RESTORE restore the window\n\ -title new title\n" +window dritare ku mund te kryesh veprime\n\ +/POS specifikojÃ« vendosje e dritares dhe dimensionet\n\ +MIN minimizo dritaren\n\ +MAX rrit dritaren\n\ +RESTORE riktheni dritraren\n\ +title titull i ri\n" STRING_CHOICE_OPTION "YN" STRING_COPY_OPTION "YNA" - STRING_ALIAS_ERROR "Command line too long after alias expansion!\n" - STRING_ASSOC_ERROR "File association not found for extension %s\n" - STRING_BATCH_ERROR "Error opening batch file\n" - STRING_CHCP_ERROR1 "Active code page: %u\n" + STRING_ALIAS_ERROR "Rreshti i komandÃ«s shumÃ« gjatÃ« pas pseudonimit!\n" + STRING_ASSOC_ERROR "Dokumentit perkates nuk u gjet pÃ«r zgjatjen %s\n" + STRING_BATCH_ERROR "Gabim gjatÃ« hapjes sÃ« dokumentit batch\n" + STRING_CHCP_ERROR1 "Faqja Active e Kodit: %u\n" STRING_CHCP_ERROR4 "Invalid code page\n" - STRING_CHOICE_ERROR "Invalid option. Expected format: /C[:]options" - STRING_CHOICE_ERROR_TXT "Invalid option. Expected format: /T[:]c,nn" + STRING_CHOICE_ERROR "Opsione invalide. Format i pritshem: /C[:]opsione" + STRING_CHOICE_ERROR_TXT "Opsione invalide. Format i pritshem: /T[:]c,nn" STRING_CHOICE_ERROR_OPTION "Illegal Option: %s" - STRING_CMD_ERROR1 "Can't redirect input from file %s\n" - STRING_CMD_ERROR2 "Error creating temporary file for pipe data\n" - STRING_CMD_ERROR3 "Can't redirect to file %s\n" - STRING_CMD_ERROR4 "Running %s...\n" - STRING_CMD_ERROR5 "Running cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "error in color specification" - STRING_COLOR_ERROR3 "Color %02x\n" - STRING_CONSOLE_ERROR "Unknown error: %d\n" - STRING_COPY_ERROR1 "Error: Cannot open source - %s!\n" - STRING_COPY_ERROR2 "Error: Can't copy onto itself!\n" - STRING_COPY_ERROR3 "Error writing destination!\n" - STRING_COPY_ERROR4 "Error: Not implemented yet!\n" - STRING_DATE_ERROR "Invalid date." - STRING_DEL_ERROR5 "The file %s will be deleted! " - STRING_DEL_ERROR6 "Are you sure (Y/N)?" - STRING_DEL_ERROR7 "Deleting: %s\n" - STRING_ERROR_ERROR1 "Unknown error! Error code: 0x%lx\n" - STRING_ERROR_ERROR2 "Syntax error" - STRING_FOR_ERROR1 "'in' missing in for statement." - STRING_FOR_ERROR2 "no brackets found." - STRING_FOR_ERROR3 "'do' missing." - STRING_FOR_ERROR4 "no command after 'do'." - STRING_FREE_ERROR1 "Invalid drive" - STRING_FREE_ERROR2 "unlabeled" - STRING_GOTO_ERROR1 "No label specified for GOTO" - STRING_GOTO_ERROR2 "Label '%s' not found\n" - STRING_MD_ERROR "A subdirectory or file already exists.\n" - STRING_MD_ERROR2 "The path to the new folder does not exist.\n" + STRING_CMD_ERROR1 "Nuk mund tÃ« pÃ«rcjellim hyrjen nga dokumenti %s\n" + STRING_CMD_ERROR2 "Error ne krijimin e dokumentit e perkohshem pÃ«r informacionin ne pipe\n" + STRING_CMD_ERROR3 "Nuk mund tÃ« pÃ«rcjellim nÃ« dokument %s\n" + STRING_CMD_ERROR4 "Fillo %s...\n" + STRING_CMD_ERROR5 "Fillo cmdexit.bat...\n" + STRING_COLOR_ERROR1 "Error i njÃ«ta ngjyra! (Historiku dhe prioritetit nuk mund tÃ« jetÃ« ngjyrÃ« tÃ« njÃ«jtÃ«)" + STRING_COLOR_ERROR2 "gabim nÃ« specifikim ngjyra" + STRING_COLOR_ERROR3 "Ngjyra %02x\n" + STRING_CONSOLE_ERROR "Error i paditur: %d\n" + STRING_COPY_ERROR1 "Error: Nuk mund tÃ« hapni burim - %s!\n" + STRING_COPY_ERROR2 "Error: Nuk mund tÃ« kopjoni mbi veten!\n" + STRING_COPY_ERROR3 "Gabim gjatÃ« shkrimit nÃ« destinacion!\n" + STRING_COPY_ERROR4 "Error: Akoma nuk Ã«shtÃ« implementuar!\n" + STRING_DATE_ERROR "Date Invalid." + STRING_DEL_ERROR5 "Dokumenti %s do tÃ« fshihet! " + STRING_DEL_ERROR6 "Jeni tÃ« sigurtÃ« (P/J))?" + STRING_DEL_ERROR7 "Fshini: %s\n" + STRING_ERROR_ERROR1 "Error i paditur! Kodi error: 0x%lx\n" + STRING_ERROR_ERROR2 "Error sintaksi" + STRING_FOR_ERROR1 "'NÃ«' humbur pÃ«r nÃ« deklaratÃ«." + STRING_FOR_ERROR2 "Nuk gjenden kllapat." + STRING_FOR_ERROR3 "'bÃ«j' i humbur." + STRING_FOR_ERROR4 "asnjÃ« komandÃ« pas 'do'." + STRING_FREE_ERROR1 "Drive Invalid" + STRING_FREE_ERROR2 "E paetiketuar" + STRING_GOTO_ERROR1 "Nuk ka etiketa specifikuar pÃ«r GOTO" + STRING_GOTO_ERROR2 "Etikete '%s' Nuk u gjet\n" + STRING_MD_ERROR "NjÃ« nÃ«n-skedÃ« ose dokument ekziston.\n" + STRING_MD_ERROR2 "Rruga pÃ«r tek skeda e re nuk ekziston.\n" STRING_MOVE_ERROR1 "[OK]\n" STRING_MOVE_ERROR2 "[Error]\n" - STRING_REN_ERROR1 "MoveFile() failed. Error: %lu\n" - STRING_START_ERROR1 "No batch support at the moment!" - STRING_TIME_ERROR1 "Invalid time." - STRING_TYPE_ERROR1 "Invalid option '/%s'\n" - STRING_WINDOW_ERROR1 "window not found" - STRING_ERROR_PARAMETERF_ERROR "Parameter format not correct - %c\n" - STRING_ERROR_INVALID_SWITCH "Invalid switch - /%c\n" - STRING_ERROR_TOO_MANY_PARAMETERS "Too many parameters - %s\n" - STRING_ERROR_PATH_NOT_FOUND "Path not found\n" - STRING_ERROR_FILE_NOT_FOUND "File not found\n" - STRING_ERROR_REQ_PARAM_MISSING "Required parameter missing\n" - STRING_ERROR_INVALID_DRIVE "Invalid drive specification\n" - STRING_ERROR_INVALID_PARAM_FORMAT "Invalid parameter format - %s\n" - STRING_ERROR_BADCOMMAND "Bad command or filename - %s\n" - STRING_ERROR_OUT_OF_MEMORY "Out of memory error.\n" - STRING_ERROR_CANNOTPIPE "Error! Cannot pipe! Cannot open temporary file!\n" - STRING_ERROR_D_PAUSEMSG "Press any key to continue . . ." - STRING_ERROR_DRIVER_NOT_READY "Drive not ready" - STRING_PATH_ERROR "CMD: Not in environment '%s'\n" - STRING_REPLACE_ERROR1 "Invalid switch - %s\n" - STRING_REPLACE_ERROR2 "Path not found - %s\n" - STRING_REPLACE_ERROR3 "The filename, directory name, or volume label syntax is incorrect.\n" - STRING_REPLACE_ERROR4 "Invalid parameter combination\n" - STRING_REPLACE_ERROR5 "Access denied - %s\n" - STRING_REPLACE_ERROR6 "No files found - %s\n" - STRING_REPLACE_ERROR7 "Extended Error 32\n" - STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n" - STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s" - STRING_VERSION_RUNVER " running on %s" + STRING_REN_ERROR1 "MoveFile() dÃ«shtoj. Error: %lu\n" + STRING_START_ERROR1 "Nuk ka mbÃ«shtetje nÃ« kÃ«tÃ« moment bÃ«r dokumentin batch!" + STRING_TIME_ERROR1 "Ora invalide." + STRING_TYPE_ERROR1 "opsion ivalid '/%s'\n" + STRING_WINDOW_ERROR1 "dritaria nuk i gjend" + STRING_ERROR_PARAMETERF_ERROR "Parametrat e formanit nuk jane te sakta - %c\n" + STRING_ERROR_INVALID_SWITCH "Qeles invalid - /%c\n" + STRING_ERROR_TOO_MANY_PARAMETERS "ShumÃ« parametra - %s\n" + STRING_ERROR_PATH_NOT_FOUND "Rruga nuk u gjet\n" + STRING_ERROR_FILE_NOT_FOUND "Dokumenti nuk i gjet\n" + STRING_ERROR_REQ_PARAM_MISSING "Parametra e kerkuar mungojnÃ«\n" + STRING_ERROR_INVALID_DRIVE "Specifikimi i drivit invalid\n" + STRING_ERROR_INVALID_PARAM_FORMAT "Parametrat e formatit invalid - %s\n" + STRING_ERROR_BADCOMMAND "Komande e keqe ose dokument i keq - %s\n" + STRING_ERROR_OUT_OF_MEMORY "Error ska memorie te mjaftueshme.\n" + STRING_ERROR_CANNOTPIPE "Error! Nuk mund tÃ« pipoj! Nuk mund tÃ« hape dokumentet e perkohshem!\n" + STRING_ERROR_D_PAUSEMSG "Shtypni njÃ« buton pÃ«r tÃ« vazhduar . . ." + STRING_ERROR_DRIVER_NOT_READY "Drive nuk Ã«shtÃ« gati" + STRING_PATH_ERROR "CMD: Jo nÃ« mjedis '%s'\n" + STRING_REPLACE_ERROR1 "Qeles invalid - %s\n" + STRING_REPLACE_ERROR2 "Rruga nuk u gjet - %s\n" + STRING_REPLACE_ERROR3 "Dokumenti, emri i direktorise, ose syntaksi i etiketes volumetrike eshte gabim.\n" + STRING_REPLACE_ERROR4 "Kombimi i parametrave invalid\n" + STRING_REPLACE_ERROR5 "Refuzot hyrja - %s\n" + STRING_REPLACE_ERROR6 "Nuk u gjet dokumenti - %s\n" + STRING_REPLACE_ERROR7 "Error i zgjatur 32\n" + STRING_REACTOS_VERSION "Sistemi Operativ ReactOS [Versioni %s-%s]\n" + STRING_CMD_SHELLINFO "\nReactOS Interpretuesi i komandave\nVersioni %s %s" + STRING_VERSION_RUNVER " funksionon nÃ« %s" STRING_COPY_FILE " %d file(s) copied\n" - STRING_DELETE_WIPE "wiped" - STRING_FOR_ERROR "bad variable specification." - STRING_SCREEN_COL "invalid value for col" - STRING_SCREEN_ROW "invalid value for row" - STRING_TIMER_TIME "Timer %d is %s: " - STRING_MKLINK_CREATED_SYMBOLIC "Symbolic link created for %s <<===>> %s\n" - STRING_MKLINK_CREATED_HARD "Hard link created for %s <<===>> %s\n" - STRING_MKLINK_CREATED_JUNCTION "Junction created for %s <<===>> %s\n" - STRING_MORE "More? " - STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " + STRING_DELETE_WIPE "spastruar" + STRING_FOR_ERROR "specifikimi i varibleve i keq." + STRING_SCREEN_COL "vlere invalide pÃ«r col" + STRING_SCREEN_ROW "vlere invalide pÃ«r row" + STRING_TIMER_TIME "kohÃ«matÃ«s %d is %s: " + STRING_MKLINK_CREATED_SYMBOLIC "Link i krijuar simbolik pÃ«r %s <<===>> %s\n" + STRING_MKLINK_CREATED_HARD "Krijus linku i forte pÃ«r %s <<===>> %s\n" + STRING_MKLINK_CREATED_JUNCTION "Kryqezim krijuar pÃ«r %s <<===>> %s\n" + STRING_MORE "MÃ« shumÃ«? " + STRING_CANCEL_BATCH_FILE "\r\nCtrl-Break. Anulo dokumentin batch? (Po/Jo/TÃ« Gjith) " STRING_INVALID_OPERAND "Invalid operand." - STRING_EXPECTED_CLOSE_PAREN "Expected ')'." - STRING_EXPECTED_NUMBER_OR_VARIABLE "Expected number or variable name." - STRING_SYNTAX_COMMAND_INCORRECT "The syntax of the command is incorrect." + STRING_EXPECTED_CLOSE_PAREN "Pritej ')'." + STRING_EXPECTED_NUMBER_OR_VARIABLE "Numer qÃ« pritej ose emri i variables." + STRING_SYNTAX_COMMAND_INCORRECT "Sintaksi i komandes Ã«shtÃ« gabim." END Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] Fri Dec 6 15:00:40 2013 @@ -82,6 +82,9 @@ #ifdef LANGUAGE_SK_SK #include "lang/sk-SK.rc" #endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif #ifdef LANGUAGE_TR_TR #include "lang/tr-TR.rc" #endif Copied: trunk/reactos/base/shell/explorer-new/lang/sq-AL.rc (from r61195, trunk/reactos/base/shell/explorer-new/lang/en-US.rc) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sq-AL.rc [iso-8859-1] Fri Dec 6 15:00:40 2013 @@ -1,23 +1,27 @@ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) + * DATE OF TR: 29-11-2013 +*/ + +LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL IDM_TRAYWND MENU BEGIN POPUP "" BEGIN MENUITEM SEPARATOR - MENUITEM "&Adjust Date/Time", ID_SHELL_CMD_ADJUST_DAT - MENUITEM "&Customize Notifications...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM "&Modifilo daten/OrÃ«n", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&Modifiko njoftimet...", ID_SHELL_CMD_CUST_NOTIF MENUITEM SEPARATOR - MENUITEM "Ca&scade Windows", ID_SHELL_CMD_CASCADE_WND - MENUITEM "Tile Windows &Horizontally", ID_SHELL_CMD_TILE_WND_H - MENUITEM "Tile Windows V&ertically", ID_SHELL_CMD_TILE_WND_V - MENUITEM "&Show the Desktop", ID_SHELL_CMD_SHOW_DESKTOP - MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION + MENUITEM "Shfaq dritaret", ID_SHELL_CMD_CASCADE_WND + MENUITEM "Shfaq dritaret &Horizontalisht", ID_SHELL_CMD_TILE_WND_H + MENUITEM "Shfaq dritaret V&ertikalisht", ID_SHELL_CMD_TILE_WND_V + MENUITEM "&Shfaq desktopin", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "&zhbÃ«j", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR - MENUITEM "Tas&k Manager", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM "Menaxhuesi i detyrave", ID_SHELL_CMD_OPEN_TASKMGR MENUITEM SEPARATOR - MENUITEM "&Lock the Taskbar", ID_LOCKTASKBAR - MENUITEM "P&roperties", ID_SHELL_CMD_PROPERTIES + MENUITEM "&Blloko Taskbarin", ID_LOCKTASKBAR + MENUITEM "Konfigurimet", ID_SHELL_CMD_PROPERTIES END END @@ -26,39 +30,39 @@ POPUP "" BEGIN MENUITEM "", -1, MFT_SEPARATOR - POPUP "&Programs", IDM_PROGRAMS + POPUP "&Programet", IDM_PROGRAMS BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Bosh)", -1, MFT_STRING, MFS_GRAYED END - POPUP "F&avorites", IDM_FAVORITES + POPUP "P&referuarat", IDM_FAVORITES BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Bosh)", -1, MFT_STRING, MFS_GRAYED END - POPUP "&Documents", IDM_DOCUMENTS + POPUP "&Dokumentet", IDM_DOCUMENTS BEGIN - MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + MENUITEM "(Bosh)", -1, MFT_STRING, MFS_GRAYED END - POPUP "&Settings", IDM_SETTINGS + POPUP "&Konfigurimet", IDM_SETTINGS BEGIN - MENUITEM "&Control Panel", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM "&Panali i kontrollit", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED MENUITEM "", -1, MFT_SEPARATOR - MENUITEM "&Security...", IDM_SECURITY, MFT_STRING, MFS_ENABLED - MENUITEM "&Network Connections", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED - MENUITEM "&Printers and Faxes", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED - MENUITEM "&Taskbar and Start Menu", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + MENUITEM "&Siguria...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&Lidhaj e Networkut", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Printerat dhe Fakset", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "&Taskbar dhe Start Menu", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED END - POPUP "Sear&ch", IDM_SEARCH + POPUP "&KÃ«rko", IDM_SEARCH BEGIN MENUITEM "", -1, MFT_SEPARATOR END - MENUITEM "&Help and Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED - MENUITEM "&Run...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "&Ndihma dhe Suporti", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "&Fillo...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED - MENUITEM "S&ynchronize", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED - MENUITEM "&Log Off %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED - MENUITEM "D&isconnect...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED - MENUITEM "Undock Comput&er", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED - MENUITEM "Sh&ut Down...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + MENUITEM "S&inkronizo", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "&Dil %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "Shkeputu...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Shkeput kompjuterin", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "Fike...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED END END @@ -67,55 +71,55 @@ CAPTION "Taskbar" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Taskbar appearance", IDC_STATIC, 6, 6, 240, 104 + GROUPBOX "Aparenca e Taskbar", IDC_STATIC, 6, 6, 240, 104 CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13, 18, 224, 21 - AUTOCHECKBOX "&Lock the taskbar", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 - AUTOCHECKBOX "A&uto-hide the taskbar", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 - AUTOCHECKBOX "Keep the &taskbar on top of other windows", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 - AUTOCHECKBOX "&Group similar taskbar buttons", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 - AUTOCHECKBOX "Show &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 + AUTOCHECKBOX "&Blloko taskbarin", IDC_TASKBARPROP_LOCK, 13, 45, 200, 10 + AUTOCHECKBOX "Fsheh automatikish taskbarin", IDC_TASKBARPROP_HIDE, 13, 58, 200, 10 + AUTOCHECKBOX "Mbaj &taskbar mbi dritaret e tjera", IDC_TASKBARPROP_ONTOP, 13, 71, 200, 10 + AUTOCHECKBOX "&Grupo butonat e njejte nÃ« taskbar", IDC_TASKBARPROP_GROUP, 13, 84, 200, 10 + AUTOCHECKBOX "Shfaq &Quick Launch", IDC_TASKBARPROP_SHOWQL, 13, 97, 200, 10 END IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Start Menu" +CAPTION "Fillo" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - AUTORADIOBUTTON "&Start menu", IDC_TASKBARPROP_STARTMENU, 7, 7, 105, 10 - LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20, 17, 150, 24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCUST, 192, 4, 53, 14, WS_DISABLED - AUTORADIOBUTTON "Classic Start &menu", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 47, 105, 10, WS_DISABLED - LTEXT "This menu style gives you the classic look and functionality", -1, 20, 57, 150, 24, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 44, 53, 14, WS_DISABLED - GROUPBOX "Privacy", IDC_STATIC, 7, 100, 238, 42 - AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14, 114, 224, 10, WS_DISABLED - AUTOCHECKBOX "Store and display a list of recently opened &programs", IDC_TASKBARPROP_RECENTFOLDERS, 14, 128, 224, 10, WS_DISABLED + AUTORADIOBUTTON "&Fillo menu", IDC_TASKBARPROP_STARTMENU, 7, 7, 105, 10 + LTEXT "Ky stil menu ju jep juve akses tÃ« lehtÃ« nÃ« dosjet tuaja tÃ« preferuara, programet, dhe kÃ«rko.", IDC_STATIC, 20, 17, 150, 24, WS_DISABLED + PUSHBUTTON "&Modifiko...", IDC_TASKBARPROP_STARTMENUCUST, 192, 4, 53, 14, WS_DISABLED + AUTORADIOBUTTON "Start &menu klasike", IDC_TASKBARPROP_STARTMENUCLASSIC, 7, 47, 105, 10, WS_DISABLED + LTEXT "Ky stil menu ju jep pamjen klasike dhe funksionalitetin", -1, 20, 57, 150, 24, WS_DISABLED + PUSHBUTTON "&Modifiko...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192, 44, 53, 14, WS_DISABLED + GROUPBOX "Fshehtesi", IDC_STATIC, 7, 100, 238, 42 + AUTOCHECKBOX "Mban dhe shfaq njÃ« listÃ« te hapjes kohÃ«t e fundit te dokumentat", IDC_TASKBARPROP_RECENTFILES, 14, 114, 224, 10, WS_DISABLED + AUTOCHECKBOX "Mban dhe shfaq njÃ« listÃ« te hapjes kohÃ«t e fundit te programeve", IDC_TASKBARPROP_RECENTFOLDERS, 14, 128, 224, 10, WS_DISABLED END IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Notification Area" +CAPTION "Zona e njoftimeve" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7, 6, 238, 21, WS_DISABLED - GROUPBOX "Icons", IDC_STATIC, 6, 33, 240, 58, WS_DISABLED - LTEXT "You can keep the notification area uncluttered by hiding icons that you have not clicked recently.", IDC_STATIC, 13, 48, 223, 16, WS_DISABLED - AUTOCHECKBOX "&Hide inactive icons", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10, WS_DISABLED - PUSHBUTTON "&Customize...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14, WS_DISABLED - GROUPBOX "System icons", IDC_STATIC, 6, 97, 240, 84, WS_DISABLED - LTEXT "Select which system icons to always show.", IDC_STATIC, 13, 112, 223, 16, WS_DISABLED - AUTOCHECKBOX "Cloc&k", IDC_TASKBARPROP_CLOCK, 13, 126, 200, 10, WS_DISABLED - AUTOCHECKBOX "&Volume", IDC_TASKBARPROP_VOLUME, 13, 139, 200, 10, WS_DISABLED - AUTOCHECKBOX "&Network", IDC_TASKBARPROP_NETWORK, 13, 152, 200, 10, WS_DISABLED - AUTOCHECKBOX "&Power", IDC_TASKBARPROP_POWER, 13, 164, 200, 10, WS_DISABLED + GROUPBOX "Ikonat", IDC_STATIC, 6, 33, 240, 58, WS_DISABLED + LTEXT "Ju mund tÃ« mbani zonÃ«n e njoftimit tÃ« pa prerÃ« duke i fshehur ikona qÃ« ju nuk e keni klikuar kohÃ«t e fundit.", IDC_STATIC, 13, 48, 223, 16, WS_DISABLED + AUTOCHECKBOX "Fsheh ikonat inaktive", IDC_TASKBARPROP_HIDEICONS, 13, 70, 125, 10, WS_DISABLED + PUSHBUTTON "Rregulloje...", IDC_TASKBARPROP_ICONCUST, 188, 70, 50, 14, WS_DISABLED + GROUPBOX "Ikonat e sistemit", IDC_STATIC, 6, 97, 240, 84, WS_DISABLED + LTEXT "Zgjidhni ikonat e sistemit te cilat do tÃ« shfaqen pÃ«rherÃ«.", IDC_STATIC, 13, 112, 223, 16, WS_DISABLED + AUTOCHECKBOX "Ora", IDC_TASKBARPROP_CLOCK, 13, 126, 200, 10, WS_DISABLED + AUTOCHECKBOX "&Volumi", IDC_TASKBARPROP_VOLUME, 13, 139, 200, 10, WS_DISABLED + AUTOCHECKBOX "&Networku", IDC_TASKBARPROP_NETWORK, 13, 152, 200, 10, WS_DISABLED + AUTOCHECKBOX "&Energjia", IDC_TASKBARPROP_POWER, 13, 164, 200, 10, WS_DISABLED END IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Toolbars" +CAPTION "Bara e instrumenteve" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - LTEXT "Select which toolbars to add to the taskbar.", IDC_STATIC, 7, 7, 223, 12, WS_DISABLED + LTEXT "PÃ«rzgjidh baren e instrumenteve pÃ«r ta shtuar nÃ« taskbar.", IDC_STATIC, 7, 7, 223, 12, WS_DISABLED CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32", WS_BORDER | WS_TABSTOP | WS_DISABLED, 7, 20, 236, 160, WS_EX_CLIENTEDGE END @@ -124,21 +128,21 @@ CAPTION "Advanced" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced options", IDC_STATIC, 6, 6, 240, 121 - AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 - AUTOCHECKBOX "&Show window previews (thumbnails)", IDC_TASKBARPROP_WNDPREV, 13, 31, 200, 10 + GROUPBOX "Opsione tÃ« avancuara", IDC_STATIC, 6, 6, 240, 121 + AUTOCHECKBOX "Shfaq s&kcondat", IDC_TASKBARPROP_SECONDS, 13, 18, 200, 10 + AUTOCHECKBOX "Shfaq shikimin paraprak te dritares(thumbnails)", IDC_TASKBARPROP_WNDPREV, 13, 31, 200, 10 END STRINGTABLE BEGIN - IDS_START "Start" - IDS_PROPERTIES "P&roperties" - IDS_OPEN_ALL_USERS "O&pen All Users" - IDS_EXPLORE_ALL_USERS "E&xplore All Users" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_START "Fillo" + IDS_PROPERTIES "TÃ« gjitha" + IDS_OPEN_ALL_USERS "Hap tÃ« gjith pÃ«rdoruesit" + IDS_EXPLORE_ALL_USERS "E&ksploro tÃ« gjith pÃ«rdoruesit" + IDS_STARTUP_ERROR "Sistemi nuk mund tÃ« fillojÃ« explorer sepse regjistrit Ã«shtÃ« e korruptuar ose padisponueshÃ«m." END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar and Start Menu" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "Taskbar dhe Start Menu" END

11 years

[akhaldi] 61232: [README.WINE] * uuid is our own lib and it's not synced with Wine. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 6 10:26:52 2013 New Revision: 61232 URL: http://svn.reactos.org/svn/reactos?rev=61232&view=rev Log: [README.WINE] * uuid is our own lib and it's not synced with Wine. CORE-7469 Modified: trunk/reactos/media/doc/README.WINE 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] Fri Dec 6 10:26:52 2013 @@ -247,7 +247,6 @@ check Wine current souces first as it may already be fixed. reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.1 -reactos/lib/sdk/uuid # Synced to Wine-1.1.42 advapi32 - reactos/dll/win32/advapi32/crypt/*.c # Unknown

11 years

[akhaldi] 61231: [ACTIVEDS] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 6 10:20:01 2013 New Revision: 61231 URL: http://svn.reactos.org/svn/reactos?rev=61231&view=rev Log: [ACTIVEDS] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/activeds/CMakeLists.txt trunk/reactos/dll/win32/activeds/activeds.spec trunk/reactos/dll/win32/activeds/activeds_main.c trunk/reactos/dll/win32/activeds/stubs.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Fri Dec 6 10:20:01 2013 @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(activeds.dll activeds.spec) list(APPEND SOURCE @@ -11,11 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) add_library(activeds SHARED ${SOURCE}) - set_module_type(activeds win32dll) - target_link_libraries(activeds wine) - add_importlibs(activeds msvcrt kernel32 ntdll) - add_cd_file(TARGET activeds DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/activeds/activeds.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived… ============================================================================== --- trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] Fri Dec 6 10:20:01 2013 @@ -5,7 +5,7 @@ 7 stdcall ADsBuildVarArrayStr(ptr long ptr) 8 stdcall ADsBuildVarArrayInt(ptr long ptr) 9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr) -12 stdcall ADsSetLastError(long str str) +12 stdcall ADsSetLastError(long ptr ptr) 13 stdcall ADsGetLastError(ptr ptr long ptr long) 14 stdcall AllocADsMem(long) 15 stdcall FreeADsMem(ptr) Modified: trunk/reactos/dll/win32/activeds/activeds_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived… ============================================================================== --- trunk/reactos/dll/win32/activeds/activeds_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/activeds/activeds_main.c [iso-8859-1] Fri Dec 6 10:20:01 2013 @@ -80,6 +80,15 @@ } /***************************************************** + * ADsFreeEnumerator [ACTIVEDS.5] + */ +HRESULT WINAPI ADsFreeEnumerator(IEnumVARIANT* pEnumVariant) +{ + FIXME("(%p)!stub\n",pEnumVariant); + return E_NOTIMPL; +} + +/***************************************************** * ADsEnumerateNext [ACTIVEDS.6] */ HRESULT WINAPI ADsEnumerateNext(IEnumVARIANT* pEnumVariant, ULONG cElements, VARIANT* pvar, ULONG * pcElementsFetched) @@ -89,22 +98,57 @@ } /***************************************************** + * ADsBuildVarArrayStr [ACTIVEDS.7] + */ +HRESULT WINAPI ADsBuildVarArrayStr(LPWSTR *lppPathNames, DWORD dwPathNames, VARIANT* pvar) +{ + FIXME("(%p, %d, %p)!stub\n",*lppPathNames, dwPathNames, pvar); + return E_NOTIMPL; +} + +/***************************************************** + * ADsBuildVarArrayInt [ACTIVEDS.8] + */ +HRESULT WINAPI ADsBuildVarArrayInt(LPDWORD lpdwObjectTypes, DWORD dwObjectTypes, VARIANT* pvar) +{ + FIXME("(%p, %d, %p)!stub\n",lpdwObjectTypes, dwObjectTypes, pvar); + return E_NOTIMPL; +} + +/***************************************************** * ADsOpenObject [ACTIVEDS.9] */ HRESULT WINAPI ADsOpenObject(LPCWSTR lpszPathName, LPCWSTR lpszUserName, LPCWSTR lpszPassword, DWORD dwReserved, REFIID riid, VOID** ppObject) { - FIXME("(%s,%s,%u,%p,%p)!stub\n", debugstr_w(lpszPathName), + FIXME("(%s,%s,%u,%s,%p)!stub\n", debugstr_w(lpszPathName), debugstr_w(lpszUserName), dwReserved, debugstr_guid(riid), ppObject); return E_NOTIMPL; } /***************************************************** + * ADsSetLastError [ACTIVEDS.12] + */ +VOID WINAPI ADsSetLastError(DWORD dwErr, LPWSTR pszError, LPWSTR pszProvider) +{ + FIXME("(%d,%p,%p)!stub\n", dwErr, pszError, pszProvider); +} + +/***************************************************** * ADsGetLastError [ACTIVEDS.13] */ HRESULT WINAPI ADsGetLastError(LPDWORD perror, LPWSTR errorbuf, DWORD errorbuflen, LPWSTR namebuf, DWORD namebuflen) { FIXME("(%p,%p,%d,%p,%d)!stub\n", perror, errorbuf, errorbuflen, namebuf, namebuflen); return E_NOTIMPL; +} + +/***************************************************** + * AllocADsMem [ACTIVEDS.14] + */ +LPVOID WINAPI AllocADsMem(DWORD cb) +{ + FIXME("(%d)!stub\n",cb); + return NULL; } /***************************************************** @@ -115,3 +159,48 @@ FIXME("(%p)!stub\n",pMem); return FALSE; } + +/***************************************************** + * ReallocADsMem [ACTIVEDS.16] + */ +LPVOID WINAPI ReallocADsMem(LPVOID pOldMem, DWORD cbOld, DWORD cbNew) +{ + FIXME("(%p,%d,%d)!stub\n", pOldMem, cbOld, cbNew); + return NULL; +} + +/***************************************************** + * AllocADsStr [ACTIVEDS.17] + */ +LPWSTR WINAPI AllocADsStr(LPWSTR pStr) +{ + FIXME("(%p)!stub\n",pStr); + return NULL; +} + +/***************************************************** + * FreeADsStr [ACTIVEDS.18] + */ +BOOL WINAPI FreeADsStr(LPWSTR pStr) +{ + FIXME("(%p)!stub\n",pStr); + return FALSE; +} + +/***************************************************** + * ReallocADsStr [ACTIVEDS.19] + */ +BOOL WINAPI ReallocADsStr(LPWSTR *ppStr, LPWSTR pStr) +{ + FIXME("(%p,%p)!stub\n",*ppStr, pStr); + return FALSE; +} + +/***************************************************** + * ADsEncodeBinaryData [ACTIVEDS.20] + */ +HRESULT WINAPI ADsEncodeBinaryData(PBYTE pbSrcData, DWORD dwSrcLen, LPWSTR *ppszDestData) +{ + FIXME("(%p,%d,%p)!stub\n", pbSrcData, dwSrcLen, *ppszDestData); + return E_NOTIMPL; +} Modified: trunk/reactos/dll/win32/activeds/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/activeds/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/activeds/stubs.c [iso-8859-1] Fri Dec 6 10:20:01 2013 @@ -13,112 +13,14 @@ HRESULT WINAPI -ADsFreeEnumerator( - IN IEnumVARIANT *pEnumVariant) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT -WINAPI -ADsBuildVarArrayStr( - LPWSTR *lppPathNames, - DWORD dwPathNames, - VARIANT *pVar) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT -WINAPI -ADsBuildVarArrayInt( - LPDWORD lpdwObjectTypes, - DWORD dwObjectTypes, - VARIANT *pVar) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -VOID -WINAPI -ADsSetLastError( - IN DWORD dwErr, - IN LPCWSTR pszError, - IN LPCWSTR pszProvider) - -{ - UNIMPLEMENTED; -} - -LPVOID -WINAPI -AllocADsMem(DWORD cb) -{ - UNIMPLEMENTED; - return NULL; -} - -LPVOID -WINAPI -ReallocADsMem( - LPVOID pOldMem, - DWORD cbOld, - DWORD cbNew) -{ - UNIMPLEMENTED; - return NULL; -} - -LPWSTR -WINAPI -AllocADsStr(LPCWSTR pStr) -{ - UNIMPLEMENTED; - return NULL; -} - -BOOL -WINAPI -FreeADsStr(IN LPWSTR pStr) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -WINAPI -ReallocADsStr( - IN OUT LPWSTR *ppStr, - IN LPWSTR pStr) -{ - UNIMPLEMENTED; - return FALSE; -} - -HRESULT -WINAPI -ADsEncodeBinaryData( - PBYTE pbSrcData, - DWORD dwSrcLen, - OUT LPWSTR *ppszDestData) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT -WINAPI PropVariantToAdsType( VARIANT * pVariant, DWORD dwNumVariant, PADSVALUE *ppAdsValues, PDWORD pdwNumValues) { - UNIMPLEMENTED; - return E_NOTIMPL; + UNIMPLEMENTED; + return E_NOTIMPL; } HRESULT @@ -128,8 +30,8 @@ DWORD dwNumValues, VARIANT * pVariant) { - UNIMPLEMENTED; - return E_NOTIMPL; + UNIMPLEMENTED; + return E_NOTIMPL; } void @@ -138,7 +40,7 @@ PADSVALUE pAdsValues, DWORD dwNumValues) { - UNIMPLEMENTED; + UNIMPLEMENTED; } HRESULT @@ -148,35 +50,34 @@ PBYTE *ppbDestData, ULONG *pdwDestLen) { - UNIMPLEMENTED; - return E_NOTIMPL; + UNIMPLEMENTED; + return E_NOTIMPL; } int AdsTypeToPropVariant2() { - DPRINT1("WARNING: calling stub AdsTypeToPropVariant2()\n"); - __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); - return 0; + DPRINT1("WARNING: calling stub AdsTypeToPropVariant2()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; } int PropVariantToAdsType2() { - DPRINT1("WARNING: calling stub PropVariantToAdsType2()\n"); - __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); - return 0; + DPRINT1("WARNING: calling stub PropVariantToAdsType2()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; } int ConvertSecDescriptorToVariant() { - DPRINT1("WARNING: calling stub ConvertSecDescriptorToVariant()\n"); - __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); - return 0; + DPRINT1("WARNING: calling stub ConvertSecDescriptorToVariant()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; } int ConvertSecurityDescriptorToSecDes() { - DPRINT1("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n"); - __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); - return 0; + DPRINT1("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; } - 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] Fri Dec 6 10:20:01 2013 @@ -48,7 +48,7 @@ reactos/dll/directx/wine/quartz # Synced to Wine-1.7.1 reactos/dll/directx/wine/wined3d # Synced to Wine-1.7.1 -reactos/dll/win32/activeds # Synced to Wine-1.1.43? +reactos/dll/win32/activeds # Synced to Wine-1.7.1 reactos/dll/win32/actxprxy # Synced to Wine-1.7.1 reactos/dll/win32/advpack # Synced to Wine-1.7.1 reactos/dll/win32/atl # Synced to Wine-1.7.1

11 years

[aandrejevic] 61230: [NTVDM] Fix race conditions.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Dec 6 04:51:47 2013 New Revision: 61230 URL: http://svn.reactos.org/svn/reactos?rev=61230&view=rev Log: [NTVDM] Fix race conditions. Modified: branches/ntvdm/subsystems/ntvdm/ps2.c Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Fri Dec 6 04:51:47 2013 @@ -32,9 +32,9 @@ static BOOLEAN KeyboardQueuePush(BYTE ScanCode) { /* Check if the keyboard queue is full */ + WaitForSingleObject(QueueMutex, INFINITE); + if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) return FALSE; - - WaitForSingleObject(QueueMutex, INFINITE); /* Insert the value in the queue */ KeyboardQueue[KeyboardQueueEnd] = ScanCode; @@ -50,10 +50,18 @@ static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) { + BOOLEAN Result = TRUE; + /* Make sure the keyboard queue is not empty */ if (KeyboardQueueEmpty) return FALSE; WaitForSingleObject(QueueMutex, INFINITE); + + if (KeyboardQueueEmpty) + { + Result = FALSE; + goto Done; + } /* Get the scan code */ *ScanCode = KeyboardQueue[KeyboardQueueStart]; @@ -68,8 +76,9 @@ KeyboardQueueEmpty = TRUE; } +Done: ReleaseMutex(QueueMutex); - return TRUE; + return Result; } /* PUBLIC FUNCTIONS ***********************************************************/

11 years

[aandrejevic] 61229: [NTVDM] Improve the keyboard event handling. Clean up the PS/2 code a bit.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Dec 6 04:35:58 2013 New Revision: 61229 URL: http://svn.reactos.org/svn/reactos?rev=61229&view=rev Log: [NTVDM] Improve the keyboard event handling. Clean up the PS/2 code a bit. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/ps2.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Dec 6 04:35:58 2013 @@ -1429,47 +1429,42 @@ BYTE ScanCode, VirtualKey; WORD Character; - /* Loop while there is a scancode available */ - do + /* Get the scan code and virtual key code */ + ScanCode = PS2ReadPort(PS2_DATA_PORT); + VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK); + + /* Check if this is a key press or release */ + if (!(ScanCode & (1 << 7))) { - /* Get the scan code and virtual key code */ - ScanCode = KeyboardReadData(); - VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK); - - /* Check if this is a key press or release */ - if (!(ScanCode & (1 << 7))) + /* Key press */ + if (VirtualKey == VK_NUMLOCK || + VirtualKey == VK_CAPITAL || + VirtualKey == VK_SCROLL || + VirtualKey == VK_INSERT) { - /* Key press */ - if (VirtualKey == VK_NUMLOCK || - VirtualKey == VK_CAPITAL || - VirtualKey == VK_SCROLL || - VirtualKey == VK_INSERT) - { - /* For toggle keys, toggle the lowest bit in the keyboard map */ - BiosKeyboardMap[VirtualKey] ^= ~(1 << 0); - } - - /* Set the highest bit */ - BiosKeyboardMap[VirtualKey] |= (1 << 7); - - /* Find out which character this is */ + /* For toggle keys, toggle the lowest bit in the keyboard map */ + BiosKeyboardMap[VirtualKey] ^= ~(1 << 0); + } + + /* Set the highest bit */ + BiosKeyboardMap[VirtualKey] |= (1 << 7); + + /* Find out which character this is */ + Character = 0; + if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0) + { + /* Not ASCII */ Character = 0; - if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0) - { - /* Not ASCII */ - Character = 0; - } - - /* Push it onto the BIOS keyboard queue */ - BiosKbdBufferPush(MAKEWORD(Character, ScanCode)); } - else - { - /* Key release, unset the highest bit */ - BiosKeyboardMap[VirtualKey] &= ~(1 << 7); - } + + /* Push it onto the BIOS keyboard queue */ + BiosKbdBufferPush(MAKEWORD(Character, ScanCode)); } - while (KeyboardReadStatus() & 1); + else + { + /* Key release, unset the highest bit */ + BiosKeyboardMap[VirtualKey] &= ~(1 << 7); + } /* Clear the keyboard flags */ Bda->KeybdShiftFlags = 0; Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Dec 6 04:35:58 2013 @@ -78,6 +78,7 @@ DWORD LastVerticalRefresh; DWORD LastCyclePrintout; DWORD Cycles = 0; + INT KeyboardIntCounter = 0; /* Set the handler routine */ SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); @@ -225,6 +226,13 @@ { VgaRefreshDisplay(); LastVerticalRefresh = CurrentTickCount; + } + + KeyboardIntCounter++; + if (KeyboardIntCounter == KBD_INT_CYCLES) + { + GenerateKeyboardInterrupts(); + KeyboardIntCounter = 0; } /* Horizontal retrace occurs as fast as possible */ Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri Dec 6 04:35:58 2013 @@ -45,6 +45,7 @@ /* Processor speed */ #define STEPS_PER_CYCLE 256 +#define KBD_INT_CYCLES 16 /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Fri Dec 6 04:35:58 2013 @@ -25,23 +25,16 @@ static BOOLEAN KeyboardReadResponse = FALSE, KeyboardWriteResponse = FALSE; static BYTE KeyboardConfig = PS2_DEFAULT_CONFIG; static HANDLE QueueMutex = NULL; - static HANDLE InputThread = NULL; /* PRIVATE FUNCTIONS **********************************************************/ static BOOLEAN KeyboardQueuePush(BYTE ScanCode) { - BOOLEAN Result = TRUE; + /* Check if the keyboard queue is full */ + if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) return FALSE; WaitForSingleObject(QueueMutex, INFINITE); - - /* Check if the keyboard queue is full */ - if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) - { - Result = FALSE; - goto Done; - } /* Insert the value in the queue */ KeyboardQueue[KeyboardQueueEnd] = ScanCode; @@ -51,23 +44,16 @@ /* Since we inserted a value, it's not empty anymore */ KeyboardQueueEmpty = FALSE; -Done: ReleaseMutex(QueueMutex); - return Result; + return TRUE; } static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) { - BOOLEAN Result = TRUE; + /* Make sure the keyboard queue is not empty */ + if (KeyboardQueueEmpty) return FALSE; WaitForSingleObject(QueueMutex, INFINITE); - - /* Make sure the keyboard queue is not empty */ - if (KeyboardQueueEmpty) - { - Result = FALSE; - goto Done; - } /* Get the scan code */ *ScanCode = KeyboardQueue[KeyboardQueueStart]; @@ -82,222 +68,208 @@ KeyboardQueueEmpty = TRUE; } -Done: ReleaseMutex(QueueMutex); - return Result; + return TRUE; } /* PUBLIC FUNCTIONS ***********************************************************/ -BYTE KeyboardReadStatus() -{ - BYTE Status = 0; - - WaitForSingleObject(QueueMutex, INFINITE); - - /* Set the first bit if the data can be read */ - if (KeyboardReadResponse || !KeyboardQueueEmpty) Status |= 1 << 0; - - ReleaseMutex(QueueMutex); - - /* Always set bit 2 */ - Status |= 1 << 2; - - /* Set bit 3 if the next byte goes to the controller */ - if (KeyboardWriteResponse) Status |= 1 << 3; - - return Status; -} - -VOID KeyboardWriteCommand(BYTE Command) -{ - switch (Command) - { - /* Read configuration byte */ - case 0x20: - { - KeyboardResponse = KeyboardConfig; - KeyboardReadResponse = TRUE; - break; - } - - /* Write configuration byte */ - case 0x60: - /* Write controller output port */ - case 0xD1: - /* Write keyboard output buffer */ - case 0xD2: - /* Write mouse output buffer */ - case 0xD3: - /* Write mouse input buffer */ - case 0xD4: - { - /* These commands require a response */ - KeyboardResponse = Command; - KeyboardWriteResponse = TRUE; - break; - } - - /* Disable mouse */ - case 0xA7: - { - // TODO: Mouse support - break; - } - - /* Enable mouse */ - case 0xA8: - { - // TODO: Mouse support - break; - } - - /* Test mouse port */ - case 0xA9: - { - KeyboardResponse = 0; - KeyboardReadResponse = TRUE; - break; - } - - /* Test PS/2 controller */ - case 0xAA: - { - KeyboardResponse = 0x55; - KeyboardReadResponse = TRUE; - break; - } - - /* Disable keyboard */ - case 0xAD: - { - // TODO: Not implemented - break; - } - - /* Enable keyboard */ - case 0xAE: - { - // TODO: Not implemented - break; - } - - /* Read controller output port */ - case 0xD0: - { - // TODO: Not implemented - break; - } - - /* CPU Reset */ - case 0xF0: - case 0xF2: - case 0xF4: - case 0xF6: - case 0xF8: - case 0xFA: - case 0xFC: - case 0xFE: - { - /* Stop the simulation */ - VdmRunning = FALSE; - break; - } - } -} - -BYTE KeyboardReadData() -{ - /* If there was a response byte from the controller, return it */ - if (KeyboardReadResponse) - { - KeyboardReadResponse = FALSE; - KeyboardData = KeyboardResponse; - } - else - { - /* Otherwise, read the data from the queue */ - KeyboardQueuePop(&KeyboardData); - } - - return KeyboardData; -} - -VOID KeyboardWriteData(BYTE Data) -{ - /* Check if the controller is waiting for a response */ - if (KeyboardWriteResponse) - { - KeyboardWriteResponse = FALSE; - - /* Check which command it was */ - switch (KeyboardResponse) - { +BYTE WINAPI PS2ReadPort(ULONG Port) +{ + if (Port == PS2_CONTROL_PORT) + { + BYTE Status = 0; + + /* Set the first bit if the data can be read */ + if (KeyboardReadResponse || !KeyboardQueueEmpty) Status |= 1 << 0; + + /* Always set bit 2 */ + Status |= 1 << 2; + + /* Set bit 3 if the next byte goes to the controller */ + if (KeyboardWriteResponse) Status |= 1 << 3; + + return Status; + } + else if (Port == PS2_DATA_PORT) + { + /* If there was a response byte from the controller, return it */ + if (KeyboardReadResponse) + { + KeyboardReadResponse = FALSE; + KeyboardData = KeyboardResponse; + } + + return KeyboardData; + } + else return 0; +} + +VOID WINAPI PS2WritePort(ULONG Port, BYTE Data) +{ + if (Port == PS2_CONTROL_PORT) + { + switch (Data) + { + /* Read configuration byte */ + case 0x20: + { + KeyboardResponse = KeyboardConfig; + KeyboardReadResponse = TRUE; + break; + } + /* Write configuration byte */ case 0x60: - { - KeyboardConfig = Data; - break; - } - - /* Write controller output */ + /* Write controller output port */ case 0xD1: - { - /* Check if bit 0 is unset */ - if (!(Data & (1 << 0))) - { - /* CPU disabled - end simulation */ - VdmRunning = FALSE; - } - - /* Update the A20 line setting */ - EmulatorSetA20(Data & (1 << 1)); - - break; - } + /* Write keyboard output buffer */ + case 0xD2: + /* Write mouse output buffer */ + case 0xD3: + /* Write mouse input buffer */ + case 0xD4: + { + /* These commands require a response */ + KeyboardResponse = Data; + KeyboardWriteResponse = TRUE; + break; + } + + /* Disable mouse */ + case 0xA7: + { + // TODO: Mouse support + break; + } + + /* Enable mouse */ + case 0xA8: + { + // TODO: Mouse support + break; + } + + /* Test mouse port */ + case 0xA9: + { + KeyboardResponse = 0; + KeyboardReadResponse = TRUE; + break; + } + + /* Test PS/2 controller */ + case 0xAA: + { + KeyboardResponse = 0x55; + KeyboardReadResponse = TRUE; + break; + } + + /* Disable keyboard */ + case 0xAD: + { + // TODO: Not implemented + break; + } + + /* Enable keyboard */ + case 0xAE: + { + // TODO: Not implemented + break; + } + + /* Read controller output port */ + case 0xD0: + { + // TODO: Not implemented + break; + } + + /* CPU Reset */ + case 0xF0: + case 0xF2: + case 0xF4: + case 0xF6: + case 0xF8: + case 0xFA: + case 0xFC: + case 0xFE: + { + /* Stop the simulation */ + VdmRunning = FALSE; + break; + } + } + } + else if (Port == PS2_DATA_PORT) + { + /* Check if the controller is waiting for a response */ + if (KeyboardWriteResponse) + { + KeyboardWriteResponse = FALSE; + + /* Check which command it was */ + switch (KeyboardResponse) + { + /* Write configuration byte */ + case 0x60: + { + KeyboardConfig = Data; + break; + } + + /* Write controller output */ + case 0xD1: + { + /* Check if bit 0 is unset */ + if (!(Data & (1 << 0))) + { + /* CPU disabled - end simulation */ + VdmRunning = FALSE; + } + + /* Update the A20 line setting */ + EmulatorSetA20(Data & (1 << 1)); + + break; + } - case 0xD2: - { - /* Push the data byte to the keyboard queue */ - KeyboardQueuePush(Data); - break; - } - - case 0xD3: - { - // TODO: Mouse support - break; - } - - case 0xD4: - { - // TODO: Mouse support - break; - } - } - - return; - } - - // TODO: Implement PS/2 device commands -} - -BYTE WINAPI PS2ReadPort(ULONG Port) -{ - if (Port == PS2_CONTROL_PORT) - return KeyboardReadStatus(); - else if (Port == PS2_DATA_PORT) - return KeyboardReadData(); - else - return 0; -} - -VOID WINAPI PS2WritePort(ULONG Port, BYTE Data) -{ - if (Port == PS2_CONTROL_PORT) - KeyboardWriteCommand(Data); - else if (Port == PS2_DATA_PORT) - KeyboardWriteData(Data); + case 0xD2: + { + /* Push the data byte to the keyboard queue */ + KeyboardQueuePush(Data); + break; + } + + case 0xD3: + { + // TODO: Mouse support + break; + } + + case 0xD4: + { + // TODO: Mouse support + break; + } + } + + return; + } + + // TODO: Implement PS/2 device commands + } +} + +VOID GenerateKeyboardInterrupts(VOID) +{ + if (KeyboardQueuePop(&KeyboardData)) + { + /* IRQ 1 */ + PicInterruptRequest(1); + } } DWORD WINAPI InputThreadProc(LPVOID Parameter) @@ -335,8 +307,6 @@ KeyboardQueuePush(ScanCode); } - /* Keyboard IRQ */ - PicInterruptRequest(1); break; } Modified: branches/ntvdm/subsystems/ntvdm/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] Fri Dec 6 04:35:58 2013 @@ -24,13 +24,11 @@ /* FUNCTIONS ******************************************************************/ -BYTE KeyboardReadStatus(); -//VOID KeyboardWriteCommand(BYTE Command); -BYTE KeyboardReadData(); -//VOID KeyboardWriteData(BYTE Data); - BOOLEAN PS2Initialize(HANDLE ConsoleInput); VOID PS2Cleanup(VOID); +BYTE WINAPI PS2ReadPort(ULONG Port); +VOID WINAPI PS2WritePort(ULONG Port, BYTE Data); +VOID GenerateKeyboardInterrupts(VOID); #endif // _PS2_H_

11 years

← Newer
1
...
21
22
23
24
25
26
27
...
31
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 December 2013