Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 31875: don't crash when GetUserNameW is called with NULL - fixes launching of Office 2003 setup
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 20:54:09 2008 New Revision: 31875 URL: http://svn.reactos.org/svn/reactos?rev=31875&view=rev Log: don't crash when GetUserNameW is called with NULL - fixes launching of Office 2003 setup Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c Fri Jan 18 20:54:09 2008 @@ -938,8 +938,11 @@ else { *pdwAccountName = dwSrcLen; - RtlCopyMemory ( pAccountName, TranslatedName->Name.Buffer, TranslatedName->Name.Length ); - pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0'; + if (pAccountName) + { + RtlCopyMemory ( pAccountName, TranslatedName->Name.Buffer, TranslatedName->Name.Length ); + pAccountName[TranslatedName->Name.Length / sizeof(WCHAR)] = L'\0'; + } } if ( peUse ) *peUse = TranslatedName->Use;

1 0

[fireball] 31874: - Winesync to Wine-20080118.
by fireball＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: fireball Date: Fri Jan 18 20:39:35 2008 New Revision: 31874 URL: http://svn.reactos.org/svn/reactos?rev=31874&view=rev Log: - Winesync to Wine-20080118. Added: trunk/reactos/dll/win32/rpcrt4/rpc_async.c (with props) Modified: trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/git.c trunk/reactos/dll/win32/ole32/ole16.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c Fri Jan 18 20:39:35 2008 @@ -1273,7 +1273,7 @@ * Return the clipboard data in the storage medium structure */ pmedium->tymed = (hData == 0) ? TYMED_NULL : TYMED_HGLOBAL; - pmedium->u.hGlobal = (HGLOBAL)hData; + pmedium->u.hGlobal = hData; pmedium->pUnkForRelease = NULL; hr = S_OK; Modified: trunk/reactos/dll/win32/ole32/git.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/git.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/git.c (original) +++ trunk/reactos/dll/win32/ole32/git.c Fri Jan 18 20:39:35 2008 @@ -104,7 +104,7 @@ StdGlobalInterfaceTableImpl* const self = (StdGlobalInterfaceTableImpl*) iface; StdGITEntry* e; - TRACE("iface=%p, cookie=0x%x\n", iface, (UINT)cookie); + TRACE("iface=%p, cookie=0x%x\n", iface, cookie); LIST_FOR_EACH_ENTRY(e, &self->list, StdGITEntry, entry) { if (e->cookie == cookie) @@ -227,7 +227,7 @@ StdGITEntry* entry; HRESULT hr; - TRACE("iface=%p, dwCookie=0x%x\n", iface, (UINT)dwCookie); + TRACE("iface=%p, dwCookie=0x%x\n", iface, dwCookie); EnterCriticalSection(&git_section); Modified: trunk/reactos/dll/win32/ole32/ole16.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole16.c?re… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole16.c (original) +++ trunk/reactos/dll/win32/ole32/ole16.c Fri Jan 18 20:39:35 2008 @@ -154,7 +154,7 @@ * IMalloc16_DidAlloc [COMPOBJ.507] */ INT16 CDECL IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) { - IMalloc16 *This = (IMalloc16 *)iface; + IMalloc16 *This = iface; TRACE("(%p)->DidAlloc(%p)\n",This,pv); return (INT16)-1; } Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2.c (original) +++ trunk/reactos/dll/win32/ole32/ole2.c Fri Jan 18 20:39:35 2008 @@ -1400,7 +1400,7 @@ * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = (HOLEMENU)GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); if ( !hOleMenu ) goto NEXTHOOK; @@ -1505,7 +1505,7 @@ * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = (HOLEMENU)GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); if ( !hOleMenu ) goto NEXTHOOK; Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/rpc.c (original) +++ trunk/reactos/dll/win32/ole32/rpc.c Fri Jan 18 20:39:35 2008 @@ -1026,8 +1026,13 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) { - FIXME("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); - return E_FAIL; + WARN("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); + + /* FIXME: implement this by storing the dwDestContext and pvDestContext + * values passed into IMarshal_MarshalInterface and returning them here */ + *pdwDestContext = MSHCTX_DIFFERENTMACHINE; + *ppvDestContext = NULL; + return S_OK; } static HRESULT WINAPI RpcChannelBuffer_IsConnected(LPRPCCHANNELBUFFER iface) Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/stg_prop.c (original) +++ trunk/reactos/dll/win32/ole32/stg_prop.c Fri Jan 18 20:39:35 2008 @@ -200,7 +200,7 @@ IsEqualGUID(&IID_IPropertyStorage, riid)) { IPropertyStorage_AddRef(iface); - *ppvObject = (IPropertyStorage*)iface; + *ppvObject = iface; return S_OK; } @@ -263,7 +263,7 @@ if (This->codePage == CP_UNICODE) { if (dictionary_find(This->name_to_propid, name, (void **)&propid)) - ret = PropertyStorage_FindProperty(This, (PROPID)propid); + ret = PropertyStorage_FindProperty(This, propid); } else { @@ -275,7 +275,7 @@ { if (dictionary_find(This->name_to_propid, ansiName, (void **)&propid)) - ret = PropertyStorage_FindProperty(This, (PROPID)propid); + ret = PropertyStorage_FindProperty(This, propid); CoTaskMemFree(ansiName); } } @@ -528,7 +528,7 @@ assert(srcName); - hr = PropertyStorage_StringCopy((LPCSTR)srcName, cp, &name, This->codePage); + hr = PropertyStorage_StringCopy(srcName, cp, &name, This->codePage); if (SUCCEEDED(hr)) { if (This->codePage == CP_UNICODE) @@ -1059,7 +1059,7 @@ TRACE("Read char 0x%x ('%c')\n", prop->u.cVal, prop->u.cVal); break; case VT_UI1: - prop->u.bVal = *(const UCHAR *)data; + prop->u.bVal = *data; TRACE("Read byte 0x%x\n", prop->u.bVal); break; case VT_I2: Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.c (original) +++ trunk/reactos/dll/win32/ole32/storage32.c Fri Jan 18 20:39:35 2008 @@ -1300,14 +1300,7 @@ /* * Open it to get a pointer to return. */ - hr = IStorage_OpenStorage( - iface, - (const OLECHAR*)pwcsName, - 0, - grfMode, - 0, - 0, - ppstg); + hr = IStorage_OpenStorage(iface, pwcsName, 0, grfMode, 0, 0, ppstg); if( (hr != S_OK) || (*ppstg == NULL)) { @@ -2004,9 +1997,7 @@ hr = IEnumSTATSTG_Next(elements, 1, &currentElement, NULL); if (hr==S_OK) { - destroyHr = StorageImpl_DestroyElement( - (IStorage*)childStorage, - (OLECHAR*)currentElement.pwcsName); + destroyHr = StorageImpl_DestroyElement(childStorage, currentElement.pwcsName); CoTaskMemFree(currentElement.pwcsName); } @@ -4053,8 +4044,7 @@ currentProperty); if ( propertyNameCmp( - (const OLECHAR*)currentProperty->name, - (const OLECHAR*)lpszPropName) == 0) + (const OLECHAR*)currentProperty->name, lpszPropName) == 0) return currentSearchNode; /* Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/cproxy.c (original) +++ trunk/reactos/dll/win32/rpcrt4/cproxy.c Fri Jan 18 20:39:35 2008 @@ -410,6 +410,7 @@ PMIDL_STUB_MESSAGE pStubMsg) { TRACE("(%p,%p)\n", This, pStubMsg); + if (pStubMsg->fBufferValid) { IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, Modified: trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_clien… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_clientserver.c Fri Jan 18 20:39:35 2008 @@ -51,7 +51,7 @@ pRpcMessage, pStubMsg, pStubDesc, ProcNum); pRpcMessage->Handle = NULL; - pRpcMessage->ProcNum = ProcNum; + pRpcMessage->ProcNum = ProcNum | RPC_FLAGS_VALID_BIT; pRpcMessage->RpcInterfaceInformation = pStubDesc->RpcInterfaceInformation; pRpcMessage->RpcFlags = 0; pRpcMessage->ReservedForRuntime = NULL; @@ -216,10 +216,29 @@ ULONG *pFaultStatus, RPC_STATUS Status ) { - FIXME("(%p, %p, %p, %ld): stub\n", pStubMsg, pCommStatus, pFaultStatus, Status); - - *pCommStatus = 0; - *pFaultStatus = 0; + TRACE("(%p, %p, %p, %ld)\n", pStubMsg, pCommStatus, pFaultStatus, Status); + + switch (Status) + { + case ERROR_INVALID_HANDLE: + case RPC_S_INVALID_BINDING: + case RPC_S_UNKNOWN_IF: + case RPC_S_SERVER_UNAVAILABLE: + case RPC_S_SERVER_TOO_BUSY: + case RPC_S_CALL_FAILED_DNE: + case RPC_S_PROTOCOL_ERROR: + case RPC_S_UNSUPPORTED_TRANS_SYN: + case RPC_S_UNSUPPORTED_TYPE: + case RPC_S_PROCNUM_OUT_OF_RANGE: + case EPT_S_NOT_REGISTERED: + case RPC_S_COMM_FAILURE: + *pCommStatus = Status; + *pFaultStatus = 0; + break; + default: + *pCommStatus = 0; + *pFaultStatus = Status; + } return RPC_S_OK; } Modified: trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_conte… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_contexthandle.c Fri Jan 18 20:39:35 2008 @@ -218,7 +218,8 @@ NDR_RUNDOWN userRunDownIn) { TRACE("(%p %p %p)\n", SContext, pBuff, userRunDownIn); - NDRSContextMarshall2(I_RpcGetCurrentCallHandle(), SContext, pBuff, userRunDownIn, NULL, 0); + NDRSContextMarshall2(I_RpcGetCurrentCallHandle(), SContext, pBuff, + userRunDownIn, NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -230,7 +231,8 @@ NDR_RUNDOWN userRunDownIn) { TRACE("(%p %p %p %p)\n", hBinding, SContext, pBuff, userRunDownIn); - NDRSContextMarshall2(hBinding, SContext, pBuff, userRunDownIn, NULL, 0); + NDRSContextMarshall2(hBinding, SContext, pBuff, userRunDownIn, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -251,6 +253,9 @@ if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); + + if (Flags & RPC_CONTEXT_HANDLE_FLAGS) + FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); if (SContext->userContext) { @@ -287,7 +292,9 @@ ULONG DataRepresentation) { TRACE("(%p %08x)\n", pBuff, DataRepresentation); - return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, DataRepresentation, NULL, 0); + return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, + DataRepresentation, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -298,7 +305,8 @@ ULONG DataRepresentation) { TRACE("(%p %p %08x)\n", hBinding, pBuff, DataRepresentation); - return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, 0); + return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } /*********************************************************************** @@ -319,6 +327,9 @@ if (!binding->server || !binding->Assoc) RpcRaiseException(ERROR_INVALID_HANDLE); + + if (Flags & RPC_CONTEXT_HANDLE_FLAGS) + FIXME("unimplemented flags: 0x%x\n", Flags & RPC_CONTEXT_HANDLE_FLAGS); if (!pBuff || (!context_ndr->attributes && UuidIsNil((UUID *)&context_ndr->uuid, &status))) 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c Fri Jan 18 20:39:35 2008 @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * TODO: - * - Non-conformant strings * - String structs * - Byte count pointers * - transmit_as/represent as @@ -1528,8 +1527,7 @@ * BufferStart and BufferEnd won't be reset when allocating memory for * sending the response. we don't have to check for the new buffer here as * it won't be used a type memory, only for buffer memory */ - if (Pointer >= (unsigned char *)pStubMsg->BufferStart && - Pointer < (unsigned char *)pStubMsg->BufferEnd) + if (Pointer >= pStubMsg->BufferStart && Pointer < pStubMsg->BufferEnd) goto notfree; if (attr & RPC_FC_P_ONSTACK) { @@ -3538,6 +3536,7 @@ SavedMemorySize = pStubMsg->MemorySize; esize = ComplexStructSize(pStubMsg, pFormat); + MemorySize = safe_multiply(pStubMsg->MaxCount, esize); count = pStubMsg->ActualCount; @@ -4980,7 +4979,7 @@ case RPC_FC_CHAR: case RPC_FC_SMALL: case RPC_FC_USMALL: - return *(const UCHAR *)pMemory; + return *pMemory; case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: @@ -5800,12 +5799,12 @@ case RPC_FC_CHAR: case RPC_FC_SMALL: RANGE_UNMARSHALL(UCHAR, "%d"); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_BYTE: case RPC_FC_USMALL: RANGE_UNMARSHALL(CHAR, "%u"); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_WCHAR: /* FIXME: valid? */ case RPC_FC_USHORT: @@ -5913,7 +5912,7 @@ case RPC_FC_SMALL: case RPC_FC_USMALL: safe_copy_to_buffer(pStubMsg, pMemory, sizeof(UCHAR)); - TRACE("value: 0x%02x\n", *(UCHAR *)pMemory); + TRACE("value: 0x%02x\n", *pMemory); break; case RPC_FC_WCHAR: case RPC_FC_SHORT: @@ -5998,7 +5997,7 @@ case RPC_FC_SMALL: case RPC_FC_USMALL: BASE_TYPE_UNMARSHALL(UCHAR); - TRACE("value: 0x%02x\n", **(UCHAR **)ppMemory); + TRACE("value: 0x%02x\n", **ppMemory); break; case RPC_FC_WCHAR: case RPC_FC_SHORT: @@ -6208,6 +6207,7 @@ ERR("invalid format type %x\n", *pFormat); RpcRaiseException(RPC_S_INTERNAL_ERROR); } + TRACE("flags: 0x%02x\n", pFormat[1]); if (pFormat[1] & 0x80) NdrClientContextMarshall(pStubMsg, *(NDR_CCONTEXT **)pMemory, FALSE); @@ -6226,16 +6226,22 @@ PFORMAT_STRING pFormat, unsigned char fMustAlloc) { + TRACE("pStubMsg %p, ppMemory %p, pFormat %p, fMustAlloc %s\n", pStubMsg, + ppMemory, pFormat, fMustAlloc ? "TRUE": "FALSE"); + if (*pFormat != RPC_FC_BIND_CONTEXT) { ERR("invalid format type %x\n", *pFormat); RpcRaiseException(RPC_S_INTERNAL_ERROR); } - - **(NDR_CCONTEXT **)ppMemory = NULL; - NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); - - return NULL; + TRACE("flags: 0x%02x\n", pFormat[1]); + + /* [out]-only or [ret] param */ + if ((pFormat[1] & 0x60) == 0x20) + **(NDR_CCONTEXT **)ppMemory = NULL; + NdrClientContextUnmarshall(pStubMsg, *(NDR_CCONTEXT **)ppMemory, pStubMsg->RpcMsg->Handle); + + return NULL; } /*********************************************************************** @@ -6301,7 +6307,8 @@ } NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer, RundownRoutine, NULL, + RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); pStubMsg->Buffer += cbNDRContext; } @@ -6323,7 +6330,7 @@ ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - NULL, 0); + NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); pStubMsg->Buffer += cbNDRContext; return ContextHandle; @@ -6339,9 +6346,24 @@ NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; + TRACE("(%p, %p)\n", pStubMsg, pFormat); + + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + return NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, NULL, - pStubMsg->RpcMsg->DataRepresentation, NULL, 0); + pStubMsg->RpcMsg->DataRepresentation, if_id, + flags); } void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, @@ -6349,6 +6371,9 @@ NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat) { + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; + TRACE("(%p, %p, %p, %p)\n", pStubMsg, ContextHandle, RundownRoutine, pFormat); ALIGN_POINTER(pStubMsg->Buffer, 4); @@ -6360,9 +6385,18 @@ RpcRaiseException(RPC_X_BAD_STUB_DATA); } - /* FIXME: do something with pFormat */ + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + NDRSContextMarshall2(pStubMsg->RpcMsg->Handle, ContextHandle, - pStubMsg->Buffer, RundownRoutine, NULL, 0); + pStubMsg->Buffer, RundownRoutine, if_id, flags); pStubMsg->Buffer += cbNDRContext; } @@ -6370,6 +6404,8 @@ PFORMAT_STRING pFormat) { NDR_SCONTEXT ContextHandle; + RPC_SYNTAX_IDENTIFIER *if_id = NULL; + ULONG flags = RPC_CONTEXT_HANDLE_DEFAULT_FLAGS; TRACE("(%p, %p)\n", pStubMsg, pFormat); @@ -6382,12 +6418,74 @@ RpcRaiseException(RPC_X_BAD_STUB_DATA); } - /* FIXME: do something with pFormat */ + if (pFormat[1] & NDR_CONTEXT_HANDLE_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_SERIALIZE; + if (pFormat[1] & NDR_CONTEXT_HANDLE_NO_SERIALIZE) + flags |= RPC_CONTEXT_HANDLE_DONT_SERIALIZE; + if (pFormat[1] & NDR_STRICT_CONTEXT_HANDLE) + { + RPC_SERVER_INTERFACE *sif = pStubMsg->StubDesc->RpcInterfaceInformation; + if_id = &sif->InterfaceId; + } + ContextHandle = NDRSContextUnmarshall2(pStubMsg->RpcMsg->Handle, pStubMsg->Buffer, pStubMsg->RpcMsg->DataRepresentation, - NULL, 0); + if_id, flags); pStubMsg->Buffer += cbNDRContext; return ContextHandle; } + +/*********************************************************************** + * NdrCorrelationInitialize [RPCRT4.@] + * + * Initializes correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * pMemory [I] Pointer to memory to use as a cache. + * CacheSize [I] Size of the memory pointed to by pMemory. + * Flags [I] Reserved. Set to zero. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) +{ + FIXME("(%p, %p, %d, 0x%x): stub\n", pStubMsg, pMemory, CacheSize, Flags); + pStubMsg->fHasNewCorrDesc = TRUE; +} + +/*********************************************************************** + * NdrCorrelationPass [RPCRT4.@] + * + * Performs correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationPass(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); +} + +/*********************************************************************** + * NdrCorrelationFree [RPCRT4.@] + * + * Frees any resources used while unmarshalling parameters that need + * correlation validity checking. + * + * PARAMS + * pStubMsg [I] MIDL_STUB_MESSAGE used during unmarshalling. + * + * RETURNS + * Nothing. + */ +void WINAPI NdrCorrelationFree(PMIDL_STUB_MESSAGE pStubMsg) +{ + FIXME("(%p): stub\n", pStubMsg); +} Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_ole.c (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_ole.c Fri Jan 18 20:39:35 2008 @@ -112,7 +112,7 @@ RpcStreamImpl *This = (RpcStreamImpl *)iface; if (!--(This->RefCount)) { TRACE("size=%d\n", *This->size); - This->pMsg->Buffer = (unsigned char*)This->data + *This->size; + This->pMsg->Buffer = This->data + *This->size; HeapFree(GetProcessHeap(),0,This); return 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c Fri Jan 18 20:39:35 2008 @@ -37,8 +37,8 @@ #include "objbase.h" #include "rpc.h" #include "rpcproxy.h" -#include "ndrtypes.h" - + +#include "wine/exception.h" #include "wine/debug.h" #include "wine/rpcfc.h" @@ -115,11 +115,12 @@ } #define STUBLESS_UNMARSHAL 1 -#define STUBLESS_CALLSERVER 2 -#define STUBLESS_CALCSIZE 3 -#define STUBLESS_GETBUFFER 4 -#define STUBLESS_MARSHAL 5 -#define STUBLESS_FREE 6 +#define STUBLESS_INITOUT 2 +#define STUBLESS_CALLSERVER 3 +#define STUBLESS_CALCSIZE 4 +#define STUBLESS_GETBUFFER 5 +#define STUBLESS_MARSHAL 6 +#define STUBLESS_FREE 7 void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) { @@ -563,6 +564,8 @@ /* the pointer to the object when in OLE mode */ void * This = NULL; PFORMAT_STRING pHandleFormat; + /* correlation cache */ + unsigned long NdrCorrCache[256]; TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); @@ -664,8 +667,7 @@ if (ext_flags.HasNewCorrDesc) { /* initialize extra correlation package */ - FIXME("new correlation description not implemented\n"); - stubMsg.fHasNewCorrDesc = TRUE; + NdrCorrelationInitialize(&stubMsg, NdrCorrCache, sizeof(NdrCorrCache), 0); } /* order of phases: @@ -675,77 +677,130 @@ * 4. PROXY_SENDRECEIVE - send/receive buffer * 5. PROXY_UNMARHSAL - unmarshal [out] params from buffer */ - for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) - { - TRACE("phase = %d\n", phase); - switch (phase) + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + __TRY { - case PROXY_GETBUFFER: - /* allocate the buffer */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) - NdrProxyGetBuffer(This, &stubMsg); - else if (Oif_flags.HasPipes) - /* NdrGetPipeBuffer(...) */ - FIXME("pipes not supported yet\n"); - else - { - if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) + for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) + { + TRACE("phase = %d\n", phase); + switch (phase) + { + case PROXY_GETBUFFER: + /* allocate the buffer */ + NdrProxyGetBuffer(This, &stubMsg); + break; + case PROXY_SENDRECEIVE: + /* send the [in] params and receive the [out] and [retval] + * params */ + NdrProxySendReceive(This, &stubMsg); + + /* convert strings, floating point values and endianess into our + * preferred format */ + if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&stubMsg, pFormat); + + break; + case PROXY_CALCSIZE: + case PROXY_MARSHAL: + case PROXY_UNMARSHAL: + if (bV2Format) + client_do_args(&stubMsg, pFormat, phase, number_of_params, + (unsigned char *)&RetVal); + else + client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, + (unsigned char *)&RetVal, + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); + break; + default: + ERR("shouldn't reach here. phase %d\n", phase); + break; + } + } + } + __EXCEPT(NULL) + { + RetVal = NdrProxyErrorHandler(GetExceptionCode()); + } + __ENDTRY + } + else + { + /* order of phases: + * 1. PROXY_CALCSIZE - calculate the buffer size + * 2. PROXY_GETBUFFER - allocate the buffer + * 3. PROXY_MARHSAL - marshal [in] params into the buffer + * 4. PROXY_SENDRECEIVE - send/receive buffer + * 5. PROXY_UNMARHSAL - unmarshal [out] params from buffer + */ + for (phase = PROXY_CALCSIZE; phase <= PROXY_UNMARSHAL; phase++) + { + TRACE("phase = %d\n", phase); + switch (phase) + { + case PROXY_GETBUFFER: + /* allocate the buffer */ + if (Oif_flags.HasPipes) + /* NdrGetPipeBuffer(...) */ + FIXME("pipes not supported yet\n"); + else + { + if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) #if 0 - NdrNsGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); + NdrNsGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); #else - FIXME("using auto handle - call NdrNsGetBuffer when it gets implemented\n"); + FIXME("using auto handle - call NdrNsGetBuffer when it gets implemented\n"); #endif + else + NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); + } + break; + case PROXY_SENDRECEIVE: + /* send the [in] params and receive the [out] and [retval] + * params */ + if (Oif_flags.HasPipes) + /* NdrPipesSendReceive(...) */ + FIXME("pipes not supported yet\n"); else - NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); - } - break; - case PROXY_SENDRECEIVE: - /* send the [in] params and receive the [out] and [retval] - * params */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) - NdrProxySendReceive(This, &stubMsg); - else if (Oif_flags.HasPipes) - /* NdrPipesSendReceive(...) */ - FIXME("pipes not supported yet\n"); - else - { - if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) + { + if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) #if 0 - NdrNsSendReceive(&stubMsg, stubMsg.Buffer, pStubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle); + NdrNsSendReceive(&stubMsg, stubMsg.Buffer, pStubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle); #else - FIXME("using auto handle - call NdrNsSendReceive when it gets implemented\n"); + FIXME("using auto handle - call NdrNsSendReceive when it gets implemented\n"); #endif + else + NdrSendReceive(&stubMsg, stubMsg.Buffer); + } + + /* convert strings, floating point values and endianess into our + * preferred format */ + if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(&stubMsg, pFormat); + + break; + case PROXY_CALCSIZE: + case PROXY_MARSHAL: + case PROXY_UNMARSHAL: + if (bV2Format) + client_do_args(&stubMsg, pFormat, phase, number_of_params, + (unsigned char *)&RetVal); else - NdrSendReceive(&stubMsg, stubMsg.Buffer); - } - - /* convert strings, floating point values and endianess into our - * preferred format */ - if ((rpcMsg.DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) - NdrConvert(&stubMsg, pFormat); - - break; - case PROXY_CALCSIZE: - case PROXY_MARSHAL: - case PROXY_UNMARSHAL: - if (bV2Format) - client_do_args(&stubMsg, pFormat, phase, number_of_params, - (unsigned char *)&RetVal); - else - client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, - (unsigned char *)&RetVal, - (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); - break; - default: - ERR("shouldn't reach here. phase %d\n", phase); - break; + client_do_args_old_format(&stubMsg, pFormat, phase, stack_size, + (unsigned char *)&RetVal, + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT)); + break; + default: + ERR("shouldn't reach here. phase %d\n", phase); + break; + } } } if (ext_flags.HasNewCorrDesc) { /* free extra correlation package */ - /* NdrCorrelationFree(&stubMsg); */ + NdrCorrelationFree(&stubMsg); } if (Oif_flags.HasPipes) @@ -855,6 +910,7 @@ pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; + break; default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */ @@ -886,7 +942,7 @@ unsigned char *pArg; current_stack_offset = pParam->stack_offset; - pArg = (unsigned char *)(args+current_stack_offset); + pArg = args + current_stack_offset; TRACE("param[%d]: new format\n", i); TRACE("\tparam_attributes:"); dump_RPC_FC_PROC_PF(pParam->param_attributes); TRACE("\n"); @@ -899,6 +955,10 @@ &pParam->type_format_char; TRACE("\tbase type: 0x%02x\n", *pTypeFormat); + + /* make a note of the address of the return value parameter for later */ + if (pParam->param_attributes.IsReturn) + retval_ptr = (LONG_PTR *)pArg; switch (phase) { @@ -915,6 +975,8 @@ if (pParam->param_attributes.ServerAllocSize) HeapFree(GetProcessHeap(), 0, *(void **)pArg); break; + case STUBLESS_INITOUT: + break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes.ServerAllocSize) *(void **)pArg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, @@ -927,11 +989,6 @@ else call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); } - - /* make a note of the address of the return value parameter for later */ - if (pParam->param_attributes.IsReturn) - retval_ptr = (LONG_PTR *)pArg; - break; case STUBLESS_CALCSIZE: if (pParam->param_attributes.IsOut || pParam->param_attributes.IsReturn) @@ -988,7 +1045,21 @@ if (pParam->param_attributes.ServerAllocSize) HeapFree(GetProcessHeap(), 0, *(void **)pArg); - /* FIXME: call call_freer here for IN types with MustFree set */ + break; + case STUBLESS_INITOUT: + if (!pParam->param_attributes.IsIn && + pParam->param_attributes.IsOut && + !pParam->param_attributes.ServerAllocSize && + !pParam->param_attributes.IsByValue) + { + DWORD size = calc_arg_size(pStubMsg, pTypeFormat); + + if(size) + { + *(void **)pArg = NdrAllocate(pStubMsg, size); + memset(*(void **)pArg, 0, size); + } + } break; case STUBLESS_UNMARSHAL: if (pParam->param_attributes.ServerAllocSize) @@ -1001,18 +1072,6 @@ call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); else call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); - } - else if (pParam->param_attributes.IsOut && - !pParam->param_attributes.ServerAllocSize && - !pParam->param_attributes.IsByValue) - { - DWORD size = calc_arg_size(pStubMsg, pTypeFormat); - - if(size) - { - *(void **)pArg = NdrAllocate(pStubMsg, size); - memset(*(void **)pArg, 0, size); - } } break; case STUBLESS_CALCSIZE: @@ -1058,7 +1117,7 @@ * if present, so adjust this */ unsigned short current_stack_offset_adjusted = current_stack_offset + (object ? sizeof(void *) : 0); - unsigned char *pArg = (unsigned char *)(args+current_stack_offset_adjusted); + unsigned char *pArg = args + current_stack_offset_adjusted; /* no more parameters; exit loop */ if (current_stack_offset_adjusted >= stack_size) @@ -1076,6 +1135,9 @@ TRACE("\tbase type 0x%02x\n", *pTypeFormat); + if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) + retval_ptr = (LONG_PTR *)pArg; + switch (phase) { case STUBLESS_MARSHAL: @@ -1089,9 +1151,7 @@ case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE) call_unmarshaller(pStubMsg, &pArg, pTypeFormat, 0); - else if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) - retval_ptr = (LONG_PTR *)pArg; - break; + break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE) call_buffer_sizer(pStubMsg, pArg, pTypeFormat); @@ -1113,6 +1173,9 @@ TRACE("\tcomplex type 0x%02x\n", *pTypeFormat); + if (pParam->param_direction == RPC_FC_RETURN_PARAM) + retval_ptr = (LONG_PTR *)pArg; + switch (phase) { case STUBLESS_MARSHAL: @@ -1127,14 +1190,9 @@ call_freer(pStubMsg, *(unsigned char **)pArg, pTypeFormat); else if (pParam->param_direction == RPC_FC_OUT_PARAM) pStubMsg->pfnFree(*(void **)pArg); - break; - case STUBLESS_UNMARSHAL: - if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || - pParam->param_direction == RPC_FC_IN_PARAM) - call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); - else if (pParam->param_direction == RPC_FC_RETURN_PARAM) - retval_ptr = (LONG_PTR *)pArg; - else if (pParam->param_direction == RPC_FC_OUT_PARAM) + break; + case STUBLESS_INITOUT: + if (pParam->param_direction == RPC_FC_OUT_PARAM) { DWORD size = calc_arg_size(pStubMsg, pTypeFormat); @@ -1144,6 +1202,11 @@ memset(*(void **)pArg, 0, size); } } + break; + case STUBLESS_UNMARSHAL: + if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || + pParam->param_direction == RPC_FC_IN_PARAM) + call_unmarshaller(pStubMsg, (unsigned char **)pArg, pTypeFormat, 0); break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM || @@ -1406,9 +1469,10 @@ stubMsg.Buffer = stubMsg.BufferStart; } break; + case STUBLESS_UNMARSHAL: + case STUBLESS_INITOUT: + case STUBLESS_CALCSIZE: case STUBLESS_MARSHAL: - case STUBLESS_UNMARSHAL: - case STUBLESS_CALCSIZE: case STUBLESS_FREE: if (bV2Format) retval_ptr = stub_do_args(&stubMsg, &pFormat[parameter_start_offset], Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h Fri Jan 18 20:39:35 2008 @@ -17,6 +17,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#include "ndrtypes.h" /* there can't be any alignment with the structures in this file */ #include "pshpack1.h" 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c Fri Jan 18 20:39:35 2008 @@ -332,7 +332,7 @@ break; } - I_RpcFreeBuffer(&msg); + I_RpcFree(msg.Buffer); RPCRT4_FreeHeader(response_hdr); return status; } Added: trunk/reactos/dll/win32/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_async… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_async.c (added) +++ trunk/reactos/dll/win32/rpcrt4/rpc_async.c Fri Jan 18 20:39:35 2008 @@ -1,0 +1,148 @@ +/* + * Asynchronous Call Support Functions + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "rpc.h" +#include "rpcndr.h" +#include "rpcasync.h" + +#include "wine/debug.h" + +#include "rpc_binding.h" +#include "rpc_message.h" + +WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +#define RPC_ASYNC_SIGNATURE 0x43595341 + +/*********************************************************************** + * RpcAsyncInitializeHandle [RPCRT4.@] + * + * Initialises an asynchronous state so it can be used in other asynchronous + * functions and for use in asynchronous calls. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * Size [I] Size of the memory pointed to by pAsync. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncInitializeHandle(PRPC_ASYNC_STATE pAsync, unsigned int Size) +{ + TRACE("(%p, %d)\n", pAsync, Size); + + if (Size != sizeof(*pAsync)) + { + ERR("invalid Size %d\n", Size); + return ERROR_INVALID_PARAMETER; + } + + pAsync->Size = sizeof(*pAsync); + pAsync->Signature = RPC_ASYNC_SIGNATURE; + pAsync->Lock = 0; + pAsync->Flags = 0; + pAsync->StubInfo = NULL; + pAsync->RuntimeInfo = NULL; + memset(&pAsync->Reserved, 0, sizeof(*pAsync) - FIELD_OFFSET(RPC_ASYNC_STATE, Reserved)); + + return RPC_S_OK; +} + +/*********************************************************************** + * RpcAsyncGetCallStatus [RPCRT4.@] + * + * Retrieves the current status of the asynchronous call taking place. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * + * RETURNS + * RPC_S_OK - The call was successfully completed. + * RPC_S_INVALID_ASYNC_HANDLE - The asynchronous structure is not valid. + * RPC_S_ASYNC_CALL_PENDING - The call is still in progress and has not been completed. + * Any other error code - The call failed. + */ +RPC_STATUS WINAPI RpcAsyncGetCallStatus(PRPC_ASYNC_STATE pAsync) +{ + FIXME("(%p): stub\n", pAsync); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncCompleteCall [RPCRT4.@] + * + * Completes a client or server asynchronous call. + * + * PARAMS + * pAsync [I] Asynchronous state to initialise. + * Reply [I] The return value of the asynchronous function. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) +{ + FIXME("(%p, %p): stub\n", pAsync, Reply); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncAbortCall [RPCRT4.@] + * + * Aborts the asynchronous server call taking place. + * + * PARAMS + * pAsync [I] Asynchronous server state to abort. + * ExceptionCode [I] Exception code to return to the client in a fault packet. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncAbortCall(PRPC_ASYNC_STATE pAsync, ULONG ExceptionCode) +{ + FIXME("(%p, %d/0x%x): stub\n", pAsync, ExceptionCode, ExceptionCode); + return RPC_S_INVALID_ASYNC_HANDLE; +} + +/*********************************************************************** + * RpcAsyncCancelCall [RPCRT4.@] + * + * Cancels the asynchronous client call taking place. + * + * PARAMS + * pAsync [I] Asynchronous client state to abort. + * fAbortCall [I] If TRUE, then send a cancel to the server, otherwise + * just wait for the call to complete. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI RpcAsyncCancelCall(PRPC_ASYNC_STATE pAsync, BOOL fAbortCall) +{ + FIXME("(%p, %s): stub\n", pAsync, fAbortCall ? "TRUE" : "FALSE"); + return RPC_S_INVALID_ASYNC_HANDLE; +} Propchange: trunk/reactos/dll/win32/rpcrt4/rpc_async.c ------------------------------------------------------------------------------ svn:eol-style = native 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_message.c Fri Jan 18 20:39:35 2008 @@ -754,8 +754,12 @@ TRACE("buffer length = %u\n", pMsg->BufferLength); - status = I_RpcGetBuffer(pMsg); - if (status != RPC_S_OK) goto fail; + pMsg->Buffer = I_RpcAllocate(pMsg->BufferLength); + if (!pMsg->Buffer) + { + status = ERROR_OUTOFMEMORY; + goto fail; + } first_flag = RPC_FLG_FIRST; auth_length = common_hdr.auth_len; @@ -842,7 +846,7 @@ *Header, hdr_length, (unsigned char *)pMsg->Buffer + buffer_length, data_length, (RpcAuthVerifier *)auth_data, - (unsigned char *)auth_data + sizeof(RpcAuthVerifier), + auth_data + sizeof(RpcAuthVerifier), header_auth_len - sizeof(RpcAuthVerifier)); if (status != RPC_S_OK) goto fail; } @@ -891,6 +895,54 @@ } /*********************************************************************** + * I_RpcNegotiateTransferSyntax [RPCRT4.@] + * + * Negotiates the transfer syntax used by a client connection by connecting + * to the server. + * + * PARAMS + * pMsg [I] RPC Message structure. + * pAsync [I] Asynchronous state to set. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI I_RpcNegotiateTransferSyntax(PRPC_MESSAGE pMsg) +{ + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + RpcConnection* conn; + RPC_STATUS status = RPC_S_OK; + + TRACE("(%p)\n", pMsg); + + if (!bind || bind->server) + return RPC_S_INVALID_BINDING; + + /* if we already have a connection, we don't need to negotiate again */ + if (!pMsg->ReservedForRuntime) + { + RPC_CLIENT_INTERFACE *cif = pMsg->RpcInterfaceInformation; + if (!cif) return RPC_S_INTERFACE_NOT_FOUND; + + if (!bind->Endpoint || !bind->Endpoint[0]) + { + TRACE("automatically resolving partially bound binding\n"); + status = RpcEpResolveBinding(bind, cif); + if (status != RPC_S_OK) return status; + } + + status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, + &cif->InterfaceId); + + if (status == RPC_S_OK) + pMsg->ReservedForRuntime = conn; + } + + return status; +} + +/*********************************************************************** * I_RpcGetBuffer [RPCRT4.@] * * Allocates a buffer for use by I_RpcSend or I_RpcSendReceive and binds to the @@ -916,26 +968,45 @@ */ RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) { + RPC_STATUS status; + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); - pMsg->Buffer = HeapAlloc(GetProcessHeap(), 0, pMsg->BufferLength); + + if (!bind) + return RPC_S_INVALID_BINDING; + + pMsg->Buffer = I_RpcAllocate(pMsg->BufferLength); + TRACE("Buffer=%p\n", pMsg->Buffer); + + if (!pMsg->Buffer) + return ERROR_OUTOFMEMORY; + + if (!bind->server) + { + status = I_RpcNegotiateTransferSyntax(pMsg); + if (status != RPC_S_OK) + I_RpcFree(pMsg->Buffer); + } + else + status = RPC_S_OK; + + return status; +} + +/*********************************************************************** + * I_RpcReAllocateBuffer (internal) + */ +static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) +{ + TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); + pMsg->Buffer = HeapReAlloc(GetProcessHeap(), 0, pMsg->Buffer, pMsg->BufferLength); TRACE("Buffer=%p\n", pMsg->Buffer); return pMsg->Buffer ? RPC_S_OK : ERROR_OUTOFMEMORY; } /*********************************************************************** - * I_RpcReAllocateBuffer (internal) - */ -static RPC_STATUS I_RpcReAllocateBuffer(PRPC_MESSAGE pMsg) -{ - TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); - pMsg->Buffer = HeapReAlloc(GetProcessHeap(), 0, pMsg->Buffer, pMsg->BufferLength); - - TRACE("Buffer=%p\n", pMsg->Buffer); - return pMsg->Buffer ? RPC_S_OK : ERROR_OUTOFMEMORY; -} - -/*********************************************************************** * I_RpcFreeBuffer [RPCRT4.@] * * Frees a buffer allocated by I_RpcGetBuffer or I_RpcReceive and unbinds from @@ -952,8 +1023,19 @@ */ RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { + RpcBinding* bind = (RpcBinding*)pMsg->Handle; + TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); - HeapFree(GetProcessHeap(), 0, pMsg->Buffer); + + if (!bind) return RPC_S_INVALID_BINDING; + + if (pMsg->ReservedForRuntime) + { + RpcConnection *conn = pMsg->ReservedForRuntime; + RPCRT4_CloseBinding(bind, conn); + pMsg->ReservedForRuntime = NULL; + } + I_RpcFree(pMsg->Buffer); return RPC_S_OK; } @@ -978,43 +1060,26 @@ { RpcBinding* bind = (RpcBinding*)pMsg->Handle; RpcConnection* conn; - RPC_CLIENT_INTERFACE* cif = NULL; RPC_STATUS status; RpcPktHdr *hdr; TRACE("(%p)\n", pMsg); - if (!bind || bind->server) return RPC_S_INVALID_BINDING; - - cif = pMsg->RpcInterfaceInformation; - if (!cif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - - if (!bind->Endpoint || !bind->Endpoint[0]) - { - TRACE("automatically resolving partially bound binding\n"); - status = RpcEpResolveBinding(bind, cif); - if (status != RPC_S_OK) return status; - } - - status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, - &cif->InterfaceId); - if (status != RPC_S_OK) return status; + if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; + + conn = pMsg->ReservedForRuntime; hdr = RPCRT4_BuildRequestHeader(pMsg->DataRepresentation, - pMsg->BufferLength, pMsg->ProcNum, + pMsg->BufferLength, + pMsg->ProcNum & ~RPC_FLAGS_VALID_BIT, &bind->ObjectUuid); if (!hdr) - { - RPCRT4_CloseBinding(bind, conn); return ERROR_OUTOFMEMORY; - } hdr->common.call_id = conn->NextCallId++; status = RPCRT4_Send(conn, hdr, pMsg->Buffer, pMsg->BufferLength); RPCRT4_FreeHeader(hdr); - /* save the connection, so the response can be read from it */ - pMsg->ReservedForRuntime = conn; return status; } @@ -1042,41 +1107,14 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) { RpcBinding* bind = (RpcBinding*)pMsg->Handle; - RpcConnection* conn; - RPC_CLIENT_INTERFACE* cif = NULL; - RPC_SERVER_INTERFACE* sif = NULL; RPC_STATUS status; RpcPktHdr *hdr = NULL; + RpcConnection *conn; TRACE("(%p)\n", pMsg); - if (!bind) return RPC_S_INVALID_BINDING; - - if (pMsg->ReservedForRuntime) { - conn = pMsg->ReservedForRuntime; - pMsg->ReservedForRuntime = NULL; - } else { - if (bind->server) { - sif = pMsg->RpcInterfaceInformation; - if (!sif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - status = RPCRT4_OpenBinding(bind, &conn, &sif->TransferSyntax, - &sif->InterfaceId); - } else { - cif = pMsg->RpcInterfaceInformation; - if (!cif) return RPC_S_INTERFACE_NOT_FOUND; /* ? */ - - if (!bind->Endpoint || !bind->Endpoint[0]) - { - TRACE("automatically resolving partially bound binding\n"); - status = RpcEpResolveBinding(bind, cif); - if (status != RPC_S_OK) return status; - } - - status = RPCRT4_OpenBinding(bind, &conn, &cif->TransferSyntax, - &cif->InterfaceId); - } - if (status != RPC_S_OK) return status; - } - + if (!bind || bind->server || !pMsg->ReservedForRuntime) return RPC_S_INVALID_BINDING; + + conn = pMsg->ReservedForRuntime; status = RPCRT4_Receive(conn, &hdr, pMsg); if (status != RPC_S_OK) { WARN("receive failed with error %lx\n", status); @@ -1085,16 +1123,6 @@ switch (hdr->common.ptype) { case PKT_RESPONSE: - if (bind->server) { - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } - break; - case PKT_REQUEST: - if (!bind->server) { - status = RPC_S_PROTOCOL_ERROR; - goto fail; - } break; case PKT_FAULT: ERR ("we got fault packet with status 0x%lx\n", hdr->fault.status); @@ -1109,13 +1137,13 @@ } /* success */ - RPCRT4_CloseBinding(bind, conn); RPCRT4_FreeHeader(hdr); return status; fail: RPCRT4_FreeHeader(hdr); RPCRT4_DestroyConnection(conn); + pMsg->ReservedForRuntime = NULL; return status; } @@ -1140,16 +1168,55 @@ RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg) { RPC_STATUS status; - RPC_MESSAGE original_message; + void *original_buffer; TRACE("(%p)\n", pMsg); - original_message = *pMsg; + original_buffer = pMsg->Buffer; status = I_RpcSend(pMsg); if (status == RPC_S_OK) status = I_RpcReceive(pMsg); /* free the buffer replaced by a new buffer in I_RpcReceive */ if (status == RPC_S_OK) - I_RpcFreeBuffer(&original_message); + I_RpcFree(original_buffer); return status; } + +/*********************************************************************** + * I_RpcAsyncSetHandle [RPCRT4.@] + * + * Sets the asynchronous state of the handle contained in the RPC message + * structure. + * + * PARAMS + * pMsg [I] RPC Message structure. + * pAsync [I] Asynchronous state to set. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI I_RpcAsyncSetHandle(PRPC_MESSAGE pMsg, PRPC_ASYNC_STATE pAsync) +{ + FIXME("(%p, %p): stub\n", pMsg, pAsync); + return RPC_S_INVALID_BINDING; +} + +/*********************************************************************** + * I_RpcAsyncAbortCall [RPCRT4.@] + * + * Aborts an asynchronous call. + * + * PARAMS + * pAsync [I] Asynchronous state. + * ExceptionCode [I] Exception code. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS WINAPI I_RpcAsyncAbortCall(PRPC_ASYNC_STATE pAsync, ULONG ExceptionCode) +{ + FIXME("(%p, %d): stub\n", pAsync, ExceptionCode); + return RPC_S_INVALID_ASYNC_HANDLE; +} 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_server.c Fri Jan 18 20:39:35 2008 @@ -3,6 +3,7 @@ * * Copyright 2001 Ove Kåven, TransGaming Technologies * Copyright 2004 Filip Navara + * Copyright 2006-2008 Robert Shearman (for CodeWeavers) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,9 +18,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * TODO: - * - a whole lot */ #include "config.h" @@ -163,16 +161,179 @@ return EXCEPTION_EXECUTE_HANDLER; } -static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSAGE* msg) -{ +static RPC_STATUS process_bind_packet(RpcConnection *conn, RpcPktBindHdr *hdr, RPC_MESSAGE *msg) +{ + RPC_STATUS status; + RpcServerInterface* sif; + RpcPktHdr *response = NULL; + + /* FIXME: do more checks! */ + if (hdr->max_tsize < RPC_MIN_PACKET_SIZE || + !UuidIsNil(&conn->ActiveInterface.SyntaxGUID, &status) || + conn->server_binding) { + TRACE("packet size less than min size, or active interface syntax guid non-null\n"); + sif = NULL; + } else { + /* create temporary binding */ + if (RPCRT4_MakeBinding(&conn->server_binding, conn) == RPC_S_OK && + RpcServerAssoc_GetAssociation(rpcrt4_conn_get_name(conn), + conn->NetworkAddr, conn->Endpoint, + conn->NetworkOptions, + hdr->assoc_gid, + &conn->server_binding->Assoc) == RPC_S_OK) + sif = RPCRT4_find_interface(NULL, &hdr->abstract, FALSE); + else + sif = NULL; + } + if (sif == NULL) { + TRACE("rejecting bind request on connection %p\n", conn); + /* Report failure to client. */ + response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION, + RPC_VER_MAJOR, RPC_VER_MINOR); + } else { + TRACE("accepting bind request on connection %p for %s\n", conn, + debugstr_guid(&hdr->abstract.SyntaxGUID)); + + /* accept. */ + response = RPCRT4_BuildBindAckHeader(NDR_LOCAL_DATA_REPRESENTATION, + RPC_MAX_PACKET_SIZE, + RPC_MAX_PACKET_SIZE, + conn->server_binding->Assoc->assoc_group_id, + conn->Endpoint, + RESULT_ACCEPT, REASON_NONE, + &sif->If->TransferSyntax); + + /* save the interface for later use */ + conn->ActiveInterface = hdr->abstract; + conn->MaxTransmissionSize = hdr->max_tsize; + + RPCRT4_release_server_interface(sif); + } + + if (response) + status = RPCRT4_Send(conn, response, NULL, 0); + else + status = ERROR_OUTOFMEMORY; + RPCRT4_FreeHeader(response); + + return status; +} + +static RPC_STATUS process_request_packet(RpcConnection *conn, RpcPktRequestHdr *hdr, RPC_MESSAGE *msg) +{ + RPC_STATUS status; + RpcPktHdr *response = NULL; RpcServerInterface* sif; RPC_DISPATCH_FUNCTION func; + BOOL exception; UUID *object_uuid; - RpcPktHdr *response = NULL; + NDR_SCONTEXT context_handle; void *buf = msg->Buffer; + + /* fail if the connection isn't bound with an interface */ + if (UuidIsNil(&conn->ActiveInterface.SyntaxGUID, &status)) { + /* FIXME: should send BindNack instead */ + response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, + status); + + RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); + return RPC_S_OK; + } + + if (hdr->common.flags & RPC_FLG_OBJECT_UUID) { + object_uuid = (UUID*)(hdr + 1); + } else { + object_uuid = NULL; + } + + sif = RPCRT4_find_interface(object_uuid, &conn->ActiveInterface, TRUE); + if (!sif) { + WARN("interface %s no longer registered, returning fault packet\n", debugstr_guid(&conn->ActiveInterface.SyntaxGUID)); + response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, + NCA_S_UNK_IF); + + RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); + return RPC_S_OK; + } + msg->RpcInterfaceInformation = sif->If; + /* copy the endpoint vector from sif to msg so that midl-generated code will use it */ + msg->ManagerEpv = sif->MgrEpv; + if (object_uuid != NULL) { + RPCRT4_SetBindingObject(msg->Handle, object_uuid); + } + + /* find dispatch function */ + msg->ProcNum = hdr->opnum; + if (sif->Flags & RPC_IF_OLE) { + /* native ole32 always gives us a dispatch table with a single entry + * (I assume that's a wrapper for IRpcStubBuffer::Invoke) */ + func = *sif->If->DispatchTable->DispatchTable; + } else { + if (msg->ProcNum >= sif->If->DispatchTable->DispatchTableCount) { + WARN("invalid procnum (%d/%d)\n", msg->ProcNum, sif->If->DispatchTable->DispatchTableCount); + response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, + NCA_S_OP_RNG_ERROR); + + RPCRT4_Send(conn, response, NULL, 0); + RPCRT4_FreeHeader(response); + } + func = sif->If->DispatchTable->DispatchTable[msg->ProcNum]; + } + + /* put in the drep. FIXME: is this more universally applicable? + perhaps we should move this outward... */ + msg->DataRepresentation = + MAKELONG( MAKEWORD(hdr->common.drep[0], hdr->common.drep[1]), + MAKEWORD(hdr->common.drep[2], hdr->common.drep[3])); + + exception = FALSE; + + /* dispatch */ + RPCRT4_SetThreadCurrentCallHandle(msg->Handle); + __TRY { + if (func) func(msg); + } __EXCEPT(rpc_filter) { + exception = TRUE; + if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) + status = ERROR_NOACCESS; + else + status = GetExceptionCode(); + response = RPCRT4_BuildFaultHeader(msg->DataRepresentation, + RPC2NCA_STATUS(status)); + } __ENDTRY + RPCRT4_SetThreadCurrentCallHandle(NULL); + + /* release any unmarshalled context handles */ + while ((context_handle = RPCRT4_PopThreadContextHandle()) != NULL) + RpcServerAssoc_ReleaseContextHandle(conn->server_binding->Assoc, context_handle, TRUE); + + if (!exception) + response = RPCRT4_BuildResponseHeader(msg->DataRepresentation, + msg->BufferLength); + + /* send response packet */ + if (response) { + status = RPCRT4_Send(conn, response, exception ? NULL : msg->Buffer, + exception ? 0 : msg->BufferLength); + RPCRT4_FreeHeader(response); + } else + ERR("out of memory\n"); + + msg->RpcInterfaceInformation = NULL; + RPCRT4_release_server_interface(sif); + + if (msg->Buffer == buf) buf = NULL; + TRACE("freeing Buffer=%p\n", buf); + I_RpcFree(buf); + + return status; +} + +static void RPCRT4_process_packet(RpcConnection* conn, RpcPktHdr* hdr, RPC_MESSAGE* msg) +{ RPC_STATUS status; - BOOL exception; - NDR_SCONTEXT context_handle; msg->Handle = (RPC_BINDING_HANDLE)conn->server_binding; @@ -180,153 +341,13 @@ case PKT_BIND: TRACE("got bind packet\n"); - /* FIXME: do more checks! */ - if (hdr->bind.max_tsize < RPC_MIN_PACKET_SIZE || - !UuidIsNil(&conn->ActiveInterface.SyntaxGUID, &status) || - conn->server_binding) { - TRACE("packet size less than min size, or active interface syntax guid non-null\n"); - sif = NULL; - } else { - /* create temporary binding */ - if (RPCRT4_MakeBinding(&conn->server_binding, conn) == RPC_S_OK && - RpcServerAssoc_GetAssociation(rpcrt4_conn_get_name(conn), - conn->NetworkAddr, conn->Endpoint, - conn->NetworkOptions, - hdr->bind.assoc_gid, - &conn->server_binding->Assoc) == RPC_S_OK) - sif = RPCRT4_find_interface(NULL, &hdr->bind.abstract, FALSE); - else - sif = NULL; - } - if (sif == NULL) { - TRACE("rejecting bind request on connection %p\n", conn); - /* Report failure to client. */ - response = RPCRT4_BuildBindNackHeader(NDR_LOCAL_DATA_REPRESENTATION, - RPC_VER_MAJOR, RPC_VER_MINOR); - } else { - TRACE("accepting bind request on connection %p for %s\n", conn, - debugstr_guid(&hdr->bind.abstract.SyntaxGUID)); - - /* accept. */ - response = RPCRT4_BuildBindAckHeader(NDR_LOCAL_DATA_REPRESENTATION, - RPC_MAX_PACKET_SIZE, - RPC_MAX_PACKET_SIZE, - conn->server_binding->Assoc->assoc_group_id, - conn->Endpoint, - RESULT_ACCEPT, REASON_NONE, - &sif->If->TransferSyntax); - - /* save the interface for later use */ - conn->ActiveInterface = hdr->bind.abstract; - conn->MaxTransmissionSize = hdr->bind.max_tsize; - - RPCRT4_release_server_interface(sif); - } - - status = RPCRT4_Send(conn, response, NULL, 0); - RPCRT4_FreeHeader(response); - if (status != RPC_S_OK) - goto fail; - + status = process_bind_packet(conn, &hdr->bind, msg); break; case PKT_REQUEST: TRACE("got request packet\n"); - /* fail if the connection isn't bound with an interface */ - if (UuidIsNil(&conn->ActiveInterface.SyntaxGUID, &status)) { - /* FIXME: should send BindNack instead */ - response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, - status); - - RPCRT4_Send(conn, response, NULL, 0); - RPCRT4_FreeHeader(response); - break; - } - - if (hdr->common.flags & RPC_FLG_OBJECT_UUID) { - object_uuid = (UUID*)(&hdr->request + 1); - } else { - object_uuid = NULL; - } - - sif = RPCRT4_find_interface(object_uuid, &conn->ActiveInterface, TRUE); - if (!sif) { - WARN("interface %s no longer registered, returning fault packet\n", debugstr_guid(&conn->ActiveInterface.SyntaxGUID)); - response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, - NCA_S_UNK_IF); - - RPCRT4_Send(conn, response, NULL, 0); - RPCRT4_FreeHeader(response); - break; - } - msg->RpcInterfaceInformation = sif->If; - /* copy the endpoint vector from sif to msg so that midl-generated code will use it */ - msg->ManagerEpv = sif->MgrEpv; - if (object_uuid != NULL) { - RPCRT4_SetBindingObject(msg->Handle, object_uuid); - } - - /* find dispatch function */ - msg->ProcNum = hdr->request.opnum; - if (sif->Flags & RPC_IF_OLE) { - /* native ole32 always gives us a dispatch table with a single entry - * (I assume that's a wrapper for IRpcStubBuffer::Invoke) */ - func = *sif->If->DispatchTable->DispatchTable; - } else { - if (msg->ProcNum >= sif->If->DispatchTable->DispatchTableCount) { - WARN("invalid procnum (%d/%d)\n", msg->ProcNum, sif->If->DispatchTable->DispatchTableCount); - response = RPCRT4_BuildFaultHeader(NDR_LOCAL_DATA_REPRESENTATION, - NCA_S_OP_RNG_ERROR); - - RPCRT4_Send(conn, response, NULL, 0); - RPCRT4_FreeHeader(response); - } - func = sif->If->DispatchTable->DispatchTable[msg->ProcNum]; - } - - /* put in the drep. FIXME: is this more universally applicable? - perhaps we should move this outward... */ - msg->DataRepresentation = - MAKELONG( MAKEWORD(hdr->common.drep[0], hdr->common.drep[1]), - MAKEWORD(hdr->common.drep[2], hdr->common.drep[3])); - - exception = FALSE; - - /* dispatch */ - RPCRT4_SetThreadCurrentCallHandle(msg->Handle); - __TRY { - if (func) func(msg); - } __EXCEPT(rpc_filter) { - exception = TRUE; - if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) - status = ERROR_NOACCESS; - else - status = GetExceptionCode(); - response = RPCRT4_BuildFaultHeader(msg->DataRepresentation, - RPC2NCA_STATUS(status)); - } __ENDTRY - RPCRT4_SetThreadCurrentCallHandle(NULL); - - /* release any unmarshalled context handles */ - while ((context_handle = RPCRT4_PopThreadContextHandle()) != NULL) - RpcServerAssoc_ReleaseContextHandle(conn->server_binding->Assoc, context_handle, TRUE); - - if (!exception) - response = RPCRT4_BuildResponseHeader(msg->DataRepresentation, - msg->BufferLength); - - /* send response packet */ - if (response) { - status = RPCRT4_Send(conn, response, exception ? NULL : msg->Buffer, - exception ? 0 : msg->BufferLength); - RPCRT4_FreeHeader(response); - } else - ERR("out of memory\n"); - - msg->RpcInterfaceInformation = NULL; - RPCRT4_release_server_interface(sif); - + status = process_request_packet(conn, &hdr->request, msg); break; default: @@ -334,14 +355,8 @@ break; } -fail: /* clean up */ - if (msg->Buffer == buf) msg->Buffer = NULL; - TRACE("freeing Buffer=%p\n", buf); - HeapFree(GetProcessHeap(), 0, buf); - msg->Handle = 0; I_RpcFreeBuffer(msg); - msg->Buffer = NULL; RPCRT4_FreeHeader(hdr); HeapFree(GetProcessHeap(), 0, msg); } @@ -388,6 +403,7 @@ HeapFree(GetProcessHeap(), 0, packet); break; } + msg = NULL; } RPCRT4_DestroyConnection(conn); @@ -1032,10 +1048,10 @@ LeaveCriticalSection(&listen_cs); return RPC_S_NOT_LISTENING; } - + do { - LeaveCriticalSection(&listen_cs); + LeaveCriticalSection(&listen_cs); LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) WaitForSingleObject(cps->server_ready_event, INFINITE); 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c Fri Jan 18 20:39:35 2008 @@ -446,8 +446,8 @@ TRACE("(%p, %s, %s)\n", tower_data, networkaddr, endpoint); - networkaddr_size = strlen(networkaddr) + 1; - endpoint_size = strlen(endpoint) + 1; + networkaddr_size = networkaddr ? strlen(networkaddr) + 1 : 1; + endpoint_size = endpoint ? strlen(endpoint) + 1 : 1; size = sizeof(*smb_floor) + endpoint_size + sizeof(*nb_floor) + networkaddr_size; if (!tower_data) @@ -461,7 +461,10 @@ smb_floor->protid = EPM_PROTOCOL_SMB; smb_floor->count_rhs = endpoint_size; - memcpy(tower_data, endpoint, endpoint_size); + if (endpoint) + memcpy(tower_data, endpoint, endpoint_size); + else + tower_data[0] = 0; tower_data += endpoint_size; nb_floor = (twr_empty_floor_t *)tower_data; @@ -472,7 +475,10 @@ nb_floor->protid = EPM_PROTOCOL_NETBIOS; nb_floor->count_rhs = networkaddr_size; - memcpy(tower_data, networkaddr, networkaddr_size); + if (networkaddr) + memcpy(tower_data, networkaddr, networkaddr_size); + else + tower_data[0] = 0; tower_data += networkaddr_size; return size; @@ -1025,7 +1031,7 @@ int bytes_written = 0; do { - int r = write(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written); + int r = send(tcpc->sock, (const char *)buffer + bytes_written, count - bytes_written, 0); if (r >= 0) bytes_written += r; else if (errno != EAGAIN) Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild Fri Jan 18 20:39:35 2008 @@ -30,6 +30,7 @@ <file>ndr_ole.c</file> <file>ndr_stubless.c</file> <file>rpc_assoc.c</file> + <file>rpc_async.c</file> <file>rpc_binding.c</file> <file>rpc_epmap.c</file> <file>rpc_message.c</file> 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Fri Jan 18 20:39:35 2008 @@ -18,11 +18,11 @@ @ stdcall IUnknown_AddRef_Proxy(ptr) @ stdcall IUnknown_QueryInterface_Proxy(ptr ptr ptr) @ stdcall IUnknown_Release_Proxy(ptr) -@ stub I_RpcAbortAsyncCall +@ stdcall I_RpcAbortAsyncCall(ptr long) I_RpcAsyncAbortCall @ stdcall I_RpcAllocate(long) -@ stub I_RpcAsyncAbortCall +@ stdcall I_RpcAsyncAbortCall(ptr long) @ stub I_RpcAsyncSendReceive # NT4 -@ stub I_RpcAsyncSetHandle +@ stdcall I_RpcAsyncSetHandle(ptr ptr) @ stub I_RpcBCacheAllocate @ stub I_RpcBCacheFree @ stub I_RpcBindingCopy @@ -201,9 +201,9 @@ @ stdcall NdrContextHandleSize(ptr ptr ptr) @ stdcall NdrConvert2(ptr ptr long) @ stdcall NdrConvert(ptr ptr) -@ stub NdrCorrelationFree -@ stub NdrCorrelationInitialize -@ stub NdrCorrelationPass +@ stdcall NdrCorrelationFree(ptr) +@ stdcall NdrCorrelationInitialize(ptr ptr long long) +@ stdcall NdrCorrelationPass(ptr) @ stub NdrDcomAsyncClientCall @ stub NdrDcomAsyncStubCall @ stdcall NdrDllCanUnloadNow(ptr) @@ -362,12 +362,12 @@ @ stub NdrpSetRpcSsDefaults @ stub NdrpVarVtOfTypeDesc # wxp @ stub PerformRpcInitialization -@ stub RpcAbortAsyncCall -@ stub RpcAsyncAbortCall -@ stub RpcAsyncCancelCall -@ stub RpcAsyncCompleteCall -@ stub RpcAsyncGetCallStatus -@ stub RpcAsyncInitializeHandle +@ stdcall RpcAbortAsyncCall(ptr long) RpcAsyncAbortCall +@ stdcall RpcAsyncAbortCall(ptr long) +@ stdcall RpcAsyncCancelCall(ptr long) +@ stdcall RpcAsyncCompleteCall(ptr ptr) +@ stdcall RpcAsyncGetCallStatus(ptr) +@ stdcall RpcAsyncInitializeHandle(ptr long) @ stub RpcAsyncRegisterInfo @ stdcall RpcBindingCopy(ptr ptr) @ stdcall RpcBindingFree(ptr) @@ -394,12 +394,12 @@ @ stdcall RpcBindingToStringBindingA(ptr ptr) @ stdcall RpcBindingToStringBindingW(ptr ptr) @ stdcall RpcBindingVectorFree(ptr) -@ stub RpcCancelAsyncCall +@ stdcall RpcCancelAsyncCall(ptr long) RpcAsyncCancelCall @ stdcall RpcCancelThread(ptr) @ stub RpcCancelThreadEx @ stub RpcCertGeneratePrincipalNameA @ stub RpcCertGeneratePrincipalNameW -@ stub RpcCompleteAsyncCall +@ stdcall RpcCompleteAsyncCall(ptr ptr) RpcAsyncCompleteCall @ stdcall RpcEpRegisterA(ptr ptr ptr str) @ stub RpcEpRegisterNoReplaceA @ stub RpcEpRegisterNoReplaceW @@ -416,11 +416,11 @@ @ stub RpcErrorSaveErrorInfo # wxp @ stdcall RpcErrorStartEnumeration(ptr) @ stub RpcFreeAuthorizationContext # wxp -@ stub RpcGetAsyncCallStatus +@ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @ stub RpcIfIdVectorFree @ stub RpcIfInqId @ stdcall RpcImpersonateClient(ptr) -@ stub RpcInitializeAsyncHandle +@ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle @ stub RpcMgmtBindingInqParameter # win9x @ stub RpcMgmtBindingSetParameter # win9x @ stdcall RpcMgmtEnableIdleCleanup() 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c Fri Jan 18 20:39:35 2008 @@ -19,74 +19,13 @@ * * WINE RPC TODO's (and a few TODONT's) * - * - Ove's decreasingly incomplete widl is an IDL compiler for wine. For widl - * to be wine's only IDL compiler, a fair bit of work remains to be done. - * until then we have used some midl-generated stuff. (What?) - * widl currently doesn't generate stub/proxy files required by wine's (O)RPC - * capabilities -- nor does it make those lovely format strings :( - * The MS MIDL compiler does some really esoteric stuff. Of course Ove has - * started with the less esoteric stuff. There are also lots of nice - * comments in there if you want to flex your bison and help build this monster. - * - * - RPC has a quite featureful error handling mechanism; basically none of this is - * implemented right now. We also have deficiencies on the compiler side, where - * wine's __TRY / __EXCEPT / __FINALLY macros are not even used for RpcTryExcept & co, - * due to syntactic differences! (we can fix it with widl by using __TRY) - * - * - There are several different memory allocation schemes for MSRPC. - * I don't even understand what they all are yet, much less have them - * properly implemented. Surely we are supposed to be doing something with - * the user-provided allocation/deallocation functions, but so far, - * I don't think we are doing this... - * - * - MSRPC provides impersonation capabilities which currently are not possible - * to implement in wine. At the very least we should implement the authorization - * API's & gracefully ignore the irrelevant stuff (to an extent we already do). - * - * - Some transports are not yet implemented. The existing transport implementations - * are incomplete and may be bug-infested. - * - * - The various transports that we do support ought to be supported in a more - * object-oriented manner, as in DCE's RPC implementation, instead of cluttering - * up the code with conditionals like we do now. - * - * - Data marshalling: So far, only the beginnings of a full implementation - * exist in wine. NDR protocol itself is documented, but the MS API's to - * convert data-types in memory into NDR are not. This is challenging work, - * and has supposedly been "at the top of Greg's queue" for several months now. - * - * - ORPC is RPC for OLE; once we have a working RPC framework, we can - * use it to implement out-of-process OLE client/server communications. - * ATM there is maybe a disconnect between the marshalling in the OLE DLLs - * and the marshalling going on here [TODO: well, is there or not?] - * - * - In-source API Documentation, at least for those functions which we have - * implemented, but preferably for everything we can document, would be nice, - * since some of this stuff is quite obscure. - * - * - Name services... [TODO: what about them] - * - * - Protocol Towers: Totally unimplemented.... I think. - * - * - Context Handle Rundown: whatever that is. - * - * - Nested RPC's: Totally unimplemented. - * * - Statistics: we are supposed to be keeping various counters. we aren't. * * - Async RPC: Unimplemented. - * - * - XML/http RPC: Somewhere there's an XML fiend that wants to do this! Betcha - * we could use these as a transport for RPC's across computers without a - * permissions and/or licensing crisis. * * - The NT "ports" API, aka LPC. Greg claims this is on his radar. Might (or * might not) enable users to get some kind of meaningful result out of * NT-based native rpcrt4's. Commonly-used transport for self-to-self RPC's. - * - * - ...? More stuff I haven't thought of. If you think of more RPC todo's - * drop me an e-mail <gmturner007(a)ameritech.net> or send a patch to the - * wine-patches mailing list. */ #include "config.h" @@ -96,6 +35,8 @@ #include <stdlib.h> #include <string.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winerror.h" #include "winbase.h" @@ -871,11 +812,128 @@ /****************************************************************************** * I_RpcMapWin32Status (rpcrt4.@) + * + * Maps Win32 RPC error codes to NT statuses. + * + * PARAMS + * status [I] Win32 RPC error code. + * + * RETURNS + * Appropriate translation into an NT status code. */ LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) { - FIXME("(%ld): stub\n", status); - return 0; + TRACE("(%ld)\n", status); + switch (status) + { + case ERROR_ACCESS_DENIED: return STATUS_ACCESS_DENIED; + case ERROR_INVALID_HANDLE: return RPC_NT_SS_CONTEXT_MISMATCH; + case ERROR_OUTOFMEMORY: return STATUS_NO_MEMORY; + case ERROR_INVALID_PARAMETER: return STATUS_INVALID_PARAMETER; + case ERROR_INSUFFICIENT_BUFFER: return STATUS_BUFFER_TOO_SMALL; + case ERROR_MAX_THRDS_REACHED: return STATUS_NO_MEMORY; + case ERROR_NOACCESS: return STATUS_ACCESS_VIOLATION; + case ERROR_NOT_ENOUGH_SERVER_MEMORY: return STATUS_INSUFF_SERVER_RESOURCES; + case ERROR_WRONG_PASSWORD: return STATUS_WRONG_PASSWORD; + case ERROR_INVALID_LOGON_HOURS: return STATUS_INVALID_LOGON_HOURS; + case ERROR_PASSWORD_EXPIRED: return STATUS_PASSWORD_EXPIRED; + case ERROR_ACCOUNT_DISABLED: return STATUS_ACCOUNT_DISABLED; + case ERROR_INVALID_SECURITY_DESCR: return STATUS_INVALID_SECURITY_DESCR; + case RPC_S_INVALID_STRING_BINDING: return RPC_NT_INVALID_STRING_BINDING; + case RPC_S_WRONG_KIND_OF_BINDING: return RPC_NT_WRONG_KIND_OF_BINDING; + case RPC_S_INVALID_BINDING: return RPC_NT_INVALID_BINDING; + case RPC_S_PROTSEQ_NOT_SUPPORTED: return RPC_NT_PROTSEQ_NOT_SUPPORTED; + case RPC_S_INVALID_RPC_PROTSEQ: return RPC_NT_INVALID_RPC_PROTSEQ; + case RPC_S_INVALID_STRING_UUID: return RPC_NT_INVALID_STRING_UUID; + case RPC_S_INVALID_ENDPOINT_FORMAT: return RPC_NT_INVALID_ENDPOINT_FORMAT; + case RPC_S_INVALID_NET_ADDR: return RPC_NT_INVALID_NET_ADDR; + case RPC_S_NO_ENDPOINT_FOUND: return RPC_NT_NO_ENDPOINT_FOUND; + case RPC_S_INVALID_TIMEOUT: return RPC_NT_INVALID_TIMEOUT; + case RPC_S_OBJECT_NOT_FOUND: return RPC_NT_OBJECT_NOT_FOUND; + case RPC_S_ALREADY_REGISTERED: return RPC_NT_ALREADY_REGISTERED; + case RPC_S_TYPE_ALREADY_REGISTERED: return RPC_NT_TYPE_ALREADY_REGISTERED; + case RPC_S_ALREADY_LISTENING: return RPC_NT_ALREADY_LISTENING; + case RPC_S_NO_PROTSEQS_REGISTERED: return RPC_NT_NO_PROTSEQS_REGISTERED; + case RPC_S_NOT_LISTENING: return RPC_NT_NOT_LISTENING; + case RPC_S_UNKNOWN_MGR_TYPE: return RPC_NT_UNKNOWN_MGR_TYPE; + case RPC_S_UNKNOWN_IF: return RPC_NT_UNKNOWN_IF; + case RPC_S_NO_BINDINGS: return RPC_NT_NO_BINDINGS; + case RPC_S_NO_PROTSEQS: return RPC_NT_NO_PROTSEQS; + case RPC_S_CANT_CREATE_ENDPOINT: return RPC_NT_CANT_CREATE_ENDPOINT; + case RPC_S_OUT_OF_RESOURCES: return RPC_NT_OUT_OF_RESOURCES; + case RPC_S_SERVER_UNAVAILABLE: return RPC_NT_SERVER_UNAVAILABLE; + case RPC_S_SERVER_TOO_BUSY: return RPC_NT_SERVER_TOO_BUSY; + case RPC_S_INVALID_NETWORK_OPTIONS: return RPC_NT_INVALID_NETWORK_OPTIONS; + case RPC_S_NO_CALL_ACTIVE: return RPC_NT_NO_CALL_ACTIVE; + case RPC_S_CALL_FAILED: return RPC_NT_CALL_FAILED; + case RPC_S_CALL_FAILED_DNE: return RPC_NT_CALL_FAILED_DNE; + case RPC_S_PROTOCOL_ERROR: return RPC_NT_PROTOCOL_ERROR; + case RPC_S_UNSUPPORTED_TRANS_SYN: return RPC_NT_UNSUPPORTED_TRANS_SYN; + case RPC_S_UNSUPPORTED_TYPE: return RPC_NT_UNSUPPORTED_TYPE; + case RPC_S_INVALID_TAG: return RPC_NT_INVALID_TAG; + case RPC_S_INVALID_BOUND: return RPC_NT_INVALID_BOUND; + case RPC_S_NO_ENTRY_NAME: return RPC_NT_NO_ENTRY_NAME; + case RPC_S_INVALID_NAME_SYNTAX: return RPC_NT_INVALID_NAME_SYNTAX; + case RPC_S_UNSUPPORTED_NAME_SYNTAX: return RPC_NT_UNSUPPORTED_NAME_SYNTAX; + case RPC_S_UUID_NO_ADDRESS: return RPC_NT_UUID_NO_ADDRESS; + case RPC_S_DUPLICATE_ENDPOINT: return RPC_NT_DUPLICATE_ENDPOINT; + case RPC_S_UNKNOWN_AUTHN_TYPE: return RPC_NT_UNKNOWN_AUTHN_TYPE; + case RPC_S_MAX_CALLS_TOO_SMALL: return RPC_NT_MAX_CALLS_TOO_SMALL; + case RPC_S_STRING_TOO_LONG: return RPC_NT_STRING_TOO_LONG; + case RPC_S_PROTSEQ_NOT_FOUND: return RPC_NT_PROTSEQ_NOT_FOUND; + case RPC_S_PROCNUM_OUT_OF_RANGE: return RPC_NT_PROCNUM_OUT_OF_RANGE; + case RPC_S_BINDING_HAS_NO_AUTH: return RPC_NT_BINDING_HAS_NO_AUTH; + case RPC_S_UNKNOWN_AUTHN_SERVICE: return RPC_NT_UNKNOWN_AUTHN_SERVICE; + case RPC_S_UNKNOWN_AUTHN_LEVEL: return RPC_NT_UNKNOWN_AUTHN_LEVEL; + case RPC_S_INVALID_AUTH_IDENTITY: return RPC_NT_INVALID_AUTH_IDENTITY; + case RPC_S_UNKNOWN_AUTHZ_SERVICE: return RPC_NT_UNKNOWN_AUTHZ_SERVICE; + case EPT_S_INVALID_ENTRY: return EPT_NT_INVALID_ENTRY; + case EPT_S_CANT_PERFORM_OP: return EPT_NT_CANT_PERFORM_OP; + case EPT_S_NOT_REGISTERED: return EPT_NT_NOT_REGISTERED; + case EPT_S_CANT_CREATE: return EPT_NT_CANT_CREATE; + case RPC_S_NOTHING_TO_EXPORT: return RPC_NT_NOTHING_TO_EXPORT; + case RPC_S_INCOMPLETE_NAME: return RPC_NT_INCOMPLETE_NAME; + case RPC_S_INVALID_VERS_OPTION: return RPC_NT_INVALID_VERS_OPTION; + case RPC_S_NO_MORE_MEMBERS: return RPC_NT_NO_MORE_MEMBERS; + case RPC_S_NOT_ALL_OBJS_UNEXPORTED: return RPC_NT_NOT_ALL_OBJS_UNEXPORTED; + case RPC_S_INTERFACE_NOT_FOUND: return RPC_NT_INTERFACE_NOT_FOUND; + case RPC_S_ENTRY_ALREADY_EXISTS: return RPC_NT_ENTRY_ALREADY_EXISTS; + case RPC_S_ENTRY_NOT_FOUND: return RPC_NT_ENTRY_NOT_FOUND; + case RPC_S_NAME_SERVICE_UNAVAILABLE: return RPC_NT_NAME_SERVICE_UNAVAILABLE; + case RPC_S_INVALID_NAF_ID: return RPC_NT_INVALID_NAF_ID; + case RPC_S_CANNOT_SUPPORT: return RPC_NT_CANNOT_SUPPORT; + case RPC_S_NO_CONTEXT_AVAILABLE: return RPC_NT_NO_CONTEXT_AVAILABLE; + case RPC_S_INTERNAL_ERROR: return RPC_NT_INTERNAL_ERROR; + case RPC_S_ZERO_DIVIDE: return RPC_NT_ZERO_DIVIDE; + case RPC_S_ADDRESS_ERROR: return RPC_NT_ADDRESS_ERROR; + case RPC_S_FP_DIV_ZERO: return RPC_NT_FP_DIV_ZERO; + case RPC_S_FP_UNDERFLOW: return RPC_NT_FP_UNDERFLOW; + case RPC_S_FP_OVERFLOW: return RPC_NT_FP_OVERFLOW; + case RPC_S_CALL_IN_PROGRESS: return RPC_NT_CALL_IN_PROGRESS; + case RPC_S_NO_MORE_BINDINGS: return RPC_NT_NO_MORE_BINDINGS; + case RPC_S_CALL_CANCELLED: return RPC_NT_CALL_CANCELLED; + case RPC_S_INVALID_OBJECT: return RPC_NT_INVALID_OBJECT; + case RPC_S_INVALID_ASYNC_HANDLE: return RPC_NT_INVALID_ASYNC_HANDLE; + case RPC_S_INVALID_ASYNC_CALL: return RPC_NT_INVALID_ASYNC_CALL; + case RPC_S_GROUP_MEMBER_NOT_FOUND: return RPC_NT_GROUP_MEMBER_NOT_FOUND; + case RPC_X_NO_MORE_ENTRIES: return RPC_NT_NO_MORE_ENTRIES; + case RPC_X_SS_CHAR_TRANS_OPEN_FAIL: return RPC_NT_SS_CHAR_TRANS_OPEN_FAIL; + case RPC_X_SS_CHAR_TRANS_SHORT_FILE: return RPC_NT_SS_CHAR_TRANS_SHORT_FILE; + case RPC_X_SS_IN_NULL_CONTEXT: return RPC_NT_SS_IN_NULL_CONTEXT; + case RPC_X_SS_CONTEXT_DAMAGED: return RPC_NT_SS_CONTEXT_DAMAGED; + case RPC_X_SS_HANDLES_MISMATCH: return RPC_NT_SS_HANDLES_MISMATCH; + case RPC_X_SS_CANNOT_GET_CALL_HANDLE: return RPC_NT_SS_CANNOT_GET_CALL_HANDLE; + case RPC_X_NULL_REF_POINTER: return RPC_NT_NULL_REF_POINTER; + case RPC_X_ENUM_VALUE_OUT_OF_RANGE: return RPC_NT_ENUM_VALUE_OUT_OF_RANGE; + case RPC_X_BYTE_COUNT_TOO_SMALL: return RPC_NT_BYTE_COUNT_TOO_SMALL; + case RPC_X_BAD_STUB_DATA: return RPC_NT_BAD_STUB_DATA; + case RPC_X_PIPE_CLOSED: return RPC_NT_PIPE_CLOSED; + case RPC_X_PIPE_DISCIPLINE_ERROR: return RPC_NT_PIPE_DISCIPLINE_ERROR; + case RPC_X_PIPE_EMPTY: return RPC_NT_PIPE_EMPTY; + case ERROR_PASSWORD_MUST_CHANGE: return STATUS_PASSWORD_MUST_CHANGE; + case ERROR_ACCOUNT_LOCKED_OUT: return STATUS_ACCOUNT_LOCKED_OUT; + default: return status; + } } /****************************************************************************** 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 (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Fri Jan 18 20:39:35 2008 @@ -1,5 +1,7 @@ ---- rpc_server.c Tue Jan 01 13:09:34 2008 -+++ rpc_server.c Fri Jan 11 15:58:57 2008 +Index: rpc_server.c +=================================================================== +--- rpc_server.c (working copy) ++++ rpc_server.c (working copy) @@ -1017,22 +1017,30 @@ /*********************************************************************** * RpcMgmtServerWaitListen (RPCRT4.@) @@ -33,8 +35,10 @@ } /*********************************************************************** ---- rpc_transport.c Sun Jan 06 19:27:38 2008 -+++ rpc_transport.c Fri Jan 11 15:59:32 2008 +Index: rpc_transport.c +=================================================================== +--- rpc_transport.c (working copy) ++++ rpc_transport.c (working copy) @@ -54,10 +54,13 @@ #endif #ifdef HAVE_SYS_POLL_H

1 0

[dreimer] 31873: Begin of adding DS_SHELLFONT to all RC files. Changed the Font Size of Calc. 9 -> 8
by dreimer＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: dreimer Date: Fri Jan 18 20:28:28 2008 New Revision: 31873 URL: http://svn.reactos.org/svn/reactos?rev=31873&view=rev Log: Begin of adding DS_SHELLFONT to all RC files. Changed the Font Size of Calc. 9 -> 8 Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/ca-ES.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fi-FI.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/hu-HU.rc trunk/reactos/base/applications/calc/lang/id-ID.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/calc/lang/nb-NO.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pt-BR.rc trunk/reactos/base/applications/calc/lang/pt-PT.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc trunk/reactos/base/applications/charmap/lang/bg-BG.rc trunk/reactos/base/applications/charmap/lang/ca-ES.rc trunk/reactos/base/applications/charmap/lang/de-DE.rc trunk/reactos/base/applications/charmap/lang/el-GR.rc trunk/reactos/base/applications/charmap/lang/en-US.rc trunk/reactos/base/applications/charmap/lang/es-ES.rc trunk/reactos/base/applications/charmap/lang/fr-FR.rc trunk/reactos/base/applications/charmap/lang/id-ID.rc trunk/reactos/base/applications/charmap/lang/it-IT.rc trunk/reactos/base/applications/charmap/lang/lt-LT.rc trunk/reactos/base/applications/charmap/lang/pl-PL.rc trunk/reactos/base/applications/charmap/lang/pt-BR.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/sk-SK.rc trunk/reactos/base/applications/charmap/lang/uk-UA.rc trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc Fri Jan 18 20:28:28 2008 @@ -123,10 +123,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Çà GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "Äîáðå", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -139,10 +139,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Ñòàòèñòèêà" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ca-ES.rc (original) +++ trunk/reactos/base/applications/calc/lang/ca-ES.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "En quant a GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "Acceptar", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -160,10 +160,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Cuadre Estadístic" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc Fri Jan 18 20:28:28 2008 @@ -147,10 +147,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "O GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -162,10 +162,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Info über GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -160,10 +160,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistik Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc Fri Jan 18 20:28:28 2008 @@ -144,10 +144,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Ðåñß ôïõ GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -160,10 +160,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "About GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Acerca de GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "Aceptar", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Cuadro de estadísticas" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fi-FI.rc (original) +++ trunk/reactos/base/applications/calc/lang/fi-FI.rc Fri Jan 18 20:28:28 2008 @@ -121,10 +121,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "About GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -139,8 +139,8 @@ DLG_STATS DIALOG 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc Fri Jan 18 20:28:28 2008 @@ -150,8 +150,8 @@ DLG_ABOUT DIALOG 12,0,175,90 CAPTION "À propos de GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -166,8 +166,8 @@ DLG_STATS DIALOG 12,0,145,85 CAPTION "Outils Statistiques Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/hu-HU.rc (original) +++ trunk/reactos/base/applications/calc/lang/hu-HU.rc Fri Jan 18 20:28:28 2008 @@ -146,10 +146,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "GNU winecalc (számológép) névjegye" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -162,10 +162,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statisztika" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/calc/lang/id-ID.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Tentang GNU WineCalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -163,8 +163,8 @@ DLG_STATS DIALOG 12,0,145,85 CAPTION "Kotak Statistik" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Informazioni su GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistiche" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc (original) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc Fri Jan 18 20:28:28 2008 @@ -124,18 +124,18 @@ END -DLG_ABOUT DIALOG 12, 0, 175, 90 -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +DLG_ABOUT DIALOGEX 12, 0, 175, 90 +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "GNU winecalc ÉÂ¢Ä" BEGIN DEFPUSHBUTTON "OK",IDOK,73,70,30,14 END -DLG_STATS DIALOG 12, 0, 145, 85 -STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +DLG_STATS DIALOGEX 12, 0, 145, 85 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "vBEGINbNX" -FONT 9, "MS Shell Dlg" +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "ßé(&R)",ID_STATS_RET,4,52,30,13,WS_GROUP PUSHBUTTON "[h(&L)",ID_STATS_LOAD,39,52,30,13,WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/calc/lang/nb-NO.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Om GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc Fri Jan 18 20:28:28 2008 @@ -153,18 +153,18 @@ END END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Over GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc Fri Jan 18 20:28:28 2008 @@ -125,10 +125,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Informacje GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -141,10 +141,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-BR.rc (original) +++ trunk/reactos/base/applications/calc/lang/pt-BR.rc Fri Jan 18 20:28:28 2008 @@ -153,17 +153,18 @@ END END -DLG_ABOUT DIALOG 12,0,120,82 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Sobre a Calculadora" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -DLG_STATS DIALOG 12,0,125,78 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "Tahoma" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/calc/lang/pt-PT.rc Fri Jan 18 20:28:28 2008 @@ -153,18 +153,18 @@ END END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "About GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc Fri Jan 18 20:28:28 2008 @@ -121,10 +121,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Î ïðîãðàììå GNU WineCalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -137,10 +137,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Ñòàòèñòèêà" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc Fri Jan 18 20:28:28 2008 @@ -132,10 +132,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Èo je Kalkulaèka" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -148,10 +148,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "tatistika" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sv-SE.rc (original) +++ trunk/reactos/base/applications/calc/lang/sv-SE.rc Fri Jan 18 20:28:28 2008 @@ -146,10 +146,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Om GNU Kalkylatorn (winecalc)" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -162,10 +162,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistikruta" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "à¡ÕèÂÇ¡Ñº GNU WineCalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "µ¡Å§", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "¡ÅèÍ§Ê¶Ò¹Ð" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc Fri Jan 18 20:28:28 2008 @@ -145,10 +145,10 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,90 +DLG_ABOUT DIALOGEX 12,0,175,90 CAPTION "Ïðî GNU winecalc" -FONT 9, "MS Shell Dlg" -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -161,10 +161,10 @@ END END -DLG_STATS DIALOG 12,0,145,85 +DLG_STATS DIALOGEX 12,0,145,85 CAPTION "Statistics Box" -FONT 9, "MS Shell Dlg" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 30, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc Fri Jan 18 20:28:28 2008 @@ -147,10 +147,9 @@ DLG_ABOUT DIALOGEX 12, 0, 140, 95 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | - WS_SYSMENU +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "¹ØÓÚ GNU winecalc" -FONT 9, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN //LTEXT "ÖÐÎÄ·Òë:ÕÅ±ù (e_zb(a)21cn.com, ezb(a)mail.gywb.cn)",IDC_STATIC, 5, 57, 111, 25 DEFPUSHBUTTON "È·¶¨",IDOK, 55, 75, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -164,10 +163,10 @@ END END -DLG_STATS DIALOG 12,0,125,78 +DLG_STATS DIALOGEX 12,0,125,78 CAPTION "Í³¼Æ¿ò" -STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -FONT 9, "MS Shell Dlg" +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "·µ»Ø(&R)", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "¼ÓÔØ(&L)", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP Modified: trunk/reactos/base/applications/charmap/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/charmap/lang/bg-BG.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Çíàêîâ èçáîðíèê" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Øðèôò :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Çà çíàêîâèÿ èçáîðíèê" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Çíàêîâ èçáîðíèê, â0,1\nÂúçïðîèçâîäñòâåíî ïðàâî (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Çàòâàðÿíå", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ca-ES.rc (original) +++ trunk/reactos/base/applications/charmap/lang/ca-ES.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa de caràcters" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "En quanta al Mapa de caràcters" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Tancar", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/charmap/lang/de-DE.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Zeichentabelle" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Schrift:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Über Zeichentabelle" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Zeichentabelle v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/el-GR.rc (original) +++ trunk/reactos/base/applications/charmap/lang/el-GR.rc Fri Jan 18 20:28:28 2008 @@ -1,7 +1,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT IDD_CHARMAP DIALOGEX 6, 6, 293, 205 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ðßíáêáò ÷áñáêôÞñùí" FONT 8, "MS Shell Dlg" BEGIN @@ -18,7 +18,7 @@ END IDD_ABOUTBOX DIALOGEX 22, 16, 210, 182 -STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ðëçñïöïñßåò" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN Modified: trunk/reactos/base/applications/charmap/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/en-US.rc (original) +++ trunk/reactos/base/applications/charmap/lang/en-US.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "About Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/charmap/lang/es-ES.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa de Caracteres" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Fuente :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Acerca de Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/charmap/lang/fr-FR.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Table des Caractères" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Police :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "À propos de la Table des Caractères" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Table des Caractères v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/charmap/lang/id-ID.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Peta Karakter" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Tentang Peta Karakter" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nHak Cipta (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/charmap/lang/it-IT.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Font :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Informazioni su Character Map" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/lt-LT.rc (original) +++ trunk/reactos/base/applications/charmap/lang/lt-LT.rc Fri Jan 18 20:28:28 2008 @@ -12,7 +12,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Simboliø lentelë" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Ðriftas:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -29,7 +29,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Apie simboliø lentelæ" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Uþverti", IDOK, 83, 161, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/charmap/lang/pl-PL.rc Fri Jan 18 20:28:28 2008 @@ -8,7 +8,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Tablica znaków" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Czci&onka:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -25,7 +25,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Informacje o tablicy znaków" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Tablica znaków v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/pt-BR.rc (original) +++ trunk/reactos/base/applications/charmap/lang/pt-BR.rc Fri Jan 18 20:28:28 2008 @@ -3,7 +3,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa de caracteres" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Fonte :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -20,7 +20,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Sobre o Mapa de caracteres" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Mapa de caracteres v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Fechar", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/charmap/lang/ru-RU.rc Fri Jan 18 20:28:28 2008 @@ -5,7 +5,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Òàáëèöà ñèìâîëîâ" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Øðèôò:", IDC_STATIC, 6, 7, 27, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -22,7 +22,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Î Òàáëèöå ñèìâîëîâ" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Òàáëèöà ñèìâîëîâ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Çàêðûòü", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/charmap/lang/sk-SK.rc Fri Jan 18 20:28:28 2008 @@ -11,7 +11,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Mapa znakov" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Pís&mo:", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -28,7 +28,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Èo je Mapa znakov" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Mapa znakov v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "&Zavrie", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/charmap/lang/uk-UA.rc Fri Jan 18 20:28:28 2008 @@ -11,7 +11,7 @@ IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 CAPTION "Òàáëèöÿ ñèìâîë³â" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX BEGIN LTEXT "Øðèôò :", IDC_STATIC, 6, 7, 24, 9 COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS @@ -28,7 +28,7 @@ IDD_ABOUTBOX DIALOGEX 22,16,210,182 CAPTION "Ïðî Òàáëèöþ ñèìâîë³â" FONT 8,"MS Shell Dlg",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Òàáëèöÿ ñèìâîë³â v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Çàêðèòè", IDOK, 75, 162, 44, 15 Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Fri Jan 18 20:28:28 2008 @@ -13,7 +13,7 @@ /* Dialogs */ IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Íàñòðîéêè" FONT 8, "MS Shell Dlg" EXSTYLE DS_SHELLFONT

1 0

[cfinck] 31872: Hopefully the last fix to get this to compile under Windows and Unix hosts...
by cfinck＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cfinck Date: Fri Jan 18 20:14:31 2008 New Revision: 31872 URL: http://svn.reactos.org/svn/reactos?rev=31872&view=rev Log: Hopefully the last fix to get this to compile under Windows and Unix hosts... Modified: trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Fri Jan 18 20:14:31 2008 @@ -106,19 +106,18 @@ #include <stdarg.h> #include "guiddef.h" #include "wine/rpcfc.h" -@@ -31,8 +38,10 @@ - typedef GUID UUID; - #endif +@@ -34,6 +41,11 @@ + #define TRUE 1 + #define FALSE 0 --#define TRUE 1 --#define FALSE 0 +// All hosts, which don't define O_BINARY, don't need it :-) +#ifndef O_BINARY +#define O_BINARY 0 +#endif - ++ typedef struct _attr_t attr_t; typedef struct _expr_t expr_t; + typedef struct _type_t type_t; Index: write_msft.c =================================================================== --- write_msft.c (revision 31863) Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Fri Jan 18 20:14:31 2008 @@ -37,6 +37,9 @@ #define UUID_DEFINED typedef GUID UUID; #endif + +#define TRUE 1 +#define FALSE 0 // All hosts, which don't define O_BINARY, don't need it :-) #ifndef O_BINARY

1 0

[cfinck] 31871: Define O_BINARY to 0 if it is not defined (all hosts, which don't define it, don't need it). Update the .diff file as well.
by cfinck＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cfinck Date: Fri Jan 18 20:07:20 2008 New Revision: 31871 URL: http://svn.reactos.org/svn/reactos?rev=31871&view=rev Log: Define O_BINARY to 0 if it is not defined (all hosts, which don't define it, don't need it). Update the .diff file as well. Modified: trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Fri Jan 18 20:07:20 2008 @@ -106,6 +106,19 @@ #include <stdarg.h> #include "guiddef.h" #include "wine/rpcfc.h" +@@ -31,8 +38,10 @@ + typedef GUID UUID; + #endif + +-#define TRUE 1 +-#define FALSE 0 ++// All hosts, which don't define O_BINARY, don't need it :-) ++#ifndef O_BINARY ++#define O_BINARY 0 ++#endif + + typedef struct _attr_t attr_t; + typedef struct _expr_t expr_t; Index: write_msft.c =================================================================== --- write_msft.c (revision 31863) @@ -123,3 +136,12 @@ #include "widltypes.h" #include "typelib.h" +@@ -2415,7 +2413,7 @@ + + retval = TYPE_E_IOERROR; + +- fd = creat(typelib->typelib->filename, 0666); ++ fd = open(typelib->typelib->filename, O_CREAT | O_RDWR | O_BINARY, 0666); + if (fd == -1) return retval; + + filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir); Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Fri Jan 18 20:07:20 2008 @@ -38,8 +38,10 @@ typedef GUID UUID; #endif -#define TRUE 1 -#define FALSE 0 +// All hosts, which don't define O_BINARY, don't need it :-) +#ifndef O_BINARY +#define O_BINARY 0 +#endif typedef struct _attr_t attr_t; typedef struct _expr_t expr_t;

1 0

[hpoussin] 31870: Fix separators for .rbuild files in the generated makefile Add a 'don't care' value for types and host.
by hpoussin＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: hpoussin Date: Fri Jan 18 19:55:56 2008 New Revision: 31870 URL: http://svn.reactos.org/svn/reactos?rev=31870&view=rev Log: Fix separators for .rbuild files in the generated makefile Add a 'don't care' value for types and host. Modified: trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Fri Jan 18 19:55:56 2008 @@ -71,6 +71,8 @@ case EmbeddedTypeLib: case ElfExecutable: return false; + case TypeDontCare: + break; } throw InvalidOperationException ( __FILE__, __LINE__ ); Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Fri Jan 18 19:55:56 2008 @@ -254,7 +254,7 @@ __LINE__, "Module created with non-<module> node" ); - xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () ); + xmlbuildFile = FixSeparator ( Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename () ) ); const XMLAttribute* att = moduleNode.GetAttribute ( "name", true ); assert(att); @@ -963,6 +963,8 @@ case Alias: case IdlHeader: return IntermediateDirectory; + case TypeDontCare: + break; } throw InvalidOperationException ( __FILE__, __LINE__, @@ -1018,6 +1020,8 @@ return ""; case EmbeddedTypeLib: return ".tlb"; + case TypeDontCare: + break; } throw InvalidOperationException ( __FILE__, __LINE__ ); @@ -1070,6 +1074,8 @@ case ElfExecutable: case EmbeddedTypeLib: return ""; + case TypeDontCare: + break; } throw InvalidOperationException ( __FILE__, __LINE__ ); @@ -1115,6 +1121,8 @@ case IdlHeader: case EmbeddedTypeLib: return ""; + case TypeDontCare: + break; } throw InvalidOperationException ( __FILE__, __LINE__ ); @@ -1161,6 +1169,8 @@ case EmbeddedTypeLib: case ElfExecutable: return false; + case TypeDontCare: + break; } throw InvalidOperationException ( __FILE__, __LINE__ ); Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Fri Jan 18 19:55:56 2008 @@ -300,13 +300,15 @@ EmbeddedTypeLib = 26, ElfExecutable = 27, RpcProxy, + TypeDontCare, }; enum HostType { HostFalse, HostDefault, - HostTrue + HostTrue, + HostDontCare, }; class FileLocation

1 0

[cfinck] 31869: Fix the fix
by cfinck＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cfinck Date: Fri Jan 18 19:26:31 2008 New Revision: 31869 URL: http://svn.reactos.org/svn/reactos?rev=31869&view=rev Log: Fix the fix Modified: trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c (original) +++ trunk/reactos/tools/widl/write_msft.c Fri Jan 18 19:26:31 2008 @@ -2413,7 +2413,7 @@ retval = TYPE_E_IOERROR; - fd = open(typelib->typelib->filename, _O_CREAT | _O_RDWR | _O_BINARY, 0666); + fd = open(typelib->typelib->filename, O_CREAT | O_RDWR | O_BINARY, 0666); if (fd == -1) return retval; filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir);

1 0

[dreimer] 31867: Bug 2975: slovak translations for logoff and cacls (kario<AT>szm<DOT>sk) Bug 2976: Lithuanian translation by Vytis Girdzijauskas (cman<AT>cman<DOT>us) Bug 2979: Brazilian Portuguese Translation (wagner<DOT>snake<AT>gmail<DOT>com) Bug 2980: Bulgarian language update (sstpr<AT>narod<DOT>ru)
by dreimer＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: dreimer Date: Fri Jan 18 18:55:02 2008 New Revision: 31867 URL: http://svn.reactos.org/svn/reactos?rev=31867&view=rev Log: Bug 2975: slovak translations for logoff and cacls (kario<AT>szm<DOT>sk) Bug 2976: Lithuanian translation by Vytis Girdzijauskas (cman<AT>cman<DOT>us) Bug 2979: Brazilian Portuguese Translation (wagner<DOT>snake<AT>gmail<DOT>com) Bug 2980: Bulgarian language update (sstpr<AT>narod<DOT>ru) Added: trunk/reactos/base/applications/cacls/lang/pt-BR.rc (with props) trunk/reactos/base/applications/calc/lang/pt-BR.rc (with props) trunk/reactos/base/applications/charmap/lang/pt-BR.rc (with props) trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc (with props) trunk/reactos/base/applications/winhelp/lang/lt-LT.rc (with props) trunk/reactos/base/setup/usetup/lang/lt-LT.h (with props) Modified: trunk/reactos/base/applications/cacls/lang/sk-SK.rc trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/lang/pt-PT.rc trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/base/applications/charmap/rsrc.rc trunk/reactos/base/applications/cmdutils/find/rsrc.rc trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/base/applications/winhelp/rsrc.rc trunk/reactos/base/setup/usetup/mui.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/userenv/lang/bg-BG.rc Added: trunk/reactos/base/applications/cacls/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/cacls/lang/pt-BR.rc Fri Jan 18 18:55:02 2008 @@ -1,0 +1,76 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Exibe ou modifica as listas de controle de acesso (ACLs) de arquivos\n\n\ +CACLS nome-arquivo [/T] [/E] [/C] [/G usuário:perm] [/R usuário [...]]\n\ + [/P usuário:perm [...]] [/D usuário [...]]\n\ + nome-arquivo Exibe ACLs.\n\ + /T Altera ACLs de arquivos especificados\n\ + na pasta atual e em todas as subpastas.\n\ + /E Edita ACL em vez de substituí-la.\n\ + /C Continua ao encontrar erros de acesso negado.\n\ + /G usuário:perm Concede os direitos de acesso ao usuário especificado.\n\ + Perm pode ser: R Ler\n\ + W Gravar\n\ + C Alterar (gravar)\n\ + F Controle total\n\ + /R usuário Revoga os direitos de acesso do usuário especificado\n\ + (válido somente com /E).\n\ + /P usuário:perm Substitui os direitos de acesso do usuário especificado.\n\ + Perm pode ser: N Nenhum\n\ + R Ler\n\ + W Gravar\n\ + C Alterar (gravar)\n\ + F Controle total\n\ + /D usuário Nega o acesso ao usuário especificado.\n\ +Caracteres curinga podem ser usados para especificar mais de um arquivo\n\ +em um comando.\n\ +Você pode especificar mais de um usuário em um comando.\n\n\ +Abreviaçäes:\n\ + CI - Herança de recipiente.\n\ + O ACE será herdado pelas pastas.\n\ + OI - Herança de objeto.\n\ + O ACE será herdado pelos arquivos.\n\ + IO - Somente herança.\n\ + O ACE não se aplica ao arquivo/pasta atual.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(special access:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +END Propchange: trunk/reactos/base/applications/cacls/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cacls/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/cacls/lang/sk-SK.rc Fri Jan 18 18:55:02 2008 @@ -1,45 +1,44 @@ -//Slovak language file by M rio Kam r aka Kario (kario(a)szm.sk) 16-01-2008 -//kodovanie pisma Latin II (CP852) +//Slovak language file by Mário Kaèmár aka Kario (kario(a)szm.sk) 16-01-2008 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -IDS_HELP, "Zobraz¡ alebo zmen¡ zoznamy pr¡stupovìch pr v (Access Control List) s£borov.\n\n\ -CACLS n zov_s£boru [/T] [/E] [/C] [/G pou§¡vate:povolenia [...]]\n\ - [/R pou§¡vate [...]] [/P pou§¡vate:povolenia [...]]\n\ - [/D pou§¡vate [...]]\n\ - n zov_s£boru Zobraz¡ zoznamy ACL.\n\ - /T Zmen¡ zoznamy ACL çpecifikovanìch s£borov\n\ - v aktu lnom adres ri a vo vçetkìch podadres roch.\n\ - /E Uprav¡ zoznam ACL namiesto jeho nahradenia.\n\ - /C Pokraovanie pri chyb ch odmietnutia pr¡stupu.\n\ - /G pou§¡vate:povolenia\n\ - Udel¡ çpecifikovanmu pou§¡vateovi pr¡stupov pr va.\n\ - Povolenia m§u by: R ¡tanie\n\ - W z pis\n\ - C zmena (z pis)\n\ - F £plnì pr¡stup\n\ - /R pou§¡vate Odoberie çpecifikovanìm pou§¡vateom pr¡stupov pr va\n\ - (platn iba s prep¡naom /E).\n\ - /P pou§¡vate:povolenia\n\ - Nahrad¡ çpecifikovanìm pou§¡vateom pr¡stupov pr va.\n\ - Povolenia m§u by: N §iadne\n\ - R ¡tanie\n\ - W z pis\n\ - C zmena (z pis)\n\ - F £plnì pr¡stup\n\ - /D pou§¡vate Odoprie çpecifikovanmu pou§¡vateovi pr¡stup.\n\ -N hradn znaky sa daj£ pou§i na çpecifikovanie viacerìch s£borov v jednom\n\ -pr¡kaze. Rovnako m§ete çpecifikova aj viacerìch pou§¡vateov v pr¡kaze.\n\n\ +IDS_HELP, "Zobrazí alebo zmení zoznamy prístupových práv (Access Control List) súborov.\n\n\ +CACLS názov_súboru [/T] [/E] [/C] [/G pouívate¾:povolenia [...]]\n\ + [/R pouívate¾ [...]] [/P pouívate¾:povolenia [...]]\n\ + [/D pouívate¾ [...]]\n\ + názov_súboru Zobrazí zoznamy ACL.\n\ + /T Zmení zoznamy ACL pecifikovaných súborov\n\ + v aktuálnom adresári a vo vetkých podadresároch.\n\ + /E Upraví zoznam ACL namiesto jeho nahradenia.\n\ + /C Pokraèovanie pri chybách odmietnutia prístupu.\n\ + /G pouívate¾:povolenia\n\ + Udelí pecifikovanému pouívate¾ovi prístupové práva.\n\ + Povolenia môu by: R èítanie\n\ + W zápis\n\ + C zmena (zápis)\n\ + F úplný prístup\n\ + /R pouívate¾ Odoberie pecifikovaným pouívate¾om prístupové práva\n\ + (platné iba s prepínaèom /E).\n\ + /P pouívate¾:povolenia\n\ + Nahradí pecifikovaným pouívate¾om prístupové práva.\n\ + Povolenia môu by: N iadne\n\ + R èítanie\n\ + W zápis\n\ + C zmena (zápis)\n\ + F úplný prístup\n\ + /D pouívate¾ Odoprie pecifikovanému pouívate¾ovi prístup.\n\ +Náhradné znaky sa dajú poui na pecifikovanie viacerých súborov v jednom\n\ +príkaze. Rovnako môete pecifikova aj viacerých pouívate¾ov v príkaze.\n\n\ Skratky:\n\ - CI - Kontajnrov dedenie.\n\ - ACE bud zdeden po adres roch.\n\ - OI - Objektov dedenie.\n\ - ACE bud zdeden po s£boroch.\n\ - IO - Iba zdedi.\n\ - ACE sa neaplikuje na aktu lny s£bor alebo adres r.\n" + CI - Kontajnérové dedenie.\n\ + ACE budé zdedené po adresároch.\n\ + OI - Objektové dedenie.\n\ + ACE budé zdedené po súboroch.\n\ + IO - Iba zdedi.\n\ + ACE sa neaplikuje na aktuálny súbor alebo adresár.\n" IDS_ABBR_CI, "(CI)" IDS_ABBR_OI, "(OI)" @@ -51,7 +50,7 @@ IDS_ABBR_NONE, "N" IDS_ALLOW, "" IDS_DENY, "(DENY)" -IDS_SPECIAL_ACCESS, "(çpeci lny pr¡stup:)" +IDS_SPECIAL_ACCESS, "(peciálny prístup:)" IDS_GENERIC_READ, "GENERIC_READ" IDS_GENERIC_WRITE, "GENERIC_WRITE" IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Fri Jan 18 18:55:02 2008 @@ -12,6 +12,7 @@ #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/calc/lang/pt-BR.rc Fri Jan 18 18:55:02 2008 @@ -1,0 +1,172 @@ +/* + * WineCalc (pt-BR.rc) + * + * Copyright 2003 James Briggs + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME, "Calculadora" + + IDS_COPYRIGHT1, "Calculadora 5.0. Licenciada sob LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Graus" + IDS_BTN_RADIANS, "Radianos" + IDS_BTN_GRADS, "Grados" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" + IDS_ERR_INVALID_INPUT, "Valor inválido para a função." + IDS_ERR_DIVIDE_BY_ZERO, "Impossível dividir por 0." + IDS_ERR_UNDEFINED, "O resultado da função é indefinido." +END + +MAIN_MENU MENU DISCARDABLE +BEGIN + POPUP "&Editar" + BEGIN + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "Co&lar Ctrl+V", IDM_PASTE + END + POPUP "E&xibir" + BEGIN + MENUITEM "&Padrão", IDM_MODE_STANDARD + MENUITEM "&Científica", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "&Agrupamento de dígitos", IDM_DIGIT_GROUPING + END + POPUP "Aj&uda" + BEGIN + MENUITEM "&Tópico de ajuda", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "So&bre a Calculadora", IDM_ABOUT + END +END + +SCIMS_MENU MENU DISCARDABLE +BEGIN + POPUP "&Editar" + BEGIN + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "Co&lar Ctrl+V", IDM_PASTE + END + POPUP "E&xibir" + BEGIN + MENUITEM "&Padrão", IDM_MODE_STANDARD + MENUITEM "&Científica", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "&Hex\tF5", ID_CALC_NS_HEX + MENUITEM "&Decimal\tF6", ID_CALC_NS_DEC + MENUITEM "&Octal\tF7", ID_CALC_NS_OCT + MENUITEM "&Binário\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Gra&us\tF2", ID_CALC_MS_DEGREES + MENUITEM "&Radianos\tF3", ID_CALC_MS_RADIANS + MENUITEM "&Grados\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "&Agrupamento de dígitos", IDM_DIGIT_GROUPING + END + POPUP "Aj&uda" + BEGIN + MENUITEM "&Tópico de ajuda", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "So&bre a Calculadora", IDM_ABOUT + END +END + +SCIWS_MENU MENU DISCARDABLE +BEGIN + POPUP "&Editar" + BEGIN + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "Co&lar Ctrl+V", IDM_PASTE + END + POPUP "E&xibir" + BEGIN + MENUITEM "&Padrão", IDM_MODE_STANDARD + MENUITEM "&Científica", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "&Hex\tF5", ID_CALC_NS_HEX + MENUITEM "&Decimal\tF6", ID_CALC_NS_DEC + MENUITEM "&Octal\tF7", ID_CALC_NS_OCT + MENUITEM "&Binário\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dword\tF2", ID_CALC_WS_DWORD + MENUITEM "Word\tF3", ID_CALC_WS_WORD + MENUITEM "Byte\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "&Agrupamento de dígitos", IDM_DIGIT_GROUPING + END + POPUP "Aj&uda" + BEGIN + MENUITEM "&Tópico de ajuda", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "So&bre a Calculadora", IDM_ABOUT + END +END + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +WHATS_THIS_MENU MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "O que é isto?", IDM_WHATS_THIS + END +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Sobre a Calculadora" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Statistics Box" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Propchange: trunk/reactos/base/applications/calc/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-PT.rc (original) +++ trunk/reactos/base/applications/calc/lang/pt-PT.rc Fri Jan 18 18:55:02 2008 @@ -22,7 +22,7 @@ #include "resource.h" #include "winecalc.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Fri Jan 18 18:55:02 2008 @@ -41,6 +41,7 @@ #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" Added: trunk/reactos/base/applications/charmap/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/charmap/lang/pt-BR.rc Fri Jan 18 18:55:02 2008 @@ -1,0 +1,35 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 +CAPTION "Mapa de caracteres" +FONT 8,"MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX +BEGIN + LTEXT "Fonte :", IDC_STATIC, 6, 7, 24, 9 + COMBOBOX IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS + PUSHBUTTON "Aj&uda", IDC_CMHELP, 249, 5, 35, 13 + CONTROL "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156 + LTEXT "Caracteres a serem copiados :", IDC_STATIC, 6, 183, 66, 17 + EDITTEXT IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Selecionar", IDC_SELECT, 194, 186, 46, 13 + PUSHBUTTON "Copiar", IDC_COPY, 244, 186, 46, 13, WS_DISABLED + //AUTOCHECKBOX "Modo de exibição avançado", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP + //EDITTEXT IDC_DISPLAY, 8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Sobre o Mapa de caracteres" +FONT 8,"MS Shell Dlg",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Mapa de caracteres v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Fechar", IDOK, 75, 162, 44, 15 + ICON IDI_ICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "Este programa é software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos da GNU General Public License conforme publicada pela Free Software Foundation; quer a versão 2 da licença, ou (conforme você escolha) qualquer versão posterior.\r\n\r\nEste programa é distribuído com a esperança de que seja útil, mas SEM QUALQUER GARANTIA; mesmo sem a garantia implícita de MERCANTIBILIDADE OU ADEQUAÇÃO A UM DETERMINADO PROPÓSITO. Para mais detalhes, veja a GNU General Public License.\r\n\r\nVocê deve ter recebido uma cópia da GNU General Public License juntamente com este programa; caso contrário, escreva para a Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." + IDS_ABOUT "So&bre..." +END Propchange: trunk/reactos/base/applications/charmap/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/charmap/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/rsrc.rc (original) +++ trunk/reactos/base/applications/charmap/rsrc.rc Fri Jan 18 18:55:02 2008 @@ -17,6 +17,7 @@ #include "lang/it-IT.rc" #include "lang/lt-LT.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc Fri Jan 18 18:55:02 2008 @@ -1,0 +1,17 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Localiza uma seqüência de texto em um ou mais arquivos.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"seqüência\" [ arquivo... ]\n\ + /C Exibe apenas o número de linhas que contêm a seqüência.\n\ + /I Ignora maiúsculas/minúsculas ao localizar uma seqüência.\n\ + /N Exibe o número de cada linha, iniciando no 1.\n\ + /V Exibe todas as linhas que NÃO contêm a seqüência especificada." + +IDS_NO_SUCH_FILE, "FIND: %s: Arquivo não encontrado\n" + +IDS_CANNOT_OPEN, "FIND: %s: Não foi possível abrir o arquivo\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc Fri Jan 18 18:55:02 2008 @@ -11,5 +11,6 @@ #include "lang/it-IT.rc" #include "lang/lt-LT.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc Fri Jan 18 18:55:02 2008 @@ -6,14 +6,14 @@ STRINGTABLE BEGIN - IDS_SECONDS, "seconds" - IDS_NOBODY, "Nobody" - IDS_ABOUT, "by Joshua Thielen and ReactOS developers" + IDS_SECONDS, "sekundës" + IDS_NOBODY, "Niekas" + IDS_ABOUT, "Joshua Thielen ir ReactOS kûrëjai" END IDM_WINEMINE MENU DISCARDABLE BEGIN - POPUP "&Game" + POPUP "&Þaidimas" BEGIN MENUITEM "&Naujas þaidimas\tF2", IDM_NEW MENUITEM SEPARATOR @@ -28,7 +28,7 @@ MENUITEM SEPARATOR MENUITEM "&Baigti", IDM_EXIT END - POPUP "&Informacija" + POPUP "&Info" BEGIN MENUITEM "&Apie", IDM_ABOUT @@ -51,7 +51,7 @@ LTEXT "", IDC_NAME2, 132, 30, 55, 8 LTEXT "", IDC_NAME3, 132, 40, 55, 8 DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 - PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 + PUSHBUTTON "&Atstatyti", IDRESET, 18, 57, 67, 15 END IDD_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60 Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/rsrc.rc (original) +++ trunk/reactos/base/applications/taskmgr/rsrc.rc Fri Jan 18 18:55:02 2008 @@ -18,6 +18,7 @@ #include "lang/nb-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" Added: trunk/reactos/base/applications/winhelp/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/winhelp/lang/lt-LT.rc Fri Jan 18 18:55:02 2008 @@ -1,0 +1,79 @@ +/* + * Help Viewer + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * Translation by Vytis "CMan" Girdþijauskas (cman(a)cman.us) + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +/* Menu */ + +MAIN_MENU MENU +BEGIN + POPUP "&Byla" + BEGIN + MENUITEM "&Atverti", MNID_FILE_OPEN + MENUITEM SEPARATOR + MENUITEM "&Spausdinti", MNID_FILE_PRINT + MENUITEM "S&pausdintuvo nuostatos...", MNID_FILE_SETUP + MENUITEM SEPARATOR + MENUITEM "&Baigti", MNID_FILE_EXIT + END + POPUP "&Redaguoti" + BEGIN + MENUITEM "&Kopijuoti...", MNID_EDIT_COPYDLG + MENUITEM SEPARATOR + MENUITEM "&Pastaba...", MNID_EDIT_ANNOTATE + END + POPUP "&Þymë" + BEGIN + MENUITEM "&Kurti...", MNID_BKMK_DEFINE + END + POPUP "&Pagalba" + BEGIN + MENUITEM "&Turinys", MNID_HELP_HELPON + MENUITEM "Visada &virðuje", MNID_HELP_HELPTOP + MENUITEM SEPARATOR + MENUITEM "&Apie", MNID_HELP_ABOUT +#ifdef WINELIB + MENUITEM "Apie &Wine", MNID_HELP_WINE +#endif + END +END + +/* Strings */ + +STRINGTABLE DISCARDABLE +BEGIN +STID_WINE_HELP, "WINE Pagalba" +STID_WHERROR, "KLAIDA" +STID_WARNING, "DËMESIO" +STID_INFO, "Informacija" +STID_NOT_IMPLEMENTED, "Dar nesukurta" +STID_HLPFILE_ERROR_s, "Ávyko klaida skaitant pagalbos bylà '%s'." +STID_CONTENTS, "&Turinys" +STID_SEARCH, "&Paieðka" +STID_BACK, "&Atgal" +STID_HISTORY, "&Istorija" +STID_TOPICS, "&Temos" +STID_ALL_FILES, "Visos bylos (*.*)" +STID_HELP_FILES_HLP, "Pagalbos bylos (*.hlp)" +STID_FILE_NOT_FOUND_s "Nepavyko rasti '%s'. Ar norëtumëte pabandyti surasti ðia bylà patys?" +END Propchange: trunk/reactos/base/applications/winhelp/lang/lt-LT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/winhelp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… ============================================================================== --- trunk/reactos/base/applications/winhelp/rsrc.rc (original) +++ trunk/reactos/base/applications/winhelp/rsrc.rc Fri Jan 18 18:55:02 2008 @@ -36,6 +36,7 @@ #include "lang/hu-HU.rc" #include "lang/it-IT.rc" #include "lang/ko-KO.rc" +#include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" Added: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h (added) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h Fri Jan 18 18:55:02 2008 @@ -1,0 +1,1580 @@ +/* + * PROJECT: ReactOS Setup + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/setup/usetup/lang/lt-LT.h + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2008-01-06 + */ + +#ifndef LANG_LT_LT_H__ +#define LANG_LT_LT_H__ + +static MUI_ENTRY ltLTLanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Language Selection", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Please choose the language used for the installation process.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 This Language will be the default language for the final system.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Welcome to ReactOS Setup", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "This part of the setup copies the ReactOS Operating System to your", + TEXT_NORMAL + }, + { + 6, + 12, + "computer and prepares the second part of the setup.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press ENTER to install ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press R to repair ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Press L to view the ReactOS Licensing Terms and Conditions", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "For more information on ReactOS, please visit:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Testi R = Repair F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_NORMAL + }, + { + 6, + 12, + "The following limitations apply:", + TEXT_NORMAL + }, + { + 8, + 13, + "- Setup can not handle more than one primary partition per disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "- Setup can not delete a primary partition from a disk", + TEXT_NORMAL + }, + { + 8, + 15, + " as long as extended partitions exist on this disk.", + TEXT_NORMAL + }, + { + 8, + 16, + "- Setup can not delete the first extended partition from a disk", + TEXT_NORMAL + }, + { + 8, + 17, + " as long as other extended partitions exist on this disk.", + TEXT_NORMAL + }, + { + 8, + 18, + "- Setup supports FAT file systems only.", + TEXT_NORMAL + }, + { + 8, + 19, + "- File system checks are not implemented yet.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Press ENTER to install ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Press F3 to quit without installing ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTLicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 6, + "Licensing:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "The ReactOS System is licensed under the terms of the", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL with parts containing code from other compatible", + TEXT_NORMAL + }, + { + 8, + 10, + "licenses such as the X11 or BSD and GNU LGPL licenses.", + TEXT_NORMAL + }, + { + 8, + 11, + "All software that is part of the ReactOS system is", + TEXT_NORMAL + }, + { + 8, + 12, + "therefore released under the GNU GPL as well as maintaining", + TEXT_NORMAL + }, + { + 8, + 13, + "the original license.", + TEXT_NORMAL + }, + { + 8, + 15, + "This software comes with NO WARRANTY or restrictions on usage", + TEXT_NORMAL + }, + { + 8, + 16, + "save applicable local and international law. The licensing of", + TEXT_NORMAL + }, + { + 8, + 17, + "ReactOS only covers distribution to third parties.", + TEXT_NORMAL + }, + { + 8, + 18, + "If for some reason you did not receive a copy of the", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License with ReactOS please visit", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Warranty:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "This is free software; see the source for copying conditions.", + TEXT_NORMAL + }, + { + 8, + 25, + "There is NO warranty; not even for MERCHANTABILITY or", + TEXT_NORMAL + }, + { + 8, + 26, + "FITNESS FOR A PARTICULAR PURPOSE", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Return", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "The list below shows the current device settings.", + TEXT_NORMAL + }, + { + 8, + 11, + " Computer:", + TEXT_NORMAL + }, + { + 8, + 12, + " Display:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Keyboard:", + TEXT_NORMAL + }, + { + 8, + 14, + "Keyboard layout:", + TEXT_NORMAL + }, + { + 8, + 16, + " Accept:", + TEXT_NORMAL + }, + { + 25, + 16, "Accept these device settings", + TEXT_NORMAL + }, + { + 6, + 19, + "You can change the hardware settings by pressing the UP or DOWN keys", + TEXT_NORMAL + }, + { + 6, + 20, + "to select an entry. Then press the ENTER key to select alternative", + TEXT_NORMAL + }, + { + 6, + 21, + "settings.", + TEXT_NORMAL + }, + { + 6, + 23, + "When all settings are correct, select \"Accept these device settings\"", + TEXT_NORMAL + }, + { + 6, + 24, + "and press ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTRepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "ReactOS Setup is in an early development phase. It does not yet", + TEXT_NORMAL + }, + { + 6, + 9, + "support all the functions of a fully usable setup application.", + TEXT_NORMAL + }, + { + 6, + 12, + "The repair functions are not implemented yet.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press U for Updating OS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press R for the Recovery Console.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Press ESC to return to the main page.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Main page ENTER = Reboot", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY ltLTComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of computer to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired computer type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the computer type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi ESC = Atsaukti F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "The system is now making sure all data is stored on your disk", + TEXT_NORMAL + }, + { + 10, + 8, + "This may take a minute", + TEXT_NORMAL + }, + { + 10, + 9, + "When finished, your computer will reboot automatically", + TEXT_NORMAL + }, + { + 0, + 0, + " Flushing cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "ReactOS is not completely installed", + TEXT_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drives.", + TEXT_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of display to be installed.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Press the UP or DOWN key to select the desired display type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the display type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi ESC = Atsaukti F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTSuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 10, + 6, + "The basic components of ReactOS have been installed successfully.", + TEXT_NORMAL + }, + { + 10, + 8, + "Remove floppy disk from Drive A: and", + TEXT_NORMAL + }, + { + 10, + 9, + "all CD-ROMs from CD-Drive.", + TEXT_NORMAL + }, + { + 10, + 11, + "Press ENTER to reboot your computer.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Reboot computer", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup cannot install the bootloader on your computers", + TEXT_NORMAL + }, + { + 6, + 9, + "hardisk", + TEXT_NORMAL + }, + { + 6, + 13, + "Please insert a formatted floppy disk in drive A: and", + TEXT_NORMAL + }, + { + 6, + 14, + "press ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Testi F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY ltLTSelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "The list below shows existing partitions and unused disk", + TEXT_NORMAL + }, + { + 6, + 9, + "space for new partitions.", + TEXT_NORMAL + }, + { + 8, + 11, + "\x07 Press UP or DOWN to select a list entry.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press ENTER to install ReactOS onto the selected partition.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Press C to create a new partition.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Press D to delete an existing partition.", + TEXT_NORMAL + }, + { + 0, + 0, + " Please wait...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Format partition", + TEXT_NORMAL + }, + { + 6, + 10, + "Setup will now format the partition. Press ENTER to continue.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + TEXT_NORMAL + } +}; + +static MUI_ENTRY ltLTInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup installs ReactOS files onto the selected partition. Choose a", + TEXT_NORMAL + }, + { + 6, + 9, + "directory where you want ReactOS to be installed:", + TEXT_NORMAL + }, + { + 6, + 14, + "To change the suggested directory, press BACKSPACE to delete", + TEXT_NORMAL + }, + { + 6, + 15, + "characters and then type the directory where you want ReactOS to", + TEXT_NORMAL + }, + { + 6, + 16, + "be installed.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 11, + 12, + "Please wait while ReactOS Setup copies files to your ReactOS", + TEXT_NORMAL + }, + { + 30, + 13, + "installation folder.", + TEXT_NORMAL + }, + { + 20, + 14, + "This may take several minutes to complete.", + TEXT_NORMAL + }, + { + 0, + 0, + " \xB3 Please wait... ", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is installing the boot loader", + TEXT_NORMAL + }, + { + 8, + 12, + "Install bootloader on the harddisk (MBR).", + TEXT_NORMAL + }, + { + 8, + 13, + "Install bootloader on a floppy disk.", + TEXT_NORMAL + }, + { + 8, + 14, + "Skip install bootloader.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "You want to change the type of keyboard to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard type.", + TEXT_NORMAL + }, + { + 8, + 11, + " Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard type.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi ESC = Atsaukti F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "You want to change the keyboard layout to be installed.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Press the UP or DOWN key to select the desired keyboard", + TEXT_NORMAL + }, + { + 8, + 11, + " layout. Then press ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Press the ESC key to return to the previous page without changing", + TEXT_NORMAL + }, + { + 8, + 14, + " the keyboard layout.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Testi ESC = Atsaukti F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY ltLTPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup prepares your computer for copying the ReactOS files. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Building the file copy list...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY ltLTSelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 17, + "Select a file system from the list below.", + 0 + }, + { + 8, + 19, + "\x07 Press UP or DOWN to select a file system.", + 0 + }, + { + 8, + 21, + "\x07 Press ENTER to format the partition.", + 0 + }, + { + 8, + 23, + "\x07 Press ESC to select another partition.", + 0 + }, + { + 0, + 0, + " ENTER = Testi ESC = Atsaukti F3 = Baigti", + TEXT_STATUS + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "You have chosen to delete the partition", + TEXT_NORMAL + }, + { + 8, + 18, + "\x07 Press D to delete the partition.", + TEXT_NORMAL + }, + { + 11, + 19, + "WARNING: All data on this partition will be lost!", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Press ESC to cancel.", + TEXT_NORMAL + }, + { + 0, + 0, + " D = Delete Partition ESC = Atsaukti F3 = Baigti", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY ltLTRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Setup ", + TEXT_UNDERLINE + }, + { + 6, + 8, + "Setup is updating the system configuration. ", + TEXT_NORMAL + }, + { + 0, + 0, + " Creating registry hives...", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR ltLTErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS is not completely installed on your\n" + "computer. If you quit Setup now, you will need to\n" + "run Setup again to install ReactOS.\n" + "\n" + " \x07 Press ENTER to continue Setup.\n" + " \x07 Press F3 to quit Setup.", + "F3 = Quit ENTER = Continue" + }, + { + //ERROR_NO_HDD + "Setup could not find a harddisk.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Setup could not find its source drive.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Setup failed to load the file TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Setup found a corrupt TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Setup found an invalid signature in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_DRIVE_INFORMATION + "Setup could not retrieve system drive information.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_BOOT, + "Setup failed to install FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_COMPUTER, + "Setup failed to load the computer type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_DISPLAY, + "Setup failed to load the display settings list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KEYBOARD, + "Setup failed to load the keyboard type list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Setup failed to load the keyboard layout list.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WARN_PARTITION, + "Setup found that at least one harddisk contains an incompatible\n" + "partition table that can not be handled properly!\n" + "\n" + "Creating or deleting partitions can destroy the partition table.\n" + "\n" + " \x07 Press F3 to quit Setup." + " \x07 Press ENTER to continue.", + "F3= Quit ENTER = Continue" + }, + { + //ERROR_NEW_PARTITION, + "You can not create a new Partition inside\n" + "of an already existing Partition!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "You can not delete unpartitioned disk space!\n" + "\n" + " * Press any key to continue.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Setup failed to install the FAT bootcode on the system partition.", + "ENTER = Reboot computer" + }, + { + //ERROR_NO_FLOPPY, + "No disk in drive A:.", + "ENTER = Continue" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Setup failed to update keyboard layout settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Setup failed to update display registry settings.", + "ENTER = Reboot computer" + }, + { + //ERROR_IMPORT_HIVE, + "Setup failed to import a hive file.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_REGISTRY + "Setup failed to find the registry data files.", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_HIVE, + "Setup failed to create the registry hives.", + "ENTER = Reboot computer" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Setup failed to set the initialize the registry.", + "ENTER = Reboot computer" + }, + { + //ERROR_INVALID_CABINET_INF, + "Cabinet has no valid inf file.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_MISSING, + "Cabinet not found.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SCRIPT, + "Cabinet has no setup script.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_COPY_QUEUE, + "Setup failed to open the copy file queue.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_DIR, + "Setup could not create install directories.", + "ENTER = Reboot computer" + }, + { + //ERROR_TXTSETUP_SECTION, + "Setup failed to find the 'Directories' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CABINET_SECTION, + "Setup failed to find the 'Directories' section\n" + "in the cabinet.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Setup could not create the install directory.", + "ENTER = Reboot computer" + }, + { + //ERROR_FIND_SETUPDATA, + "Setup failed to find the 'SetupData' section\n" + "in TXTSETUP.SIF.\n", + "ENTER = Reboot computer" + }, + { + //ERROR_WRITE_PTABLE, + "Setup failed to write partition tables.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_ADDING_CODEPAGE, + "Setup failed to add codepage to registry.\n" + "ENTER = Reboot computer" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Setup could not set the system locale.\n" + "ENTER = Reboot computer" + }, + { + NULL, + NULL + } +}; + + +MUI_PAGE ltLTPages[] = +{ + { + LANGUAGE_PAGE, + ltLTLanguagePageEntries + }, + { + START_PAGE, + ltLTWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + ltLTIntroPageEntries + }, + { + LICENSE_PAGE, + ltLTLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + ltLTDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + ltLTRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + ltLTComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + ltLTDisplayPageEntries + }, + { + FLUSH_PAGE, + ltLTFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + ltLTSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + ltLTSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + ltLTFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + ltLTDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + ltLTInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + ltLTPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + ltLTFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + ltLTKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + ltLTBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + ltLTLayoutSettingsEntries + }, + { + QUIT_PAGE, + ltLTQuitPageEntries + }, + { + SUCCESS_PAGE, + ltLTSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + ltLTBootPageEntries + }, + { + REGISTRY_PAGE, + ltLTRegistryEntries + }, + { + -1, + NULL + } +}; + +#endif Propchange: trunk/reactos/base/setup/usetup/lang/lt-LT.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Fri Jan 18 18:55:02 2008 @@ -48,6 +48,7 @@ #include "lang/he-IL.h" #include "lang/hu-HU.h" #include "lang/ja-JP.h" +#include "lang/lt-LT.h" #include "lang/nl-NL.h" #include "lang/pt-PT.h" #include "lang/sk-SK.h" @@ -208,6 +209,16 @@ L"Korean", koKRPages, koKRErrorEntries + }, + { + L"00000427", + L"00000427", + L"1257", + L"775", + L"10029", + L"Lithuanian", + ltLTPages, + ltLTErrorEntries }, { L"00000414", Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc Fri Jan 18 18:55:02 2008 @@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ðàçðàáîò÷èöèòå íà ÐåàêòÎÑ áèõà æåëàëè äà èçðàçÿò ïðèçíàòåëíîñòòà ñè êúì ñëåäíèòå ïðîåêòè "\ - "ñ îòâîðåí êîä, (÷àñòè îò êîèòî) ñà èçïîëçâàíè ïðè ñúçäàâàíåòî íà ÐåàêòÎÑ:", + "ñ îòâîðåí êîä, (÷àñòè îò) êîèòî ñà èçïîëçâàíè ïðè ñúçäàâàíåòî íà ÐåàêòÎÑ:", IDC_STATIC,15,2,286,24 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL @@ -82,9 +82,9 @@ IDC_STATIC, 45, 57, 250, 25 LTEXT "Íàïèøåòå ïàðîëà çà Administrator, íå ïî- äúëãà îò 14 çíàêà.", IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Ïàðîëà çà Administrator:", IDC_STATIC, 45, 104, 85, 8 + LTEXT "&Ïàðîëà çà Administrator:", IDC_STATIC, 45, 104, 95, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "Ïî&òâúðäåòå ïàðîëàòà:", IDC_STATIC, 45, 123, 77, 8 + LTEXT "Ïî&òâúðäåòå ïàðîëàòà:", IDC_STATIC, 45, 123, 95, 8 EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END Modified: trunk/reactos/dll/win32/userenv/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/bg-BG.rc (original) +++ trunk/reactos/dll/win32/userenv/lang/bg-BG.rc Fri Jan 18 18:55:02 2008 @@ -16,33 +16,32 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -// \dll\win32\userenv\lang LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" - IDS_APPDATA "Äàííè íà ïðèëîæåíèÿòà" + IDS_PROFILEPATH "%SystemDrive%\\Äîêóìåíòè è íàñòðîéêè" + IDS_APPDATA "Ïðèëîæíè äàííè" IDS_DESKTOP "Ðàáîòíà ïëîù" IDS_FAVORITES "Ëþáèìêè" IDS_STARTMENU "Ïóñêîâ èçáîðíèê" IDS_PROGRAMS "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ" - IDS_ADMINTOOLS "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ\\Ñðåäñòâà çà óïðàâëåíèå" - IDS_STARTUP "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ\\Íà÷àëíî çàðåæäàíå" - IDS_MYDOCUMENTS "Êíèæà" - IDS_MYPICTURES "Ìîèòå êíèæà\\Ñíèìêèòå ìè" - IDS_MYMUSIC "Ìîèòå êíèæà\\Ìóçèêàòà ìè" - IDS_MYVIDEOS "Ìîèòå êíèæà\\Ôèëìèòå ìè" + IDS_ADMINTOOLS "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ\\Ñëóæåáíè" + IDS_STARTUP "Ïóñêîâ èçáîðíèê\\Ïðèëîæåíèÿ\\Ñàìîïóñêàùè" + IDS_MYDOCUMENTS "Äîêóìåíòèòå ìè" + IDS_MYPICTURES "Äîêóìåíòèòå ìè\\Èçîáðàæåíèÿòà ìè" + IDS_MYMUSIC "Äîêóìåíòèòå ìè\\Ìóçèêàòà ìè" + IDS_MYVIDEOS "Äîêóìåíòèòå ìè\\Âèäåîçàïèñèòå ìè" IDS_TEMPLATES "Øàáëîíè" IDS_RECENT "Ñêîðîøíè" IDS_SENDTO "Èçïðàùàíå â" IDS_PRINTHOOD "Ñúñåäñêè ïå÷àòà÷è" IDS_NETHOOD "Ñúñåäñêà ìðåæà" - IDS_LOCALSETTINGS "Local Settings" - IDS_LOCALAPPDATA "Local Settings\\Application Data" - IDS_TEMP "Local Settings\\Temp" - IDS_CACHE "Local Settings\\Temporary Internet Files" - IDS_HISTORY "Local Settings\\History" - IDS_COOKIES "Cookies" + IDS_LOCALSETTINGS "Ìåñòíè íàñòðîéêè" + IDS_LOCALAPPDATA "Ìåñòíè íàñòðîéêè\\Ïðèëîæíè äàííè" + IDS_TEMP "Ìåñòíè íàñòðîéêè\\Âðåìåííè" + IDS_CACHE "Ìåñòíè íàñòðîéêè\\Âðåìåííè ôàéëîâå çà èíòåðíåò" + IDS_HISTORY "Ìåñòíè íàñòðîéêè\\Ïîñåòåíè" + IDS_COOKIES "Êóðàáèéêè" IDS_PROGRAMFILES "%SystemDrive%\\Program Files" END

1 0

[cwittich] 31866: add wpp_ros.diff
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 17:42:20 2008 New Revision: 31866 URL: http://svn.reactos.org/svn/reactos?rev=31866&view=rev Log: add wpp_ros.diff Added: trunk/reactos/tools/wpp/wpp_ros.diff Added: trunk/reactos/tools/wpp/wpp_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp_ros.diff?rev… ============================================================================== --- trunk/reactos/tools/wpp/wpp_ros.diff (added) +++ trunk/reactos/tools/wpp/wpp_ros.diff Fri Jan 18 17:42:20 2008 @@ -1,0 +1,20 @@ +Index: preproc.c +=================================================================== +--- preproc.c (revision 28293) ++++ preproc.c (revision 28294) +@@ -328,6 +328,15 @@ + char *tok; + char *cpy = pp_xstrdup(path); + ++ /* check for absolute windows paths */ ++ if (strchr(cpy, ':') != NULL) ++ { ++ nincludepath++; ++ includepath = pp_xrealloc(includepath, nincludepath * sizeof(*includepath)); ++ includepath[nincludepath-1] = cpy; ++ return; ++ } ++ + tok = strtok(cpy, INCLUDESEPARATOR); + while(tok) + {

1 0

[cwittich] 31865: update wine headers included by widl to wine-0.9.53
by cwittich＠svn.reactos.org 18 Jan '08

18 Jan '08

Author: cwittich Date: Fri Jan 18 17:11:42 2008 New Revision: 31865 URL: http://svn.reactos.org/svn/reactos?rev=31865&view=rev Log: update wine headers included by widl to wine-0.9.53 Modified: trunk/reactos/include/reactos/wine/list.h trunk/reactos/include/reactos/wine/rpcfc.h Modified: trunk/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.… ============================================================================== --- trunk/reactos/include/reactos/wine/list.h (original) +++ trunk/reactos/include/reactos/wine/list.h Fri Jan 18 17:11:42 2008 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_SERVER_LIST_H @@ -54,16 +54,16 @@ * * And to iterate over it: * - * struct list *cursor; - * LIST_FOR_EACH( cursor, &global_gadgets ) + * struct gadget *gadget; + * LIST_FOR_EACH_ENTRY( gadget, &global_gadgets, struct gadget, entry ) * { - * struct gadget *gadget = LIST_ENTRY( cursor, struct gadget, entry ); + * ... * } * */ /* add an element after the specified one */ -__inline static void list_add_after( struct list *elem, struct list *to_add ) +static inline void list_add_after( struct list *elem, struct list *to_add ) { to_add->next = elem->next; to_add->prev = elem; @@ -72,7 +72,7 @@ } /* add an element before the specified one */ -__inline static void list_add_before( struct list *elem, struct list *to_add ) +static inline void list_add_before( struct list *elem, struct list *to_add ) { to_add->next = elem; to_add->prev = elem->prev; @@ -81,26 +81,26 @@ } /* add element at the head of the list */ -__inline static void list_add_head( struct list *list, struct list *elem ) +static inline void list_add_head( struct list *list, struct list *elem ) { list_add_after( list, elem ); } /* add element at the tail of the list */ -__inline static void list_add_tail( struct list *list, struct list *elem ) +static inline void list_add_tail( struct list *list, struct list *elem ) { list_add_before( list, elem ); } /* remove an element from its list */ -__inline static void list_remove( struct list *elem ) +static inline void list_remove( struct list *elem ) { elem->next->prev = elem->prev; elem->prev->next = elem->next; } /* get the next element */ -__inline static struct list *list_next( struct list *list, struct list *elem ) +static inline struct list *list_next( const struct list *list, const struct list *elem ) { struct list *ret = elem->next; if (elem->next == list) ret = NULL; @@ -108,7 +108,7 @@ } /* get the previous element */ -__inline static struct list *list_prev( struct list *list, struct list *elem ) +static inline struct list *list_prev( const struct list *list, const struct list *elem ) { struct list *ret = elem->prev; if (elem->prev == list) ret = NULL; @@ -116,36 +116,60 @@ } /* get the first element */ -__inline static struct list *list_head( struct list *list ) +static inline struct list *list_head( const struct list *list ) { return list_next( list, list ); } /* get the last element */ -__inline static struct list *list_tail( struct list *list ) +static inline struct list *list_tail( const struct list *list ) { return list_prev( list, list ); } /* check if a list is empty */ -__inline static int list_empty( struct list *list ) +static inline int list_empty( const struct list *list ) { return list->next == list; } /* initialize a list */ -__inline static void list_init( struct list *list ) +static inline void list_init( struct list *list ) { list->next = list->prev = list; } /* count the elements of a list */ -__inline static unsigned int list_count( const struct list *list ) +static inline unsigned int list_count( const struct list *list ) { unsigned count = 0; const struct list *ptr; for (ptr = list->next; ptr != list; ptr = ptr->next) count++; return count; +} + +/* move all elements from src to the tail of dst */ +static inline void list_move_tail( struct list *dst, struct list *src ) +{ + if (list_empty(src)) return; + + dst->prev->next = src->next; + src->next->prev = dst->prev; + dst->prev = src->prev; + src->prev->next = dst; + list_init(src); +} + +/* move all elements from src to the head of dst */ +static inline void list_move_head( struct list *dst, struct list *src ) +{ + if (list_empty(src)) return; + + dst->next->prev = src->prev; + src->prev->next = dst->next; + dst->next = src->next; + src->next->prev = dst; + list_init(src); } /* iterate through the list */ @@ -164,6 +188,7 @@ &(elem)->field != (list); \ (elem) = LIST_ENTRY((elem)->field.next, type, field)) +/* iterate through the list using a list entry, with safety against removal */ #define LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, list, type, field) \ for ((cursor) = LIST_ENTRY((list)->next, type, field), \ (cursor2) = LIST_ENTRY((cursor)->field.next, type, field); \ @@ -171,12 +196,30 @@ (cursor) = (cursor2), \ (cursor2) = LIST_ENTRY((cursor)->field.next, type, field)) +/* iterate through the list in reverse order */ +#define LIST_FOR_EACH_REV(cursor,list) \ + for ((cursor) = (list)->prev; (cursor) != (list); (cursor) = (cursor)->prev) + +/* iterate through the list in reverse order, with safety against removal */ +#define LIST_FOR_EACH_SAFE_REV(cursor, cursor2, list) \ + for ((cursor) = (list)->prev, (cursor2) = (cursor)->prev; \ + (cursor) != (list); \ + (cursor) = (cursor2), (cursor2) = (cursor)->prev) + /* iterate through the list in reverse order using a list entry */ #define LIST_FOR_EACH_ENTRY_REV(elem, list, type, field) \ for ((elem) = LIST_ENTRY((list)->prev, type, field); \ &(elem)->field != (list); \ (elem) = LIST_ENTRY((elem)->field.prev, type, field)) +/* iterate through the list in reverse order using a list entry, with safety against removal */ +#define LIST_FOR_EACH_ENTRY_SAFE_REV(cursor, cursor2, list, type, field) \ + for ((cursor) = LIST_ENTRY((list)->prev, type, field), \ + (cursor2) = LIST_ENTRY((cursor)->field.prev, type, field); \ + &(cursor)->field != (list); \ + (cursor) = (cursor2), \ + (cursor2) = LIST_ENTRY((cursor)->field.prev, type, field)) + /* macros for statically initialized lists */ #define LIST_INIT(list) { &(list), &(list) } Modified: trunk/reactos/include/reactos/wine/rpcfc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rpcfc… ============================================================================== --- trunk/reactos/include/reactos/wine/rpcfc.h (original) +++ trunk/reactos/include/reactos/wine/rpcfc.h Fri Jan 18 17:11:42 2008 @@ -60,8 +60,10 @@ #define RPC_FC_BOGUS_ARRAY 0x21 /* complex array */ #define RPC_FC_C_CSTRING 0x22 +#define RPC_FC_C_SSTRING 0x24 #define RPC_FC_C_WSTRING 0x25 #define RPC_FC_CSTRING 0x26 +#define RPC_FC_SSTRING 0x28 #define RPC_FC_WSTRING 0x29 #define RPC_FC_ENCAPSULATED_UNION 0x2a @@ -91,10 +93,10 @@ #define RPC_FC_STRUCTPAD1 0x3d #define RPC_FC_STRUCTPAD2 0x3e #define RPC_FC_STRUCTPAD3 0x3f -#define RPC_FC_STRUCTPAD4 0x40 -#define RPC_FC_STRUCTPAD5 0x41 -#define RPC_FC_STRUCTPAD6 0x42 -#define RPC_FC_STRUCTPAD7 0x43 +#define RPC_FC_STRUCTPAD4 0x40 +#define RPC_FC_STRUCTPAD5 0x41 +#define RPC_FC_STRUCTPAD6 0x42 +#define RPC_FC_STRUCTPAD7 0x43 #define RPC_FC_STRING_SIZED 0x44 @@ -166,13 +168,6 @@ #define RPC_FC_PROC_OIF_OBJ_V2 0x20 #define RPC_FC_PROC_OIF_NEWINIT 0x40 -#define RPC_FC_PROC_OI2F_SRVMUSTSIZE 0x01 -#define RPC_FC_PROC_OI2F_CLTMUSTSIZE 0x02 -#define RPC_FC_PROC_OI2F_HASRETURN 0x04 -#define RPC_FC_PROC_OI2F_HASPIPES 0x08 -#define RPC_FC_PROC_OI2F_HASASYNCUUID 0x20 -#define RPC_FC_PROC_OI2F_HASEXTS 0x40 -#define RPC_FC_PROC_OI2F_HASASYNCHND 0x80 #define RPC_FC_PROC_PF_MUSTSIZE 0x0001 #define RPC_FC_PROC_PF_MUSTFREE 0x0002 #define RPC_FC_PROC_PF_PIPE 0x0004 @@ -185,11 +180,6 @@ #define RPC_FC_PROC_PF_DONTFREEINST 0x0200 #define RPC_FC_PROC_PF_SAVEASYNC 0x0400 #define RPC_FC_PROC_PF_SRVALLOCSIZE 0xe000 /* in 8 byte units */ -#define RPC_FC_PROC_EXT_NEWCORRDESC 0x01 -#define RPC_FC_PROC_EXT_CLIENTCORRCHECK 0x02 -#define RPC_FC_PROC_EXT_SERVERCORRCHECK 0x04 -#define RPC_FC_PROC_EXT_HASNOTIFY 0x08 -#define RPC_FC_PROC_EXT_HASNOTIFY2 0x10 /* correlation types */ #define RPC_FC_NORMAL_CONFORMANCE 0x00

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs