November 2012 - Wine-Commits

Dmitry Timoshkov : windowscodecs: Make GetFrameCount in the TIFF decoder not fail without an image stream.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 9e5ecdb74532e0d2a503d26d16de98376c17f7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5ecdb74532e0d2a503d26d1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 21 17:11:15 2012 +0800 windowscodecs: Make GetFrameCount in the TIFF decoder not fail without an image stream. --- dlls/windowscodecs/tests/tiffformat.c | 3 --- dlls/windowscodecs/tiffformat.c | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 9b5db52..4cbda4d 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -203,9 +203,7 @@ static void test_QueryCapability(void) frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); -todo_wine ok(hr == S_OK || broken(hr == E_POINTER) /* XP */, "GetFrameCount error %#x\n", hr); -todo_wine ok(frame_count == 0, "expected 0, got %u\n", frame_count); pos.QuadPart = 4; @@ -222,7 +220,6 @@ todo_wine frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); -todo_wine ok(hr == S_OK, "GetFrameCount error %#x\n", hr); todo_wine ok(frame_count == 1, "expected 1, got %u\n", frame_count); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index cf93540..f22d9f6 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -668,14 +668,10 @@ static HRESULT WINAPI TiffDecoder_GetFrameCount(IWICBitmapDecoder *iface, { TiffDecoder *This = impl_from_IWICBitmapDecoder(iface); - if (!This->tiff) - { - WARN("(%p) <-- WINCODEC_ERR_WRONGSTATE\n", iface); - return WINCODEC_ERR_WRONGSTATE; - } + if (!pCount) return E_INVALIDARG; EnterCriticalSection(&This->lock); - *pCount = pTIFFNumberOfDirectories(This->tiff); + *pCount = This->tiff ? pTIFFNumberOfDirectories(This->tiff) : 0; LeaveCriticalSection(&This->lock); TRACE("(%p) <-- %i\n", iface, *pCount);

1 0

Christian Costa : winegstreamer: Turn some FIXME into TRACE.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 20e1f8a0278dd7cd7866f9d2e9d32533ccdd4943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e1f8a0278dd7cd7866f9d2e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 21 09:49:01 2012 +0100 winegstreamer: Turn some FIXME into TRACE. --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3f70ae3..dd160eb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -515,7 +515,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { if (This->initial) { gst_buffer_unref(buf); - FIXME("Triggering %p %p\n", pad, pin->caps_event); + TRACE("Triggering %p %p\n", pad, pin->caps_event); SetEvent(pin->caps_event); return GST_FLOW_NOT_LINKED; } @@ -539,7 +539,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { ERR("Didn't get a GST_APP_BUFFER, and could not get a delivery buffer (%x), returning GST_FLOW_WRONG_STATE\n", hr); return GST_FLOW_WRONG_STATE; } - FIXME("Did not get a GST_APP_BUFFER, creating a sample\n"); + TRACE("Did not get a GST_APP_BUFFER, creating a sample\n"); IMediaSample_GetPointer(sample, &ptr); memcpy(ptr, GST_BUFFER_DATA(buf), GST_BUFFER_SIZE(buf)); } @@ -759,7 +759,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS gst_segment_init(pin->segment, GST_FORMAT_TIME); ret = gst_pad_link(pad, mypad); gst_pad_activate_push(mypad, 1); - FIXME("Linking: %i\n", ret); + TRACE("Linking: %i\n", ret); if (ret >= 0) { pin->their_src = pad; gst_object_ref(pin->their_src); @@ -859,7 +859,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { } static void no_more_pads(GstElement *decodebin, GSTImpl *This) { - FIXME("Done\n"); + TRACE("Done\n"); SetEvent(This->event); }

1 0

Jacek Caban : mshtml: Added nsIURI::GetOriginCharset implementation.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 2f5123cbbc8655fc410ed47b0e7dff51d857a3ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5123cbbc8655fc410ed47b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 15:06:46 2012 +0100 mshtml: Added nsIURI::GetOriginCharset implementation. --- dlls/mshtml/nsio.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e3520d1..89a7fe8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -63,6 +63,7 @@ struct nsWineURI { nsChannelBSC *channel_bsc; IUri *uri; IUriBuilder *uri_builder; + char *origin_charset; BOOL is_doc_uri; BOOL is_mutable; DWORD scheme; @@ -140,7 +141,7 @@ static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) return ret; } -static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,nsWineURI**); +static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,const char*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -1847,6 +1848,7 @@ static nsrefcnt NSAPI nsURI_Release(nsIFileURL *iface) nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); if(This->uri) IUri_Release(This->uri); + heap_free(This->origin_charset); heap_free(This); } @@ -2309,7 +2311,8 @@ static nsresult NSAPI nsURI_Clone(nsIFileURL *iface, nsIURI **_retval) if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, + This->container, This->origin_charset, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -2384,8 +2387,11 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIFileURL *iface, nsACString *aAsciiHo static nsresult NSAPI nsURI_GetOriginCharset(nsIFileURL *iface, nsACString *aOriginCharset) { nsWineURI *This = impl_from_nsIFileURL(iface); - FIXME("(%p)->(%p)\n", This, aOriginCharset); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%p)\n", This, aOriginCharset); + + nsACString_SetData(aOriginCharset, This->origin_charset); + return NS_OK; } static nsresult NSAPI nsURL_GetRef(nsIFileURL *iface, nsACString *aRef) @@ -2481,7 +2487,8 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIFileURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, + This->origin_charset, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); @@ -2850,7 +2857,8 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_Init }; -static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, + const char *origin_charset, nsWineURI **_retval) { nsWineURI *ret; HRESULT hres; @@ -2874,6 +2882,14 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c if(FAILED(hres)) ret->scheme = URL_SCHEME_UNKNOWN; + if(origin_charset && *origin_charset && strcmp(origin_charset, "UTF-8")) { + ret->origin_charset = heap_strdupA(origin_charset); + if(!ret->origin_charset) { + nsIFileURL_Release(&ret->nsIFileURL_iface); + return NS_ERROR_OUT_OF_MEMORY; + } + } + TRACE("retval=%p\n", ret); *_retval = ret; return NS_OK; @@ -2890,7 +2906,7 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, const WCHAR *url, nsWineURI **re if(FAILED(hres)) return hres; - nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, &uri); + nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -2942,7 +2958,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_nsuri(iuri, window, NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3257,7 +3273,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(FAILED(hres)) return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); - nsres = create_nsuri(urlmon_uri, window, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, window, NULL, NULL, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);

1 0

Qian Hong : usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: dd2be15118fa368c18ee9fe300f91c1ba8f9ab3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2be15118fa368c18ee9fe30… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Nov 21 18:14:30 2012 +0800 usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida. --- dlls/usp10/tests/usp10.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ff757ee..d6786cd 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1804,11 +1804,64 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok (!psc, "psc is not null after ScriptFreeCache\n"); } +#define MAX_ENUM_FONTS 4096 + +struct enum_font_data +{ + int total; + ENUMLOGFONT elf[MAX_ENUM_FONTS]; +}; + +static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE)) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + +static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (!(type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE))) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + static void test_ScriptGetFontProperties(HDC hdc) { HRESULT hr; SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; + HFONT font, oldfont; + LOGFONT lf; + struct enum_font_data efnd; + TEXTMETRICA tmA; + WORD gi[3]; + WCHAR str[3]; + DWORD i, ret; + WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); + static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; + /* U+0020: numeric space + U+200B: zero width space + U+F71B: unkown, found by black box testing */ + BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ @@ -1866,6 +1919,109 @@ static void test_ScriptGetFontProperties(HDC hdc) ok( psc == old_psc, "Expected psc not to be changed, was %p is now %p\n", old_psc, psc); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); + if (!pGetGlyphIndicesW) + { + win_skip("Skip on WINNT4\n"); + return; + } + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_bitmap_font_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("bitmap font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + ret = GetTextMetricsA(hdc, &tmA); + ok(ret != 0, "GetTextMetricsA failed!\n"); + + is_terminal = !(lstrcmpA(lf.lfFaceName, "Terminal") && lstrcmpA(lf.lfFaceName, "@Terminal")); + ok(sfp.wgBlank == tmA.tmBreakChar || broken(is_terminal) || broken(is_arabic), "bitmap font %s wgBlank %04x tmBreakChar %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar); + + ok(sfp.wgDefault == tmA.tmDefaultChar || broken(is_arabic), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); + + ok(sfp.wgInvalid == sfp.wgBlank || broken(is_arabic), "bitmap font %s wgInvalid %02x wgBlank %02x\n", lf.lfFaceName, sfp.wgInvalid, sfp.wgBlank); + + ok(sfp.wgKashida == 0xFFFF || broken(is_arabic), "bitmap font %s wgKashida %02x\n", lf.lfFaceName, sfp.wgKashida); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } + + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_truetype_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("truetype font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + str[0] = 0x0020; /* U+0020: numeric space */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + ok(sfp.wgBlank == gi[0], "truetype font %s wgBlank %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgBlank, gi[0]); + + ok(sfp.wgDefault == 0 || broken(is_arabic), "truetype font %s wgDefault %04x\n", lf.lfFaceName, sfp.wgDefault); + + ret = pGetGlyphIndicesW(hdc, invalids, 3, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + if (gi[2] != 0xFFFF) /* index of default non exist char */ + ok(sfp.wgInvalid == gi[2], "truetype font %s wgInvalid %04x gi[2] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[2]); + else if (gi[1] != 0xFFFF) + ok(sfp.wgInvalid == gi[1], "truetype font %s wgInvalid %04x gi[1] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[1]); + else if (gi[0] != 0xFFFF) + ok(sfp.wgInvalid == gi[0], "truetype font %s wgInvalid %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[0]); + else + ok(sfp.wgInvalid == 0, "truetype font %s wgInvalid %04x expect 0\n", lf.lfFaceName, sfp.wgInvalid); + + str[0] = 0x0640; /* U+0640: kashida */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + is_arial = !lstrcmpA(lf.lfFaceName, "Arial"); + is_times_new_roman= !lstrcmpA(lf.lfFaceName, "Times New Roman"); + ok(sfp.wgKashida == gi[0] || broken(is_arial || is_times_new_roman) || broken(is_arabic), "truetype font %s wgKashida %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgKashida, gi[0]); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } } static void test_ScriptTextOut(HDC hdc)

1 0

Nikolay Sivov : msxml3: Properly update node to doc link when cloning.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 2b5ddbfe9a39b7c16fb20b33b0201252c51532cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5ddbfe9a39b7c16fb20b33b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 21 19:50:32 2012 -0500 msxml3: Properly update node to doc link when cloning. --- dlls/msxml3/node.c | 2 +- dlls/msxml3/tests/domdoc.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 30ce1b9..7b6e1ab 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -595,7 +595,7 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) clone = xmlCopyNode(This->node, deep ? 1 : 2); if (clone) { - clone->doc = This->node->doc; + xmlSetTreeDoc(clone, This->node->doc); xmldoc_add_orphan(clone->doc, clone); node = create_node(clone); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4b894b0..3a62c95 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6073,7 +6073,7 @@ static void test_cloneNode(void ) IXMLDOMNamedNodeMap *mapAttr; LONG length, length1; LONG attr_cnt, attr_cnt1; - IXMLDOMNode *node; + IXMLDOMNode *node, *attr; IXMLDOMNode *node_clone; IXMLDOMNode *node_first; HRESULT hr; @@ -6134,6 +6134,11 @@ static void test_cloneNode(void ) hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt1); ok( hr == S_OK, "ret %08x\n", hr ); ok(attr_cnt1 == 3, "got %d\n", attr_cnt1); + /* now really get some attributes from cloned element */ + attr = NULL; + hr = IXMLDOMNamedNodeMap_getNamedItem(mapAttr, _bstr_("id"), &attr); + ok(hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(attr); IXMLDOMNamedNodeMap_Release(mapAttr); ok(length == length1, "wrong Child count (%d, %d)\n", length, length1);

1 0

Alexandre Julliard : user32: Don' t check for driver events before normal messages in GetMessage.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 8ba4c316f2a65354783a03e0559abee2082b813f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba4c316f2a65354783a03e05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 21 19:20:09 2012 +0100 user32: Don't check for driver events before normal messages in GetMessage. --- dlls/user32/message.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6d45671..2ffbf6e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3727,9 +3727,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT USER_CheckNotLock(); - /* check for graphics events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); - if (first || last) { if ((first <= WM_KEYLAST) && (last >= WM_KEYFIRST)) mask |= QS_KEY;

1 0

Christian Costa : winegstreamer: Remove left over FIXME.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 1fcce23f34a70441311b0c34e79228c9c9c255e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcce23f34a70441311b0c34e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 21 09:48:42 2012 +0100 winegstreamer: Remove left over FIXME. --- dlls/winegstreamer/gsttffilter.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 03b854b..4222008 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -398,7 +398,6 @@ static HRESULT WINAPI Gstreamer_transform_Cleanup(TransformFilter *tf, PIN_DIREC gst_object_unref(This->my_sink); } This->my_sink = This->my_src = This->their_sink = This->their_src = NULL; - FIXME("%p stub\n", This); } return S_OK; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetVertexBuffers().
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 860c0eb24e5077458ef90113558531e8dd33852c URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c0eb24e5077458ef901135… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:22 2012 +0100 d3d10core: Implement d3d10_device_IAGetVertexBuffers(). --- dlls/d3d10core/device.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2501da99..853c538 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -527,8 +527,31 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers, UINT *strides, UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i, + &wined3d_buffer, &offsets[i], &strides[i]))) + ERR("Failed to get vertex buffer.\n"); + + if (!wined3d_buffer) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface,

1 0

Jacek Caban : atl: Removed unneeded includes.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 0c8e91af5147fcc708d5559a900b281e27ed6ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8e91af5147fcc708d5559a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:10:14 2012 +0100 atl: Removed unneeded includes. --- dlls/atl/registrar.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 2aaf888..b03fdf0 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -16,19 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include <stdarg.h> - #define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winreg.h" -#include "objbase.h" #include "oaidl.h" #include "rpcproxy.h" -#include "atliface.h" #include "atlbase.h" #include "wine/debug.h"

1 0

Jacek Caban : mshtml: Use ATTR_FIX_PX in IHTMLStyle2:: put_bottom implementation.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 6b0f51f9de1c9ddb314833ba6586f97ff8498341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0f51f9de1c9ddb314833ba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:57:26 2012 +0100 mshtml: Use ATTR_FIX_PX in IHTMLStyle2::put_bottom implementation. --- dlls/mshtml/htmlstyle2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle2.c b/dlls/mshtml/htmlstyle2.c index 7eedc00..b2740d5 100644 --- a/dlls/mshtml/htmlstyle2.c +++ b/dlls/mshtml/htmlstyle2.c @@ -208,7 +208,7 @@ static HRESULT WINAPI HTMLStyle2_put_bottom(IHTMLStyle2 *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - return set_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, &v, 0); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BOTTOM, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle2_get_bottom(IHTMLStyle2 *iface, VARIANT *p)

1 0