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

Bruno Jesus : dinput: DISFFC_RESET will not release the effects.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 2b3c631b2e8ac0d843e31198836aa32a443b5bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3c631b2e8ac0d843e311988… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 26 17:07:03 2017 -0200 dinput: DISFFC_RESET will not release the effects. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 27f456844b8195dac09bfce0c4cc906236462a60) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 911700b..9b99b36 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1331,9 +1331,9 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE { case DISFFC_STOPALL: { - /* Stop all effects */ effect_list_item *itr; + /* Stop all effects */ LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) IDirectInputEffect_Stop(itr->ref); break; @@ -1341,12 +1341,14 @@ static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE case DISFFC_RESET: { - effect_list_item *itr, *ptr; + effect_list_item *itr; - /* Stop, unload, release and free all effects */ - /* This returns the device to its "bare" state */ - LIST_FOR_EACH_ENTRY_SAFE(itr, ptr, &This->ff_effects, effect_list_item, entry) - IDirectInputEffect_Release(itr->ref); + /* Stop and unload all effects. It is not true that effects are released */ + LIST_FOR_EACH_ENTRY(itr, &This->ff_effects, effect_list_item, entry) + { + IDirectInputEffect_Stop(itr->ref); + IDirectInputEffect_Unload(itr->ref); + } break; } case DISFFC_PAUSE:

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw1 surface segfaults.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: f515b99ab45b32aea7c2cbe225387d0872e01929 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f515b99ab45b32aea7c2cbe22… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:03 2017 -0700 ddraw: Don't crash if writing out a new ddraw1 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d9f2b4627af575ebcd28395d9ba3744cab6c5f36) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 ++++++++++++++++------ dlls/ddraw/tests/ddraw1.c | 2 ++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3b4c628..ecc0a46 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -26,6 +26,8 @@ #include "ddraw_private.h" +#include "wine/exception.h" + WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static const struct ddraw *exclusive_ddraw; @@ -2977,14 +2979,22 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; } - - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ed4c5ec..ff88b74 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1967,6 +1967,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Nikolay Sivov : comctl32/propsheet: Only use header bitmap when asked for it.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 992280add64610193d886d8b5f25db1ca5efabc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992280add64610193d886d8b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 08:17:04 2017 +0300 comctl32/propsheet: Only use header bitmap when asked for it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 34dd326060e7458661aa0644e3aa81503cc5097d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/propsheet.c | 115 ++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4c04dfe..f575e16 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3205,61 +3205,65 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) COLORREF clrOld = 0; int oldBkMode = 0; - hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); - hOldFont = SelectObject(hdc, psInfo->hFontBold); - - GetClientRect(hwndLineHeader, &r); - MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2); - SetRect(&rzone, 0, 0, r.right + 1, r.top - 1); - - GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm); - - if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD) - { - /* Fill the unoccupied part of the header with color of the - * left-top pixel, but do it only when needed. - */ - if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) - { - hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); - r = rzone; - if (bm.bmWidth < r.right) - { - r.left = bm.bmWidth; - FillRect(hdc, &r, hbr); - } - if (bm.bmHeight < r.bottom) - { - r.left = 0; - r.top = bm.bmHeight; - FillRect(hdc, &r, hbr); - } - DeleteObject(hbr); - } - - /* Draw the header itself. */ - BitBlt(hdc, 0, 0, - bm.bmWidth, min(bm.bmHeight, rzone.bottom), - hdcSrc, 0, 0, SRCCOPY); - } - else - { - int margin; - hbr = GetSysColorBrush(COLOR_WINDOW); - FillRect(hdc, &rzone, hbr); - - /* Draw the header bitmap. It's always centered like a - * common 49 x 49 bitmap. */ - margin = (rzone.bottom - 49) / 2; - BitBlt(hdc, rzone.right - 49 - margin, margin, - min(bm.bmWidth, 49), min(bm.bmHeight, 49), - hdcSrc, 0, 0, SRCCOPY); - - /* NOTE: Native COMCTL32 draws a white stripe over the bitmap - * if its height is smaller than 49 pixels. Because the reason - * for this bug is unknown the current code doesn't try to - * replicate it. */ - } + GetClientRect(hwndLineHeader, &r); + MapWindowPoints(hwndLineHeader, hwnd, (LPPOINT) &r, 2); + SetRect(&rzone, 0, 0, r.right + 1, r.top - 1); + + hOldFont = SelectObject(hdc, psInfo->hFontBold); + + if (psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER) + { + hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); + + GetObjectW(psInfo->ppshheader.u5.hbmHeader, sizeof(BITMAP), &bm); + if (psInfo->ppshheader.dwFlags & PSH_WIZARD97_OLD) + { + /* Fill the unoccupied part of the header with color of the + * left-top pixel, but do it only when needed. + */ + if (bm.bmWidth < r.right || bm.bmHeight < r.bottom) + { + hbr = CreateSolidBrush(GetPixel(hdcSrc, 0, 0)); + r = rzone; + if (bm.bmWidth < r.right) + { + r.left = bm.bmWidth; + FillRect(hdc, &r, hbr); + } + if (bm.bmHeight < r.bottom) + { + r.left = 0; + r.top = bm.bmHeight; + FillRect(hdc, &r, hbr); + } + DeleteObject(hbr); + } + + /* Draw the header itself. */ + BitBlt(hdc, 0, 0, bm.bmWidth, min(bm.bmHeight, rzone.bottom), + hdcSrc, 0, 0, SRCCOPY); + } + else + { + int margin; + hbr = GetSysColorBrush(COLOR_WINDOW); + FillRect(hdc, &rzone, hbr); + + /* Draw the header bitmap. It's always centered like a + * common 49 x 49 bitmap. */ + margin = (rzone.bottom - 49) / 2; + BitBlt(hdc, rzone.right - 49 - margin, margin, + min(bm.bmWidth, 49), min(bm.bmHeight, 49), + hdcSrc, 0, 0, SRCCOPY); + + /* NOTE: Native COMCTL32 draws a white stripe over the bitmap + * if its height is smaller than 49 pixels. Because the reason + * for this bug is unknown the current code doesn't try to + * replicate it. */ + } + + SelectObject(hdcSrc, hbmp); + } clrOld = SetTextColor (hdc, 0x00000000); oldBkMode = SetBkMode (hdc, TRANSPARENT); @@ -3300,7 +3304,6 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) SetTextColor(hdc, clrOld); SetBkMode(hdc, oldBkMode); SelectObject(hdc, hOldFont); - SelectObject(hdcSrc, hbmp); } if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) &&

1 0

Nikolay Sivov : comctl32/propsheet: Force wizard header if any of pages has title/subtitle.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: d84ebf0ddf770ba42f71d49f20ebec7bfa928255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d84ebf0ddf770ba42f71d49f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 1 08:17:03 2017 +0300 comctl32/propsheet: Force wizard header if any of pages has title/subtitle. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6eafebedb88ccd00aac6b838fd9d882c94ae61b2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/propsheet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 1809b86..4c04dfe 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -486,6 +486,9 @@ static BOOL PROPSHEET_CollectPageInfo(LPCPROPSHEETPAGEW lppsp, width = (WORD)*p; p++; height = (WORD)*p; p++; + if (lppsp->dwFlags & (PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE)) + psInfo->ppshheader.dwFlags |= PSH_HEADER; + /* Special calculation for interior wizard pages so the largest page is * calculated correctly. We need to add all the padding and space occupied * by the header so the width and height sums up to the whole wizard client

1 0

Matteo Bruni : d3d9: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 8e442cdf31d6839e49f0075f5180178f1243f5ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e442cdf31d6839e49f0075f5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 21:35:28 2017 +0100 d3d9: Fix DrawIndexedPrimitiveUP with non-zero min_vertex_idx. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bbce5af7d39c54bad156aa0754e7eb4cd03552e4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/device.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e0bc585..e646cb7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2485,18 +2485,16 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa UINT primitive_count, const void *index_data, D3DFORMAT index_format, const void *vertex_data, UINT vertex_stride) { - struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; + UINT vtx_size = vertex_count * vertex_stride; UINT idx_size = idx_count * idx_fmt_size; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib, *vb; - UINT ib_pos; - - UINT vtx_size = vertex_count * vertex_stride; - UINT vb_pos, align; + UINT vb_pos, ib_pos, align; + HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, " "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", @@ -2536,7 +2534,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(wined3d_map_desc.data, vertex_data, vtx_size); + memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; @@ -2568,7 +2566,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer, wined3dformat_from_d3dformat(index_format), 0); - wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride); + wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count);

1 0

Nikolay Sivov : comdlg32: Always use original Open File dialog template.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 9b841fb6c5573749743fce9ab2bd1f4af98f26be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b841fb6c5573749743fce9ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 22:56:09 2017 +0300 comdlg32: Always use original Open File dialog template. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6c4aaf776faf6bf465e3a06bb68a7c7e998b68be) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comdlg32/filedlg.c | 50 ++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 67b3566..d0d00b3 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -248,11 +248,8 @@ static BOOL BrowseSelectedFolder(HWND hwnd); */ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) { - LRESULT lRes; - LPCVOID origTemplate; - DWORD dwSize; - LPDLGTEMPLATEW template; + void *template; HRSRC hRes; HANDLE hDlgTmpl = 0; HRESULT hr; @@ -271,36 +268,25 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; } - if (!(dwSize = SizeofResource(COMDLG32_hInstance, hRes)) || - !(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes)) || - !(origTemplate = LockResource(hDlgTmpl))) + if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) || + !(template = LockResource( hDlgTmpl ))) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - if (!(template = HeapAlloc(GetProcessHeap(), 0, dwSize))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); - return FALSE; - } - memcpy(template, origTemplate, dwSize); /* msdn: explorer style dialogs permit sizing by default. * The OFN_ENABLESIZING flag is only needed when a hook or - * custom tmeplate is provided */ + * custom template is provided */ if( (fodInfos->ofnInfos->Flags & OFN_EXPLORER) && !(fodInfos->ofnInfos->Flags & ( OFN_ENABLEHOOK | OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) fodInfos->ofnInfos->Flags |= OFN_ENABLESIZING; if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - template->style |= WS_SIZEBOX; fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; fodInfos->initial_size.x = fodInfos->initial_size.y = 0; } - else - template->style &= ~WS_SIZEBOX; - /* old style hook messages */ if (IsHooked(fodInfos)) @@ -329,8 +315,6 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) if (SUCCEEDED(hr)) OleUninitialize(); - HeapFree(GetProcessHeap(), 0, template); - /* Unable to create the dialog */ if( lRes == -1) return FALSE; @@ -1286,7 +1270,31 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { - GetWindowRect( hwnd, &rc); + DWORD style = GetWindowLongW(hwnd, GWL_STYLE); + DWORD ex_style = GetWindowLongW(hwnd, GWL_EXSTYLE); + RECT client, client_adjusted; + + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + style |= WS_SIZEBOX; + ex_style |= WS_EX_WINDOWEDGE; + } + else + style &= ~WS_SIZEBOX; + SetWindowLongW(hwnd, GWL_STYLE, style); + SetWindowLongW(hwnd, GWL_EXSTYLE, ex_style); + + GetClientRect( hwnd, &client ); + GetClientRect( hwnd, &client_adjusted ); + AdjustWindowRectEx( &client_adjusted, style, FALSE, ex_style ); + + GetWindowRect( hwnd, &rc ); + rc.right += client_adjusted.right - client.right; + rc.bottom += client_adjusted.bottom - client.bottom; + SetWindowPos(hwnd, 0, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_FRAMECHANGED | SWP_NOACTIVATE | + SWP_NOZORDER | SWP_NOMOVE); + + GetWindowRect( hwnd, &rc ); fodInfos->DlgInfos.hwndGrip = CreateWindowExA( 0, "SCROLLBAR", NULL, WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS |

1 0

Jacek Caban : mshtml: Initialize nsAString in IHTMLDocument3::get_dir.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 7b452a600c2461743f7a1e2bcab81efbdfa17f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b452a600c2461743f7a1e2bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 24 13:26:25 2017 +0100 mshtml: Initialize nsAString in IHTMLDocument3::get_dir. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4823119a79152f7cf3808b9744e2143776970edb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 47e087d..cf9344f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2207,6 +2207,7 @@ static HRESULT WINAPI HTMLDocument3_get_dir(IHTMLDocument3 *iface, BSTR *p) return E_UNEXPECTED; } + nsAString_Init(&dir_str, NULL); nsres = nsIDOMHTMLDocument_GetDir(This->doc_node->nsdoc, &dir_str); return return_nsstr(nsres, &dir_str, p); }

1 0

Józef Kucia : d3d11: Do not keep reference to resources.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: efe09a40695dec714c74ef4e72de18d5fcc7c65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe09a40695dec714c74ef4e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:36 2017 +0100 d3d11: Do not keep reference to resources. 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> (cherry picked from commit 57fac9b02e1c113c28c5c07a3f41676153120bd0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 12 ++++++------ dlls/d3d11/view.c | 9 +-------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a524f58..e76bb3d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2731,7 +2731,7 @@ static void test_create_depthstencil_view(void) hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3095,7 +3095,7 @@ static void test_create_rendertarget_view(void) hr = ID3D11Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3454,7 +3454,7 @@ static void test_create_shader_resource_view(void) hr = ID3D11Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -8132,7 +8132,7 @@ static void test_swapchain_views(void) context = test_context.immediate_context; refcount = get_refcount((IUnknown *)test_context.backbuffer); - todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); @@ -8145,7 +8145,7 @@ static void test_swapchain_views(void) ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); refcount = get_refcount((IUnknown *)test_context.backbuffer); - todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); draw_color_quad(&test_context, &color); todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); @@ -10365,7 +10365,7 @@ static void test_create_unordered_access_view(void) hr = ID3D11Device_CreateUnorderedAccessView(device, texture, current_desc, &uav); ok(SUCCEEDED(hr), "Test %u: Failed to create unordered access view, hr %#x.\n", i, hr); refcount = get_refcount((IUnknown *)texture); - todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); memset(&uav_desc, 0, sizeof(uav_desc)); ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 06f4011..92fc37c 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -996,7 +996,6 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci { wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -1312,7 +1311,6 @@ static HRESULT d3d_depthstencil_view_init(struct d3d_depthstencil_view *view, st wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -1419,7 +1417,6 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge { wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -1740,7 +1737,6 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -1848,7 +1844,6 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe { wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -2221,7 +2216,6 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device); @@ -2314,7 +2308,6 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder { wined3d_mutex_lock(); wined3d_unordered_access_view_decref(view->wined3d_view); - ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -2510,7 +2503,7 @@ static HRESULT d3d11_unordered_access_view_init(struct d3d11_unordered_access_vi wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); - ID3D11Resource_AddRef(view->resource = resource); + view->resource = resource; ID3D11Device_AddRef(view->device = &device->ID3D11Device_iface); return S_OK;

1 0

Dmitry Timoshkov : avifil32: AVIFileGetStream should set stream to NULL in case of an error.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: 3b787da6286e12d6ee26393390b630d9e53115c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b787da6286e12d6ee2639339… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 26 17:32:53 2017 +0100 avifil32: AVIFileGetStream should set stream to NULL in case of an error. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7ee4021694630d7ed1d0cd4d87c2ec79911609ba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/avifil32/avifile.c | 1 + dlls/avifil32/tests/api.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f649d05..7a4caaa 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -316,6 +316,7 @@ static HRESULT WINAPI IAVIFile_fnGetStream(IAVIFile *iface, IAVIStream **avis, D } /* Sorry, but the specified stream doesn't exist */ + *avis = NULL; return AVIERR_NODATA; } diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index b3d822d..66ba205 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -373,6 +373,11 @@ static void test_default_data(void) res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); ok(res == 0, "Unable to open file: error=%u\n", res); + pStream0 = (void *)0xdeadbeef; + res = AVIFileGetStream(pFile, &pStream0, ~0U, 0); + ok(res == AVIERR_NODATA, "expected AVIERR_NODATA, got %u\n", res); + ok(pStream0 == NULL, "AVIFileGetStream should set stream to NULL\n"); + res = AVIFileGetStream(pFile, &pStream0, 0, 0); ok(res == 0, "Unable to open video stream: error=%u\n", res);

1 0

Zebediah Figura : storage.dll16: Fix bad type in IStorage16_fnOpenStorage.
by Alexandre Julliard April 20, 2017

April 20, 2017

Module: wine Branch: stable Commit: d816da8a73922eb34e8ab4979c095d68a4b93d11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d816da8a73922eb34e8ab4979… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 28 15:48:34 2017 -0600 storage.dll16: Fix bad type in IStorage16_fnOpenStorage. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 289d032e766fca240e02e967224f823a4a4c6fb2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/storage.dll16/storage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index dcaff5c..74aa7f9 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -1848,7 +1848,7 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg) { IStorage16Impl *This = impl_from_IStorage16(iface); - IStream16Impl* lpstg; + IStorage16Impl *lpstg; WCHAR name[33]; int newpps; @@ -1869,12 +1869,12 @@ HRESULT CDECL IStorage16_fnOpenStorage(IStorage16 *iface, LPCOLESTR16 pwcsName, MultiByteToWideChar( CP_ACP, 0, pwcsName, -1, name, sizeof(name)/sizeof(WCHAR)); newpps = STORAGE_look_for_named_pps(&lpstg->str,This->stde.pps_dir,name); if (newpps==-1) { - IStream16_fnRelease(&lpstg->IStream16_iface); + IStorage16_fnRelease(&lpstg->IStorage16_iface); return E_FAIL; } if (1!=STORAGE_get_pps_entry(&lpstg->str,newpps,&(lpstg->stde))) { - IStream16_fnRelease(&lpstg->IStream16_iface); + IStorage16_fnRelease(&lpstg->IStorage16_iface); return E_FAIL; } lpstg->ppsent = newpps;

1 0