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

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

May 18, 2012

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

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

May 18, 2012

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

Vincent Povirk : windowscodecs: Implement IWICBitmapCodecInfo:: GetContainerFormat.
by Alexandre Julliard May 18, 2012

May 18, 2012

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

Scott Ritchie : Update Ubuntu download page
by Jeremy Newman May 18, 2012

May 18, 2012

Module: website Branch: master Commit: 552cb6f5dfe5debda894af2d4b0bc9ba628d0f3f URL: http://source.winehq.org/git/website.git/?a=commit;h=552cb6f5dfe5debda894af… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu May 17 23:16:08 2012 -0700 Update Ubuntu download page Should have done this months ago... >From 75c21d0e23bede6855e2215cc9c700453fa5f5ff Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Fri, 18 May 2012 08:47:05 -0700 Subject: [website] Update Ubuntu download page (translation changes are find/replace so the links work, do not include text changes) --- templates/de/download/ubuntu.template | 14 +++++++------- templates/en/download.template | 2 +- templates/en/download/ubuntu.template | 24 ++++++++++++------------ templates/fr/download/ubuntu.template | 14 +++++++------- templates/pl/download/ubuntu.template | 10 +++++----- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/templates/de/download/ubuntu.template b/templates/de/download/ubuntu.template index 0afd7ce..de480f9 100644 --- a/templates/de/download/ubuntu.template +++ b/templates/de/download/ubuntu.template @@ -26,20 +26,20 @@ Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinz <h2>Warnung: Betapakete</h2> -Die 1.3 Pakete hier sind Betapakete. Das bedeutet, dass sie +Die 1.5 Pakete hier sind Betapakete. Das bedeutet, dass sie in regelmäßigen Abständen <a href="http://wiki.winehq.org/Regression">Regressionen</a> erleiden, wodurch eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die stabile Version -Wine 1.2 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. +Wine 1.4 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen. <h2>Installieren von Wine:</h2> Sobald du das WineHQ PPA Repository hinzugefügt hast, kannst du es installieren. -Für die aktuellste Wine 1.3 Beta, -<a href="apt://wine1.3">klicke diesen Link um das wine1.3 Paket zu installieren</a>. -Für die ältere, stabile Wine 1.2 Version, -<a href="apt://wine1.3">klicke diesen Link um das wine1.2 Paket zu installieren</a>. +Für die aktuellste Wine 1.5 Beta, +<a href="apt://wine1.5">klicke diesen Link um das wine1.5 Paket zu installieren</a>. +Für die ältere, stabile Wine 1.4 Version, +<a href="apt://wine1.5">klicke diesen Link um das wine1.4 Paket zu installieren</a>. <h2>Aktualisierung auf eine neue Ubuntuversion</h2> @@ -58,6 +58,6 @@ Derivate. Zuerst öffne ein Terminalfenster (Anwendungen->Zubehör->Terminal).</ Aktualisiere dann die APT-Paketinformationen durch Ausführen von 'sudo apt-get update'. Du kannst nun Wine durch Ausführen von 'sudo apt-get -install wine1.3' im Terminal installieren. +install wine1.5' im Terminal installieren. Wenn du das PPA durchsuchen willst, kannst du es <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">bei Launchpad anschauen</a>. diff --git a/templates/en/download.template b/templates/en/download.template index 9bf08d3..5b90bf3 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/ubuntu">Download Ubuntu packages</a> - - binary and source .debs for Ubuntu Karmic (9.10), Lucid (10.04 LTS), Maverick (10.10), and Natty (11.04) + - binary and source .debs for Ubuntu Oneiric (11.10), and Precise (12.04) <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/ubuntu.template b/templates/en/download/ubuntu.template index 862f2c0..2a02c90 100644 --- a/templates/en/download/ubuntu.template +++ b/templates/en/download/ubuntu.template @@ -13,11 +13,11 @@ latest Wine package you can use WineHQ's by following these instructions. <h2>Adding the WineHQ PPA Repository:</h2> -Open the Software Sources menu by going to Applications->Ubuntu Software -Center, then selecting Edit->Software Sources. Choose the Other +Open the Software Sources menu by launching the Ubuntu Software +Center and selecting Edit->Software Sources. Choose the Other Software tab and click Add. -<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="System->Administration->Software Sources->Other Software" border="0"> +<img src="{$root}/images/distro/ubuntu-ppa.png" width="531" height="509" alt="Software Center->Edit->Software Sources->Other Software" border="0"> Then, copy and paste the line below. @@ -25,25 +25,25 @@ Software tab and click Add. <h2>Warning: Beta packages</h2> -The 1.3 packages here are beta packages. This means they will +The 1.5 packages here are beta packages. This means they will periodically suffer from <a href="http://wiki.winehq.org/Regression">regressions</a>, and as a result an -update may break functionality in Wine. If the stable 1.2 Wine version works +update may break functionality in Wine. If the stable 1.4 Wine version works for you, then you may not want to use these beta packages. <h2>Installing Wine:</h2> Once you have added the WineHQ PPA Repository, you are ready to install. -To get the most recent Wine 1.3 beta, -<a href="apt://wine1.3">click this link to install the wine1.3 package</a>. -To install the older, stable Wine 1.2 version, -<a href="apt://wine1.2">click this link to install the wine1.2 package</a>. +To get the most recent Wine 1.5 beta, +<a href="apt://wine1.5">click this link to install the wine1.5 package</a>. +To install the older, stable Wine 1.4 version, +<a href="apt://wine1.4">click this link to install the wine1.4 package</a>. <h2>Upgrading to a new version of Ubuntu</h2> -If you are upgrading the entire system, such as going from Ubuntu 10.04 to -10.10, you will need to come back to this page and add the repository again. +If you are upgrading the entire system, such as going from Ubuntu 11.10 to +12.04, you will need to come back to this page and add the repository again. The built in update manager will not switch the Wine repository automatically. @@ -56,6 +56,6 @@ may be useful on Kubuntu, Xubuntu, and other Ubuntu derivatives. Then update APT package information by running 'sudo apt-get update'. You can now install Wine by typing 'sudo apt-get -install wine1.3'. +install wine1.5'. If you'd like to browse the PPA manually, you can <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visit its Launchpad page</a>. diff --git a/templates/fr/download/ubuntu.template b/templates/fr/download/ubuntu.template index 7b1fb2e..cc20744 100644 --- a/templates/fr/download/ubuntu.template +++ b/templates/fr/download/ubuntu.template @@ -27,10 +27,10 @@ alt="Système->Administration->Sources de logiciels->Autres logiciels" border="0 <h2>Avertissement : paquets bêta</h2> -Les paquets 1.3 sont des paquets bêta, c.-à-d. qu'ils +Les paquets 1.5 sont des paquets bêta, c.-à-d. qu'ils peuvent à l'occasion souffrir de <a href="http://wiki.winehq.org/Regression">régressions</a>. Par conséquent, une -mise à jour peut casser une fonctionnalité dans Wine. Si la version stable 1.2 +mise à jour peut casser une fonctionnalité dans Wine. Si la version stable 1.4 de Wine fonctionne dans votre cas, vous ne devriez pas utiliser de paquets bêta. @@ -39,10 +39,10 @@ de Wine fonctionne dans votre cas, vous ne devriez pas utiliser de paquets bêta Une fois le dépôt PPA de WineHQ ajouté, l'installation peut se poursuivre. -Pour la version bêta 1.3 la plus récente, -<a href="apt://wine1.3">utilisez ce lien pour installer le paquet wine1.3</a>. -Pour la version stable 1.2 (plus ancienne) -<a href="apt://wine1.2">utilisez ce lien pour installer le paquet wine1.2</a>. +Pour la version bêta 1.5 la plus récente, +<a href="apt://wine1.5">utilisez ce lien pour installer le paquet wine1.5</a>. +Pour la version stable 1.4 (plus ancienne) +<a href="apt://wine1.4">utilisez ce lien pour installer le paquet wine1.4</a>. <h2>Mise à niveau vers une nouvelle version d'Ubuntu</h2> @@ -62,6 +62,6 @@ Kubuntu, Xubuntu ou d'autres distributions dérivées. Mettez ensuite à jour les informations sur les paquets d'APT en exécutant « sudo apt-get update ». Vous pouvez dès lors installer Wine en tapant - « sudo apt-get install wine1.3 ». + « sudo apt-get install wine1.5 ». Si vous voulez parcourir manuellement le PPA, vous pouvez <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">visiter sa page Launchpad</a>. diff --git a/templates/pl/download/ubuntu.template b/templates/pl/download/ubuntu.template index be7d33c..2ebe476 100644 --- a/templates/pl/download/ubuntu.template +++ b/templates/pl/download/ubuntu.template @@ -35,10 +35,10 @@ to instalowanie tych paczek może nie być konieczne. Skoro już dodałeś/aś repozytorium WineHQ PPA to jesteś gotowy/a do instalacji. -Aby używać najnowszego Wine 1.3 beta, -<a href="apt://wine1.3">kliknij na ten link, aby zainstalować paczkę wine1.3</a>. -Aby używać ostatniej stabilnej wersji Wine 1.2, -<a href="apt://wine1.2">kliknij na ten link, aby zainstalować paczkę wine1.2</a>. +Aby używać najnowszego Wine 1.5 beta, +<a href="apt://wine1.5">kliknij na ten link, aby zainstalować paczkę wine1.5</a>. +Aby używać ostatniej stabilnej wersji Wine 1.4, +<a href="apt://wine1.4">kliknij na ten link, aby zainstalować paczkę wine1.4</a>. <h2>Aktualizacja do nowej wersji Ubuntu</h2> @@ -57,6 +57,6 @@ Jest to użyteczne w przypadku Kubuntu, Xubuntu, i innych pochodnych Ubuntu. Następnie zaktualizuj informacje o paczkach APT wpisując 'sudo apt-get update'. Teraz możesz zainstalować Wine wpisując w terminalu 'sudo apt-get -install wine1.3'. +install wine1.5'. Jeżeli chciałbyś ręcznie przeglądać PPA, możesz odwiedzić <a href="https://launchpad.net/~ubuntu-wine/+archive/ppa">jego stronę na Launchpad</a>.

1 0

Dmitry Timoshkov : oleaut32: OleCreatePictureIndirect should set loadtime_format for a bitmap.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 25fd436db01d39b1a3feea0a878e70780b1ce5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=25fd436db01d39b1a3feea0a8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:30:07 2012 +0900 oleaut32: OleCreatePictureIndirect should set loadtime_format for a bitmap. --- dlls/oleaut32/olepicture.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a00d463..395afa9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -68,6 +68,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(olepicture); +#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ +#define BITMAP_FORMAT_JPEG 0xd8ff +#define BITMAP_FORMAT_GIF 0x4947 +#define BITMAP_FORMAT_PNG 0x5089 +#define BITMAP_FORMAT_APM 0xcdd7 + #include "pshpack1.h" /* Header for Aldus Placable Metafiles - a standard metafile follows */ @@ -212,6 +218,8 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) This->origWidth = bm.bmWidth; This->origHeight = bm.bmHeight; + TRACE("width %d, height %d, bpp %d\n", bm.bmWidth, bm.bmHeight, bm.bmBitsPixel); + /* The width and height are stored in HIMETRIC units (0.01 mm), so we take our pixel width divide by pixels per inch and multiply by 25.4 * 100 */ @@ -222,6 +230,8 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) This->himetricHeight = ypixels_to_himetric(bm.bmHeight, hdcRef); This->stock_bitmap = GetCurrentObject( hdcRef, OBJ_BITMAP ); + This->loadtime_format = BITMAP_FORMAT_BMP; + DeleteDC(hdcRef); } @@ -1322,17 +1332,6 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, } /************************************************************************ - * BITMAP FORMAT FLAGS - - * Flags that differentiate between different types of bitmaps. - */ - -#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ -#define BITMAP_FORMAT_JPEG 0xd8ff -#define BITMAP_FORMAT_GIF 0x4947 -#define BITMAP_FORMAT_PNG 0x5089 -#define BITMAP_FORMAT_APM 0xcdd7 - -/************************************************************************ * OLEPictureImpl_IPersistStream_Load (IUnknown) * * Loads the binary data from the IStream. Starts at current position.

1 0

André Hentschel : wmvcore: Add stub for WMCreateReader .
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 8933d91c66280a2e4cd7b9272ce45d49b92486e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8933d91c66280a2e4cd7b9272… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 17 15:58:00 2012 +0200 wmvcore: Add stub for WMCreateReader. --- dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/wmvcore_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index e0fa2e9..ee85eb6 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -9,7 +9,7 @@ @ stub WMCreateEditor @ stub WMCreateIndexer @ stub WMCreateProfileManager -@ stub WMCreateReader +@ stdcall WMCreateReader(ptr long ptr) @ stub WMCreateReaderPriv @ stdcall WMCreateSyncReader(ptr long ptr) @ stub WMCreateWriter diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 1d24c24..b92a662 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -45,6 +45,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) +{ + FIXME("(%p, %x, %p): stub\n", reserved, rights, reader); + return E_NOTIMPL; +} + HRESULT WINAPI WMCreateSyncReader(IUnknown *pcert, DWORD rights, IWMSyncReader **syncreader) { FIXME("(%p, %x, %p): stub\n", pcert, rights, syncreader);

1 0

Dmitry Timoshkov : oleaut32: OLEPictureImpl_Save should load bitmap data if it's not yet loaded.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: dc7843590dd3f9d6e3593eed43f3410c063f3a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7843590dd3f9d6e3593eed4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:30:28 2012 +0900 oleaut32: OLEPictureImpl_Save should load bitmap data if it's not yet loaded. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 395afa9..beb1477 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1776,7 +1776,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( hResult = S_OK; break; case PICTYPE_BITMAP: - if (This->bIsDirty) { + if (This->bIsDirty || !This->data) { switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP) { case BITMAP_FORMAT_BMP: iSerializeResult = serializeBMP(This->desc.u.bmp.hbitmap, &pIconData, &iDataSize);

1 0

Vincent Povirk : mscoree: Add a fallback for mono_image_open_from_module_handle.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 56484cc0379697b934a859700d17d277c496daa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56484cc0379697b934a859700… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 17 09:47:46 2012 -0500 mscoree: Add a fallback for mono_image_open_from_module_handle. --- dlls/mscoree/metahost.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/mscoree/mscoree_private.h | 1 + 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 3736dc0..fa12853 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -100,6 +100,29 @@ static void CDECL do_nothing(void) { } +static MonoImage* image_open_module_handle_dummy(HMODULE module_handle, + char* fname, UINT has_entry_point, MonoImageOpenStatus* status, int abi_version) +{ + return loaded_monos[abi_version-1].mono_image_open(fname, status); +} + +static CDECL MonoImage* image_open_module_handle_dummy_1(HMODULE module_handle, + char* fname, UINT has_entry_point, MonoImageOpenStatus* status) +{ + return image_open_module_handle_dummy(module_handle, fname, has_entry_point, status, 1); +} + +static CDECL MonoImage* image_open_module_handle_dummy_2(HMODULE module_handle, + char* fname, UINT has_entry_point, MonoImageOpenStatus* status) +{ + return image_open_module_handle_dummy(module_handle, fname, has_entry_point, status, 2); +} + +MonoImage* (CDECL * const image_from_handle_fn[NUM_ABI_VERSIONS])(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status) = { + image_open_module_handle_dummy_1, + image_open_module_handle_dummy_2 +}; + static void missing_runtime_message(const CLRRuntimeInfo *This) { if (This->major == 1) @@ -172,7 +195,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_class_from_name); LOAD_MONO_FUNCTION(mono_class_get_method_from_name); LOAD_MONO_FUNCTION(mono_domain_assembly_open); - LOAD_MONO_FUNCTION(mono_image_open_from_module_handle); + LOAD_MONO_FUNCTION(mono_image_open); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); LOAD_MONO_FUNCTION(mono_jit_exec); LOAD_MONO_FUNCTION(mono_jit_init); @@ -207,19 +230,20 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) #undef LOAD_MONO_FUNCTION -#define LOAD_OPT_VOID_MONO_FUNCTION(x) do { \ +#define LOAD_OPT_MONO_FUNCTION(x, default) do { \ (*result)->x = (void*)GetProcAddress((*result)->mono_handle, #x); \ if (!(*result)->x) { \ - (*result)->x = do_nothing; \ + (*result)->x = default; \ } \ } while (0); - LOAD_OPT_VOID_MONO_FUNCTION(mono_runtime_set_shutting_down); - LOAD_OPT_VOID_MONO_FUNCTION(mono_thread_pool_cleanup); - LOAD_OPT_VOID_MONO_FUNCTION(mono_thread_suspend_all_other_threads); - LOAD_OPT_VOID_MONO_FUNCTION(mono_threads_set_shutting_down); + LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_from_handle_fn[This->mono_abi_version-1]); + LOAD_OPT_MONO_FUNCTION(mono_runtime_set_shutting_down, do_nothing); + LOAD_OPT_MONO_FUNCTION(mono_thread_pool_cleanup, do_nothing); + LOAD_OPT_MONO_FUNCTION(mono_thread_suspend_all_other_threads, do_nothing); + LOAD_OPT_MONO_FUNCTION(mono_threads_set_shutting_down, do_nothing); -#undef LOAD_OPT_VOID_MONO_FUNCTION +#undef LOAD_OPT_MONO_FUNCTION (*result)->mono_profiler_install((MonoProfiler*)*result, mono_shutdown_callback_fn); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index ef9079e..7266687 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -154,6 +154,7 @@ struct loaded_mono void (CDECL *mono_config_parse)(const char *filename); MonoAssembly* (CDECL *mono_domain_assembly_open) (MonoDomain *domain, const char *name); void (CDECL *mono_free)(void *); + MonoImage* (CDECL *mono_image_open)(const char *fname, MonoImageOpenStatus *status); MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]);

1 0

Dmitry Timoshkov : oleaut32: Move OLEPicture implementation into its own debug channel.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 48df41f83462e6aaaa8ed68159ca16b41ba9d727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48df41f83462e6aaaa8ed6815… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:29:54 2012 +0900 oleaut32: Move OLEPicture implementation into its own debug channel. --- dlls/oleaut32/olepicture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 348529e..a00d463 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -66,7 +66,7 @@ #include "wine/unicode.h" #include "wine/library.h" -WINE_DEFAULT_DEBUG_CHANNEL(ole); +WINE_DEFAULT_DEBUG_CHANNEL(olepicture); #include "pshpack1.h"

1 0

Dmitry Timoshkov : oleaut32: Call OleCreatePictureIndirect directly.
by Alexandre Julliard May 17, 2012

May 17, 2012

Module: wine Branch: master Commit: 340d9c1a78c2453f294c12b75894ebf748813651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=340d9c1a78c2453f294c12b75… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 17 18:29:42 2012 +0900 oleaut32: Call OleCreatePictureIndirect directly. --- dlls/oleaut32/tests/olepicture.c | 22 ++++------------------ 1 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ecf88f6..8be8b82 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -55,7 +55,6 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pOleLoadPicture)(LPSTREAM,LONG,BOOL,REFIID,LPVOID*); static HRESULT (WINAPI *pOleLoadPictureEx)(LPSTREAM,LONG,BOOL,REFIID,DWORD,DWORD,DWORD,LPVOID*); -static HRESULT (WINAPI *pOleCreatePictureIndirect)(PICTDESC*,REFIID,BOOL,LPVOID*); #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -488,19 +487,13 @@ static void test_OleCreatePictureIndirect(void) HRESULT hr; short type; - if(!pOleCreatePictureIndirect) - { - win_skip("Skipping OleCreatePictureIndirect tests\n"); - return; - } - if (0) { /* crashes on native */ - pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); + OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); } - hr = pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); + hr = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); ok(hr == S_OK, "hr %08x\n", hr); type = PICTYPE_NONE; @@ -901,12 +894,6 @@ static void test_himetric(void) HDC hdc; INT d; - if (!pOleCreatePictureIndirect) - { - win_skip("OleCreatePictureIndirect not available\n"); - return; - } - desc.cbSizeofstruct = sizeof(desc); desc.picType = PICTYPE_BITMAP; desc.u.bmp.hpal = NULL; @@ -919,7 +906,7 @@ static void test_himetric(void) desc.u.bmp.hbitmap = bmp; /* size in himetric units reported rounded up to next integer value */ - hr = pOleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "got 0x%08x\n", hr); cx = 0; @@ -945,7 +932,7 @@ static void test_himetric(void) desc.picType = PICTYPE_ICON; desc.u.icon.hicon = icon; - hr = pOleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, FALSE, (void**)&pic); ok(hr == S_OK, "got 0x%08x\n", hr); cx = 0; @@ -971,7 +958,6 @@ START_TEST(olepicture) hOleaut32 = GetModuleHandleA("oleaut32.dll"); pOleLoadPicture = (void*)GetProcAddress(hOleaut32, "OleLoadPicture"); pOleLoadPictureEx = (void*)GetProcAddress(hOleaut32, "OleLoadPictureEx"); - pOleCreatePictureIndirect = (void*)GetProcAddress(hOleaut32, "OleCreatePictureIndirect"); if (!pOleLoadPicture) { win_skip("OleLoadPicture is not available\n");

1 0