Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

by gvg＠svn.reactos.com

Sync to Wine-0_9: Pierre d'Herbemont <pidherbemont(a)opendarwin.org> - Allow compilation on non-i386. Huw Davies <huw(a)codeweavers.com> - When a dispinterface isn't dual, we should return TYPE_E_ELEMENTNOTFOUND when trying to get index -1. - Proxies and stubs for GetTypeInfoCont, GetLibAttr and ReleaseLibAttr. - Implement GetContainingTypelib_{Proxy,Stub}. Modified: trunk/reactos/lib/oleaut32/tmarshal.c Deleted: trunk/reactos/lib/oleaut32/tmarshal.h Modified: trunk/reactos/lib/oleaut32/typelib.c Modified: trunk/reactos/lib/oleaut32/usrmarshal.c Modified: trunk/reactos/w32api/include/oaidl.h _____ Modified: trunk/reactos/lib/oleaut32/tmarshal.c --- trunk/reactos/lib/oleaut32/tmarshal.c 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/lib/oleaut32/tmarshal.c 2005-11-02 19:28:16 UTC (rev 18954) @@ -344,7 +344,9 @@ #include "poppack.h" #else /* __i386__ */ -# error You need to implement stubless proxies for your architecture +# warning You need to implement stubless proxies for your architecture +typedef struct _TMAsmProxy { +} TMAsmProxy; #endif typedef struct _TMProxyImpl { @@ -1939,6 +1941,7 @@ for (j=0;j<fdesc->cParams;j++) nrofargs += _argsize(fdesc->lprgelemdescParam[j].tdesc.vt); +#ifdef __i386__ if (fdesc->callconv != CC_STDCALL) { ERR("calling convention is not stdcall????\n"); return E_FAIL; @@ -1963,6 +1966,10 @@ xasm->bytestopop= (nrofargs+2)*4; /* pop args, This, iMethod */ proxy->lpvtbl[i] = xasm; break; +#else + FIXME("not implemented on non i386\n"); + return E_FAIL; +#endif } } } _____ Deleted: trunk/reactos/lib/oleaut32/tmarshal.h --- trunk/reactos/lib/oleaut32/tmarshal.h 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/lib/oleaut32/tmarshal.h 2005-11-02 19:28:16 UTC (rev 18954) @@ -1,24 +0,0 @@ -/* - * Copyright 2002 Marcus Meissner - * - * 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 - */ - -#ifndef TMARSHAL_H -#define TMARSHAL_H -HRESULT WINAPI -TypeLibFac_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv); - -#endif _____ Modified: trunk/reactos/lib/oleaut32/typelib.c --- trunk/reactos/lib/oleaut32/typelib.c 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/lib/oleaut32/typelib.c 2005-11-02 19:28:16 UTC (rev 18954) @@ -4338,7 +4338,8 @@ HREFTYPE *pRefType) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int(i); + int i; + HRESULT hr = S_OK; TLBImplType *pImpl = This->impltypelist; TRACE("(%p) index %d\n", This, index); @@ -4358,8 +4359,7 @@ } else { - if (!pImpl) return TYPE_E_ELEMENTNOTFOUND; - *pRefType = pImpl->hRef; + hr = TYPE_E_ELEMENTNOTFOUND; } } else @@ -4370,15 +4370,21 @@ pImpl = pImpl->next; } - if (!pImpl) return TYPE_E_ELEMENTNOTFOUND; + if (pImpl) + *pRefType = pImpl->hRef; + else + hr = TYPE_E_ELEMENTNOTFOUND; + } - *pRefType = pImpl->hRef; - - TRACE("-- 0x%08lx\n", pImpl->hRef ); + if(TRACE_ON(ole)) + { + if(SUCCEEDED(hr)) + TRACE("SUCCESS -- hRef = 0x%08lx\n", *pRefType ); + else + TRACE("FAILURE -- hresult = 0x%08lx\n", hr); } - return S_OK; - + return hr; } /* ITypeInfo::GetImplTypeFlags _____ Modified: trunk/reactos/lib/oleaut32/usrmarshal.c --- trunk/reactos/lib/oleaut32/usrmarshal.c 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/lib/oleaut32/usrmarshal.c 2005-11-02 19:28:16 UTC (rev 18954) @@ -967,8 +967,24 @@ ITypeLib** ppTLib, UINT* pIndex) { - FIXME("not implemented\n"); - return E_FAIL; + ITypeLib *pTL; + UINT index; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", This, ppTLib, pIndex ); + + hr = ITypeInfo_RemoteGetContainingTypeLib_Proxy(This, &pTL, &index); + if(SUCCEEDED(hr)) + { + if(pIndex) + *pIndex = index; + + if(ppTLib) + *ppTLib = pTL; + else + ITypeLib_Release(pTL); + } + return hr; } HRESULT __RPC_STUB ITypeInfo_GetContainingTypeLib_Stub( @@ -976,8 +992,8 @@ ITypeLib** ppTLib, UINT* pIndex) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %p, %p)\n", This, ppTLib, pIndex ); + return ITypeInfo_GetContainingTypeLib(This, ppTLib, pIndex); } void CALLBACK ITypeInfo_ReleaseTypeAttr_Proxy( @@ -1055,24 +1071,30 @@ UINT CALLBACK ITypeLib_GetTypeInfoCount_Proxy( ITypeLib* This) { - FIXME("not implemented\n"); - return E_FAIL; + UINT count = 0; + TRACE("(%p)\n", This); + + ITypeLib_RemoteGetTypeInfoCount_Proxy(This, &count); + + return count; } HRESULT __RPC_STUB ITypeLib_GetTypeInfoCount_Stub( ITypeLib* This, UINT* pcTInfo) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %p)\n", This, pcTInfo); + *pcTInfo = ITypeLib_GetTypeInfoCount(This); + return S_OK; } HRESULT CALLBACK ITypeLib_GetLibAttr_Proxy( ITypeLib* This, TLIBATTR** ppTLibAttr) { - FIXME("not implemented\n"); - return E_FAIL; + CLEANLOCALSTORAGE stg; + TRACE("(%p, %p)\n", This, ppTLibAttr); + return ITypeLib_RemoteGetLibAttr_Proxy(This, ppTLibAttr, &stg); } HRESULT __RPC_STUB ITypeLib_GetLibAttr_Stub( @@ -1080,8 +1102,8 @@ LPTLIBATTR* ppTLibAttr, CLEANLOCALSTORAGE* pDummy) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("(%p, %p)\n", This, ppTLibAttr); + return ITypeLib_GetLibAttr(This, ppTLibAttr); } HRESULT CALLBACK ITypeLib_GetDocumentation_Proxy( @@ -1159,14 +1181,15 @@ ITypeLib* This, TLIBATTR* pTLibAttr) { - FIXME("not implemented\n"); + TRACE("(%p, %p)\n", This, pTLibAttr); + CoTaskMemFree(pTLibAttr); } HRESULT __RPC_STUB ITypeLib_ReleaseTLibAttr_Stub( ITypeLib* This) { - FIXME("not implemented\n"); - return E_FAIL; + TRACE("nothing to do\n"); + return S_OK; } _____ Modified: trunk/reactos/w32api/include/oaidl.h --- trunk/reactos/w32api/include/oaidl.h 2005-11-02 18:36:04 UTC (rev 18953) +++ trunk/reactos/w32api/include/oaidl.h 2005-11-02 19:28:16 UTC (rev 18954) @@ -91,6 +91,11 @@ extern const IID IID_IRecordInfo; extern const IID IID_ITypeMarshal; +#ifndef __ITypeLib_FWD_DEFINED__ +#define __ITypeLib_FWD_DEFINED__ +typedef struct ITypeLib ITypeLib; +#endif + typedef enum tagSYSKIND { SYS_WIN16,SYS_WIN32,SYS_MAC } SYSKIND; @@ -586,6 +591,301 @@ #define ITypeInfo_ReleaseVarDesc(p,a) (p)->lpVtbl->ReleaseVarDesc(p,a) #endif +HRESULT CALLBACK ITypeInfo_RemoteGetTypeAttr_Proxy( + ITypeInfo* This, + LPTYPEATTR* ppTypeAttr, + CLEANLOCALSTORAGE* pDummy); +void __RPC_STUB ITypeInfo_RemoteGetTypeAttr_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetTypeAttr_Proxy( + ITypeInfo* This, + TYPEATTR** ppTypeAttr); +HRESULT __RPC_STUB ITypeInfo_GetTypeAttr_Stub( + ITypeInfo* This, + LPTYPEATTR* ppTypeAttr, + CLEANLOCALSTORAGE* pDummy); +HRESULT CALLBACK ITypeInfo_GetTypeComp_Proxy( + ITypeInfo* This, + ITypeComp** ppTComp); +void __RPC_STUB ITypeInfo_GetTypeComp_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_RemoteGetFuncDesc_Proxy( + ITypeInfo* This, + UINT index, + LPFUNCDESC* ppFuncDesc, + CLEANLOCALSTORAGE* pDummy); +void __RPC_STUB ITypeInfo_RemoteGetFuncDesc_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetFuncDesc_Proxy( + ITypeInfo* This, + UINT index, + FUNCDESC** ppFuncDesc); +HRESULT __RPC_STUB ITypeInfo_GetFuncDesc_Stub( + ITypeInfo* This, + UINT index, + LPFUNCDESC* ppFuncDesc, + CLEANLOCALSTORAGE* pDummy); +HRESULT CALLBACK ITypeInfo_RemoteGetVarDesc_Proxy( + ITypeInfo* This, + UINT index, + LPVARDESC* ppVarDesc, + CLEANLOCALSTORAGE* pDummy); +void __RPC_STUB ITypeInfo_RemoteGetVarDesc_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetVarDesc_Proxy( + ITypeInfo* This, + UINT index, + VARDESC** ppVarDesc); +HRESULT __RPC_STUB ITypeInfo_GetVarDesc_Stub( + ITypeInfo* This, + UINT index, + LPVARDESC* ppVarDesc, + CLEANLOCALSTORAGE* pDummy); +HRESULT CALLBACK ITypeInfo_RemoteGetNames_Proxy( + ITypeInfo* This, + MEMBERID memid, + BSTR* rgBstrNames, + UINT cMaxNames, + UINT* pcNames); +void __RPC_STUB ITypeInfo_RemoteGetNames_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetNames_Proxy( + ITypeInfo* This, + MEMBERID memid, + BSTR* rgBstrNames, + UINT cMaxNames, + UINT* pcNames); +HRESULT __RPC_STUB ITypeInfo_GetNames_Stub( + ITypeInfo* This, + MEMBERID memid, + BSTR* rgBstrNames, + UINT cMaxNames, + UINT* pcNames); +HRESULT CALLBACK ITypeInfo_GetRefTypeOfImplType_Proxy( + ITypeInfo* This, + UINT index, + HREFTYPE* pRefType); +void __RPC_STUB ITypeInfo_GetRefTypeOfImplType_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetImplTypeFlags_Proxy( + ITypeInfo* This, + UINT index, + INT* pImplTypeFlags); +void __RPC_STUB ITypeInfo_GetImplTypeFlags_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_LocalGetIDsOfNames_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalGetIDsOfNames_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetIDsOfNames_Proxy( + ITypeInfo* This, + LPOLESTR* rgszNames, + UINT cNames, + MEMBERID* pMemId); +HRESULT __RPC_STUB ITypeInfo_GetIDsOfNames_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_LocalInvoke_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalInvoke_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_Invoke_Proxy( + ITypeInfo* This, + PVOID pvInstance, + MEMBERID memid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr); +HRESULT __RPC_STUB ITypeInfo_Invoke_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_RemoteGetDocumentation_Proxy( + ITypeInfo* This, + MEMBERID memid, + DWORD refPtrFlags, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +void __RPC_STUB ITypeInfo_RemoteGetDocumentation_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetDocumentation_Proxy( + ITypeInfo* This, + MEMBERID memid, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +HRESULT __RPC_STUB ITypeInfo_GetDocumentation_Stub( + ITypeInfo* This, + MEMBERID memid, + DWORD refPtrFlags, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +HRESULT CALLBACK ITypeInfo_RemoteGetDllEntry_Proxy( + ITypeInfo* This, + MEMBERID memid, + INVOKEKIND invKind, + DWORD refPtrFlags, + BSTR* pBstrDllName, + BSTR* pBstrName, + WORD* pwOrdinal); +void __RPC_STUB ITypeInfo_RemoteGetDllEntry_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetDllEntry_Proxy( + ITypeInfo* This, + MEMBERID memid, + INVOKEKIND invKind, + BSTR* pBstrDllName, + BSTR* pBstrName, + WORD* pwOrdinal); +HRESULT __RPC_STUB ITypeInfo_GetDllEntry_Stub( + ITypeInfo* This, + MEMBERID memid, + INVOKEKIND invKind, + DWORD refPtrFlags, + BSTR* pBstrDllName, + BSTR* pBstrName, + WORD* pwOrdinal); +HRESULT CALLBACK ITypeInfo_GetRefTypeInfo_Proxy( + ITypeInfo* This, + HREFTYPE hRefType, + ITypeInfo** ppTInfo); +void __RPC_STUB ITypeInfo_GetRefTypeInfo_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_LocalAddressOfMember_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalAddressOfMember_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_AddressOfMember_Proxy( + ITypeInfo* This, + MEMBERID memid, + INVOKEKIND invKind, + PVOID* ppv); +HRESULT __RPC_STUB ITypeInfo_AddressOfMember_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_RemoteCreateInstance_Proxy( + ITypeInfo* This, + REFIID riid, + IUnknown** ppvObj); +void __RPC_STUB ITypeInfo_RemoteCreateInstance_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_CreateInstance_Proxy( + ITypeInfo* This, + IUnknown* pUnkOuter, + REFIID riid, + PVOID* ppvObj); +HRESULT __RPC_STUB ITypeInfo_CreateInstance_Stub( + ITypeInfo* This, + REFIID riid, + IUnknown** ppvObj); +HRESULT CALLBACK ITypeInfo_GetMops_Proxy( + ITypeInfo* This, + MEMBERID memid, + BSTR* pBstrMops); +void __RPC_STUB ITypeInfo_GetMops_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_RemoteGetContainingTypeLib_Proxy( + ITypeInfo* This, + ITypeLib** ppTLib, + UINT* pIndex); +void __RPC_STUB ITypeInfo_RemoteGetContainingTypeLib_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeInfo_GetContainingTypeLib_Proxy( + ITypeInfo* This, + ITypeLib** ppTLib, + UINT* pIndex); +HRESULT __RPC_STUB ITypeInfo_GetContainingTypeLib_Stub( + ITypeInfo* This, + ITypeLib** ppTLib, + UINT* pIndex); +HRESULT CALLBACK ITypeInfo_LocalReleaseTypeAttr_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalReleaseTypeAttr_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +void CALLBACK ITypeInfo_ReleaseTypeAttr_Proxy( + ITypeInfo* This, + TYPEATTR* pTypeAttr); +HRESULT __RPC_STUB ITypeInfo_ReleaseTypeAttr_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_LocalReleaseFuncDesc_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalReleaseFuncDesc_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +void CALLBACK ITypeInfo_ReleaseFuncDesc_Proxy( + ITypeInfo* This, + FUNCDESC* pFuncDesc); +HRESULT __RPC_STUB ITypeInfo_ReleaseFuncDesc_Stub( + ITypeInfo* This); +HRESULT CALLBACK ITypeInfo_LocalReleaseVarDesc_Proxy( + ITypeInfo* This); +void __RPC_STUB ITypeInfo_LocalReleaseVarDesc_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +void CALLBACK ITypeInfo_ReleaseVarDesc_Proxy( + ITypeInfo* This, + VARDESC* pVarDesc); +HRESULT __RPC_STUB ITypeInfo_ReleaseVarDesc_Stub( + ITypeInfo* This); + #define INTERFACE ITypeInfo2 DECLARE_INTERFACE_(ITypeInfo2,ITypeInfo) { @@ -704,6 +1004,161 @@ #define ITypeLib_ReleaseTLibAttr(p,a) (p)->lpVtbl->ReleaseTLibAttr(p,a) #endif +HRESULT CALLBACK ITypeLib_RemoteGetTypeInfoCount_Proxy( + ITypeLib* This, + UINT* pcTInfo); +void __RPC_STUB ITypeLib_RemoteGetTypeInfoCount_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +UINT CALLBACK ITypeLib_GetTypeInfoCount_Proxy( + ITypeLib* This); +HRESULT __RPC_STUB ITypeLib_GetTypeInfoCount_Stub( + ITypeLib* This, + UINT* pcTInfo); +HRESULT CALLBACK ITypeLib_GetTypeInfo_Proxy( + ITypeLib* This, + UINT index, + ITypeInfo** ppTInfo); +void __RPC_STUB ITypeLib_GetTypeInfo_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_GetTypeInfoType_Proxy( + ITypeLib* This, + UINT index, + TYPEKIND* pTKind); +void __RPC_STUB ITypeLib_GetTypeInfoType_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_GetTypeInfoOfGuid_Proxy( + ITypeLib* This, + REFGUID guid, + ITypeInfo** ppTinfo); +void __RPC_STUB ITypeLib_GetTypeInfoOfGuid_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_RemoteGetLibAttr_Proxy( + ITypeLib* This, + LPTLIBATTR* ppTLibAttr, + CLEANLOCALSTORAGE* pDummy); +void __RPC_STUB ITypeLib_RemoteGetLibAttr_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_GetLibAttr_Proxy( + ITypeLib* This, + TLIBATTR** ppTLibAttr); +HRESULT __RPC_STUB ITypeLib_GetLibAttr_Stub( + ITypeLib* This, + LPTLIBATTR* ppTLibAttr, + CLEANLOCALSTORAGE* pDummy); +HRESULT CALLBACK ITypeLib_GetTypeComp_Proxy( + ITypeLib* This, + ITypeComp** ppTComp); +void __RPC_STUB ITypeLib_GetTypeComp_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_RemoteGetDocumentation_Proxy( + ITypeLib* This, + INT index, + DWORD refPtrFlags, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +void __RPC_STUB ITypeLib_RemoteGetDocumentation_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_GetDocumentation_Proxy( + ITypeLib* This, + INT index, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +HRESULT __RPC_STUB ITypeLib_GetDocumentation_Stub( + ITypeLib* This, + INT index, + DWORD refPtrFlags, + BSTR* pBstrName, + BSTR* pBstrDocString, + DWORD* pdwHelpContext, + BSTR* pBstrHelpFile); +HRESULT CALLBACK ITypeLib_RemoteIsName_Proxy( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + BOOL* pfName, + BSTR* pBstrLibName); +void __RPC_STUB ITypeLib_RemoteIsName_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_IsName_Proxy( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + BOOL* pfName); +HRESULT __RPC_STUB ITypeLib_IsName_Stub( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + BOOL* pfName, + BSTR* pBstrLibName); +HRESULT CALLBACK ITypeLib_RemoteFindName_Proxy( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + ITypeInfo** ppTInfo, + MEMBERID* rgMemId, + USHORT* pcFound, + BSTR* pBstrLibName); +void __RPC_STUB ITypeLib_RemoteFindName_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK ITypeLib_FindName_Proxy( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + ITypeInfo** ppTInfo, + MEMBERID* rgMemId, + USHORT* pcFound); +HRESULT __RPC_STUB ITypeLib_FindName_Stub( + ITypeLib* This, + LPOLESTR szNameBuf, + ULONG lHashVal, + ITypeInfo** ppTInfo, + MEMBERID* rgMemId, + USHORT* pcFound, + BSTR* pBstrLibName); +HRESULT CALLBACK ITypeLib_LocalReleaseTLibAttr_Proxy( + ITypeLib* This); +void __RPC_STUB ITypeLib_LocalReleaseTLibAttr_Stub( + struct IRpcStubBuffer* This, + struct IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +void CALLBACK ITypeLib_ReleaseTLibAttr_Proxy( + ITypeLib* This, + TLIBATTR* pTLibAttr); +HRESULT __RPC_STUB ITypeLib_ReleaseTLibAttr_Stub( + ITypeLib* This); + #define INTERFACE ITypeLib2 DECLARE_INTERFACE_(ITypeLib2,ITypeLib) {

18 years, 10 months

[mf] 18953: regedit: polish resource file from Sebastian Gasiorek (sebastian dot gasiorek at gmail dot com

by mf＠svn.reactos.com

regedit: polish resource file from Sebastian Gasiorek (sebastian dot gasiorek at gmail dot com Added: trunk/reactos/subsys/system/regedit/Pl.rc Modified: trunk/reactos/subsys/system/regedit/rsrc.rc _____ Added: trunk/reactos/subsys/system/regedit/Pl.rc --- trunk/reactos/subsys/system/regedit/Pl.rc 2005-11-02 16:13:00 UTC (rev 18952) +++ trunk/reactos/subsys/system/regedit/Pl.rc 2005-11-02 18:36:04 UTC (rev 18953) @@ -0,0 +1,395 @@ +/* + * Regedit resources + * + * Copyright 2005 Sebastian Gasiorek + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +/* + * Menu + */ + +IDC_REGEDIT MENU DISCARDABLE +BEGIN + POPUP "&Plik" + BEGIN + MENUITEM "Za&ko±cz", ID_REGISTRY_EXIT + END + POPUP "Pomo&c" + BEGIN + MENUITEM "&Informacje ...", ID_HELP_ABOUT + END +END + +IDR_REGEDIT_MENU MENU DISCARDABLE +BEGIN + POPUP "&Rejestr" + BEGIN + MENUITEM "&Importuj plik rejestru...", ID_REGISTRY_IMPORTREGISTRYFILE + + MENUITEM "&Eksportuj plik rejestru...", ID_REGISTRY_EXPORTREGISTRYFILE + + MENUITEM SEPARATOR + MENUITEM "&Pod??cz rejestr sieciowy...", + ID_REGISTRY_CONNECTNETWORKREGISTRY + + MENUITEM "&Od??cz rejestr sieciowy...", + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + , GRAYED + MENUITEM SEPARATOR + MENUITEM "&Drukuj\tCtrl+P", ID_REGISTRY_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Za&ko±cz", ID_REGISTRY_EXIT + END + POPUP "&Edycja" + BEGIN + MENUITEM "&Modyfikuj", ID_EDIT_MODIFY + MENUITEM SEPARATOR + POPUP "&Nowy" + BEGIN + MENUITEM "&Klucz", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "Warto£µ &ci?gu", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Warto£µ &binarna", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Warto£µ &DWORD", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM SEPARATOR + MENUITEM "&Uprawnienia...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "U&su±\tDel", ID_EDIT_DELETE + MENUITEM "Z&mie± nazwÛ", ID_EDIT_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopiuj nazwÛ klucza", ID_EDIT_COPYKEYNAME + MENUITEM SEPARATOR + MENUITEM "&Znajdf\tCtrl+F", ID_EDIT_FIND, GRAYED + MENUITEM "Zn&ajdf nastÛpny\tF3", ID_EDIT_FINDNEXT, GRAYED + END + POPUP "&Widok" + BEGIN + MENUITEM "&Pasek stanu", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "Po&dziel", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Od£wie?\tF5", ID_VIEW_REFRESH + END + POPUP "Ulu&bione" + BEGIN + MENUITEM "&Dodaj do ulubionych", ID_FAVOURITES_ADDTOFAVOURITES + , GRAYED + MENUITEM "&Usu± ulubiony", ID_FAVOURITES_REMOVEFAVOURITE + , GRAYED + END + POPUP "Pomo&c" + BEGIN + MENUITEM "&Tematy pomocy\tF1", ID_HELP_HELPTOPICS + MENUITEM SEPARATOR + MENUITEM "Edytor rejestru - i&nformacje", ID_HELP_ABOUT + END +END + +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Modyfikuj", ID_EDIT_MODIFY + MENUITEM "Modyfikuj dane &binarne", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Usu±\tDel", ID_EDIT_DELETE + MENUITEM "&Zmie± nazwÛ", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Nowy" + BEGIN + MENUITEM "&Kklucz", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Warto£µ ci?gu", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Warto£µ &binarna", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Warto£µ &DWORD", ID_EDIT_NEW_DWORDVALUE + END + END + POPUP "" + BEGIN + MENUITEM "Rozwi±/Zwi±", ID_TREE_EXPANDBRANCH + POPUP "&Nowy" + BEGIN + MENUITEM "&Klucz", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Warto£µ ci?gu", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Warto£µ &binarna", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Warto£µ &DWORD", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&Znajdf", ID_EDIT_FIND, GRAYED + MENUITEM "U&su±", ID_TREE_DELETE + MENUITEM "Z&mie± nazwÛ", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopiuj nazwÛ klucza", ID_EDIT_COPYKEYNAME + END +END + + +/* + * Dialog + */ + +IDD_EDIT_STRING DIALOG 32, 24, 252, 84 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edytowanie ci?gu" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa warto£ci:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Dane warto£ci:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,142,64,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,196,64,50,14 +END + +IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edytowanie wieloci?gu" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa warto£ci:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Dane &warto£ci:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,196,154,50,14 +END + +IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edytowanie warto£ci binarnej" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa warto£ci:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Dane warto£ci:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "OK",IDOK,142,154,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,196,154,50,14 +END + + +IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | + WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Edytowanie warto£ci DWORD" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Nazwa warto£ci:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Dane &warto£ci:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL + GROUPBOX "System",IDC_STATIC,130,35,116,39 + AUTORADIOBUTTON "&Szesnastkowy",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP + AUTORADIOBUTTON "&DziesiÛtny",IDC_FORMAT_DEC,141,59,60,10 + DEFPUSHBUTTON "OK",IDOK,142,82,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,196,82,50,14 +END + +/* + * String Table + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LIST_COLUMN_NAME "Nazwa" + IDS_LIST_COLUMN_TYPE "Typ" + IDS_LIST_COLUMN_DATA "Dane" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Edytor rejestru" + IDC_REGEDIT "REGEDIT" + IDC_REGEDIT_FRAME "REGEDIT_FRAME" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_MENU "Zawiera polecenia do pracy z ca?ym rejestrem" + ID_EDIT_MENU "Zawiera polecenia do edycji warto£ci lub klucz" + ID_VIEW_MENU "Zawiera polecenia do dostosowywania okien rejestru" + ID_FAVOURITES_MENU "Zawiera polecenia dla dostÛpu do czÛsto u?ywanych klawiszy" + ID_HELP_MENU "Zawiera polecenia do wy£wietlania Pomocy oraz informacji o Edytorze rejestru" + ID_EDIT_NEW_MENU "Zawiera polecenia do tworzenia nowych kluczy lub warto£ci" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_EDIT_MODIFY "Zmienia dane warto£ci" + ID_EDIT_NEW_KEY "Dodaje nowy klucz" + ID_EDIT_NEW_STRINGVALUE "Dodaje now? warto£µ ci?gu" + ID_EDIT_NEW_BINARYVALUE "Dodaje now? warto£µ binarn?" + ID_EDIT_NEW_DWORDVALUE "Dodaje now? warto£µ DWORD" + ID_REGISTRY_IMPORTREGISTRYFILE "Importuje plik do rejestru" + ID_REGISTRY_EXPORTREGISTRYFILE + "Eksportuje ca?o£µ lub czÛ£µ rejestru do pliku" + ID_REGISTRY_CONNECTNETWORKREGISTRY + "Po??czenie z rejestrem zdalnego komputera" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY + "Od??cza od rejestru zdalnego komputera" + ID_REGISTRY_PRINT "Drukuje ca?o£µ lub czÛ£µ rejestru" +/* ID_HELP_HELPTOPICS "Otwiera Pomoc Edytora rejestru" */ + ID_HELP_ABOUT "Wy£wietla informacje o programie, numerze wersji i prawach autorskich" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "Konczy dzia?anie Edytora rejestru" + ID_FAVOURITES_ADDTOFAVOURITES "Dodaje klawisze do listy element¾w ulubionych" + ID_FAVOURITES_REMOVEFAVOURITE "Usuwa klawisze z listy element¾w ulubionych" + ID_VIEW_STATUSBAR "Pokazuje lub ukrywa pasek stanu" + ID_VIEW_SPLIT "Zmienia pozycjÛ podzia?u pomiÛdzy dwoma okienkami" + ID_VIEW_REFRESH "Od£wie?a okno" + ID_EDIT_DELETE "Usuwa zaznaczenie" + ID_EDIT_RENAME "Zmienia nazwÛ zaznaczenia" + ID_EDIT_COPYKEYNAME "Kopiuje nazwÛ wybranego klucza do Schowka" + ID_EDIT_FIND "Znajduje ci?g tekstowy w kluczu, warto£ci lub danych" + ID_EDIT_FINDNEXT "Znajduje nastÛpne wyst?pienie tekstu okre£lonego przy poprzednim szukaniu" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "B??d" + IDS_WARNING "Ostrze?enie" + IDS_BAD_VALUE "Nie mo?na odczytaµ warto£ci '%s'" + IDS_UNSUPPORTED_TYPE "Nie mo?na edytowaµ kluczy tego typu (%ld)" + IDS_TOO_BIG_VALUE "Warto£µ jest za du?a (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Dane typu REG_MULTI_SZ nie mog? zawieraµ pustych ci?g¾w.\nPusty ci?g zosta? usuniÛty z listy." + IDS_QUERY_DELETE_KEY_ONE "Czy na pewno chcesz usun?µ ten klucz?" + IDS_QUERY_DELETE_KEY_MORE "Czy na pewno chcesz usun?µ te klucze?" + IDS_QUERY_DELETE_KEY_CONFIRM "Potwierdzenie usuniÛcia klucza" + IDS_QUERY_DELETE_ONE "Czy na pewno chcesz usun?µ tÛ warto£µ?" + IDS_QUERY_DELETE_MORE "Czy na pewno chcesz usun?µ te warto£ci?" + IDS_QUERY_DELETE_CONFIRM "Potwierdzanie usuniÛcia warto£ci" + IDS_ERR_DELVAL_CAPTION "B??d przy usuwaniu warto£ci" + IDS_ERR_DELETEVALUE "Nie mo?na usun?µ wszystkich podanych warto£ci!" + IDS_ERR_RENVAL_CAPTION "B??d przy zmianie warto£ci" + IDS_ERR_RENVAL_TOEMPTY "Nie mo?na zmieniµ nazwy %s. Okre£lona nazwa klucza jest pusta. Wpisz inn? nazwÛ i spr¾buj ponownie." + IDS_NEW_KEY "Nowy klucz #%d" + IDS_NEW_VALUE "Nowa warto£µ #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(warto£µ binarna o d?ugo£ci zero)" + IDS_DEFAULT_VALUE_NAME "(Domy£lna)" + IDS_VALUE_NOT_SET "(warto£µ nie ustalona)" + IDS_UNKNOWN_TYPE "Nieznany typ: (0x%lx)" + IDS_MY_COMPUTER "M¾j komputer" + IDS_IMPORT_REG_FILE "Importuj plik rejestru" + IDS_EXPORT_REG_FILE "Eksportuj plik rejestru" + IDS_INVALID_DWORD "(niew?a£ciwa warto£µ DWORD)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Pliki rejestru" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Pliki rejestru Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "Wszystkie pliki (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Pe?na kontrola" + IDS_ACCESS_READ "Odczyt" + IDS_ACCESS_QUERYVALUE "Badanie warto£ci" + IDS_ACCESS_SETVALUE "Ustawianie warto£ci" + IDS_ACCESS_CREATESUBKEY "Tworzenie podklucza" + IDS_ACCESS_ENUMERATESUBKEYS "Wyliczanie podkluczy" + IDS_ACCESS_NOTIFY "Powiadamianie" + IDS_ACCESS_CREATELINK "Tworzenie ??cza" + IDS_ACCESS_DELETE "Usu±" + IDS_ACCESS_WRITEDAC "Zapisywanie DAC" + IDS_ACCESS_WRITEOWNER "Zapisywanie w?a£ciciela" + IDS_ACCESS_READCONTROL "Kontrola odczytu" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Tylko ten klucz" + IDS_INHERIT_THISKEYANDSUBKEYS "Ten klucz i podklucze" + IDS_INHERIT_SUBKEYSONLY "Tylko podklucze" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Rozwi±" + IDS_COLLAPSE "&Zwi±" + IDS_GOTO_SUGGESTED_KEY "&Idf do '%s'" +END + +/*****************************************************************/ + + +/* + * Dialog + */ + +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + WS_BORDER +FONT 8, "MS Sans Serif" +BEGIN + GROUPBOX "Zakres eksportu",IDC_STATIC,2,0,366,48 + CONTROL "&Wszystko",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "Wy&brana ga?? f",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 +END + +IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dialog" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,130,7,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,130,24,50,14 +END + + +/* + * TEXTINCLUDE + */ + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + + + +/* + * String Table + */ + +/* + *STRINGTABLE DISCARDABLE + *BEGIN + * ID_HELP_HELPTOPICS "Opens Registry Editor Help." + * ID_HELP_ABOUT "Displays program information, version number, and copyright." + *END + */ _____ Modified: trunk/reactos/subsys/system/regedit/rsrc.rc --- trunk/reactos/subsys/system/regedit/rsrc.rc 2005-11-02 16:13:00 UTC (rev 18952) +++ trunk/reactos/subsys/system/regedit/rsrc.rc 2005-11-02 18:36:04 UTC (rev 18953) @@ -35,6 +35,7 @@ #include "It.rc" #include "Ja.rc" #include "Nl.rc" +#include "Pl.rc" #include "Pt.rc" #include "Ru.rc" #include "Si.rc"

18 years, 10 months

[gvg] 18952: ScoTTie <scott@wizzer-it.com>/erie-- <seditaniedi@gmail.com>

by gvg＠svn.reactos.com

ScoTTie <scott(a)wizzer-it.com>/erie-- <seditaniedi(a)gmail.com> Build fixes for FreeBSD Modified: trunk/reactos/tools/buildno/XML.cpp Modified: trunk/reactos/tools/buildno/ssprintf.cpp Modified: trunk/reactos/tools/cabman/cabinet.cxx Modified: trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/ssprintf.cpp Modified: trunk/reactos/tools/rsym.h Modified: trunk/reactos/w32api/include/poppack.h Modified: trunk/reactos/w32api/include/pshpack1.h Modified: trunk/reactos/w32api/include/pshpack2.h Modified: trunk/reactos/w32api/include/pshpack4.h Modified: trunk/reactos/w32api/include/pshpack8.h Modified: trunk/reactos/w32api/include/wingdi.h _____ Modified: trunk/reactos/tools/buildno/XML.cpp --- trunk/reactos/tools/buildno/XML.cpp 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/buildno/XML.cpp 2005-11-02 16:13:00 UTC (rev 18952) @@ -71,13 +71,19 @@ filelen ( FILE* f ) { #ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); + return _filelengthi64 ( _fileno(f) ); #else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) - return 0; - return file_stat.st_size; -#endif +# ifdef __FreeBSD__ + struct stat file_stat; + if ( fstat(fileno(f), &file_stat) != 0 ) +# else + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) +# endif // __FreeBSD__ + return 0; + return file_stat.st_size; + +#endif // WIN32 } Path::Path() _____ Modified: trunk/reactos/tools/buildno/ssprintf.cpp --- trunk/reactos/tools/buildno/ssprintf.cpp 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/buildno/ssprintf.cpp 2005-11-02 16:13:00 UTC (rev 18952) @@ -2,12 +2,23 @@ #include "pch.h" -#include <malloc.h> +#ifdef __FreeBSD__ +# include <stdlib.h> +#else +# include <malloc.h> +#endif // __FreeBSD__ #include <math.h> #include <float.h> #include <assert.h> #include "ssprintf.h" +#ifdef __FreeBSD__ +# define __isnan isnan +# define __finite finite +# define powl __builtin_powl +# define modfl __builtin_modfl +#endif // _FreeBSD__ + #ifdef _MSC_VER #define alloca _alloca #endif//_MSC_VER _____ Modified: trunk/reactos/tools/cabman/cabinet.cxx --- trunk/reactos/tools/cabman/cabinet.cxx 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/cabman/cabinet.cxx 2005-11-02 16:13:00 UTC (rev 18952) @@ -16,6 +16,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifdef __FreeBSD__ +# include <sys/stat.h> +#endif // __FreeBSD__ #include "cabinet.h" #include "raw.h" #include "mszip.h" _____ Modified: trunk/reactos/tools/cdmake/cdmake.c --- trunk/reactos/tools/cdmake/cdmake.c 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/cdmake/cdmake.c 2005-11-02 16:13:00 UTC (rev 18952) @@ -35,15 +35,19 @@ #include <stdlib.h> #include <string.h> #ifdef WIN32 -#include <io.h> -#include <dos.h> +# include <io.h> +# include <dos.h> #else -#include <sys/io.h> -#include <errno.h> -#include <sys/types.h> -#include <dirent.h> -#include <unistd.h> -#endif +# ifdef __FreeBSD__ +# include <sys/uio.h> +# else +# include <sys/io.h> +# endif // __FreeBSD__ +# include <errno.h> +# include <sys/types.h> +# include <dirent.h> +# include <unistd.h> +#endif // WIN32 #include <ctype.h> #include <setjmp.h> #include <time.h> _____ Modified: trunk/reactos/tools/nci/ncitool.c --- trunk/reactos/tools/nci/ncitool.c 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/nci/ncitool.c 2005-11-02 16:13:00 UTC (rev 18952) @@ -14,7 +14,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <malloc.h> +#ifndef __FreeBSD__ +# include <malloc.h> +#endif // __FreeBSD__ /* DEFINES ****************************************************************/ _____ Modified: trunk/reactos/tools/pefixup.c --- trunk/reactos/tools/pefixup.c 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/pefixup.c 2005-11-02 16:13:00 UTC (rev 18952) @@ -47,7 +47,7 @@ #define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((unsigned long)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS )(h))->FileHeader.SizeOfOptionalHeader)) #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 -#pragma pack(push,2) +#pragma pack(2) typedef struct _IMAGE_DOS_HEADER { WORD e_magic; WORD e_cblp; @@ -69,8 +69,8 @@ WORD e_res2[10]; LONG e_lfanew; } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(pop) -#pragma pack(push,4) +#pragma pack(4) +#pragma pack(4) typedef struct _IMAGE_EXPORT_DIRECTORY { DWORD Characteristics; DWORD TimeDateStamp; @@ -150,7 +150,7 @@ WORD NumberOfLinenumbers; DWORD Characteristics; } IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; -#pragma pack(pop) +#pragma pack(4) /* End of ripped definitions */ _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-11-02 16:13:00 UTC (rev 18952) @@ -70,13 +70,19 @@ filelen ( FILE* f ) { #ifdef WIN32 - return _filelengthi64 ( _fileno(f) ); + return _filelengthi64 ( _fileno(f) ); #else - struct stat64 file_stat; - if ( fstat64(fileno(f), &file_stat) != 0 ) - return 0; - return file_stat.st_size; -#endif +# ifdef __FreeBSD__ + struct stat file_stat; + if ( fstat(fileno(f), &file_stat) != 0 ) +# else + struct stat64 file_stat; + if ( fstat64(fileno(f), &file_stat) != 0 ) +# endif // __FreeBSD__ + return 0; + return file_stat.st_size; + +#endif // WIN32 } Path::Path() _____ Modified: trunk/reactos/tools/rbuild/ssprintf.cpp --- trunk/reactos/tools/rbuild/ssprintf.cpp 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/rbuild/ssprintf.cpp 2005-11-02 16:13:00 UTC (rev 18952) @@ -15,12 +15,23 @@ */ #include "pch.h" -#include <malloc.h> +#ifdef __FreeBSD__ +# include <stdlib.h> +#else +# include <malloc.h> +#endif // __FreeBSD__ #include <math.h> #include <float.h> #include <assert.h> #include "ssprintf.h" +#ifdef __FreeBSD__ +# define __isnan isnan +# define __finite finite +# define powl __builtin_powl +# define modfl __builtin_modfl +#endif // _FreeBSD__ + #ifdef _MSC_VER #define alloca _alloca #endif//_MSC_VER _____ Modified: trunk/reactos/tools/rsym.h --- trunk/reactos/tools/rsym.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/tools/rsym.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -33,7 +33,7 @@ #endif #endif -#pragma pack(push,2) +#pragma pack(2) typedef struct _IMAGE_DOS_HEADER { WORD e_magic; WORD e_cblp; @@ -55,13 +55,13 @@ WORD e_res2[10]; LONG e_lfanew; } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(pop) +#pragma pack(4) #define IMAGE_FILE_LINE_NUMS_STRIPPED 4 #define IMAGE_FILE_LOCAL_SYMS_STRIPPED 8 #define IMAGE_FILE_DEBUG_STRIPPED 512 -#pragma pack(push,4) +#pragma pack(4) typedef struct _IMAGE_FILE_HEADER { WORD Machine; WORD NumberOfSections; @@ -162,7 +162,7 @@ USHORT s_nlnno; /* number of line number entries */ ULONG s_flags; /* flags */ } SCNHDR; -#pragma pack(pop) +#pragma pack(4) typedef struct _SYMBOLFILE_HEADER { ULONG SymbolsOffset; @@ -238,7 +238,7 @@ #define C_ALIAS 105 /* duplicate tag */ #define C_HIDDEN 106 /* ext symbol in dmert public lib */ -#pragma pack(push,1) +#pragma pack(1) typedef struct _COFF_SYMENT { union @@ -258,7 +258,7 @@ UCHAR e_sclass; UCHAR e_numaux; } COFF_SYMENT, *PCOFF_SYMENT; -#pragma pack(pop) +#pragma pack(4) typedef struct _ROSSYM_ENTRY { ULONG_PTR Address; _____ Modified: trunk/reactos/w32api/include/poppack.h --- trunk/reactos/w32api/include/poppack.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/poppack.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(pop) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(4) +# else +# pragma pack(pop) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/pshpack1.h --- trunk/reactos/w32api/include/pshpack1.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/pshpack1.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(push,1) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(1) +# else +# pragma pack(push,1) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/pshpack2.h --- trunk/reactos/w32api/include/pshpack2.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/pshpack2.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(push,2) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(2) +# else +# pragma pack(push,2) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/pshpack4.h --- trunk/reactos/w32api/include/pshpack4.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/pshpack4.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(push,4) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(4) +# else +# pragma pack(push,4) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/pshpack8.h --- trunk/reactos/w32api/include/pshpack8.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/pshpack8.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1,3 +1,7 @@ #ifndef RC_INVOKED -#pragma pack(push,8) -#endif +# if ( __FreeBSD__ == 5 ) +# pragma pack(8) +# else +# pragma pack(push,8) +# endif // __FreeBSD__ +#endif // RC_INVOKED _____ Modified: trunk/reactos/w32api/include/wingdi.h --- trunk/reactos/w32api/include/wingdi.h 2005-11-02 15:32:05 UTC (rev 18951) +++ trunk/reactos/w32api/include/wingdi.h 2005-11-02 16:13:00 UTC (rev 18952) @@ -1225,14 +1225,14 @@ WORD bcPlanes; WORD bcBitCount; } BITMAPCOREHEADER,*LPBITMAPCOREHEADER,*PBITMAPCOREHEADER; -#pragma pack(push,1) +#include "pshpack1.h" typedef struct tagRGBTRIPLE { BYTE rgbtBlue; BYTE rgbtGreen; BYTE rgbtRed; } RGBTRIPLE,*LPRGBTRIPLE; -#pragma pack(pop) -#pragma pack(push,2) +#include "poppack.h" +#include "pshpack2.h" typedef struct tagBITMAPFILEHEADER { WORD bfType; DWORD bfSize; @@ -1240,7 +1240,7 @@ WORD bfReserved2; DWORD bfOffBits; } BITMAPFILEHEADER,*LPBITMAPFILEHEADER,*PBITMAPFILEHEADER; -#pragma pack(pop) +#include "poppack.h" typedef struct _BITMAPCOREINFO { BITMAPCOREHEADER bmciHeader; RGBTRIPLE bmciColors[1]; @@ -2024,7 +2024,7 @@ EMR emr; DWORD iMode; } EMRSELECTCLIPPATH,*PEMRSELECTCLIPPATH,EMRSETBKMODE,*PEMRSETBKMODE,EMRSET MAPMODE,*PEMRSETMAPMODE,EMRSETPOLYFILLMODE,*PEMRSETPOLYFILLMODE,EMRSETRO P2,*PEMRSETROP2,EMRSETSTRETCHBLTMODE,*PEMRSETSTRETCHBLTMODE,EMRSETTEXTAL IGN,*PEMRSETTEXTALIGN,EMRENABLEICM,*PEMRENABLEICM; -#pragma pack(push,2) +#include "pshpack2.h" typedef struct tagMETAHEADER { WORD mtType; WORD mtHeaderSize; @@ -2034,7 +2034,7 @@ DWORD mtMaxRecord; WORD mtNoParameters; } METAHEADER,*PMETAHEADER,*LPMETAHEADER; -#pragma pack(pop) +#include "poppack.h" typedef struct tagENHMETAHEADER { DWORD iType; DWORD nSize; @@ -2320,7 +2320,7 @@ DWORD lsCsbSupported[2]; } LOCALESIGNATURE,*PLOCALESIGNATURE,*LPLOCALESIGNATURE; typedef LONG LCSTYPE; -#pragma pack(push,4) +#include "pshpack4.h" typedef struct tagNEWTEXTMETRICA { LONG tmHeight; LONG tmAscent; @@ -2373,7 +2373,7 @@ UINT ntmCellHeight; UINT ntmAvgWidth; } NEWTEXTMETRICW,*PNEWTEXTMETRICW,*LPNEWTEXTMETRICW; -#pragma pack(pop) +#include "poppack.h" typedef struct tagNEWTEXTMETRICEXA { NEWTEXTMETRICA ntmTm; FONTSIGNATURE ntmFontSig;

18 years, 10 months

[cwittich] 18951: * compile .S files with MSVC2002/2003 too

by cwittich＠svn.reactos.com

* compile .S files with MSVC2002/2003 too Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-02 14:18:40 UTC (rev 18950) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-02 15:32:05 UTC (rev 18951) @@ -367,6 +367,24 @@ const string& source_file = DosSeparator(source_files[isrcfile]); fprintf ( OUT, "\t\t\t<File\r\n" ); fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); + + if (configuration.VSProjectVersion < "8.00") { + if (source_file.at(source_file.size() - 1) == 'S') { + for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) + { + std::string& config = cfgs[iconfig]; + fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); + fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, config.c_str()); + fprintf ( OUT, "|Win32\">\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); + fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); + } + } + } fprintf ( OUT, "\t\t\t</File>\r\n" ); } fprintf ( OUT, "\t\t</Filter>\r\n" );

18 years, 10 months

[royce] 18950: newer msvc's are aware of __FUNCTION__

by royce＠svn.reactos.com

newer msvc's are aware of __FUNCTION__ Modified: trunk/reactos/include/wine/debug.h _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-11-02 14:15:42 UTC (rev 18949) +++ trunk/reactos/include/wine/debug.h 2005-11-02 14:18:40 UTC (rev 18950) @@ -17,7 +17,9 @@ #endif #ifndef __GNUC__ +#if !defined(_MSC_VER) || _MSC_VER < 8 #define __FUNCTION__ "" +#endif//_MSC_VER #define inline __inline #endif

18 years, 10 months

[turner] 18949: Some changes for better formatting / following standards.

by turner＠svn.reactos.com

Some changes for better formatting / following standards. Modified: trunk/reactos/subsys/system/cmd/dir.c _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-11-02 14:08:16 UTC (rev 18948) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-11-02 14:15:42 UTC (rev 18949) @@ -216,7 +216,8 @@ * displays help screen for dir * Rob Lake */ -static VOID DirHelp(VOID) +static VOID +DirHelp(VOID) { ConOutResPaging(TRUE, STRING_DIR_HELP1); } @@ -228,10 +229,11 @@ * * Parse the parameters and switches of the command line and exports them */ -static BOOL DirReadParam(LPTSTR Line, /* [IN] The line with the parameters & switches */ - LPTSTR** params, /* [OUT] The parameters after parsing */ - LPINT entries, /* [OUT] The number of parameters after parsing */ - LPDIRSWITCHFLAGS lpFlags) /* [IN/OUT] The flags after calculating switches */ +static BOOL +DirReadParam(LPTSTR Line, /* [IN] The line with the parameters & switches */ + LPTSTR** params, /* [OUT] The parameters after parsing */ + LPINT entries, /* [OUT] The number of parameters after parsing */ + LPDIRSWITCHFLAGS lpFlags) /* [IN/OUT] The flags after calculating switches */ { TCHAR cCurSwitch; /* The current switch */ TCHAR cCurChar; /* Current examing character */ @@ -1220,7 +1222,8 @@ * * Get the name of the file without extension */ -static LPTSTR getName(const TCHAR* file, TCHAR * dest) +static LPTSTR +getName(const TCHAR* file, TCHAR * dest) { int iLen; LPTSTR end; @@ -1320,9 +1323,9 @@ */ static VOID DirPrintWideList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ + DWORD dwCount, /* [IN] The quantity of files */ + TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { SHORT iScreenWidth; USHORT iColumns; @@ -1512,9 +1515,9 @@ */ static VOID DirPrintBareList(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The number of files */ - LPTSTR lpCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ + DWORD dwCount, /* [IN] The number of files */ + LPTSTR lpCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { TCHAR szFullName[MAX_PATH]; DWORD i; @@ -1556,9 +1559,9 @@ */ static VOID DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */ - DWORD dwCount, /* [IN] The quantity of files */ - TCHAR *szCurPath, /* [IN] Full path of current directory */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ + DWORD dwCount, /* [IN] The quantity of files */ + TCHAR *szCurPath, /* [IN] Full path of current directory */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags used */ { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szTemp[MAX_PATH]; /* A buffer to format the directory header */ @@ -1617,8 +1620,8 @@ */ static BOOL CompareFiles(LPWIN32_FIND_DATA lpFile1, /* [IN] A pointer to WIN32_FIND_DATA of file 1 */ - LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ + LPWIN32_FIND_DATA lpFile2, /* [IN] A pointer to WIN32_FIND_DATA of file 2 */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we use to list */ { ULARGE_INTEGER u64File1; ULARGE_INTEGER u64File2; @@ -1768,9 +1771,9 @@ */ static INT DirList(LPTSTR szPath, /* [IN] The path that dir starts */ - LPTSTR szFilespec, /* [IN] The type of file that we are looking for */ - LPINT pLine, /* FIXME: Maybe used for paginating */ - LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ + LPTSTR szFilespec, /* [IN] The type of file that we are looking for */ + LPINT pLine, /* FIXME: Maybe used for paginating */ + LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ { HANDLE hSearch; /* The handle of the search */ HANDLE hRecSearch; /* The handle for searching recursivly */ @@ -1974,7 +1977,8 @@ * * internal dir command */ -INT CommandDir(LPTSTR first, LPTSTR rest) +INT +CommandDir(LPTSTR first, LPTSTR rest) { TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ TCHAR cDrive;

18 years, 10 months

[royce] 18948: comment out incorrect #defines

by royce＠svn.reactos.com

comment out incorrect #defines Modified: trunk/reactos/w32api/include/winerror.h _____ Modified: trunk/reactos/w32api/include/winerror.h --- trunk/reactos/w32api/include/winerror.h 2005-11-02 13:49:14 UTC (rev 18947) +++ trunk/reactos/w32api/include/winerror.h 2005-11-02 14:08:16 UTC (rev 18948) @@ -416,11 +416,14 @@ #define ERROR_PKINIT_FAILURE 1263L #define ERROR_SMARTCARD_SUBSYSTEM_FAILURE 1264L #define ERROR_DOWNGRADE_DETECTED 1265L +/* wrong: */ +#if 0 #define SEC_E_SMARTCARD_CERT_REVOKED 1266L #define SEC_E_ISSUING_CA_UNTRUSTED 1267L #define SEC_E_REVOCATION_OFFLINE_C 1268L #define SEC_E_PKINIT_CLIENT_FAILUR 1269L #define SEC_E_SMARTCARD_CERT_EXPIRED 1270L +#endif #define ERROR_MACHINE_LOCKED 1271L #define ERROR_CALLBACK_SUPPLIED_INVALID_DATA 1273L #define ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED 1274L

18 years, 10 months

[turner] 18947: fix for bug 875. Patch by jvangael@wisc.edu

by turner＠svn.reactos.com

fix for bug 875. Patch by jvangael(a)wisc.edu Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/dir.c Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-11-02 01:39:30 UTC (rev 18946) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-11-02 13:49:14 UTC (rev 18947) @@ -293,6 +293,7 @@ BOOL SetRootPath(TCHAR *InPath); TCHAR cgetchar (VOID); BOOL CheckCtrlBreak (INT); +BOOL add_entry (LPINT ac, LPTSTR **arg, LPCTSTR entry); LPTSTR *split (LPTSTR, LPINT, BOOL); VOID freep (LPTSTR *); LPTSTR _stpcpy (LPTSTR, LPCTSTR); _____ Modified: trunk/reactos/subsys/system/cmd/dir.c --- trunk/reactos/subsys/system/cmd/dir.c 2005-11-02 01:39:30 UTC (rev 18946) +++ trunk/reactos/subsys/system/cmd/dir.c 2005-11-02 13:49:14 UTC (rev 18947) @@ -228,20 +228,29 @@ * * Parse the parameters and switches of the command line and exports them */ -static BOOL -DirReadParam(LPTSTR Line, /* [IN] The line with the parameters & switches */ - LPTSTR *param, /* [OUT] The parameters after parsing */ - LPDIRSWITCHFLAGS lpFlags) /* [IN/OUT] The flags after calculating switches */ +static BOOL DirReadParam(LPTSTR Line, /* [IN] The line with the parameters & switches */ + LPTSTR** params, /* [OUT] The parameters after parsing */ + LPINT entries, /* [OUT] The number of parameters after parsing */ + LPDIRSWITCHFLAGS lpFlags) /* [IN/OUT] The flags after calculating switches */ { - TCHAR cCurSwitch; /* The current switch */ - TCHAR cCurChar; /* Current examing character */ - TCHAR cCurUChar; /* Current upper examing character */ - BOOL bNegative; /* Negative switch */ - BOOL bPNegative; /* Negative switch parameter */ - BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ - LPTSTR ptrLast; /* A pointer to the last character of param */ + TCHAR cCurSwitch; /* The current switch */ + TCHAR cCurChar; /* Current examing character */ + TCHAR cCurUChar; /* Current upper examing character */ + BOOL bNegative; /* Negative switch */ + BOOL bPNegative; /* Negative switch parameter */ + BOOL bIntoQuotes; /* A flag showing if we are in quotes (") */ + LPTSTR ptrStart; /* A pointer to the first character of a parameter */ + LPTSTR ptrEnd; /* A pointer to the last character of a parameter */ + LPTSTR temp; - + /* Initialize parameter array */ + *params = malloc(sizeof(LPTSTR)); + if(!params) + return FALSE; + *params = NULL; + *entries = 0; + ptrStart = NULL; + ptrEnd = NULL; /* Initialize variables; */ cCurSwitch = _T(' '); @@ -249,10 +258,6 @@ bPNegative = FALSE; bIntoQuotes = FALSE; - /* No parameters yet */ - *param = NULL; - ptrLast = NULL; - /* We suppose that switch parameters were given to avoid setting them to default if the switch was not given */ @@ -352,8 +357,25 @@ if (!bIntoQuotes) { cCurSwitch = _T(' '); - if ((*param) && !(ptrLast)) - ptrLast = Line; + if(ptrStart && ptrEnd) + { + temp = malloc((ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + if(!temp) + return FALSE; + memcpy(temp, ptrStart, (ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + temp[(ptrEnd - ptrStart + 1)] = _T('\0'); + if(!add_entry(entries, params, temp)) + { + free(temp); + freep(*params); + return FALSE; + } + + free(temp); + + ptrStart = NULL; + ptrEnd = NULL; + } } } @@ -361,19 +383,35 @@ { /* Process a quote */ bIntoQuotes = !bIntoQuotes; - if (!bIntoQuotes) ptrLast = Line; + if(!bIntoQuotes) + ptrEnd = Line; } else { /* Process a character for parameter */ - if ((cCurSwitch == _T(' ')) && (*param)) - { - error_too_many_parameters(Line); - return FALSE; + if ((cCurSwitch == _T(' ')) && ptrStart && ptrEnd) + { + temp = malloc((ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + if(!temp) + return FALSE; + memcpy(temp, ptrStart, (ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + temp[(ptrEnd - ptrStart + 1)] = _T('\0'); + if(!add_entry(entries, params, temp)) + { + free(temp); + freep(*params); + return FALSE; + } + + free(temp); + + ptrStart = NULL; + ptrEnd = NULL; } cCurSwitch = _T('P'); - if (!(*param)) - *param = Line; + if(!ptrStart) + ptrStart = ptrEnd = Line; + ptrEnd = Line; } } else @@ -522,8 +560,26 @@ Line++; } /* Terminate the parameters */ - if (ptrLast) *ptrLast = 0; + if(ptrStart && ptrEnd) + { + temp = malloc((ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + if(!temp) + return FALSE; + memcpy(temp, ptrStart, (ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + temp[(ptrEnd - ptrStart + 1)] = _T('\0'); + if(!add_entry(entries, params, temp)) + { + free(temp); + freep(*params); + return FALSE; + } + free(temp); + + ptrStart = NULL; + ptrEnd = NULL; + } + /* Calculate the switches with no switch paramater */ if (!(lpFlags->stAttribs.bParSetted)) { @@ -1120,7 +1176,21 @@ ConOutPrintf(szMsg,ulFiles, szBuffer); } - /* Print total directories and freespace */ + /* Print File Summary */ + /* Condition to print summary is: + If we are not in bare format and if we have results! */ + if (ulFiles > 0) + { + ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator); + LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); + if(lpFlags->bPause) + ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); + else + ConOutPrintf(szMsg,ulFiles, szBuffer); + + } + + /* Print total directories and freespace */ szRoot[0] = szPath[0]; GetUserDiskFreeSpace(szRoot, &uliFree); ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); @@ -1710,13 +1780,11 @@ PDIRFINDLISTNODE ptrNextNode; /* A pointer used for relatives refernces */ TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing \ */ TCHAR szFullFileSpec[MAX_PATH]; /* The full path with file specs that we ll request\ */ -TCHAR szBytes[20]; /* A string for converting ULARGE integer */ DWORD dwCount; /* A counter of files found in directory */ DWORD dwCountFiles; /* Counter for files */ DWORD dwCountDirs; /* Counter for directories */ ULARGE_INTEGER u64CountBytes; /* Counter for bytes */ ULARGE_INTEGER u64Temp; /* A temporary counter */ -TCHAR szMsg[RC_STRING_MAX_SIZE]; /* Initialize Variables */ ptrStartNode = NULL; @@ -1853,20 +1921,6 @@ /* Free array */ free(ptrFileArray); - /* Print Directory Summary */ - /* Condition to print summary is: - If we are not in bare format and if we have results! */ - if (!(lpFlags->bBareFormat) && (dwCount > 0)) - { - ConvertULargeInteger(u64CountBytes, szBytes, 20, lpFlags->bTSeperator); - LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE); - if(lpFlags->bPause) - ConOutPrintfPaging(FALSE,szMsg,dwCountFiles, szBytes); - else - ConOutPrintf(szMsg,dwCountFiles, szBytes); - - } - /* Add statistics to recursive statistics*/ recurse_dir_cnt += dwCountDirs; recurse_file_cnt += dwCountFiles; @@ -1922,14 +1976,18 @@ */ INT CommandDir(LPTSTR first, LPTSTR rest) { - TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ - TCHAR szPath[MAX_PATH]; - TCHAR szFilespec[MAX_PATH]; - LPTSTR param; - INT nLine = 0; + TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ + TCHAR cDrive; + TCHAR szPath[MAX_PATH]; + TCHAR szFilespec[MAX_PATH]; + LPTSTR* params; + UINT entries = 0; + INT nLine = 0; + UINT loop = 0; DIRSWITCHFLAGS stFlags; /* Initialize variables */ + cDrive = 0; recurse_dir_cnt = 0L; recurse_file_cnt = 0L; recurse_bytes.QuadPart = 0; @@ -1958,67 +2016,77 @@ /* read the parameters from the DIRCMD environment variable */ if (GetEnvironmentVariable (_T("DIRCMD"), dircmd, 256)) - if (!DirReadParam(dircmd, &param, &stFlags)) + if (!DirReadParam(dircmd, &params, &entries, &stFlags)) { nErrorLevel = 1; return 1; } /* read the parameters */ - if (!DirReadParam(rest, &param, &stFlags)) + if (!DirReadParam(rest, &params, &entries, &stFlags)) { nErrorLevel = 1; return 1; } /* default to current directory */ - if (!param) - param = _T("."); - - /* parse the directory info */ - if (DirParsePathspec (param, szPath, szFilespec)) - { - nErrorLevel = 1; - return 1; + if(entries == 0) { + if(!add_entry(&entries, &params, _T("."))) { + nErrorLevel = 1; + return 1; + } } -/* <Debug :> - Uncomment this to show the final state of switch flags*/ -#ifdef _DEBUG + for(loop = 0; loop < entries; loop++) { - int i; - ConOutPrintf(_T("Attributes mask/value %x/%x\n"),stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); - ConOutPrintf(_T("(B) Bare format : %i\n"), stFlags.bBareFormat ); - ConOutPrintf(_T("(C) Thousand : %i\n"), stFlags.bTSeperator ); - ConOutPrintf(_T("(W) Wide list : %i\n"), stFlags.bWideList ); - ConOutPrintf(_T("(D) Wide list sort by column : %i\n"), stFlags.bWideListColSort ); - ConOutPrintf(_T("(L) Lowercase : %i\n"), stFlags.bLowerCase ); - ConOutPrintf(_T("(N) New : %i\n"), stFlags.bNewLongList ); - ConOutPrintf(_T("(O) Order : %i\n"), stFlags.stOrderBy.sCriteriaCount ); - for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) - ConOutPrintf(_T(" Order Criteria [%i]: %i (Reversed: %i)\n"),i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); - ConOutPrintf(_T("(P) Pause : %i\n"), stFlags.bPause ); - ConOutPrintf(_T("(Q) Owner : %i\n"), stFlags.bUser ); - ConOutPrintf(_T("(S) Recursive : %i\n"), stFlags.bRecursive ); - ConOutPrintf(_T("(T) Time field : %i\n"), stFlags.stTimeField.eTimeField ); - ConOutPrintf(_T("(X) Short names : %i\n"), stFlags.bShortName ); - ConOutPrintf(_T("Parameter : %s\n"), param ); - } -#endif + /* parse the directory info */ + if (DirParsePathspec (params[loop], szPath, szFilespec)) + { + nErrorLevel = 1; + return 1; + } - /* print the header */ - if (!stFlags.bBareFormat) - if (!PrintDirectoryHeader (szPath, &nLine, &stFlags)) + /* <Debug :> + Uncomment this to show the final state of switch flags*/ + #ifdef _DEBUG { + int i; + ConOutPrintf(_T("Attributes mask/value %x/%x\n"),stFlags.stAttribs.dwAttribMask,stFlags.stAttribs.dwAttribVal ); + ConOutPrintf(_T("(B) Bare format : %i\n"), stFlags.bBareFormat ); + ConOutPrintf(_T("(C) Thousand : %i\n"), stFlags.bTSeperator ); + ConOutPrintf(_T("(W) Wide list : %i\n"), stFlags.bWideList ); + ConOutPrintf(_T("(D) Wide list sort by column : %i\n"), stFlags.bWideListColSort ); + ConOutPrintf(_T("(L) Lowercase : %i\n"), stFlags.bLowerCase ); + ConOutPrintf(_T("(N) New : %i\n"), stFlags.bNewLongList ); + ConOutPrintf(_T("(O) Order : %i\n"), stFlags.stOrderBy.sCriteriaCount ); + for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++) + ConOutPrintf(_T(" Order Criteria [%i]: %i (Reversed: %i)\n"),i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] ); + ConOutPrintf(_T("(P) Pause : %i\n"), stFlags.bPause ); + ConOutPrintf(_T("(Q) Owner : %i\n"), stFlags.bUser ); + ConOutPrintf(_T("(S) Recursive : %i\n"), stFlags.bRecursive ); + ConOutPrintf(_T("(T) Time field : %i\n"), stFlags.stTimeField.eTimeField ); + ConOutPrintf(_T("(X) Short names : %i\n"), stFlags.bShortName ); + ConOutPrintf(_T("Parameter : %s\n"), params[loop] ); + } + #endif + + /* Print the drive header if the drive changed */ + if(cDrive != szPath[0] && !stFlags.bBareFormat) { + if (!PrintDirectoryHeader (szPath, &nLine, &stFlags)) { + nErrorLevel = 1; + return 1; + } + + cDrive = szPath[0]; + } + + + /* do the actual dir */ + if (DirList (szPath, szFilespec, &nLine, &stFlags)) + { nErrorLevel = 1; return 1; } - - /* do the actual dir */ - if (DirList (szPath, szFilespec, &nLine, &stFlags)) - { - nErrorLevel = 1; - return 1; } /* print the footer */ _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-11-02 01:39:30 UTC (rev 18946) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-11-02 13:49:14 UTC (rev 18947) @@ -162,7 +162,7 @@ } /* add new entry for new argument */ -static BOOL add_entry (LPINT ac, LPTSTR **arg, LPCTSTR entry) +BOOL add_entry (LPINT ac, LPTSTR **arg, LPCTSTR entry) { LPTSTR q; LPTSTR *oldarg;

18 years, 10 months

[weiden] 18946: implemented yet one more - still useless - function: RtlCreateSystemVolumeInformationFolder

by weiden＠svn.reactos.com

implemented yet one more - still useless - function: RtlCreateSystemVolumeInformationFolder Modified: trunk/reactos/lib/rtl/bootdata.c _____ Modified: trunk/reactos/lib/rtl/bootdata.c --- trunk/reactos/lib/rtl/bootdata.c 2005-11-02 00:40:35 UTC (rev 18945) +++ trunk/reactos/lib/rtl/bootdata.c 2005-11-02 01:39:30 UTC (rev 18946) @@ -14,8 +14,525 @@ /* FUNCTIONS *****************************************************************/ +static SID_IDENTIFIER_AUTHORITY LocalSystemAuthority = {SECURITY_NT_AUTHORITY}; + +static NTSTATUS +RtlpSysVolCreateSecurityDescriptor(OUT PSECURITY_DESCRIPTOR *SecurityDescriptor, + OUT PSID *SystemSid) +{ + PSECURITY_DESCRIPTOR AbsSD = NULL; + PSID LocalSystemSid = NULL; + PACL Dacl = NULL; + ULONG DaclSize; + NTSTATUS Status; + + /* create the local SYSTEM SID */ + Status = RtlAllocateAndInitializeSid(&LocalSystemAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &LocalSystemSid); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* allocate and initialize the security descriptor */ + AbsSD = RtlpAllocateMemory(sizeof(SECURITY_DESCRIPTOR), + TAG('S', 'e', 'S', 'd')); + if (AbsSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + Status = RtlCreateSecurityDescriptor(AbsSD, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* allocate and create the DACL */ + DaclSize = sizeof(ACL) + sizeof(ACE) + + RtlLengthSid(LocalSystemSid); + Dacl = RtlpAllocateMemory(DaclSize, + TAG('S', 'e', 'A', 'c')); + if (Dacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + Status = RtlAddAccessAllowedAceEx(Dacl, + ACL_REVISION, + OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL, + LocalSystemSid); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* set the DACL in the security descriptor */ + Status = RtlSetDaclSecurityDescriptor(AbsSD, + TRUE, + Dacl, + FALSE); + + /* all done */ + if (NT_SUCCESS(Status)) + { + *SecurityDescriptor = AbsSD; + *SystemSid = LocalSystemSid; + } + else + { +Cleanup: + if (LocalSystemSid != NULL) + { + RtlFreeSid(LocalSystemSid); + } + + if (Dacl != NULL) + { + RtlpFreeMemory(Dacl, + TAG('S', 'e', 'A', 'c')); + } + + if (AbsSD != NULL) + { + RtlpFreeMemory(AbsSD, + TAG('S', 'e', 'S', 'd')); + } + } + + return Status; +} + +static NTSTATUS +RtlpSysVolCheckOwnerAndSecurity(IN HANDLE DirectoryHandle, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PSECURITY_DESCRIPTOR RelSD = NULL; + PSECURITY_DESCRIPTOR NewRelSD = NULL; + PSECURITY_DESCRIPTOR AbsSD = NULL; +#ifdef _WIN64 + BOOLEAN AbsSDAllocated = FALSE; +#endif + PSID AdminSid = NULL; + PSID LocalSystemSid = NULL; + ULONG DescriptorSize; + ULONG AbsSDSize, RelSDSize = 0; + PACL Dacl; + BOOLEAN DaclPresent, DaclDefaulted; + PSID OwnerSid; + BOOLEAN OwnerDefaulted; + ULONG AceIndex; + PACE Ace = NULL; + NTSTATUS Status; + + /* find out how much memory we need to allocate for the self-relative + descriptor we're querying */ + Status = ZwQuerySecurityObject(DirectoryHandle, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NULL, + 0, + &DescriptorSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + /* looks like the FS doesn't support security... return success */ + Status = STATUS_SUCCESS; + goto Cleanup; + } + + /* allocate enough memory for the security descriptor */ + RelSD = RtlpAllocateMemory(DescriptorSize, + TAG('S', 'e', 'S', 'd')); + if (RelSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* query the self-relative security descriptor */ + Status = ZwQuerySecurityObject(DirectoryHandle, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + RelSD, + DescriptorSize, + &DescriptorSize); + if (!NT_SUCCESS(Status)) + { + /* FIXME - handle the case where someone else modified the owner and/or + DACL while we allocated memory. But that should be *very* + unlikely.... */ + goto Cleanup; + } + + /* query the owner and DACL from the descriptor */ + Status = RtlGetOwnerSecurityDescriptor(RelSD, + &OwnerSid, + &OwnerDefaulted); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + Status = RtlGetDaclSecurityDescriptor(RelSD, + &DaclPresent, + &Dacl, + &DaclDefaulted); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* create the Administrators SID */ + Status = RtlAllocateAndInitializeSid(&LocalSystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdminSid); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* create the local SYSTEM SID */ + Status = RtlAllocateAndInitializeSid(&LocalSystemAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &LocalSystemSid); + + /* check if the Administrators are the owner and at least a not-NULL DACL + is present */ + if (OwnerSid != NULL && + RtlEqualSid(OwnerSid, + AdminSid) && + DaclPresent && Dacl != NULL) + { + /* check the DACL for an Allowed ACE for the SYSTEM account */ + AceIndex = 0; + do + { + Status = RtlGetAce(Dacl, + AceIndex++, + (PVOID*)&Ace); + if (!NT_SUCCESS(Status)) + { + Ace = NULL; + } + else if (Ace != NULL && Ace->Header.AceType == ACCESS_ALLOWED_ACE_TYPE) + { + /* check if the the ACE is a set of allowed permissions for the + local SYSTEM account */ + if (RtlEqualSid((PSID)(Ace + 1), + LocalSystemSid)) + { + /* check if the ACE is inherited by noncontainer and + container objects, if not attempt to change that */ + if (!(Ace->Header.AceFlags & OBJECT_INHERIT_ACE) || + !(Ace->Header.AceFlags & CONTAINER_INHERIT_ACE)) + { + Ace->Header.AceFlags |= OBJECT_INHERIT_ACE | CONTAINER_INHERIT_ACE; + Status = ZwSetSecurityObject(DirectoryHandle, + DACL_SECURITY_INFORMATION, + RelSD); + } + else + { + /* all done, we have access */ + Status = STATUS_SUCCESS; + } + + goto Cleanup; + } + } + } while (Ace != NULL); + } + + AbsSDSize = DescriptorSize; + + /* because we need to change any existing data we need to convert it to + an absolute security descriptor first */ + Status = RtlSelfRelativeToAbsoluteSD2(RelSD, + &AbsSDSize); +#ifdef _WIN64 + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* this error code can only be returned on 64 bit builds because + the size of an absolute security descriptor is greater than the + size of a self-relative security descriptor */ + ASSERT(AbsSDSize > DescriptorSize); + + AbsSD = RtlpAllocateMemory(DescriptorSize, + TAG('S', 'e', 'S', 'd')); + if (AbsSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + AbsSDAllocated = TRUE; + + /* make a raw copy of the self-relative descriptor */ + RtlCopyMemory(AbsSD, + RelSD, + DescriptorSize); + + /* finally convert it */ + Status = RtlSelfRelativeToAbsoluteSD2(AbsSD, + &AbsSDSize); + } + else +#endif + { + AbsSD = RelSD; + } + + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* set the owner SID */ + Status = RtlSetOwnerSecurityDescriptor(AbsSD, + AdminSid, + FALSE); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* set the DACL in the security descriptor */ + Status = RtlSetDaclSecurityDescriptor(AbsSD, + TRUE, + SecurityDescriptor->Dacl, + FALSE); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* convert it back to a self-relative descriptor, find out how much + memory we need */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + goto Cleanup; + } + + /* allocate enough memory for the new self-relative descriptor */ + NewRelSD = RtlpAllocateMemory(RelSDSize, + TAG('S', 'e', 'S', 'd')); + if (NewRelSD == NULL) + { + goto Cleanup; + } + + /* convert the security descriptor to self-relative format */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + NewRelSD, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + goto Cleanup; + } + + /* finally attempt to change the security information */ + Status = ZwSetSecurityObject(DirectoryHandle, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NewRelSD); + +Cleanup: + if (AdminSid != NULL) + { + RtlFreeSid(AdminSid); + } + + if (LocalSystemSid != NULL) + { + RtlFreeSid(LocalSystemSid); + } + + if (RelSD != NULL) + { + RtlpFreeMemory(RelSD, + TAG('S', 'e', 'S', 'd')); + } + + if (NewRelSD != NULL) + { + RtlpFreeMemory(NewRelSD, + TAG('S', 'e', 'S', 'd')); + } + +#ifdef _WIN64 + if (AbsSDAllocated) + { + RtlpFreeMemory(AbsSD, + TAG('S', 'e', 'S', 'd')); + } +#endif + + return Status; +} + +static NTSTATUS +RtlpSysVolTakeOwnership(IN PUNICODE_STRING DirectoryPath, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + TOKEN_PRIVILEGES TokenPrivileges; + OBJECT_ATTRIBUTES ObjectAttributes; + SECURITY_DESCRIPTOR AbsSD; + PSID AdminSid = NULL; + IO_STATUS_BLOCK IoStatusBlock; + BOOLEAN TokenEnabled = FALSE; + HANDLE hToken = NULL; + HANDLE hDirectory = NULL; + NTSTATUS Status; + + Status = ZwOpenProcessToken(NtCurrentProcess(), + TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, + &hToken); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* attempt to enable the SE_TAKE_OWNERSHIP_PRIVILEGE privilege */ + TokenPrivileges.PrivilegeCount = 1; + TokenPrivileges.Privileges[0].Luid.LowPart = SE_TAKE_OWNERSHIP_PRIVILEGE; + TokenPrivileges.Privileges[0].Luid.HighPart = 0; + TokenPrivileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + Status = ZwAdjustPrivilegesToken(hToken, + FALSE, + &TokenPrivileges, + sizeof(TokenPrivileges), + &TokenPrivileges, + NULL); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + TokenEnabled = (TokenPrivileges.PrivilegeCount != 0); + + /* open the directory */ + InitializeObjectAttributes(&ObjectAttributes, + DirectoryPath, + 0, + NULL, + SecurityDescriptor); + + Status = ZwOpenFile(&hDirectory, + SYNCHRONIZE | WRITE_OWNER, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* create the Administrators SID */ + Status = RtlAllocateAndInitializeSid(&LocalSystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdminSid); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* create the security descriptor */ + Status = RtlCreateSecurityDescriptor(&AbsSD, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + Status = RtlSetOwnerSecurityDescriptor(&AbsSD, + AdminSid, + FALSE); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* attempt to take ownership */ + Status = ZwSetSecurityObject(hDirectory, + OWNER_SECURITY_INFORMATION, + &AbsSD); + +Cleanup: + if (TokenEnabled) + { + ZwAdjustPrivilegesToken(hToken, + FALSE, + &TokenPrivileges, + 0, + NULL, + NULL); + } + + if (AdminSid != NULL) + { + RtlFreeSid(AdminSid); + } + + if (hDirectory != NULL) + { + ZwClose(hDirectory); + } + + if (hToken != NULL) + { + ZwClose(hToken); + } + + return Status; +} + /* -* @unimplemented +* @implemented */ NTSTATUS NTAPI @@ -23,8 +540,131 @@ IN PUNICODE_STRING VolumeRootPath ) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE hDirectory; + UNICODE_STRING DirectoryName, NewPath; + ULONG PathLen; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + PSID SystemSid = NULL; + BOOLEAN AddSep = FALSE; + NTSTATUS Status; + + PAGED_CODE_RTL(); + + RtlInitUnicodeString(&DirectoryName, + L"System Volume Information"); + + PathLen = VolumeRootPath->Length + DirectoryName.Length; + + /* make sure we don't overflow while appending the strings */ + if (PathLen > 0xFFFC) + { + return STATUS_INVALID_PARAMETER; + } + + if (VolumeRootPath->Buffer[(VolumeRootPath->Length / sizeof(WCHAR)) - 1] != L'\\') + { + AddSep = TRUE; + PathLen += sizeof(WCHAR); + } + + /* allocate the new string */ + NewPath.MaximumLength = (USHORT)PathLen + sizeof(WCHAR); + NewPath.Buffer = RtlpAllocateStringMemory(NewPath.MaximumLength, + TAG_USTR); + if (NewPath.Buffer == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* create the new path string */ + NewPath.Length = VolumeRootPath->Length; + RtlCopyMemory(NewPath.Buffer, + VolumeRootPath->Buffer, + NewPath.Length); + if (AddSep) + { + NewPath.Buffer[NewPath.Length / sizeof(WCHAR)] = L'\\'; + NewPath.Length += sizeof(WCHAR); + } + RtlCopyMemory(NewPath.Buffer + (NewPath.Length / sizeof(WCHAR)), + DirectoryName.Buffer, + DirectoryName.Length); + NewPath.Length += DirectoryName.Length; + NewPath.Buffer[NewPath.Length / sizeof(WCHAR)] = L'\0'; + + ASSERT(NewPath.Length == PathLen); + ASSERT(NewPath.Length == NewPath.MaximumLength - sizeof(WCHAR)); + + /* create the security descriptor for the new directory */ + Status = RtlpSysVolCreateSecurityDescriptor(&SecurityDescriptor, + &SystemSid); + if (NT_SUCCESS(Status)) + { + /* create or open the directory */ + InitializeObjectAttributes(&ObjectAttributes, + &NewPath, + 0, + NULL, + SecurityDescriptor); + + Status = ZwCreateFile(&hDirectory, + SYNCHRONIZE | WRITE_OWNER | WRITE_DAC | READ_CONTROL, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN_IF, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + if (!NT_SUCCESS(Status)) + { + Status = RtlpSysVolTakeOwnership(&NewPath, + SecurityDescriptor); + + if (NT_SUCCESS(Status)) + { + /* successfully took ownership, attempt to open it */ + Status = ZwCreateFile(&hDirectory, + SYNCHRONIZE | WRITE_OWNER | WRITE_DAC | READ_CONTROL, + &ObjectAttributes, + &IoStatusBlock, + NULL, + FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN_IF, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0); + } + } + + if (NT_SUCCESS(Status)) + { + /* check security now and adjust it if neccessary */ + Status = RtlpSysVolCheckOwnerAndSecurity(hDirectory, + SecurityDescriptor); + ZwClose(hDirectory); + } + + /* free allocated memory */ + ASSERT(SecurityDescriptor != NULL); + ASSERT(SecurityDescriptor->Dacl != NULL) + + RtlpFreeMemory(SecurityDescriptor->Dacl, + TAG('S', 'e', 'A', 'c')); + RtlpFreeMemory(SecurityDescriptor, + TAG('S', 'e', 'S', 'd')); + + RtlFreeSid(SystemSid); + } + + RtlpFreeStringMemory(NewPath.Buffer, + TAG_USTR); + return Status; } /*

18 years, 10 months

[weiden] 18945: return the required buffer size in RtlMakeSelfRelativeSD if the supplied buffer is too small

by weiden＠svn.reactos.com

return the required buffer size in RtlMakeSelfRelativeSD if the supplied buffer is too small Modified: trunk/reactos/lib/rtl/sd.c _____ Modified: trunk/reactos/lib/rtl/sd.c --- trunk/reactos/lib/rtl/sd.c 2005-11-01 23:54:39 UTC (rev 18944) +++ trunk/reactos/lib/rtl/sd.c 2005-11-02 00:40:35 UTC (rev 18945) @@ -455,6 +455,7 @@ TotalLength = sizeof(SECURITY_DESCRIPTOR_RELATIVE) + OwnerLength + GroupLength + SaclLength + DaclLength; if (*BufferLength < TotalLength) { + *BufferLength = TotalLength; return STATUS_BUFFER_TOO_SMALL; }

18 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005