April 2017 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml.idl: Added HTMLMetaElement coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 6785ccfce52d04ace8ba038421de164383c0c030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6785ccfce52d04ace8ba03842… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:08:39 2017 +0200 mshtml.idl: Added HTMLMetaElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlmeta.c | 4 ++-- include/mshtml.idl | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index 07490e3..b3312f8 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -31,11 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLMetaElement { HTMLElement element; IHTMLMetaElement IHTMLMetaElement_iface; -} HTMLMetaElement; +}; static inline HTMLMetaElement *impl_from_IHTMLMetaElement(IHTMLMetaElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index e646d77..ebaac7b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11800,6 +11800,24 @@ methods: } /***************************************************************************** + * HTMLMetaElement coclass + */ +[ + noncreatable, + uuid(3050f275-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLMetaElement +{ + [default] dispinterface DispHTMLMetaElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLMetaElement; + interface IHTMLMetaElement2; + interface IHTMLMetaElement3; +} + +/***************************************************************************** * DispHTMLUnknownElement dispinterface */ [

1 0

Nikolay Sivov : user32: Partially protect WM_SETTEXT handlers from invalid input.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 3c7fee39d3567cd3815083a060f46ecee526afad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7fee39d3567cd3815083a06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 13:49:20 2017 +0300 user32: Partially protect WM_SETTEXT handlers from invalid input. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 40 ++++++++++++++++++++++++++-------------- dlls/user32/tests/msg.c | 18 ++++++++++++++++++ 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 6fbaf1e..235c139 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -83,16 +83,21 @@ static void DEFWND_HandleWindowPosChanged( HWND hwnd, const WINDOWPOS *winpos ) * * Set the window text. */ -static void DEFWND_SetTextA( HWND hwnd, LPCSTR text ) +static LRESULT DEFWND_SetTextA( HWND hwnd, LPCSTR text ) { int count; WCHAR *textW; WND *wndPtr; + /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) + * may have child window IDs instead of window name */ + if (text && IS_INTRESOURCE(text)) + return 0; + if (!text) text = ""; count = MultiByteToWideChar( CP_ACP, 0, text, -1, NULL, 0 ); - if (!(wndPtr = WIN_GetPtr( hwnd ))) return; + if (!(wndPtr = WIN_GetPtr( hwnd ))) return 0; if ((textW = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)))) { HeapFree(GetProcessHeap(), 0, wndPtr->text); @@ -111,6 +116,8 @@ static void DEFWND_SetTextA( HWND hwnd, LPCSTR text ) WIN_ReleasePtr( wndPtr ); USER_Driver->pSetWindowText( hwnd, textW ); + + return 1; } /*********************************************************************** @@ -118,16 +125,21 @@ static void DEFWND_SetTextA( HWND hwnd, LPCSTR text ) * * Set the window text. */ -static void DEFWND_SetTextW( HWND hwnd, LPCWSTR text ) +static LRESULT DEFWND_SetTextW( HWND hwnd, LPCWSTR text ) { static const WCHAR empty_string[] = {0}; WND *wndPtr; int count; + /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) + * may have child window IDs instead of window name */ + if (text && IS_INTRESOURCE(text)) + return 0; + if (!text) text = empty_string; count = strlenW(text) + 1; - if (!(wndPtr = WIN_GetPtr( hwnd ))) return; + if (!(wndPtr = WIN_GetPtr( hwnd ))) return 0; HeapFree(GetProcessHeap(), 0, wndPtr->text); if ((wndPtr->text = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)))) { @@ -146,6 +158,8 @@ static void DEFWND_SetTextW( HWND hwnd, LPCWSTR text ) WIN_ReleasePtr( wndPtr ); USER_Driver->pSetWindowText( hwnd, text ); + + return 1; } /*********************************************************************** @@ -783,10 +797,8 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam if (lParam) { CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam; - /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) - * may have child window IDs instead of window name */ - if (!IS_INTRESOURCE(cs->lpszName)) - DEFWND_SetTextA( hwnd, cs->lpszName ); + + DEFWND_SetTextA( hwnd, cs->lpszName ); result = 1; if(cs->style & (WS_HSCROLL | WS_VSCROLL)) @@ -822,7 +834,8 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam break; case WM_SETTEXT: - DEFWND_SetTextA( hwnd, (LPCSTR)lParam ); + if (!DEFWND_SetTextA( hwnd, (LPCSTR)lParam )) + break; if( (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CAPTION) == WS_CAPTION ) NC_HandleNCPaint( hwnd , (HRGN)1 ); /* Repaint caption */ result = 1; /* success. FIXME: check text length */ @@ -933,10 +946,8 @@ LRESULT WINAPI DefWindowProcW( if (lParam) { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) - * may have child window IDs instead of window name */ - if (!IS_INTRESOURCE(cs->lpszName)) - DEFWND_SetTextW( hwnd, cs->lpszName ); + + DEFWND_SetTextW( hwnd, cs->lpszName ); result = 1; if(cs->style & (WS_HSCROLL | WS_VSCROLL)) @@ -969,7 +980,8 @@ LRESULT WINAPI DefWindowProcW( break; case WM_SETTEXT: - DEFWND_SetTextW( hwnd, (LPCWSTR)lParam ); + if (!DEFWND_SetTextW( hwnd, (LPCWSTR)lParam )) + break; if( (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CAPTION) == WS_CAPTION ) NC_HandleNCPaint( hwnd , (HRGN)1 ); /* Repaint caption */ result = 1; /* success. FIXME: check text length */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fbadf7d..760a9ea 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14438,6 +14438,7 @@ static void test_defwinproc(void) INT x, y; LRESULT res; struct rbuttonup_thread_data data; + char buffA[64]; HANDLE thread; hwnd = CreateWindowExA(0, "TestWindowClass", "test_defwndproc", @@ -14445,6 +14446,23 @@ static void test_defwinproc(void) assert(hwnd); flush_events(); + buffA[0] = 0; + GetWindowTextA(hwnd, buffA, sizeof(buffA)/sizeof(*buffA)); + ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + + /* Zero high word of the lParam */ + res = DefWindowProcA(hwnd, WM_SETTEXT, 0, 0x1234); + ok(res == 0, "WM_SETTEXT was expected to fail, %ld\n", res); + + GetWindowTextA(hwnd, buffA, sizeof(buffA)/sizeof(*buffA)); + ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + + res = DefWindowProcW(hwnd, WM_SETTEXT, 0, 0x1234); + ok(res == 0, "WM_SETTEXT was expected to fail, %ld\n", res); + + GetWindowTextA(hwnd, buffA, sizeof(buffA)/sizeof(*buffA)); + ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + GetCursorPos(&pos); GetWindowRect(hwnd, &rect); x = (rect.left+rect.right) / 2;

1 0

Nikolay Sivov : oledb32: Support textual representation of Mode property values.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: ffd3e8543cadc98b167d016eb2c1ca9c0a413e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd3e8543cadc98b167d016eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 13:05:32 2017 +0300 oledb32: Support textual representation of Mode property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 58 +++++++++++++++++++++++++++++++++++++++++-- dlls/oledb32/tests/database.c | 26 +++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 7ed4099..650c220 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -289,8 +289,56 @@ struct dbproperty { DBPROPID id; DBPROPOPTIONS options; VARTYPE type; + HRESULT (*convert_dbproperty)(const WCHAR *src, VARIANT *dest); }; +struct mode_propval +{ + const WCHAR *name; + DWORD value; +}; + +static int dbmodeprop_compare(const void *a, const void *b) +{ + const WCHAR *src = a; + const struct mode_propval *propval = b; + return strcmpiW(src, propval->name); +} + +static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) +{ + static const WCHAR readW[] = {'R','e','a','d',0}; + static const WCHAR readwriteW[] = {'R','e','a','d','W','r','i','t','e',0}; + static const WCHAR sharedenynoneW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','N','o','n','e',0}; + static const WCHAR sharedenyreadW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','R','e','a','d',0}; + static const WCHAR sharedenywriteW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','W','r','i','t','e',0}; + static const WCHAR shareexclusiveW[] = {'S','h','a','r','e',' ','E','x','c','l','u','s','i','v','e',0}; + static const WCHAR writeW[] = {'W','r','i','t','e',0}; + + struct mode_propval mode_propvals[] = + { + { readW, DB_MODE_READ }, + { readwriteW, DB_MODE_READWRITE }, + { sharedenynoneW, DB_MODE_SHARE_DENY_NONE }, + { sharedenyreadW, DB_MODE_SHARE_DENY_READ }, + { sharedenywriteW, DB_MODE_SHARE_DENY_WRITE }, + { shareexclusiveW, DB_MODE_SHARE_EXCLUSIVE }, + { writeW, DB_MODE_WRITE }, + }; + struct mode_propval *prop; + + if ((prop = bsearch(src, mode_propvals, sizeof(mode_propvals) / sizeof(*mode_propvals), + sizeof(struct mode_propval), dbmodeprop_compare))) + { + V_VT(dest) = VT_I4; + V_I4(dest) = prop->value; + TRACE("%s = %#x\n", debugstr_w(src), prop->value); + return S_OK; + } + + return E_FAIL; +} + static const WCHAR asyncW[] = {'A','s','y','n','c','h','r','o','n','o','u','s',' ','P','r','o','c','e','s','s','i','n','g',0}; static const WCHAR bindW[] = {'B','i','n','d',' ','F','l','a','g','s',0}; static const WCHAR cacheW[] = {'C','a','c','h','e',' ','A','u','t','h','e','n','i','c','a','t','i','o','n',0}; @@ -332,7 +380,7 @@ static const struct dbproperty dbproperties[] = { { locationW, DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { lockownerW, DBPROP_INIT_LOCKOWNER, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { maskpassW, DBPROP_AUTH_MASK_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, - { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { persistEncW, DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, @@ -418,7 +466,10 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) else delim = strchrW(eq, ';'); - value = SysAllocStringLen(eq, delim ? delim - eq : -1); + if (delim) + value = SysAllocStringLen(eq, delim - eq); + else + value = SysAllocString(eq); /* skip semicolon if present */ if (delim) @@ -534,6 +585,9 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr VariantInit(&dest); hr = VariantChangeType(&dest, &src, 0, descr->type); + if (FAILED(hr) && descr->convert_dbproperty) + hr = descr->convert_dbproperty(pair->value, &dest); + if (FAILED(hr)) { ERR("failed to init property %s value as type %d\n", debugstr_w(pair->name), descr->type); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index f39c2f5..b8c0e61 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -500,6 +500,15 @@ static void test_initializationstring(void) 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; static const WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; + static const WCHAR initstring_mode[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', + 'M','o','d','e','=','i','n','v','a','l','i','d',0}; + static const WCHAR initstring_mode2[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', + 'M','o','d','e','=','W','r','i','t','e','R','e','a','d',0}; + static const WCHAR initstring_mode3[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', + 'M','o','d','e','=','R','e','a','d','W','R','I','T','E',0}; IDataInitialize *datainit = NULL; IDBInitialize *dbinit; HRESULT hr; @@ -537,6 +546,23 @@ static void test_initializationstring(void) &IID_IDBInitialize, (IUnknown**)&dbinit); ok(hr == S_OK, "got 0x%08x\n", hr); IDBInitialize_Release(dbinit); + + /* Invalid Mode value */ + dbinit = NULL; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, (WCHAR *)initstring_mode, + &IID_IDBInitialize, (IUnknown **)&dbinit); + ok(FAILED(hr), "got 0x%08x\n", hr); + + dbinit = NULL; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, (WCHAR *)initstring_mode2, + &IID_IDBInitialize, (IUnknown **)&dbinit); + ok(FAILED(hr), "got 0x%08x\n", hr); + + dbinit = NULL; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, (WCHAR *)initstring_mode3, + &IID_IDBInitialize, (IUnknown **)&dbinit); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDBInitialize_Release(dbinit); } else ok(dbinit == NULL, "got %p\n", dbinit);

1 0

Jacek Caban : mshtml.idl: Added HTMLTableRow coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: c84111de12369cb1eaa64706b95de1122946e6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84111de12369cb1eaa64706b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:09:14 2017 +0200 mshtml.idl: Added HTMLTableRow coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltablerow.c | 4 ++-- include/mshtml.idl | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 1604dcf..82f7115 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -32,13 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLTableRow { HTMLElement element; IHTMLTableRow IHTMLTableRow_iface; nsIDOMHTMLTableRowElement *nsrow; -} HTMLTableRow; +}; static inline HTMLTableRow *impl_from_IHTMLTableRow(IHTMLTableRow *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 4c7e095..a1edef2 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -18315,6 +18315,26 @@ methods: } /***************************************************************************** + * HTMLTableRow coclass + */ +[ + noncreatable, + uuid(3050f26d-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLTableRow +{ + [default] dispinterface DispHTMLTableRow; + /* [source, default] dispinterface HTMLControlElementEvents; */ + /* [source] dispinterface HTMLControlElementEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLTableRow; + /* interface IHTMLTableRowMetrics; */ + /* interface IHTMLTableRow2; */ + /* interface IHTMLTableRow3; */ + /* interface IHTMLTableRow4; */ +} + +/***************************************************************************** * DispHTMLTableCell dispinterface */ [

1 0

Nikolay Sivov : dwrite: Handle allocation failure when duplicating reference key.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 5b07cfc13ec3ddbb3092e2e5fd1a613a97fb2b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b07cfc13ec3ddbb3092e2e5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 12:50:07 2017 +0300 dwrite: Handle allocation failure when duplicating reference key. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c1b2286..3b265cb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2,7 +2,7 @@ * Font and collections * * Copyright 2011 Huw Davies - * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -4212,23 +4212,32 @@ static const IDWriteFontFileVtbl dwritefontfilevtbl = { dwritefontfile_Analyze, }; -HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) +HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, + IDWriteFontFile **ret) { - struct dwrite_fontfile *This; + struct dwrite_fontfile *file; + void *key; - This = heap_alloc(sizeof(struct dwrite_fontfile)); - if (!This) return E_OUTOFMEMORY; + *ret = NULL; - This->IDWriteFontFile_iface.lpVtbl = &dwritefontfilevtbl; - This->ref = 1; + file = heap_alloc(sizeof(*file)); + key = heap_alloc(key_size); + if (!file || !key) { + heap_free(file); + heap_free(key); + return E_OUTOFMEMORY; + } + + file->IDWriteFontFile_iface.lpVtbl = &dwritefontfilevtbl; + file->ref = 1; IDWriteFontFileLoader_AddRef(loader); - This->loader = loader; - This->stream = NULL; - This->reference_key = heap_alloc(key_size); - memcpy(This->reference_key, reference_key, key_size); - This->key_size = key_size; + file->loader = loader; + file->stream = NULL; + file->reference_key = key; + memcpy(file->reference_key, reference_key, key_size); + file->key_size = key_size; - *font_file = &This->IDWriteFontFile_iface; + *ret = &file->IDWriteFontFile_iface; return S_OK; }

1 0

Nikolay Sivov : dwrite: Added a helper to avoid extra traces from one method calling another.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 9bf9a9590a2f35ac3fd98d1f1b9f88d9792bc127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf9a9590a2f35ac3fd98d1f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 12:50:08 2017 +0300 dwrite: Added a helper to avoid extra traces from one method calling another. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3b265cb..c74b2bb 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -605,25 +605,31 @@ static HRESULT WINAPI dwritefontface_GetDesignGlyphMetrics(IDWriteFontFace4 *ifa return S_OK; } -static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace4 *iface, UINT32 const *codepoints, - UINT32 count, UINT16 *glyph_indices) +static HRESULT fontface_get_glyphs(struct dwrite_fontface *fontface, UINT32 const *codepoints, + UINT32 count, UINT16 *glyphs) { - struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); - - TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); - - if (!glyph_indices) + if (!glyphs) return E_INVALIDARG; if (!codepoints) { - memset(glyph_indices, 0, count*sizeof(UINT16)); + memset(glyphs, 0, count * sizeof(*glyphs)); return E_INVALIDARG; } - freetype_get_glyphs(iface, This->charmap, codepoints, count, glyph_indices); + freetype_get_glyphs(&fontface->IDWriteFontFace4_iface, fontface->charmap, codepoints, count, glyphs); return S_OK; } +static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace4 *iface, UINT32 const *codepoints, + UINT32 count, UINT16 *glyphs) +{ + struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); + + TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyphs); + + return fontface_get_glyphs(This, codepoints, count, glyphs); +} + static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace4 *iface, UINT32 table_tag, const void **table_data, UINT32 *table_size, void **context, BOOL *exists) { @@ -1161,13 +1167,11 @@ static BOOL WINAPI dwritefontface3_HasCharacter(IDWriteFontFace4 *iface, UINT32 { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); UINT16 index; - HRESULT hr; TRACE("(%p)->(0x%08x)\n", This, ch); index = 0; - hr = IDWriteFontFace4_GetGlyphIndices(iface, &ch, 1, &index); - if (FAILED(hr)) + if (FAILED(fontface_get_glyphs(This, &ch, 1, &index))) return FALSE; return index != 0;

1 0

Hugh McMaster : regedit: Select the targeted treeview item on right mouse click.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: ab0d0c6ee4325670f66a68af4f06fbd9acbb6151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab0d0c6ee4325670f66a68af4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 17 09:15:36 2017 +0000 regedit: Select the targeted treeview item on right mouse click. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 4d184c3..df7c640 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -372,9 +372,14 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; case WM_CONTEXTMENU: { - int x = GET_X_LPARAM(lParam); - int y = GET_Y_LPARAM(lParam); - TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, x, y, 0, hFrameWnd, NULL); + POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)}; + TVHITTESTINFO ht; + ht.pt = pt; + ScreenToClient(g_pChildWnd->hTreeWnd, &ht.pt); + if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) + SendMessageW(g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM)ht.hItem); + TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON, + pt.x, pt.y, 0, hFrameWnd, NULL); } case WM_KEYDOWN:

1 0

Jacek Caban : mshtml.idl: Added HTMLTitleElement coclass declaration.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: c80bd90ab0f40e7117907d691f7cd2b8878f6e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80bd90ab0f40e7117907d691… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:08:28 2017 +0200 mshtml.idl: Added HTMLTitleElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlhead.c | 4 ++-- include/mshtml.idl | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index e391396..f9f3dbe 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -32,11 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLTitleElement { HTMLElement element; IHTMLTitleElement IHTMLTitleElement_iface; -} HTMLTitleElement; +}; static inline HTMLTitleElement *impl_from_IHTMLTitleElement(IHTMLTitleElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index e3bf2e7..e646d77 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11728,6 +11728,22 @@ methods: } /***************************************************************************** + * HTMLTitleElement coclass + */ +[ + noncreatable, + uuid(3050f284-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLTitleElement +{ + [default] dispinterface DispHTMLTitleElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLTitleElement; +} + +/***************************************************************************** * DispHTMLMetaElement dispinterface */ [

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSSetShader().
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 595a5de39048781a82ff423c34cc4d0545045906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595a5de39048781a82ff423c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:14 2017 +0200 d3d11: Implement d3d11_immediate_context_HSSetShader(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 12 +++++++++++- dlls/d3d11/shader.c | 9 +++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 10709c4..b5b2678 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -293,6 +293,7 @@ struct d3d11_hull_shader HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, struct d3d11_hull_shader **shader) DECLSPEC_HIDDEN; +struct d3d11_hull_shader *unsafe_impl_from_ID3D11HullShader(ID3D11HullShader *iface) DECLSPEC_HIDDEN; /* ID3D11DomainShader */ struct d3d11_domain_shader diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e6702fc..6f71d4d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1135,8 +1135,18 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceContext *iface, ID3D11HullShader *shader, ID3D11ClassInstance *const *class_instances, UINT class_instance_count) { - FIXME("iface %p, shader %p, class_instances %p, class_instance_count %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_hull_shader *hs = unsafe_impl_from_ID3D11HullShader(shader); + + TRACE("iface %p, shader %p, class_instances %p, class_instance_count %u.\n", iface, shader, class_instances, class_instance_count); + + if (class_instances) + FIXME("Dynamic linking is not implemented yet.\n"); + + wined3d_mutex_lock(); + wined3d_device_set_hull_shader(device->wined3d_device, hs ? hs->wined3d_shader : NULL); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 420a47d..7531586 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -788,6 +788,15 @@ HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_cod return S_OK; } +struct d3d11_hull_shader *unsafe_impl_from_ID3D11HullShader(ID3D11HullShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d11_hull_shader_vtbl); + + return impl_from_ID3D11HullShader(iface); +} + /* ID3D11DomainShader methods */ static inline struct d3d11_domain_shader *impl_from_ID3D11DomainShader(ID3D11DomainShader *iface)

1 0

Józef Kucia : wined3d: Avoid multiple layout qualifiers for uniform blocks.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: master Commit: 74773a160375bfc059525bb71495a4e63924ee46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74773a160375bfc059525bb71… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 20 11:04:11 2017 +0200 wined3d: Avoid multiple layout qualifiers for uniform blocks. Nvidia Legacy GPU driver (340.xx series) doesn't allow multiple layout qualifiers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dffbf18..856a5b5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2318,9 +2318,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { if (reg_maps->cb_sizes[i]) { + shader_addline(buffer, "layout(std140"); if (shader_glsl_use_layout_binding_qualifier(gl_info)) - shader_addline(buffer, "layout(binding = %u)\n", uniform_block_base + i); - shader_addline(buffer, "layout(std140) uniform block_%s_cb%u { vec4 %s_cb%u[%u]; };\n", + shader_addline(buffer, ", binding = %u", uniform_block_base + i); + shader_addline(buffer, ") uniform block_%s_cb%u { vec4 %s_cb%u[%u]; };\n", prefix, i, prefix, i, reg_maps->cb_sizes[i]); } }

1 0