February 2017 - Wine-Commits

Lauri Kenttä : crypt32: Fix Base64 issues in CryptStringToBinary.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 552820acbf00b60ef268811e1546f9fde1aa0fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=552820acbf00b60ef268811e1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 14 16:59:34 2017 +0200 crypt32: Fix Base64 issues in CryptStringToBinary. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 280 ++++++++++++++------------------------------ dlls/crypt32/tests/base64.c | 9 +- 2 files changed, 90 insertions(+), 199 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552820acbf00b60ef2688…

1 0

Fabian Maurer : user32/tests: Add tests for disabled buttons receiving WM_LBUTTONUP.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 43b0dce2032e757b54540baa639b5880a3cfa528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b0dce2032e757b54540baa6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Feb 9 20:37:02 2017 +0100 user32/tests: Add tests for disabled buttons receiving WM_LBUTTONUP. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1752b68..e95d435 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6060,6 +6060,23 @@ static const struct message WmClearStateButtonSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { 0 } }; +static const struct message WmDisableButtonSeq[] = +{ + { WM_LBUTTONDOWN, sent }, + { BM_SETSTATE, sent|defwinproc }, + { WM_CTLCOLORSTATIC, sent|defwinproc|optional }, + { WM_CTLCOLORBTN, sent|optional }, + { WM_LBUTTONUP, sent }, + { BM_SETSTATE, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|defwinproc|optional }, + { WM_CTLCOLORSTATIC, sent|defwinproc|optional }, + { BM_SETCHECK, sent|defwinproc|optional }, + { WM_CTLCOLORBTN, sent|optional }, + { WM_CTLCOLORSTATIC, sent|defwinproc|optional }, + { WM_CAPTURECHANGED, sent|defwinproc }, + { WM_COMMAND, sent }, + { 0 } +}; static const struct message WmClearStateOwnerdrawSeq[] = { { BM_SETSTATE, sent }, @@ -6448,6 +6465,24 @@ static void test_button_messages(void) DeleteObject(hfont2); DestroyWindow(parent); + + /* Test if WM_LBUTTONDOWN and WM_LBUTTONUP to a disabled button leads to a WM_COMMAND for the parent */ + + parent = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok (hwnd != 0, "Failed to create overlapped window\n"); + + hwnd = CreateWindowExA(0, "my_button_class", "test", BS_DEFPUSHBUTTON | WS_VISIBLE | WS_CHILD, + 0, 0, 50, 14, parent, 0, 0, NULL); + + EnableWindow(hwnd, FALSE); + flush_sequence(); + SendMessageA(hwnd, WM_LBUTTONDOWN, MK_LBUTTON, 0); + SendMessageA(hwnd, WM_LBUTTONUP, 0, 0); + ok_sequence(WmDisableButtonSeq, "Mouseclick on a disabled button", FALSE); + + DestroyWindow(hwnd); + DestroyWindow(parent); } /****************** static message test *************************/

1 0

Nikolay Sivov : comctl32/propsheet: Implement PSM_SETHEADERTITLE.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: ce9c06be2b30b1218bb416c28d8f569fcaec3dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9c06be2b30b1218bb416c28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 21:34:20 2017 +0300 comctl32/propsheet: Implement PSM_SETHEADERTITLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index be787cd..5fc1474 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -34,7 +34,6 @@ * - Messages: * o PSM_RECALCPAGESIZES * o PSM_SETHEADERSUBTITLE - * o PSM_SETHEADERTITLE * o WM_HELP * o WM_CONTEXTMENU * - Notifications: @@ -2497,17 +2496,37 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) /****************************************************************************** * PROPSHEET_SetHeaderTitleW */ -static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, int iPageIndex, LPCWSTR pszHeaderTitle) +static void PROPSHEET_SetHeaderTitleW(HWND hwndDlg, UINT page_index, const WCHAR *title) { - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_w(pszHeaderTitle)); + PropSheetInfo *psInfo = GetPropW(hwndDlg, PropSheetInfoStr); + PROPSHEETPAGEW *page; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_w(title)); + + if (page_index >= psInfo->nPages) + return; + + page = (PROPSHEETPAGEW *)psInfo->proppage[page_index].hpage; + + if (!IS_INTRESOURCE(page->pszHeaderTitle)) + Free((void *)page->pszHeaderTitle); + + page->pszHeaderTitle = heap_strdupW(title); + page->dwFlags |= PSP_USEHEADERTITLE; } /****************************************************************************** * PROPSHEET_SetHeaderTitleA */ -static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, int iPageIndex, LPCSTR pszHeaderTitle) +static void PROPSHEET_SetHeaderTitleA(HWND hwndDlg, UINT page_index, const char *title) { - FIXME("(%p, %d, %s): stub\n", hwndDlg, iPageIndex, debugstr_a(pszHeaderTitle)); + WCHAR *titleW; + + TRACE("(%p, %u, %s)\n", hwndDlg, page_index, debugstr_a(title)); + + titleW = heap_strdupAtoW(title); + PROPSHEET_SetHeaderTitleW(hwndDlg, page_index, titleW); + Free(titleW); } /****************************************************************************** @@ -3723,11 +3742,11 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } case PSM_SETHEADERTITLEW: - PROPSHEET_SetHeaderTitleW(hwnd, (int)wParam, (LPCWSTR)lParam); + PROPSHEET_SetHeaderTitleW(hwnd, wParam, (LPCWSTR)lParam); return TRUE; case PSM_SETHEADERTITLEA: - PROPSHEET_SetHeaderTitleA(hwnd, (int)wParam, (LPCSTR)lParam); + PROPSHEET_SetHeaderTitleA(hwnd, wParam, (LPCSTR)lParam); return TRUE; case PSM_SETHEADERSUBTITLEW:

1 0

Nikolay Sivov : comctl32/propsheet: Add helpers to do string duplication.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 1a750f7b10c0acfbbb21b2b2272436f724b0b8c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a750f7b10c0acfbbb21b2b22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 21:34:19 2017 +0300 comctl32/propsheet: Add helpers to do string duplication. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 84 +++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 50 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index caf7181..be787cd 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -177,6 +177,26 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); WINE_DEFAULT_DEBUG_CHANNEL(propsheet); +static WCHAR *heap_strdupW(const WCHAR *str) +{ + int len = strlenW(str) + 1; + WCHAR *ret = Alloc(len * sizeof(WCHAR)); + strcpyW(ret, str); + return ret; +} + +static WCHAR *heap_strdupAtoW(const char *str) +{ + WCHAR *ret; + INT len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, 0, 0); + ret = Alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + #define add_flag(a) if (dwFlags & a) {strcat(string, #a );strcat(string," ");} /****************************************************************************** * PROPSHEET_UnImplementedFlags @@ -270,23 +290,6 @@ static INT PROPSHEET_FindPageByResId(const PropSheetInfo * psInfo, LRESULT resId } /****************************************************************************** - * PROPSHEET_AtoW - * - * Convert ASCII to Unicode since all data is saved as Unicode. - */ -static void PROPSHEET_AtoW(LPCWSTR *tostr, LPCSTR frstr) -{ - INT len; - WCHAR *to; - - TRACE("<%s>\n", frstr); - len = MultiByteToWideChar(CP_ACP, 0, frstr, -1, 0, 0); - to = Alloc(len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, frstr, -1, to, len); - *tostr = to; -} - -/****************************************************************************** * PROPSHEET_CollectSheetInfoCommon * * Common code for PROPSHEET_CollectSheetInfoA/W @@ -374,12 +377,7 @@ static void PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh, else { if (!IS_INTRESOURCE(lppsh->pszCaption)) - { - int len = strlenW(lppsh->pszCaption); - WCHAR *caption = Alloc( (len+1)*sizeof(WCHAR) ); - - psInfo->ppshheader.pszCaption = strcpyW( caption, lppsh->pszCaption ); - } + psInfo->ppshheader.pszCaption = heap_strdupW( lppsh->pszCaption ); } psInfo->nPages = lppsh->nPages; @@ -552,8 +550,6 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, WCHAR szTitle[256]; const WCHAR *pTitle; static const WCHAR pszNull[] = { '(','n','u','l','l',')',0 }; - WCHAR *text; - int len; if (IS_INTRESOURCE( lppsp->pszTitle )) { @@ -567,9 +563,7 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, else pTitle = lppsp->pszTitle; - len = strlenW(pTitle); - text = Alloc( (len+1)*sizeof (WCHAR) ); - psInfo->proppage[index].pszText = strcpyW( text, pTitle); + psInfo->proppage[index].pszText = heap_strdupW( pTitle ); } /* @@ -2945,15 +2939,15 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( if (ppsp->dwFlags & PSP_USEICONID) { if (!IS_INTRESOURCE( ppsp->u2.pszIcon )) - PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon); + ppsp->u2.pszIcon = heap_strdupAtoW( lpPropSheetPage->u2.pszIcon ); } if (ppsp->dwFlags & PSP_USETITLE) { - if (!IS_INTRESOURCE( ppsp->pszTitle )) - PROPSHEET_AtoW( &ppsp->pszTitle, lpPropSheetPage->pszTitle ); - else + if (IS_INTRESOURCE( ppsp->pszTitle )) ppsp->pszTitle = load_string( ppsp->hInstance, ppsp->pszTitle ); + else + ppsp->pszTitle = heap_strdupAtoW( lpPropSheetPage->pszTitle ); } else ppsp->pszTitle = NULL; @@ -2963,20 +2957,20 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageA( if (ppsp->dwFlags & PSP_USEHEADERTITLE) { - if (!IS_INTRESOURCE( ppsp->pszHeaderTitle )) - PROPSHEET_AtoW(&ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle); - else + if (IS_INTRESOURCE( ppsp->pszHeaderTitle )) ppsp->pszHeaderTitle = load_string( ppsp->hInstance, ppsp->pszHeaderTitle ); + else + ppsp->pszHeaderTitle = heap_strdupAtoW( lpPropSheetPage->pszHeaderTitle ); } else ppsp->pszHeaderTitle = NULL; if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE) { - if (!IS_INTRESOURCE( ppsp->pszHeaderSubTitle )) - PROPSHEET_AtoW(&ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle); - else + if (IS_INTRESOURCE( ppsp->pszHeaderSubTitle )) ppsp->pszHeaderSubTitle = load_string( ppsp->hInstance, ppsp->pszHeaderSubTitle ); + else + ppsp->pszHeaderSubTitle = heap_strdupAtoW( lpPropSheetPage->pszHeaderSubTitle ); } else ppsp->pszHeaderSubTitle = NULL; @@ -3000,23 +2994,13 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW lpPropSheetPage if ( !(ppsp->dwFlags & PSP_DLGINDIRECT) ) { if (!IS_INTRESOURCE( ppsp->u.pszTemplate )) - { - int len = strlenW(lpPropSheetPage->u.pszTemplate) + 1; - WCHAR *template = Alloc( len * sizeof (WCHAR) ); - - ppsp->u.pszTemplate = strcpyW( template, lpPropSheetPage->u.pszTemplate ); - } + ppsp->u.pszTemplate = heap_strdupW( lpPropSheetPage->u.pszTemplate ); } if ( ppsp->dwFlags & PSP_USEICONID ) { if (!IS_INTRESOURCE( ppsp->u2.pszIcon )) - { - int len = strlenW(lpPropSheetPage->u2.pszIcon) + 1; - WCHAR *icon = Alloc( len * sizeof (WCHAR) ); - - ppsp->u2.pszIcon = strcpyW( icon, lpPropSheetPage->u2.pszIcon ); - } + ppsp->u2.pszIcon = heap_strdupW( lpPropSheetPage->u2.pszIcon ); } if (ppsp->dwFlags & PSP_USETITLE)

1 0

Zebediah Figura : storage.dll16: Set OpenStorage/ OpenStream output to NULL on failure.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 74ed392f85834555bc1f5fb235ccb54abaffbb38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ed392f85834555bc1f5fb23… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 11 17:40:11 2017 -0600 storage.dll16: Set OpenStorage/OpenStream output to NULL on failure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 2ce3571..cac616c 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1859,11 +1859,13 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, newpps = STORAGE_look_for_named_pps(&lpstg->str,This->stde.pps_dir,name); if (newpps==-1) { IStorage16_fnRelease(&lpstg->IStorage16_iface); + *ppstg = NULL; return E_FAIL; } if (1!=STORAGE_get_pps_entry(&lpstg->str,newpps,&(lpstg->stde))) { IStorage16_fnRelease(&lpstg->IStorage16_iface); + *ppstg = NULL; return E_FAIL; } lpstg->ppsent = newpps; @@ -1899,11 +1901,13 @@ HRESULT CDECL IStorage16_fnOpenStream(IStorage16 *iface, LPCOLESTR16 pwcsName, v newpps = STORAGE_look_for_named_pps(&lpstr->str,This->stde.pps_dir,name); if (newpps==-1) { IStream16_fnRelease(&lpstr->IStream16_iface); + *ppstm = NULL; return E_FAIL; } if (1!=STORAGE_get_pps_entry(&lpstr->str,newpps,&(lpstr->stde))) { IStream16_fnRelease(&lpstr->IStream16_iface); + *ppstm = NULL; return E_FAIL; } lpstr->offset.u.LowPart = 0;

1 0

Jacek Caban : mshtml: Added IHTMLDocument4:: onselectionchange property implementation.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: e51ece778fcef338b62f4634343f8b9b78778b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51ece778fcef338b62f46343… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 16 16:35:37 2017 +0100 mshtml: Added IHTMLDocument4::onselectionchange property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9ef11e9..3241c6a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2624,15 +2624,19 @@ static HRESULT WINAPI HTMLDocument4_hasFocus(IHTMLDocument4 *iface, VARIANT_BOOL static HRESULT WINAPI HTMLDocument4_put_onselectionchange(IHTMLDocument4 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_SELECTIONCHANGE, &v); } static HRESULT WINAPI HTMLDocument4_get_onselectionchange(IHTMLDocument4 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument4(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_SELECTIONCHANGE, p); } static HRESULT WINAPI HTMLDocument4_get_namespace(IHTMLDocument4 *iface, IDispatch **p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 57c13c6..77c998f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -139,6 +139,9 @@ static const WCHAR onscrollW[] = {'o','n','s','c','r','o','l','l',0}; static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t',0}; static const WCHAR onselectstartW[] = {'o','n','s','e','l','e','c','t','s','t','a','r','t',0}; +static const WCHAR selectionchangeW[] = {'s','e','l','e','c','t','i','o','n','c','h','a','n','g','e',0}; +static const WCHAR onselectionchangeW[] = {'o','n','s','e','l','e','c','t','i','o','n','c','h','a','n','g','e',0}; + static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; static const WCHAR onsubmitW[] = {'o','n','s','u','b','m','i','t',0}; @@ -242,6 +245,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {scrollW, onscrollW, EVENTT_HTML, DISPID_EVMETH_ONSCROLL, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {selectionchangeW, onselectionchangeW, EVENTT_NONE, DISPID_EVMETH_ONSELECTSTART, + EVENT_FIXME}, {selectstartW, onselectstartW, EVENTT_MOUSE, DISPID_EVMETH_ONSELECTSTART, EVENT_CANCELABLE}, {submitW, onsubmitW, EVENTT_HTML, DISPID_EVMETH_ONSUBMIT, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8844eb3..b88f32f3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -48,6 +48,7 @@ typedef enum { EVENTID_READYSTATECHANGE, EVENTID_RESIZE, EVENTID_SCROLL, + EVENTID_SELECTIONCHANGE, EVENTID_SELECTSTART, EVENTID_SUBMIT, EVENTID_UNLOAD,

1 0

Jacek Caban : mshtml: Added IHTMLDocument7:: onchange property implementation.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: c058ce52c00233d2d508dc0bc211762d3d9ab61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c058ce52c00233d2d508dc0bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 16 16:35:45 2017 +0100 mshtml: Added IHTMLDocument7::onchange property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 3241c6a..87df4b0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3475,15 +3475,19 @@ static HRESULT WINAPI HTMLDocument7_get_onchange(IHTMLDocument7 *iface, VARIANT static HRESULT WINAPI HTMLDocument7_put_ondrag(IHTMLDocument7 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_DRAG, &v); } static HRESULT WINAPI HTMLDocument7_get_ondrag(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_DRAG, p); } static HRESULT WINAPI HTMLDocument7_put_ondragend(IHTMLDocument7 *iface, VARIANT v)

1 0

Jonathan Doron : include: Add definition for FILE_ID_INFORMATION.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 9e889691cf255a953e76c39f72ba6c8c38702b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e889691cf255a953e76c39f7… Author: Jonathan Doron <jond(a)wizery.com> Date: Thu Feb 16 18:16:37 2017 +0100 include: Add definition for FILE_ID_INFORMATION. Signed-off-by: Jonathan Doron <jond(a)wizery.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 891b6a7..2f2ea86 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -571,6 +571,15 @@ typedef struct _FILE_INTERNAL_INFORMATION { LARGE_INTEGER IndexNumber; } FILE_INTERNAL_INFORMATION, *PFILE_INTERNAL_INFORMATION; +typedef struct _FILE_ID_128 { + UCHAR Identifier[16]; +} FILE_ID_128, *PFILE_ID_128; + +typedef struct _FILE_ID_INFORMATION { + ULONGLONG VolumeSerialNumber; + FILE_ID_128 FileId; +} FILE_ID_INFORMATION, *PFILE_ID_INFORMATION; + typedef struct _FILE_EA_INFORMATION { ULONG EaSize; } FILE_EA_INFORMATION, *PFILE_EA_INFORMATION;

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_imin opcode.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: d0e7ffa0e4110301527442ced5af06240bccbda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e7ffa0e4110301527442ced… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:20 2017 +0100 wined3d: Recognize SM5 imm_atomic_imin opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3e32cab..24dcb05 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5144,6 +5144,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ff24a92..adc6746 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9345,6 +9345,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_EXCH */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0a07253..6f012cd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -164,6 +164,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", /* WINED3DSIH_IMM_ATOMIC_IMAX */ "imm_atomic_imax", + /* WINED3DSIH_IMM_ATOMIC_IMIN */ "imm_atomic_imin", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 44a9da9..61af803 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -284,6 +284,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, WINED3D_SM5_OP_IMM_ATOMIC_IMAX = 0xba, + WINED3D_SM5_OP_IMM_ATOMIC_IMIN = 0xbb, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, @@ -1011,6 +1012,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, {WINED3D_SM5_OP_IMM_ATOMIC_IMAX, WINED3DSIH_IMM_ATOMIC_IMAX, "iU", "ii"}, + {WINED3D_SM5_OP_IMM_ATOMIC_IMIN, WINED3DSIH_IMM_ATOMIC_IMIN, "iU", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d63983..54adf26 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -695,6 +695,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_IADD, WINED3DSIH_IMM_ATOMIC_IMAX, + WINED3DSIH_IMM_ATOMIC_IMIN, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMIN,

1 0

Józef Kucia : wined3d: Implement SM5 ld_raw instruction.
by Alexandre Julliard Feb. 16, 2017

Feb. 16, 2017

Module: wine Branch: master Commit: 80bd7efcf8ed359edf2a4584c7cbcd6c867711fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bd7efcf8ed359edf2a4584c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 16 13:02:23 2017 +0100 wined3d: Implement SM5 ld_raw instruction. 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 | 49 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adc6746..b583453 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3831,9 +3831,7 @@ static void shader_glsl_float16(const struct wined3d_shader_instruction *ins) dst = ins->dst[0]; for (i = 0; i < 4; ++i) { - write_mask = WINED3DSP_WRITEMASK_0 << i; - dst.write_mask = ins->dst[0].write_mask & write_mask; - + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; @@ -3864,9 +3862,7 @@ static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) dst = ins->dst[0]; for (i = 0; i < 4; ++i) { - write_mask = WINED3DSP_WRITEMASK_0 << i; - dst.write_mask = ins->dst[0].write_mask & write_mask; - + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &dst, dst.reg.data_type))) continue; @@ -5034,6 +5030,45 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); } +static void shader_glsl_ld_raw(const struct wined3d_shader_instruction *ins) +{ + const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type); + const struct wined3d_shader_src_param *src = &ins->src[1]; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct wined3d_shader_dst_param dst; + const char *function, *resource; + struct glsl_src_param offset; + char dst_swizzle[6]; + DWORD write_mask; + unsigned int i; + + if (src->reg.type == WINED3DSPR_RESOURCE) + { + function = "texelFetch"; + resource = "sampler"; + } + else + { + function = "imageLoad"; + resource = "image"; + } + + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &offset); + + dst = ins->dst[0]; + for (i = 0; i < 4; ++i) + { + dst.write_mask = ins->dst[0].write_mask & (WINED3DSP_WRITEMASK_0 << i); + if (!(write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, + &dst, dst.reg.data_type))) + continue; + + shader_glsl_swizzle_to_str(src->swizzle, FALSE, write_mask, dst_swizzle); + shader_addline(buffer, "%s(%s_%s%u, %s / 4)%s);\n", + function, prefix, resource, src->reg.idx[0].offset, offset.param_str, dst_swizzle); + } +} + static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; @@ -9359,7 +9394,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, - /* WINED3DSIH_LD_RAW */ NULL, + /* WINED3DSIH_LD_RAW */ shader_glsl_ld_raw, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit,

1 0