May 2012 - Wine-commits - list.winehq.org

Christian Costa : d3drm: IDirect3DRM3_Load implementation is correct now.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 795bea989da3081bf440376928280d657bad2382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=795bea989da3081bf44037692… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri May 18 12:09:56 2012 +0200 d3drm: IDirect3DRM3_Load implementation is correct now. --- dlls/d3drm/d3drm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 8dc9523..f13effc 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1463,7 +1463,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc HRESULT ret = D3DRMERR_BADOBJECT; DWORD i; - FIXME("(%p/%p)->(%p,%p,%p,%d,%d,%p,%p,%p,%p,%p): partial implementation\n", iface, This, ObjSource, ObjID, GUIDs, + TRACE("(%p/%p)->(%p,%p,%p,%d,%d,%p,%p,%p,%p,%p)\n", iface, This, ObjSource, ObjID, GUIDs, nb_GUIDs, LOFlags, LoadProc, ArgLP, LoadTextureProc, ArgLTP, ParentFrame); TRACE("Looking for GUIDs:\n");

1 0

Aric Stewart : quartz: vmr-9 call BaseControlWindow_Destroy when destroying .
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: d04552cadac40f7de2bcc0da744ea3264bd69c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04552cadac40f7de2bcc0da7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 18 09:24:21 2012 -0500 quartz: vmr-9 call BaseControlWindow_Destroy when destroying. --- dlls/quartz/vmr9.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index cd7429d..809ee0f 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -527,6 +527,7 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) if (!refCount) { TRACE("Destroying\n"); + BaseControlWindow_Destroy(&This->baseControlWindow); if (This->allocator) IVMRSurfaceAllocator9_Release(This->allocator);

1 0

André Hentschel : wmvcore: Set output parameters to NULL.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 6bd29b2810a2f9dfbb1442cf268bb19bfcc8f4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd29b2810a2f9dfbb1442cf2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 18 16:58:49 2012 +0200 wmvcore: Set output parameters to NULL. --- dlls/wmvcore/wmvcore_main.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index b92a662..5d07159 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -48,11 +48,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) { FIXME("(%p, %x, %p): stub\n", reserved, rights, reader); + + *reader = NULL; + return E_NOTIMPL; } HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) { FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader); + + *syncreader = NULL; + return E_NOTIMPL; }

1 0

Aric Stewart : wineqtdecoder: Implement DataHGetFileSizeAsync.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 4948d343df7b834449f734ea924a2fea664a1868 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4948d343df7b834449f734ea9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 18 09:25:04 2012 -0500 wineqtdecoder: Implement DataHGetFileSizeAsync. --- dlls/wineqtdecoder/qtdatahandler.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index cfcb676..cd32077 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -422,6 +422,33 @@ static pascal ComponentResult myDataHGetFileSize64(DataHandler dh, wide * fileSi return noErr; } +static pascal ComponentResult myDataHGetFileSizeAsync ( DataHandler dh, wide *fileSize, DataHCompletionUPP CompletionRtn, long RefCon ) +{ + Handle storage = GetComponentInstanceStorage(dh); + DHData *data = (DHData*)*storage; + LONGLONG total; + LONGLONG avaliable; + SInt64 total64; + + TRACE("%p\n",dh); + + IAsyncReader_Length(data->dataRef.pReader,&total,&avaliable); + total64 = total; + *fileSize = SInt64ToWide(total64); + + if (CompletionRtn) + { + if (data->AsyncCompletionRtn) + InvokeDataHCompletionUPP(data->AsyncPtr, data->AsyncRefCon, noErr, data->AsyncCompletionRtn); + + data->AsyncPtr = (Ptr)fileSize; + data->AsyncRefCon = RefCon; + data->AsyncCompletionRtn = CompletionRtn; + } + + return noErr; +} + static pascal ComponentResult myDataHGetAvailableFileSize64(DataHandler dh, wide * fileSize) { Handle storage = GetComponentInstanceStorage(dh); @@ -610,7 +637,13 @@ static const struct { LPVOID proc; ProcInfoType type;} componentFunctions[] = {NULL, 0}, /* kDataHGetDataAvailabilitySelect */ {NULL, 0}, /* 0x0038 */ {NULL, 0}, /* 0x0039 */ - {NULL, 0}, /* kDataHGetFileSizeAsyncSelect */ + {myDataHGetFileSizeAsync, kPascalStackBased + | RESULT_SIZE(SIZE_CODE(sizeof(ComponentResult))) + | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(DataHandler))) + | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(wide*))) + | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(DataHCompletionUPP))) + | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(long))) +}, /* kDataHGetFileSizeAsyncSelect */ {NULL, 0}, /* kDataHGetDataRefAsTypeSelect */ {NULL, 0}, /* kDataHSetDataRefExtensionSelect */ {NULL, 0}, /* kDataHGetDataRefExtensionSelect */

1 0

Aric Stewart : wineqtdecoder: Implement a stub for DataHPlaybackHints64.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 6c51c1ba1310707a6380cac66aeb06b3f2f3994a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c51c1ba1310707a6380cac66… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 18 09:25:17 2012 -0500 wineqtdecoder: Implement a stub for DataHPlaybackHints64. --- dlls/wineqtdecoder/qtdatahandler.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtdatahandler.c b/dlls/wineqtdecoder/qtdatahandler.c index cd32077..f09014c 100644 --- a/dlls/wineqtdecoder/qtdatahandler.c +++ b/dlls/wineqtdecoder/qtdatahandler.c @@ -406,6 +406,22 @@ static pascal ComponentResult myDataHPlaybackHints(DataHandler dh, long flags, return noErr; } +static pascal ComponentResult myDataHPlaybackHints64(DataHandler dh, long flags, + wide *minFileOffset, wide *maxFileOffset, + long bytesPerSecond) +{ + if (TRACE_ON(qtdatahandler)) + { + SInt64 minFileOffset64 = WideToSInt64(*minFileOffset); + LONGLONG minFileOffsetLL = minFileOffset64; + SInt64 maxFileOffset64 = WideToSInt64(*maxFileOffset); + LONGLONG maxFileOffsetLL = maxFileOffset64; + + TRACE("%s %s %li\n",wine_dbgstr_longlong(minFileOffsetLL), wine_dbgstr_longlong(maxFileOffsetLL), bytesPerSecond); + } + return noErr; +} + static pascal ComponentResult myDataHGetFileSize64(DataHandler dh, wide * fileSize) { Handle storage = GetComponentInstanceStorage(dh); @@ -480,7 +496,7 @@ static pascal ComponentResult myDataHScheduleData64( DataHandler dh, LONGLONG offset = fileOffset64; BYTE* buffer = (BYTE*)PlaceToPutDataPtr; - TRACE("%p %p %lli %li %li %p %p\n",dh, PlaceToPutDataPtr, offset, DataSize, RefCon, scheduleRec, CompletionRtn); + TRACE("%p %p %s %li %li %p %p\n",dh, PlaceToPutDataPtr, wine_dbgstr_longlong(offset), DataSize, RefCon, scheduleRec, CompletionRtn); hr = IAsyncReader_SyncRead(data->dataRef.pReader, offset, DataSize, buffer); TRACE("result %x\n",hr); @@ -685,7 +701,14 @@ static const struct { LPVOID proc; ProcInfoType type;} componentFunctions_2[] = | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(unsigned long))) | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(long))) }, /* kDataHPlaybackHintsSelect 0x103 */ - {NULL, 0}, /* kDataHPlaybackHints64Select 0x10E */ + {myDataHPlaybackHints64, kPascalStackBased + | RESULT_SIZE(SIZE_CODE(sizeof(ComponentResult))) + | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(DataHandler))) + | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(long))) + | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(wide*))) + | STACK_ROUTINE_PARAMETER(4, SIZE_CODE(sizeof(wide*))) + | STACK_ROUTINE_PARAMETER(5, SIZE_CODE(sizeof(long))) +}, /* kDataHPlaybackHints64Select 0x10E */ {NULL, 0}, /* kDataHGetDataRateSelect 0x110 */ {NULL, 0}, /* kDataHSetTimeHintsSelect 0x111 */ }; @@ -726,6 +749,8 @@ static pascal ComponentResult myComponentCanDo(ComponentInstance ci, SInt16 ftnN return TRUE; if (ftnNumber == kDataHPlaybackHintsSelect) return TRUE; + if (ftnNumber == kDataHPlaybackHints64Select) + return TRUE; if (ftnNumber > kDataHGetDataAvailability64Select) return FALSE; TRACE("impl? %i\n",(componentFunctions[ftnNumber].proc != NULL)); @@ -758,6 +783,8 @@ static pascal ComponentResult myComponentRoutineProc ( ComponentParameters * cp, return callOurFunction(myComponentCanDo, uppCallComponentCanDoProcInfo, cp); case kDataHPlaybackHintsSelect: return callOurFunction(componentFunctions_2[0].proc, componentFunctions_2[0].type, cp); + case kDataHPlaybackHints64Select: + return callOurFunction(componentFunctions_2[1].proc, componentFunctions_2[1].type, cp); } if (cp->what > 0 && cp->what <=kDataHGetDataAvailability64Select && componentFunctions[cp->what].proc)

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapCodecInfo:: GetContainerFormat.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 49b98b111df40e4bcc7963e9aee6c42e44811eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b98b111df40e4bcc7963e9a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 16:09:45 2012 -0600 windowscodecs: Implement IWICBitmapCodecInfo::GetContainerFormat. --- dlls/windowscodecs/info.c | 39 +++++++++++++++++++++++++++++++++++---- dlls/windowscodecs/regsvr.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 50b520f..86f0adb 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -38,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; +static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -64,6 +65,34 @@ static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, return HRESULT_FROM_WIN32(ret); } +static HRESULT ComponentInfo_GetGUIDValue(HKEY classkey, LPCWSTR value, + GUID *result) +{ + LONG ret; + WCHAR guid_string[39]; + DWORD cbdata = sizeof(guid_string); + HRESULT hr; + + if (!result) + return E_INVALIDARG; + + ret = RegGetValueW(classkey, NULL, value, RRF_RT_REG_SZ|RRF_NOEXPAND, NULL, + guid_string, &cbdata); + + if (ret != ERROR_SUCCESS) + return HRESULT_FROM_WIN32(ret); + + if (cbdata < sizeof(guid_string)) + { + ERR("incomplete GUID value\n"); + return E_FAIL; + } + + hr = CLSIDFromString(guid_string, result); + + return hr; +} + typedef struct { IWICBitmapDecoderInfo IWICBitmapDecoderInfo_iface; LONG ref; @@ -191,8 +220,9 @@ static HRESULT WINAPI BitmapDecoderInfo_GetFriendlyName(IWICBitmapDecoderInfo *i static HRESULT WINAPI BitmapDecoderInfo_GetContainerFormat(IWICBitmapDecoderInfo *iface, GUID *pguidContainerFormat) { - FIXME("(%p,%p): stub\n", iface, pguidContainerFormat); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + TRACE("(%p,%p)\n", iface, pguidContainerFormat); + return ComponentInfo_GetGUIDValue(This->classkey, containerformat_valuename, pguidContainerFormat); } static HRESULT WINAPI BitmapDecoderInfo_GetPixelFormats(IWICBitmapDecoderInfo *iface, @@ -635,8 +665,9 @@ static HRESULT WINAPI BitmapEncoderInfo_GetFriendlyName(IWICBitmapEncoderInfo *i static HRESULT WINAPI BitmapEncoderInfo_GetContainerFormat(IWICBitmapEncoderInfo *iface, GUID *pguidContainerFormat) { - FIXME("(%p,%p): stub\n", iface, pguidContainerFormat); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + TRACE("(%p,%p)\n", iface, pguidContainerFormat); + return ComponentInfo_GetGUIDValue(This->classkey, containerformat_valuename, pguidContainerFormat); } static HRESULT WINAPI BitmapEncoderInfo_GetPixelFormats(IWICBitmapEncoderInfo *iface, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index e81ae00..b3c1f1b 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -59,6 +59,7 @@ struct regsvr_decoder LPCSTR friendlyname; LPCSTR version; GUID const *vendor; + GUID const *container_format; LPCSTR mimetypes; LPCSTR extensions; GUID const * const *formats; @@ -75,6 +76,7 @@ struct regsvr_encoder LPCSTR friendlyname; LPCSTR version; GUID const *vendor; + GUID const *container_format; LPCSTR mimetypes; LPCSTR extensions; GUID const * const *formats; @@ -119,6 +121,7 @@ static const char tmodel_valuename[] = "ThreadingModel"; static const char author_valuename[] = "Author"; static const char friendlyname_valuename[] = "FriendlyName"; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; +static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; static const char version_valuename[] = "Version"; static const char mimetypes_valuename[] = "MimeTypes"; static const char extensions_valuename[] = "FileExtensions"; @@ -201,6 +204,13 @@ static HRESULT register_decoders(struct regsvr_decoder const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (list->container_format) { + StringFromGUID2(list->container_format, buf, 39); + res = RegSetValueExW(clsid_key, containerformat_valuename, 0, REG_SZ, + (CONST BYTE*)(buf), 78); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + if (list->version) { res = RegSetValueExA(clsid_key, version_valuename, 0, REG_SZ, (CONST BYTE*)(list->version), @@ -409,6 +419,13 @@ static HRESULT register_encoders(struct regsvr_encoder const *list) if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (list->container_format) { + StringFromGUID2(list->container_format, buf, 39); + res = RegSetValueExW(clsid_key, containerformat_valuename, 0, REG_SZ, + (CONST BYTE*)(buf), 78); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + if (list->version) { res = RegSetValueExA(clsid_key, version_valuename, 0, REG_SZ, (CONST BYTE*)(list->version), @@ -819,6 +836,7 @@ static struct regsvr_decoder const decoder_list[] = { "BMP Decoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatBmp, "image/bmp", ".bmp,.dib,.rle", bmp_formats, @@ -829,6 +847,7 @@ static struct regsvr_decoder const decoder_list[] = { "GIF Decoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatGif, "image/gif", ".gif", gif_formats, @@ -839,6 +858,7 @@ static struct regsvr_decoder const decoder_list[] = { "ICO Decoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatIco, "image/vnd.microsoft.icon", ".ico", ico_formats, @@ -849,6 +869,7 @@ static struct regsvr_decoder const decoder_list[] = { "JPEG Decoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatJpeg, "image/jpeg", ".jpg;.jpeg;.jfif", jpeg_formats, @@ -859,6 +880,7 @@ static struct regsvr_decoder const decoder_list[] = { "PNG Decoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatPng, "image/png", ".png", png_formats, @@ -869,6 +891,7 @@ static struct regsvr_decoder const decoder_list[] = { "TIFF Decoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatTiff, "image/tiff", ".tif;.tiff", tiff_decode_formats, @@ -879,6 +902,7 @@ static struct regsvr_decoder const decoder_list[] = { "TGA Decoder", "1.0.0.0", &GUID_VendorWine, + &GUID_WineContainerFormatTga, "image/x-targa", ".tga;.tpic", tga_formats, @@ -933,6 +957,7 @@ static struct regsvr_encoder const encoder_list[] = { "BMP Encoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatBmp, "image/bmp", ".bmp,.dib,.rle", bmp_encode_formats @@ -942,6 +967,7 @@ static struct regsvr_encoder const encoder_list[] = { "JPEG Encoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatJpeg, "image/jpeg", ".jpg;.jpeg;.jfif", jpeg_formats @@ -951,6 +977,7 @@ static struct regsvr_encoder const encoder_list[] = { "PNG Encoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatPng, "image/png", ".png", png_encode_formats @@ -960,6 +987,7 @@ static struct regsvr_encoder const encoder_list[] = { "TIFF Encoder", "1.0.0.0", &GUID_VendorMicrosoft, + &GUID_ContainerFormatTiff, "image/tiff", ".tif;.tiff", tiff_encode_formats @@ -969,6 +997,7 @@ static struct regsvr_encoder const encoder_list[] = { "ICNS Encoder", "1.0.0.0", &GUID_VendorWine, + NULL, /* no container format guid */ "image/icns", ".icns", icns_encode_formats

1 0

Dylan Smith : richedit: Invalidate a range of paragraphs without marking them.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 10d800b6b805af0636a8aa9c95512fde3093cf33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d800b6b805af0636a8aa9c9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri May 18 00:30:03 2012 -0400 richedit: Invalidate a range of paragraphs without marking them. --- dlls/riched20/editor.h | 5 ++--- dlls/riched20/editstr.h | 1 - dlls/riched20/paint.c | 17 +++++++---------- dlls/riched20/para.c | 9 --------- dlls/riched20/table.c | 14 ++++++++++++++ dlls/riched20/wrap.c | 38 +++++++++++++++----------------------- 6 files changed, 38 insertions(+), 46 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 82d86a2..b9c055f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -187,7 +187,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; /* wrap.c */ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; -void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *end_para) DECLSPEC_HIDDEN; +void ME_InvalidateParagraphRange(ME_TextEditor *editor, ME_DisplayItem *start_para, ME_DisplayItem *last_para) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; /* para.c */ @@ -201,8 +201,6 @@ void ME_DumpParaStyle(ME_Paragraph *s) DECLSPEC_HIDDEN; void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DECLSPEC_HIDDEN; BOOL ME_SetSelectionParaFormat(ME_TextEditor *editor, const PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; -/* marks from first up to (but not including) last */ -void ME_MarkForPainting(ME_TextEditor *editor, ME_DisplayItem *first, const ME_DisplayItem *last) DECLSPEC_HIDDEN; void ME_MarkAllForWrapping(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt) DECLSPEC_HIDDEN; @@ -261,6 +259,7 @@ ME_DisplayItem *ME_InsertTableCellFromCursor(ME_TextEditor *editor) DECLSPEC_HID ME_DisplayItem *ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_DisplayItem *ME_GetTableRowEnd(ME_DisplayItem *para) DECLSPEC_HIDDEN; ME_DisplayItem *ME_GetTableRowStart(ME_DisplayItem *para) DECLSPEC_HIDDEN; +ME_DisplayItem *ME_GetOuterParagraph(ME_DisplayItem *para) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) DECLSPEC_HIDDEN; ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, ME_DisplayItem *table_row) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index b782ed3..8f136cb 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -138,7 +138,6 @@ typedef enum { /* this paragraph was already wrapped and hasn't changed, every change resets that flag */ #define MEPF_REWRAP 0x01 -#define MEPF_REPAINT 0x02 /* v4.1 */ #define MEPF_CELL 0x04 /* The paragraph is nested in a cell */ #define MEPF_ROWSTART 0x08 /* Hidden empty paragraph at the start of the row */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 662e5ab..f82802a 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1274,32 +1274,29 @@ ME_InvalidateSelection(ME_TextEditor *editor) * they can point past the end of the document */ if (editor->nLastSelStart > len || editor->nLastSelEnd > len) { repaint_start = ME_FindItemFwd(editor->pBuffer->pFirst, diParagraph); - repaint_end = editor->pBuffer->pLast; - ME_MarkForPainting(editor, repaint_start, repaint_end); + repaint_end = editor->pBuffer->pLast->member.para.prev_para; } else { /* if the start part of selection is being expanded or contracted... */ if (nStart < editor->nLastSelStart) { repaint_start = sel_start; - repaint_end = editor->pLastSelStartPara->member.para.next_para; + repaint_end = editor->pLastSelStartPara; } else if (nStart > editor->nLastSelStart) { repaint_start = editor->pLastSelStartPara; - repaint_end = sel_start->member.para.next_para; + repaint_end = sel_start; } - ME_MarkForPainting(editor, repaint_start, repaint_end); /* if the end part of selection is being contracted or expanded... */ if (nEnd < editor->nLastSelEnd) { if (!repaint_start) repaint_start = sel_end; - repaint_end = editor->pLastSelEndPara->member.para.next_para; - ME_MarkForPainting(editor, sel_end, repaint_end); + repaint_end = editor->pLastSelEndPara; } else if (nEnd > editor->nLastSelEnd) { if (!repaint_start) repaint_start = editor->pLastSelEndPara; - repaint_end = sel_end->member.para.next_para; - ME_MarkForPainting(editor, editor->pLastSelEndPara, repaint_end); + repaint_end = sel_end; } } - ME_InvalidateMarkedParagraphs(editor, repaint_start, repaint_end); + if (repaint_start) + ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); /* remember the last invalidated position */ ME_GetSelectionOfs(editor, &editor->nLastSelStart, &editor->nLastSelEnd); ME_GetSelectionParas(editor, &editor->pLastSelStartPara, &editor->pLastSelEndPara); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index efd3d04..ffa816d 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -94,15 +94,6 @@ void ME_MarkAllForWrapping(ME_TextEditor *editor) ME_MarkForWrapping(editor, editor->pBuffer->pFirst->member.para.next_para, editor->pBuffer->pLast); } -void ME_MarkForPainting(ME_TextEditor *editor, ME_DisplayItem *first, const ME_DisplayItem *last) -{ - while(first != last && first) - { - first->member.para.nFlags |= MEPF_REPAINT; - first = first->member.para.next_para; - } -} - static void ME_UpdateTableFlags(ME_DisplayItem *para) { para->member.para.pFmt->dwMask |= PFM_TABLE|PFM_TABLEROWDELIMITER; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 053bedf..1182550 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -172,6 +172,20 @@ ME_DisplayItem* ME_GetTableRowStart(ME_DisplayItem *para) return para; } +ME_DisplayItem* ME_GetOuterParagraph(ME_DisplayItem *para) +{ + if (para->member.para.nFlags & MEPF_ROWEND) + para = para->member.para.prev_para; + while (para->member.para.pCell) + { + para = ME_GetTableRowStart(para); + if (!para->member.para.pCell) + break; + para = ME_FindItemBack(para->member.para.pCell, diParagraph); + } + return para; +} + /* Make a bunch of assertions to make sure tables haven't been corrupted. * * These invariants may not hold true in the middle of streaming in rich text diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index ceb87ad..8ac14f9 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -589,8 +589,7 @@ static void ME_MarkRepaintEnd(ME_DisplayItem *para, { if (!*repaint_start) *repaint_start = para; - *repaint_end = para->member.para.next_para; - para->member.para.nFlags |= MEPF_REPAINT; + *repaint_end = para; } BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) @@ -738,42 +737,35 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_DestroyContext(&c); if (repaint_start || editor->nTotalLength < editor->nLastTotalLength) - { - if (!repaint_start) repaint_start = editor->pBuffer->pFirst; - ME_InvalidateMarkedParagraphs(editor, repaint_start, repaint_end); - } + ME_InvalidateParagraphRange(editor, repaint_start, repaint_end); return !!repaint_start; } -void ME_InvalidateMarkedParagraphs(ME_TextEditor *editor, - ME_DisplayItem *start_para, - ME_DisplayItem *end_para) +void ME_InvalidateParagraphRange(ME_TextEditor *editor, + ME_DisplayItem *start_para, + ME_DisplayItem *last_para) { ME_Context c; RECT rc; int ofs; - ME_DisplayItem *item; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); rc = c.rcView; ofs = editor->vert_si.nPos; - item = start_para; - while(item && item != end_para) { - if (item->member.para.nFlags & MEPF_REPAINT) { - rc.top = c.rcView.top + item->member.para.pt.y - ofs; - rc.bottom = max(rc.top + item->member.para.nHeight, c.rcView.bottom); - ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); - item->member.para.nFlags &= ~MEPF_REPAINT; - } - item = item->member.para.next_para; + if (start_para) { + start_para = ME_GetOuterParagraph(start_para); + last_para = ME_GetOuterParagraph(last_para); + rc.top = c.rcView.top + start_para->member.para.pt.y - ofs; + } else { + rc.top = c.rcView.top + editor->nTotalLength - ofs; } if (editor->nTotalLength < editor->nLastTotalLength) - { - rc.top = c.rcView.top + editor->nTotalLength - ofs; rc.bottom = c.rcView.top + editor->nLastTotalLength - ofs; - ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); - } + else + rc.bottom = c.rcView.top + last_para->member.para.pt.y + last_para->member.para.nHeight - ofs; + ITextHost_TxInvalidateRect(editor->texthost, &rc, TRUE); + ME_DestroyContext(&c); }

1 0

Hans Leidekker : wininet: Support setting the user agent string on handles returned by InternetOpen.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: b1c4eecdc84733cf76c9e461de1811c6a4eaa5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c4eecdc84733cf76c9e461d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 18 09:29:57 2012 +0200 wininet: Support setting the user agent string on handles returned by InternetOpen. --- dlls/wininet/internet.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index be1663b..66f25eb 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -906,6 +906,10 @@ static DWORD APPINFO_SetOption(object_header_t *hdr, DWORD option, void *buf, DW ai->connect_timeout = *(ULONG*)buf; return ERROR_SUCCESS; + case INTERNET_OPTION_USER_AGENT: + heap_free(ai->agent); + if (!(ai->agent = heap_strdupW(buf))) return ERROR_OUTOFMEMORY; + return ERROR_SUCCESS; } return INET_SetOption(hdr, option, buf, size);

1 0

Hans Leidekker : taskkill: Print a fixme if the /T option is used.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: dbc21a185e700494cf83c87b71217b9f1c144f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc21a185e700494cf83c87b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 18 10:48:01 2012 +0200 taskkill: Print a fixme if the /T option is used. --- programs/taskkill/taskkill.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 4408eda..53b56ff 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -22,10 +22,13 @@ #include <stdlib.h> #include <windows.h> #include <psapi.h> +#include <wine/debug.h> #include <wine/unicode.h> #include "taskkill.h" +WINE_DEFAULT_DEBUG_CHANNEL(taskkill); + static int force_termination; static WCHAR **task_list; @@ -448,6 +451,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) static const WCHAR slashImage[] = {'/','i','m',0}; static const WCHAR slashPID[] = {'/','p','i','d',0}; static const WCHAR slashHelp[] = {'/','?',0}; + static const WCHAR slashTerminateChildren[] = {'/','t',0}; if (argc > 1) { @@ -465,6 +469,8 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) { int got_im = 0, got_pid = 0; + if (!strcmpiW(slashTerminateChildren, argv[i])) + WINE_FIXME("/T not supported\n"); if (!strcmpiW(slashForceTerminate, argv[i])) force_termination = 1; /* Options /IM and /PID appear to behave identically, except for

1 0

Jacek Caban : mshtml: Get rid of no longer needed nsIWindowCreator2.
by Alexandre Julliard 18 May '12

18 May '12

Module: wine Branch: master Commit: 9d0bfce9d848ad307aa86afa8cbede027b106e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0bfce9d848ad307aa86afa8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 18 14:20:19 2012 +0200 mshtml: Get rid of no longer needed nsIWindowCreator2. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/nsembed.c | 22 +----------- dlls/mshtml/nsiface.idl | 45 ----------------------- dlls/mshtml/nsservice.c | 80 ------------------------------------------ 5 files changed, 3 insertions(+), 149 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6b616da..05eb664 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2428,7 +2428,7 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) doc->usermode = UNKNOWN_USERMODE; - hres = create_nscontainer(doc, NULL, &doc->nscontainer); + hres = create_nscontainer(doc, &doc->nscontainer); if(FAILED(hres)) { ERR("Failed to init Gecko, returning CLASS_E_CLASSNOTAVAILABLE\n"); htmldoc_release(&doc->basedoc); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cdf34cd..cabe04e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -666,9 +666,8 @@ void ConnectionPoint_Init(ConnectionPoint*,ConnectionPointContainer*,REFIID,cp_s void ConnectionPointContainer_Init(ConnectionPointContainer*,IUnknown*) DECLSPEC_HIDDEN; void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN; -HRESULT create_nscontainer(HTMLDocumentObj*,NSContainer*,NSContainer**) DECLSPEC_HIDDEN; +HRESULT create_nscontainer(HTMLDocumentObj*,NSContainer**) DECLSPEC_HIDDEN; void NSContainer_Release(NSContainer*) DECLSPEC_HIDDEN; -nsresult create_chrome_window(nsIWebBrowserChrome*,nsIWebBrowserChrome**) DECLSPEC_HIDDEN; void init_mutation(nsIComponentManager*) DECLSPEC_HIDDEN; void init_document_mutation(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 1bda14e..9d5b4a2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1733,22 +1733,6 @@ static const nsISupportsWeakReferenceVtbl nsSupportsWeakReferenceVtbl = { nsSupportsWeakReference_GetWeakReference }; -nsresult create_chrome_window(nsIWebBrowserChrome *parent, nsIWebBrowserChrome **ret) -{ - NSContainer *new_container; - HRESULT hres; - - if(parent->lpVtbl != &nsWebBrowserChromeVtbl) - return NS_ERROR_UNEXPECTED; - - hres = create_nscontainer(NULL, impl_from_nsIWebBrowserChrome(parent), &new_container); - if(FAILED(hres)) - return NS_ERROR_FAILURE; - - *ret = &new_container->nsIWebBrowserChrome_iface; - return NS_OK; -} - static HRESULT init_nscontainer(NSContainer *nscontainer) { nsIWebBrowserSetup *wbsetup; @@ -1857,7 +1841,7 @@ static HRESULT init_nscontainer(NSContainer *nscontainer) return S_OK; } -HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer *parent, NSContainer **_ret) +HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer **_ret) { NSContainer *ret; HRESULT hres; @@ -1880,10 +1864,6 @@ HRESULT create_nscontainer(HTMLDocumentObj *doc, NSContainer *parent, NSContaine ret->doc = doc; ret->ref = 1; - if(parent) - nsIWebBrowserChrome_AddRef(&parent->nsIWebBrowserChrome_iface); - ret->parent = parent; - hres = init_nscontainer(ret); if(SUCCEEDED(hres)) *_ret = ret; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 2327f4a..03b2816 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -2824,51 +2824,6 @@ interface nsIProfile : nsISupports [ object, - uuid(30465632-a777-44cc-90f9-8145475ef999), - local -] -interface nsIWindowCreator : nsISupports -{ - nsresult CreateChromeWindow(nsIWebBrowserChrome *parent, PRUint32 chromeFlags, - nsIWebBrowserChrome **_retval); -} - -[ - object, - uuid(f673ec81-a4b0-11d6-964b-eb5a2bf216fc), - local -] -interface nsIWindowCreator2 : nsIWindowCreator -{ - nsresult CreateChromeWindow2(nsIWebBrowserChrome *parent, PRUint32 chromeFlags, - PRUint32 contextFlags, nsIURI *uri, bool *cancel, - nsIWebBrowserChrome **_retval); -} - -[ - object, - uuid(002286a8-494b-43b3-8ddd-49e3fc50622b), - local -] -interface nsIWindowWatcher : nsISupports -{ - nsresult OpenWindow(nsIDOMWindow *aParent, const char *aUrl, const char *aName, - const char *aFeatures, nsISupports *aArguments, nsIDOMWindow **_retval); - nsresult RegisterNotification(nsIObserver *aObserver); - nsresult UnregisterNotification(nsIObserver *aObserver); - nsresult GetWindowEnumerator(nsISimpleEnumerator **_retval); - nsresult GetNewPrompter(nsIDOMWindow *aParent, nsIPrompt **_retval); - nsresult GetNewAuthPrompter(nsIDOMWindow *aParent, nsIAuthPrompt **_retval); - nsresult SetWindowCreator(nsIWindowCreator *creator); - nsresult GetChromeForWindow(nsIDOMWindow *aWindow, nsIWebBrowserChrome **_retval); - nsresult GetWindowByName(const PRUnichar *aTargetName, nsIDOMWindow *aCurrentWindow, - nsIDOMWindow **_retval); - nsresult GetActiveWindow(nsIDOMWindow **aActiveWindow); - nsresult SetActiveWindow(nsIDOMWindow *aActiveWindow); -} - -[ - object, uuid(24f3f4da-18a4-448d-876d-7360fefac029), local ] diff --git a/dlls/mshtml/nsservice.c b/dlls/mshtml/nsservice.c index 6538d5c..dd6fb22 100644 --- a/dlls/mshtml/nsservice.c +++ b/dlls/mshtml/nsservice.c @@ -35,7 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NS_PROMPTSERVICE_CONTRACTID "@mozilla.org/embedcomp/prompt-service;1" -#define NS_WINDOWWATCHER_CONTRACTID "@mozilla.org/embedcomp/window-watcher;1" #define NS_TOOLTIPTEXTPROVIDER_CONTRACTID "@mozilla.org/embedcomp/tooltiptextprovider;1" #define NS_TOOLTIPTEXTPROVIDER_CLASSNAME "nsTooltipTextProvider" @@ -45,72 +44,6 @@ static const nsIID NS_PROMPTSERVICE_CID = static const nsIID NS_TOOLTIPTEXTPROVIDER_CID = {0x0b666e3e,0x569a,0x462c,{0xa7,0xf0,0xb1,0x6b,0xb1,0x5d,0x42,0xff}}; -static nsresult NSAPI nsWindowCreator_QueryInterface(nsIWindowCreator2 *iface, nsIIDRef riid, - void **result) -{ - *result = NULL; - - if(IsEqualGUID(&IID_nsISupports, riid)) { - TRACE("(IID_nsISupports %p)\n", result); - *result = iface; - }else if(IsEqualGUID(&IID_nsIWindowCreator, riid)) { - TRACE("(IID_nsIWindowCreator %p)\n", result); - *result = iface; - }else if(IsEqualGUID(&IID_nsIWindowCreator2, riid)) { - TRACE("(IID_nsIWindowCreator2 %p)\n", result); - *result = iface; - } - - if(*result) { - nsIWindowCreator_AddRef(iface); - return NS_OK; - } - - WARN("(%s %p)\n", debugstr_guid(riid), result); - return NS_NOINTERFACE; -} - -static nsrefcnt NSAPI nsWindowCreator_AddRef(nsIWindowCreator2 *iface) -{ - return 2; -} - -static nsrefcnt NSAPI nsWindowCreator_Release(nsIWindowCreator2 *iface) -{ - return 1; -} - -static nsresult NSAPI nsWindowCreator_CreateChromeWindow(nsIWindowCreator2 *iface, - nsIWebBrowserChrome *parent, PRUint32 chromeFlags, nsIWebBrowserChrome **_retval) -{ - TRACE("(%p %08x %p)\n", parent, chromeFlags, _retval); - return nsIWindowCreator2_CreateChromeWindow2(iface, parent, chromeFlags, 0, NULL, - NULL, _retval); -} - -static nsresult NSAPI nsWindowCreator_CreateChromeWindow2(nsIWindowCreator2 *iface, - nsIWebBrowserChrome *parent, PRUint32 chromeFlags, PRUint32 contextFlags, - nsIURI *uri, cpp_bool *cancel, nsIWebBrowserChrome **_retval) -{ - TRACE("(%p %08x %08x %p %p %p)\n", parent, chromeFlags, contextFlags, uri, - cancel, _retval); - - if(cancel) - *cancel = FALSE; - - return create_chrome_window(parent, _retval); -} - -static const nsIWindowCreator2Vtbl nsWindowCreatorVtbl = { - nsWindowCreator_QueryInterface, - nsWindowCreator_AddRef, - nsWindowCreator_Release, - nsWindowCreator_CreateChromeWindow, - nsWindowCreator_CreateChromeWindow2 -}; - -static nsIWindowCreator2 nsWindowCreator = { &nsWindowCreatorVtbl }; - static nsresult NSAPI nsPromptService_QueryInterface(nsIPromptService *iface, nsIIDRef riid, void **result) { @@ -454,7 +387,6 @@ static nsServiceFactory nsTooltipTextFactory = { void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *service_manager) { - nsIWindowWatcher *window_watcher; nsresult nsres; nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_PROMPTSERVICE_CID, @@ -462,18 +394,6 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser if(NS_FAILED(nsres)) ERR("RegisterFactory failed: %08x\n", nsres); - nsres = nsIServiceManager_GetServiceByContractID(service_manager, NS_WINDOWWATCHER_CONTRACTID, - &IID_nsIWindowWatcher, (void**)&window_watcher); - if(NS_SUCCEEDED(nsres)) { - nsres = nsIWindowWatcher_SetWindowCreator(window_watcher, - (nsIWindowCreator*)&nsWindowCreator); - if(NS_FAILED(nsres)) - ERR("SetWindowCreator failed: %08x\n", nsres); - nsIWindowWatcher_Release(window_watcher); - }else { - ERR("Could not get WindowWatcher object: %08x\n", nsres); - } - nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_TOOLTIPTEXTPROVIDER_CID, NS_TOOLTIPTEXTPROVIDER_CLASSNAME, NS_TOOLTIPTEXTPROVIDER_CONTRACTID, &nsTooltipTextFactory.nsIFactory_iface);

1 0