January 2011 - Wine-commits

Michael Stefaniuc : urlmon: COM cleanup for the IBinding iface.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 7b496eb178909dc249de215b2de964bfc16ad9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b496eb178909dc249de215b2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 23:27:11 2011 +0100 urlmon: COM cleanup for the IBinding iface. --- dlls/urlmon/binding.c | 117 +++++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b496eb178909dc249de2…

1 0

Michael Stefaniuc : urlmon: COM cleanup for the rest of the ifaces in Binding.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: a1cef7294de6c8188674a6c65964b42e064c844c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1cef7294de6c8188674a6c65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 23:29:12 2011 +0100 urlmon: COM cleanup for the rest of the ifaces in Binding. --- dlls/urlmon/binding.c | 104 +++++++++++++++++++++++--------------------- dlls/urlmon/urlmon_main.h | 2 - 2 files changed, 54 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1cef7294de6c8188674a…

1 0

Michael Stefaniuc : urlmon: COM cleanup for the IStream iface.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 970e211a2112c2bcbcee54a58816f70b19d58c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=970e211a2112c2bcbcee54a58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 14 23:31:13 2011 +0100 urlmon: COM cleanup for the IStream iface. --- dlls/urlmon/binding.c | 56 ++++++++++++++++++++++---------------------- dlls/urlmon/urlmon_main.h | 2 - 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 24271ee..aa547c3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -104,7 +104,6 @@ typedef struct { CRITICAL_SECTION section; } Binding; -#define STREAM(x) ((IStream*) &(x)->lpStreamVtbl) #define HTTPNEG2(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl) static void fill_stgmed_buffer(stgmed_buf_t *buf) @@ -434,35 +433,38 @@ static stgmed_buf_t *create_stgmed_buf(IInternetProtocolEx *protocol) typedef struct { stgmed_obj_t stgmed_obj; - const IStreamVtbl *lpStreamVtbl; + IStream IStream_iface; LONG ref; stgmed_buf_t *buf; } ProtocolStream; -#define STREAM_THIS(iface) DEFINE_THIS(ProtocolStream, Stream, iface) +static inline ProtocolStream *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, ProtocolStream, IStream_iface); +} static HRESULT WINAPI ProtocolStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = STREAM(This); + *ppv = &This->IStream_iface; }else if(IsEqualGUID(&IID_ISequentialStream, riid)) { TRACE("(%p)->(IID_ISequentialStream %p)\n", This, ppv); - *ppv = STREAM(This); + *ppv = &This->IStream_iface; }else if(IsEqualGUID(&IID_IStream, riid)) { TRACE("(%p)->(IID_IStream %p)\n", This, ppv); - *ppv = STREAM(This); + *ppv = &This->IStream_iface; } if(*ppv) { - IStream_AddRef(STREAM(This)); + IStream_AddRef(&This->IStream_iface); return S_OK; } @@ -472,7 +474,7 @@ static HRESULT WINAPI ProtocolStream_QueryInterface(IStream *iface, static ULONG WINAPI ProtocolStream_AddRef(IStream *iface) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -482,7 +484,7 @@ static ULONG WINAPI ProtocolStream_AddRef(IStream *iface) static ULONG WINAPI ProtocolStream_Release(IStream *iface) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -500,7 +502,7 @@ static ULONG WINAPI ProtocolStream_Release(IStream *iface) static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); DWORD read = 0, pread = 0; HRESULT hres; @@ -549,7 +551,7 @@ static HRESULT WINAPI ProtocolStream_Read(IStream *iface, void *pv, static HRESULT WINAPI ProtocolStream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); TRACE("(%p)->(%p %d %p)\n", This, pv, cb, pcbWritten); @@ -559,14 +561,14 @@ static HRESULT WINAPI ProtocolStream_Write(IStream *iface, const void *pv, static HRESULT WINAPI ProtocolStream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); FIXME("(%p)->(%d %08x %p)\n", This, dlibMove.u.LowPart, dwOrigin, plibNewPosition); return E_NOTIMPL; } static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); FIXME("(%p)->(%d)\n", This, libNewSize.u.LowPart); return E_NOTIMPL; } @@ -574,14 +576,14 @@ static HRESULT WINAPI ProtocolStream_SetSize(IStream *iface, ULARGE_INTEGER libN static HRESULT WINAPI ProtocolStream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); FIXME("(%p)->(%p %d %p %p)\n", This, pstm, cb.u.LowPart, pcbRead, pcbWritten); return E_NOTIMPL; } static HRESULT WINAPI ProtocolStream_Commit(IStream *iface, DWORD grfCommitFlags) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); TRACE("(%p)->(%08x)\n", This, grfCommitFlags); @@ -590,7 +592,7 @@ static HRESULT WINAPI ProtocolStream_Commit(IStream *iface, DWORD grfCommitFlags static HRESULT WINAPI ProtocolStream_Revert(IStream *iface) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); TRACE("(%p)\n", This); @@ -600,7 +602,7 @@ static HRESULT WINAPI ProtocolStream_Revert(IStream *iface) static HRESULT WINAPI ProtocolStream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); FIXME("(%p)->(%d %d %d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); return E_NOTIMPL; } @@ -608,7 +610,7 @@ static HRESULT WINAPI ProtocolStream_LockRegion(IStream *iface, ULARGE_INTEGER l static HRESULT WINAPI ProtocolStream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); FIXME("(%p)->(%d %d %d)\n", This, libOffset.u.LowPart, cb.u.LowPart, dwLockType); return E_NOTIMPL; } @@ -616,7 +618,7 @@ static HRESULT WINAPI ProtocolStream_UnlockRegion(IStream *iface, static HRESULT WINAPI ProtocolStream_Stat(IStream *iface, STATSTG *pstatstg, DWORD dwStatFlag) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); TRACE("(%p)->(%p %08x)\n", This, pstatstg, dwStatFlag); if(!pstatstg) @@ -645,13 +647,11 @@ static HRESULT WINAPI ProtocolStream_Stat(IStream *iface, STATSTG *pstatstg, static HRESULT WINAPI ProtocolStream_Clone(IStream *iface, IStream **ppstm) { - ProtocolStream *This = STREAM_THIS(iface); + ProtocolStream *This = impl_from_IStream(iface); FIXME("(%p)->(%p)\n", This, ppstm); return E_NOTIMPL; } -#undef STREAM_THIS - static const IStreamVtbl ProtocolStreamVtbl = { ProtocolStream_QueryInterface, ProtocolStream_AddRef, @@ -672,7 +672,7 @@ static const IStreamVtbl ProtocolStreamVtbl = { static void stgmed_stream_release(stgmed_obj_t *obj) { ProtocolStream *stream = (ProtocolStream*)obj; - IStream_Release(STREAM(stream)); + IStream_Release(&stream->IStream_iface); } static HRESULT stgmed_stream_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) @@ -680,7 +680,7 @@ static HRESULT stgmed_stream_fill_stgmed(stgmed_obj_t *obj, STGMEDIUM *stgmed) ProtocolStream *stream = (ProtocolStream*)obj; stgmed->tymed = TYMED_ISTREAM; - stgmed->u.pstm = STREAM(stream); + stgmed->u.pstm = &stream->IStream_iface; stgmed->pUnkForRelease = &stream->buf->IUnknown_iface; return S_OK; @@ -694,8 +694,8 @@ static HRESULT stgmed_stream_get_result(stgmed_obj_t *obj, DWORD bindf, void **r && (stream->buf->hres != S_FALSE || stream->buf->size)) return INET_E_DATA_NOT_AVAILABLE; - IStream_AddRef(STREAM(stream)); - *result = STREAM(stream); + IStream_AddRef(&stream->IStream_iface); + *result = &stream->IStream_iface; return S_OK; } @@ -715,7 +715,7 @@ static stgmed_obj_t *create_stgmed_stream(stgmed_buf_t *buf) ProtocolStream *ret = heap_alloc(sizeof(ProtocolStream)); ret->stgmed_obj.vtbl = &stgmed_stream_vtbl; - ret->lpStreamVtbl = &ProtocolStreamVtbl; + ret->IStream_iface.lpVtbl = &ProtocolStreamVtbl; ret->ref = 1; IUnknown_AddRef(&buf->IUnknown_iface); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 95fa43c..8edb708 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -62,8 +62,6 @@ extern LONG URLMON_refCount; static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); } static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); } -#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) - IInternetProtocolInfo *get_protocol_info(LPCWSTR); HRESULT get_protocol_handler(IUri*,CLSID*,BOOL*,IClassFactory**); IInternetProtocol *get_mime_filter(LPCWSTR);

1 0

Nikolay Sivov : oleaut32/safearray: Fix allocation error check for array descriptor.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 90090332a25f69674b5ee1808cba09ff0123062f URL: http://source.winehq.org/git/wine.git/?a=commit;h=90090332a25f69674b5ee1808… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 14 23:30:17 2011 +0300 oleaut32/safearray: Fix allocation error check for array descriptor. --- dlls/oleaut32/safearray.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index f8f87eb..dd00cfd 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -172,11 +172,15 @@ static ULONG SAFEARRAY_GetCellCount(const SAFEARRAY *psa) /* Allocate a descriptor for an array */ static HRESULT SAFEARRAY_AllocDescriptor(ULONG ulSize, SAFEARRAY **ppsaOut) { - *ppsaOut = (SAFEARRAY*)((char*)SAFEARRAY_Malloc(ulSize + SAFEARRAY_HIDDEN_SIZE) + SAFEARRAY_HIDDEN_SIZE); + char *ptr = SAFEARRAY_Malloc(ulSize + SAFEARRAY_HIDDEN_SIZE); - if (!*ppsaOut) - return E_UNEXPECTED; + if (!ptr) + { + *ppsaOut = NULL; + return E_UNEXPECTED; + } + *ppsaOut = (SAFEARRAY*)(ptr + SAFEARRAY_HIDDEN_SIZE); return S_OK; }

1 0

Nikolay Sivov : comctl32/tests: Fix a leak in toolbar test data allocation (Valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: e61fd95146d5ba7abbb000820b1c898c2db9b6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61fd95146d5ba7abbb000820… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 15 00:20:29 2011 +0300 comctl32/tests: Fix a leak in toolbar test data allocation (Valgrind). --- dlls/comctl32/tests/toolbar.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 75640a8..280a333 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -708,16 +708,15 @@ typedef struct } tbsize_result_t; tbsize_result_t init_tbsize_result(int nButtonsAlloc, int cleft, int ctop, int cright, int cbottom, int minx, int miny) { - tbsize_result_t *temp; + tbsize_result_t ret; - temp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tbsize_result_t)); - SetRect(&temp->rcClient, cleft, ctop, cright, cbottom); - temp->szMin.cx = minx; - temp->szMin.cy = miny; - temp->nButtons = 0; - temp->prcButtons = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nButtonsAlloc*sizeof(RECT)); + SetRect(&ret.rcClient, cleft, ctop, cright, cbottom); + ret.szMin.cx = minx; + ret.szMin.cy = miny; + ret.nButtons = 0; + ret.prcButtons = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nButtonsAlloc*sizeof(RECT)); - return *temp; + return ret; } void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right, int bottom) { @@ -729,7 +728,7 @@ void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right, int b #define STRING1 "MMMMMMMMMMMMM" #define STRING2 "Tst" -tbsize_result_t *tbsize_results = NULL; +static tbsize_result_t *tbsize_results; #define tbsize_results_num 24

1 0

Nikolay Sivov : comctl32/tests: Fix a leak in rebar test data allocation ( Valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 6869f89a3078f0717a14dfeec444b7f6f1988551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6869f89a3078f0717a14dfeec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 15 00:28:38 2011 +0300 comctl32/tests: Fix a leak in rebar test data allocation (Valgrind). --- dlls/comctl32/tests/rebar.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 1856502..3a01756 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -208,17 +208,16 @@ typedef struct { static rbsize_result_t rbsize_init(int cleft, int ctop, int cright, int cbottom, int cyBarHeight, int nRows, int nBands) { - rbsize_result_t *temp; + rbsize_result_t ret; - temp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(rbsize_result_t)); - SetRect(&temp->rcClient, cleft, ctop, cright, cbottom); - temp->cyBarHeight = cyBarHeight; - temp->nRows = 0; - temp->cyRowHeights = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nRows*sizeof(int)); - temp->nBands = 0; - temp->bands = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nBands*sizeof(rbband_result_t)); + SetRect(&ret.rcClient, cleft, ctop, cright, cbottom); + ret.cyBarHeight = cyBarHeight; + ret.nRows = 0; + ret.cyRowHeights = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nRows*sizeof(int)); + ret.nBands = 0; + ret.bands = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nBands*sizeof(rbband_result_t)); - return *temp; + return ret; } static void rbsize_add_row(rbsize_result_t *rbsr, int rowHeight) { @@ -234,7 +233,7 @@ static void rbsize_add_band(rbsize_result_t *rbsr, int left, int top, int right, rbsr->nBands++; } -static rbsize_result_t *rbsize_results = NULL; +static rbsize_result_t *rbsize_results; #define rbsize_results_num 27

1 0

Nikolay Sivov : oleaut32/tests: Fix a string leak (Valgrind).
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 0fc4e7b17c5797cce1bf92f3247736f41345f3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc4e7b17c5797cce1bf92f32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 15 00:54:18 2011 +0300 oleaut32/tests: Fix a string leak (Valgrind). --- dlls/oleaut32/tests/typelib.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 03eda3b..acc60f5 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1847,6 +1847,7 @@ static void test_CreateTypeLib(void) { V_BSTR(&paramdescex.varDefaultValue) = SysAllocString(defaultW); hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc); ok(hres == S_OK, "got %08x\n", hres); + SysFreeString(V_BSTR(&paramdescex.varDefaultValue)); hres = ITypeInfo2_GetFuncDesc(ti2, 3, &pfuncdesc); ok(hres == S_OK, "got %08x\n", hres);

1 0

Alexander Morozov : include: Add some Shell32 interfaces and coclasses.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 420b48b4c88a867297d55bb3ac8814de6d9e3b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=420b48b4c88a867297d55bb3a… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Jan 14 20:41:10 2011 +0300 include: Add some Shell32 interfaces and coclasses. --- include/shldisp.idl | 366 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 366 insertions(+), 0 deletions(-) diff --git a/include/shldisp.idl b/include/shldisp.idl index 07c3059..ce6d555 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -77,6 +77,15 @@ interface IAutoComplete2 : IAutoComplete } [ + uuid(50a7e9b0-70ef-11d1-b75a-00a0c90564fe), + version(1.0) +] +library Shell32 +{ + +importlib("stdole2.tlb"); + +[ object, uuid(9ba05970-f6a8-11cf-a442-00a0c90a8f39), pointer_default(unique) @@ -119,6 +128,363 @@ coclass ShellFolderViewOC [default, source] dispinterface DShellFolderViewEvents; } +interface FolderItem; +interface FolderItems; +interface FolderItemVerb; +interface FolderItemVerbs; + +/***************************************************************************** + * Folder interface + */ +[ + object, + uuid(bbcbde60-c3ff-11ce-8350-444553540000), + oleautomation, + dual +] +interface Folder : IDispatch +{ + [propget, id(DISPID_VALUE)] + HRESULT Title( [out, retval] BSTR *pbs ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT ParentFolder( [out, retval] Folder **ppsf ); + + HRESULT Items( [out, retval] FolderItems **ppid ); + + HRESULT ParseName( [in] BSTR bName, [out, retval] FolderItem **ppid ); + + HRESULT NewFolder( [in] BSTR bName, [in, optional] VARIANT vOptions ); + + HRESULT MoveHere( [in] VARIANT vItem, [in, optional] VARIANT vOptions ); + + HRESULT CopyHere( [in] VARIANT vItem, [in, optional] VARIANT vOptions ); + + HRESULT GetDetailsOf( [in] VARIANT vItem, + [in] int iColumn, + [out, retval] BSTR *pbs ); +} + +/***************************************************************************** + * Folder2 interface + */ +[ + object, + uuid(f0d2d8ef-3890-11d2-bf8b-00c04fb93661), + oleautomation, + dual +] +interface Folder2 : Folder +{ + [propget] + HRESULT Self( [out, retval] FolderItem **ppfi ); + + [propget] + HRESULT OfflineStatus( [out, retval] LONG *pul ); + + HRESULT Synchronize(); + + [propget, id(1)] + HRESULT HaveToShowWebViewBarricade( + [out, retval] VARIANT_BOOL *pbHaveToShowWebViewBarricade ); + + HRESULT DismissedWebViewBarricade(); +} + +/***************************************************************************** + * Folder3 interface + */ +[ + object, + uuid(a7ae5f64-c4d7-4d7f-9307-4d24ee54b841), + oleautomation, + dual +] +interface Folder3 : Folder2 +{ + [propget, id(2)] + HRESULT ShowWebViewBarricade( + [out, retval] VARIANT_BOOL *pbShowWebViewBarricade ); + + [propput, id(2)] + HRESULT ShowWebViewBarricade( [in] VARIANT_BOOL bShowWebViewBarricade ); +} + +/***************************************************************************** + * FolderItem interface + */ +[ + object, + uuid(fac32c80-cbe4-11ce-8350-444553540000), + oleautomation, + dual +] +interface FolderItem : IDispatch +{ + typedef FolderItem *LPFOLDERITEM; + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget, id(DISPID_VALUE)] + HRESULT Name( [out, retval] BSTR *pbs ); + + [propput, id(DISPID_VALUE)] + HRESULT Name( [in] BSTR bs ); + + [propget] + HRESULT Path( [out, retval] BSTR *pbs ); + + [propget] + HRESULT GetLink( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT GetFolder( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT IsLink( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsFolder( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsFileSystem( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT IsBrowsable( [out, retval] VARIANT_BOOL *pb ); + + [propget] + HRESULT ModifyDate( [out, retval] DATE *pdt ); + + [propput] + HRESULT ModifyDate( [in] DATE dt ); + + [propget] + HRESULT Size( [out, retval] LONG *pul ); + + [propget] + HRESULT Type( [out, retval] BSTR *pbs ); + + HRESULT Verbs( [out, retval] FolderItemVerbs **ppfic ); + + HRESULT InvokeVerb( [in, optional] VARIANT vVerb ); +} + +/***************************************************************************** + * FolderItems interface + */ +[ + object, + uuid(744129e0-cbe5-11ce-8350-444553540000), + oleautomation, + dual +] +interface FolderItems : IDispatch +{ + [propget] + HRESULT Count( [out, retval] long *plCount ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT Item( [in, optional] VARIANT index, + [out, retval] FolderItem **ppid ); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum( [out, retval] IUnknown **ppunk ); +} + +/***************************************************************************** + * FolderItemVerb interface + */ +[ + object, + uuid(08ec3e00-50b0-11cf-960c-0080c7f4ee85), + oleautomation, + dual +] +interface FolderItemVerb : IDispatch +{ + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + [propget, id(DISPID_VALUE)] + HRESULT Name( [out, retval] BSTR *pbs ); + + HRESULT DoIt(); +} + +/***************************************************************************** + * FolderItemVerbs interface + */ +[ + object, + uuid(1f8352c0-50b0-11cf-960c-0080c7f4ee85), + oleautomation, + dual +] +interface FolderItemVerbs : IDispatch +{ + [propget] + HRESULT Count( [out, retval] long *plCount ); + + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT Item( [in, optional] VARIANT index, + [out, retval] FolderItemVerb **ppid ); + + [id(DISPID_NEWENUM)] + HRESULT _NewEnum( [out, retval] IUnknown **ppunk ); +} + +/***************************************************************************** + * IShellDispatch interface + */ +[ + object, + uuid(d8f015c0-c278-11ce-a49e-444553540000), + oleautomation, + hidden, + dual +] +interface IShellDispatch : IDispatch +{ + [propget] + HRESULT Application( [out, retval] IDispatch **ppid ); + + [propget] + HRESULT Parent( [out, retval] IDispatch **ppid ); + + HRESULT NameSpace( [in] VARIANT vDir, [out, retval] Folder **ppsdf ); + + HRESULT BrowseForFolder( [in] long Hwnd, + [in] BSTR Title, + [in] long Options, + [in, optional] VARIANT RootFolder, + [out, retval] Folder **ppsdf ); + + HRESULT Windows( [out, retval] IDispatch **ppid ); + + HRESULT Open( [in] VARIANT vDir ); + + HRESULT Explore( [in] VARIANT vDir ); + + HRESULT MinimizeAll(); + + HRESULT UndoMinimizeALL(); + + HRESULT FileRun(); + + HRESULT CascadeWindows(); + + HRESULT TileVertically(); + + HRESULT TileHorizontally(); + + HRESULT ShutdownWindows(); + + HRESULT Suspend(); + + HRESULT EjectPC(); + + HRESULT SetTime(); + + HRESULT TrayProperties(); + + HRESULT Help(); + + HRESULT FindFiles(); + + HRESULT FindComputer(); + + HRESULT RefreshMenu(); + + HRESULT ControlPanelItem( [in] BSTR szDir ); +} + +[ + uuid(13709620-c279-11ce-a49e-444553540000) +] +coclass Shell +{ + [default] interface IShellDispatch; +} + +[ + uuid(0a89a860-d7b1-11ce-8350-444553540000), + hidden +] +coclass ShellDispatchInproc +{ + interface IUnknown; +} + +typedef +[ + uuid(ca31ea20-48d0-11cf-8350-444553540000) +] +enum ShellSpecialFolderConstants { + ssfDESKTOP = 0x00, + ssfPROGRAMS = 0x02, + ssfCONTROLS = 0x03, + ssfPRINTERS = 0x04, + ssfPERSONAL = 0x05, + ssfFAVORITES = 0x06, + ssfSTARTUP = 0x07, + ssfRECENT = 0x08, + ssfSENDTO = 0x09, + ssfBITBUCKET = 0x0a, + ssfSTARTMENU = 0x0b, + ssfDESKTOPDIRECTORY = 0x10, + ssfDRIVES = 0x11, + ssfNETWORK = 0x12, + ssfNETHOOD = 0x13, + ssfFONTS = 0x14, + ssfTEMPLATES = 0x15, + ssfCOMMONSTARTMENU = 0x16, + ssfCOMMONPROGRAMS = 0x17, + ssfCOMMONSTARTUP = 0x18, + ssfCOMMONDESKTOPDIR = 0x19, + ssfAPPDATA = 0x1a, + ssfPRINTHOOD = 0x1b, + ssfLOCALAPPDATA = 0x1c, + ssfALTSTARTUP = 0x1d, + ssfCOMMONALTSTARTUP = 0x1e, + ssfCOMMONFAVORITES = 0x1f, + ssfINTERNETCACHE = 0x20, + ssfCOOKIES = 0x21, + ssfHISTORY = 0x22, + ssfCOMMONAPPDATA = 0x23, + ssfWINDOWS = 0x24, + ssfSYSTEM = 0x25, + ssfPROGRAMFILES = 0x26, + ssfMYPICTURES = 0x27, + ssfPROFILE = 0x28, + ssfSYSTEMx86 = 0x29, + ssfPROGRAMFILESx86 = 0x30 +} ShellSpecialFolderConstants; + +} /* library Shell32 */ + /***************************************************************************** * IAsyncOperation interface */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: d09218d503d63d67c9a89d6f4a60d0597b041c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09218d503d63d67c9a89d6f4… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Jan 14 21:23:06 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 106 +++++++++++++++++++------------------------------------------ 1 files changed, 33 insertions(+), 73 deletions(-) diff --git a/po/lt.po b/po/lt.po index 308e5a6..9a38b5a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-01-13 20:37+0300\n" +"PO-Revision-Date: 2011-01-14 21:21+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)gmail.com>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -172,13 +172,8 @@ msgid "Desktop" msgstr "Darbalaukis" #: comdlg32.rc:35 winhlp32.rc:52 winhlp32.rc:75 -#, fuzzy msgid "Fonts" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Šriftas\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Šriftai" +msgstr "Šriftai" #: comdlg32.rc:36 shell32.rc:142 regedit.rc:206 msgid "My Computer" @@ -430,13 +425,8 @@ msgid "Open File" msgstr "Atverti failą" #: comdlg32.rc:93 oleview.rc:95 -#, fuzzy msgid "Ready" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Parengta\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Parengtas" +msgstr "Parengta" #: comdlg32.rc:94 msgid "Paused; " @@ -3251,13 +3241,8 @@ msgstr "&Užverti" #: shdocvw.rc:42 shell32.rc:40 shell32.rc:105 oleview.rc:58 oleview.rc:82 #: regedit.rc:65 taskmgr.rc:52 winefile.rc:76 wordpad.rc:66 -#, fuzzy msgid "&View" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Rodymas\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Rodinys" +msgstr "&Rodymas" #: shdocvw.rc:44 msgid "&Toolbars" @@ -3276,13 +3261,8 @@ msgid "&Favorites" msgstr "&Adresynas" #: shdocvw.rc:52 regedit.rc:75 -#, fuzzy msgid "&Add to Favorites..." -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Į&rašyti į adresyną...\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Pri&dėti į adresyną..." +msgstr "Į&rašyti į adresyną..." #: shdocvw.rc:55 shell32.rc:113 notepad.rc:57 oleview.rc:69 progman.rc:52 #: regedit.rc:78 taskmgr.rc:87 winefile.rc:130 winhlp32.rc:60 wordpad.rc:91 @@ -3382,7 +3362,6 @@ msgstr "&Pervadinti" #: shell32.rc:102 notepad.rc:36 oleview.rc:35 regedit.rc:41 view.rc:31 #: winhlp32.rc:34 wordpad.rc:37 -#, fuzzy msgid "E&xit" msgstr "Iš&eiti" @@ -3439,13 +3418,8 @@ msgid "Select" msgstr "Iš&rinkti" #: shell32.rc:152 oleview.rc:99 -#, fuzzy msgid "Open" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Atverti\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Atverti" +msgstr "Atverti" #: shell32.rc:173 msgid "Restart" @@ -5562,19 +5536,19 @@ msgstr "%s %S %S Atverti ištekliai: %lu\n" #: notepad.rc:27 msgid "&New\tCtrl+N" -msgstr "&Naujas\tCtrl+N" +msgstr "&Naujas\tVald+N" #: notepad.rc:28 wordpad.rc:29 msgid "&Open...\tCtrl+O" -msgstr "&Atverti...\tCtrl+O" +msgstr "&Atverti...\tVald+O" #: notepad.rc:29 wordpad.rc:30 msgid "&Save\tCtrl+S" -msgstr "&Išsaugoti\tCtrl+S" +msgstr "&Išsaugoti\tVald+S" #: notepad.rc:32 wordpad.rc:33 msgid "&Print...\tCtrl+P" -msgstr "S&pausdinti...\tCtrl+P" +msgstr "S&pausdinti...\tVald+P" #: notepad.rc:33 wordpad.rc:35 msgid "Page Se&tup..." @@ -5590,19 +5564,19 @@ msgstr "&Taisa" #: notepad.rc:39 wordpad.rc:41 msgid "&Undo\tCtrl+Z" -msgstr "&Atšaukti\tCtrl+Z" +msgstr "&Atšaukti\tVald+Z" #: notepad.rc:41 wordpad.rc:44 msgid "Cu&t\tCtrl+X" -msgstr "&Iškirpti\tCtrl+X" +msgstr "&Iškirpti\tVald+X" #: notepad.rc:42 wordpad.rc:45 msgid "&Copy\tCtrl+C" -msgstr "&Kopijuoti\tCtrl+C" +msgstr "&Kopijuoti\tVald+C" #: notepad.rc:43 wordpad.rc:46 msgid "&Paste\tCtrl+V" -msgstr "Į&dėti\tCtrl+V" +msgstr "Į&dėti\tVald+V" #: notepad.rc:44 progman.rc:34 regedit.rc:57 regedit.rc:93 regedit.rc:108 #: winefile.rc:30 @@ -5611,7 +5585,7 @@ msgstr "&Šalinti\tDel" #: notepad.rc:46 msgid "Select &all\tCtrl+A" -msgstr "&Pažymėti viską\tCtrl+A" +msgstr "&Pažymėti viską\tVald+A" #: notepad.rc:47 msgid "&Time/Date\tF5" @@ -5623,7 +5597,7 @@ msgstr "Skaidyti ilgas &eilutes" #: notepad.rc:53 msgid "&Search...\tCtrl+F" -msgstr "&Ieškoti...\tCtrl+F" +msgstr "&Ieškoti...\tVald+F" #: notepad.rc:54 msgid "&Search next\tF3" @@ -5631,7 +5605,7 @@ msgstr "Ieškoti ki&to\tF3" #: notepad.rc:55 wordpad.rc:52 msgid "&Replace...\tCtrl+H" -msgstr "Pa&keisti...\tCtrl+H" +msgstr "Pa&keisti...\tVald+H" #: notepad.rc:59 progman.rc:54 msgid "&Search..." @@ -5836,13 +5810,8 @@ msgid "&Status Bar" msgstr "&Būsenos juosta" #: oleview.rc:67 regedit.rc:71 winefile.rc:127 -#, fuzzy msgid "&Refresh\tF5" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"At&naujinti\tF5\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Atnaujinti\tF5" +msgstr "At&naujinti\tF5" #: oleview.rc:71 msgid "&About OleView" @@ -5873,7 +5842,6 @@ msgid "version 1.0" msgstr "versija 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb;*.olb;*.dll;*.ocx;*.exe)" msgstr "TypeLib failai (*.tlb;*.olb;*.dll;*.ocx;*.exe)" @@ -6088,11 +6056,11 @@ msgstr "&Langai" #: progman.rc:47 msgid "&Overlapped\tShift+F5" -msgstr "&Persikloję\tShift+F5" +msgstr "&Persikloję\tLyg2+F5" #: progman.rc:48 msgid "&Side by side\tShift+F4" -msgstr "&Greta vienas kito\tShift+F4" +msgstr "&Greta vienas kito\tLyg2+F4" #: progman.rc:49 msgid "&Arrange Icons" @@ -6245,7 +6213,7 @@ msgstr "&Atjungti registrą tinkle..." #: regedit.rc:39 msgid "&Print\tCtrl+P" -msgstr "S&pausdinti\tCtrl+P" +msgstr "S&pausdinti\tVald+P" #: regedit.rc:45 regedit.rc:90 msgid "&Modify" @@ -6281,7 +6249,7 @@ msgstr "Kopijuoti rakto &vardą" #: regedit.rc:62 regedit.rc:114 msgid "&Find\tCtrl+F" -msgstr "&Ieškoti\tCtrl+F" +msgstr "&Ieškoti\tVald+F" #: regedit.rc:63 msgid "Find Ne&xt\tF3" @@ -6305,13 +6273,8 @@ msgid "&Remove Favorite..." msgstr "&Pašalinti iš adresyno..." #: regedit.rc:80 winefile.rc:131 -#, fuzzy msgid "&Help Topics\tF1" -msgstr "" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"Žinyno &temos\tF1\n" -"#-#-#-#-# lt.po (Wine) #-#-#-#-#\n" -"&Žinyno temos\tF1" +msgstr "&Žinyno temos\tF1" #: regedit.rc:82 msgid "&About Registry Editor" @@ -6368,12 +6331,10 @@ msgid "Export Registry File" msgstr "Eksportuoti registro failą" #: regedit.rc:199 -#, fuzzy msgid "Registry files (*.reg)" msgstr "Registro failai (*.reg)" #: regedit.rc:200 -#, fuzzy msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "Win9x/NT4 registro failai (REGEDIT4)" @@ -7901,9 +7862,8 @@ msgid "Expand &Tree\t*" msgstr "Išskleisti &medį\t*" #: winefile.rc:70 -#, fuzzy msgid "Expand &all\tCtrl+*" -msgstr "Išskleisti &viską\tStrg+*" +msgstr "Išskleisti &viską\tVald+*" #: winefile.rc:71 msgid "Collapse &Tree\t-" @@ -7971,7 +7931,7 @@ msgstr "&Diskų juosta" #: winefile.rc:104 msgid "F&ull Screen\tCtrl+Shift+S" -msgstr "&Visas ekranas\tCtrl+Shift+S" +msgstr "&Visas ekranas\tVald+Lyg2+S" #: winefile.rc:112 msgid "&Security" @@ -7995,11 +7955,11 @@ msgstr "Naujas &langas" #: winefile.rc:120 msgid "Cascading\tCtrl+F5" -msgstr "Išdėstyti pa&kopomis\tCtrl+F5" +msgstr "Išdėstyti pa&kopomis\tVald+F5" #: winefile.rc:122 msgid "Tile &Vertically\tCtrl+F4" -msgstr "Iškloti &stačiai\tCtrl+F4" +msgstr "Iškloti &stačiai\tVald+F4" #: winefile.rc:124 msgid "Arrange Automatically" @@ -8235,11 +8195,11 @@ msgstr "Žinyno temos: " #: wordpad.rc:28 msgid "&New...\tCtrl+N" -msgstr "&Naujas...\tCtrl+N" +msgstr "&Naujas...\tVald+N" #: wordpad.rc:42 msgid "R&edo\tCtrl+Y" -msgstr "&Grąžinti\tCtrl+Y" +msgstr "&Grąžinti\tVald+Y" #: wordpad.rc:47 msgid "&Clear\tDEL" @@ -8247,11 +8207,11 @@ msgstr "&Šalinti\tDEL" #: wordpad.rc:48 msgid "&Select all\tCtrl+A" -msgstr "&Pažymėti viską\tCtrl+A" +msgstr "&Pažymėti viską\tVald+A" #: wordpad.rc:50 msgid "&Find...\tCtrl+F" -msgstr "I&eškoti...\tCtrl+F" +msgstr "I&eškoti...\tVald+F" #: wordpad.rc:51 msgid "Find &next\tF3" @@ -8335,11 +8295,11 @@ msgstr "&Fonas" #: wordpad.rc:87 msgid "&System\tCtrl+1" -msgstr "&Sistemos\tCtrl+1" +msgstr "&Sistemos\tVald+1" #: wordpad.rc:88 msgid "&PostThat yellowish\tCtrl+2" -msgstr "&Gelsvas\tCtrl+2" +msgstr "&Gelsvas\tVald+2" #: wordpad.rc:93 msgid "&About Wine Wordpad"

1 0

Alexandre Julliard : po: Update the English po files.
by Alexandre Julliard 17 Jan '11

17 Jan '11

Module: wine Branch: master Commit: 4b028deb003afc74e735906144d2823f75ebda76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b028deb003afc74e73590614… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 17 12:45:24 2011 +0100 po: Update the English po files. --- po/en.po | 781 +++++++++++++++++++---------------------------------------- po/en_US.po | 6 +- 2 files changed, 256 insertions(+), 531 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b028deb003afc74e7359…

1 0