wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Jacek Caban : mshtml: Access document object via browser object in IOmHistory::get_length.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: d8cff0dc6f1b2837cb3b6444d9704c0d20c1f958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8cff0dc6f1b2837cb3b6444… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:12:55 2019 +0100 mshtml: Access document object via browser object in IOmHistory::get_length. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 533afd0..cc4ea5a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -666,16 +666,16 @@ static HRESULT WINAPI OmHistory_Invoke(IOmHistory *iface, DISPID dispIdMember, R static HRESULT WINAPI OmHistory_get_length(IOmHistory *iface, short *p) { OmHistory *This = impl_from_IOmHistory(iface); + GeckoBrowser *browser = NULL; TRACE("(%p)->(%p)\n", This, p); - if(!This->window || !This->window->base.outer_window->doc_obj - || !This->window->base.outer_window->doc_obj->travel_log) { - *p = 0; - }else { - *p = ITravelLog_CountEntries(This->window->base.outer_window->doc_obj->travel_log, - This->window->base.outer_window->doc_obj->browser_service); - } + if(This->window && This->window->base.outer_window) + browser = This->window->base.outer_window->browser; + + *p = browser->doc->travel_log + ? ITravelLog_CountEntries(browser->doc->travel_log, browser->doc->browser_service) + : 0; return S_OK; }

1 0

Jacek Caban : mshtml: Access document object via browser object in IActiveScriptSiteWindow:: GetWindow.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: d95da5f24923b794b8586b17f837d26c583032b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d95da5f24923b794b8586b17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:12:48 2019 +0100 mshtml: Access document object via browser object in IActiveScriptSiteWindow::GetWindow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/script.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 6ad5c48..a357176 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -506,10 +506,10 @@ static HRESULT WINAPI ActiveScriptSiteWindow_GetWindow(IActiveScriptSiteWindow * TRACE("(%p)->(%p)\n", This, phwnd); - if(!This->window || !This->window->base.outer_window || !This->window->base.outer_window->doc_obj) + if(!This->window || !This->window->base.outer_window) return E_UNEXPECTED; - *phwnd = This->window->base.outer_window->doc_obj->hwnd; + *phwnd = This->window->base.outer_window->browser->doc->hwnd; return S_OK; }

1 0

Jacek Caban : mshtml: Use is_main_content_window in a few more places.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 2b8c553cc98edd319bcae7a1bb3e2a8572930de2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b8c553cc98edd319bcae7a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:12:42 2019 +0100 mshtml: Use is_main_content_window in a few more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/persist.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5d4721e..568a590 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -127,7 +127,7 @@ static void detach_inner_window(HTMLInnerWindow *window) IHTMLWindow2_Release(&child->base.IHTMLWindow2_iface); } - if(outer_window && outer_window->doc_obj && outer_window == outer_window->doc_obj->basedoc.window) + if(outer_window && is_main_content_window(outer_window)) window->doc->basedoc.cp_container.forward_container = NULL; if(doc) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a798650..cb6aab3 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -115,9 +115,9 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) HRESULT hres; if(This->mon) { - if(This->doc_obj && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) { - if(This == This->doc_obj->basedoc.window) - notify_travellog_update(This->doc_obj); + if(This->browser && !(flags & (BINDING_REPLACE|BINDING_REFRESH))) { + if(is_main_content_window(This)) + notify_travellog_update(This->browser->doc); else TRACE("Skipping travellog update for frame navigation.\n"); } @@ -351,8 +351,8 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind IUri *uri; HRESULT hres; - if(window->doc_obj && window->doc_obj->basedoc.window == window) - doc_obj = window->doc_obj; + if(is_main_content_window(window)) + doc_obj = window->browser->doc; hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); if(FAILED(hres)) { @@ -436,8 +436,8 @@ static void notif_readystate(HTMLOuterWindow *window) window->readystate_pending = FALSE; - if(window->doc_obj && window->doc_obj->basedoc.window == window) - call_property_onchanged(&window->doc_obj->basedoc.cp_container, DISPID_READYSTATE); + if(is_main_content_window(window)) + call_property_onchanged(&window->browser->doc->basedoc.cp_container, DISPID_READYSTATE); hres = create_document_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, &event); if(SUCCEEDED(hres)) {

1 0

Louis Lenders : gdi32: Add D3DKMTCloseAdapter() stub.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: d150cc192e9877037b78b89c6449ad2f5b9b6761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d150cc192e9877037b78b89c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Mar 14 08:49:14 2019 +0000 gdi32: Add D3DKMTCloseAdapter() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46571 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-dx-d3dkmt-l1-1-0.spec | 2 +- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi32.spec | 1 + include/d3dukmdt.h | 2 ++ include/ddk/d3dkmthk.h | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec index 405afb9..e8aa38e 100644 --- a/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec +++ b/dlls/api-ms-win-dx-d3dkmt-l1-1-0/api-ms-win-dx-d3dkmt-l1-1-0.spec @@ -6,7 +6,7 @@ @ stub D3DKMTCheckOcclusion @ stub D3DKMTCheckSharedResourceAccess @ stub D3DKMTCheckVidPnExclusiveOwnership -@ stub D3DKMTCloseAdapter +@ stdcall D3DKMTCloseAdapter(ptr) gdi32.D3DKMTCloseAdapter @ stub D3DKMTConfigureSharedResource @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateAllocation2 diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8920b73..054d7cf 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -26,12 +26,16 @@ #include <stdarg.h> #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "ddk/d3dkmthk.h" #include "gdi_private.h" #include "wine/unicode.h" @@ -1253,3 +1257,12 @@ NTSTATUS WINAPI D3DKMTEscape( const void *pData ) FIXME("(%p): stub\n", pData); return STATUS_NO_MEMORY; } + +/****************************************************************************** + * D3DKMTCloseAdapter [GDI32.@] + */ +NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) +{ + FIXME("(%p): stub\n", desc); + return STATUS_SUCCESS; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2dc8f0e..6e8f028 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -80,6 +80,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall D3DKMTCloseAdapter(ptr) @ stdcall D3DKMTCreateDCFromMemory(ptr) @ stdcall D3DKMTDestroyDCFromMemory(ptr) @ stdcall D3DKMTEscape(ptr) diff --git a/include/d3dukmdt.h b/include/d3dukmdt.h index a7be710..ce2b0c2 100644 --- a/include/d3dukmdt.h +++ b/include/d3dukmdt.h @@ -25,6 +25,8 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #endif /* MAKEFOURCC */ +typedef UINT D3DKMT_HANDLE; + typedef enum _D3DDDIFORMAT { D3DDDIFMT_UNKNOWN = 0, diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h index 80c0c8a..0000b2f 100644 --- a/include/ddk/d3dkmthk.h +++ b/include/ddk/d3dkmthk.h @@ -21,6 +21,11 @@ #include <d3dukmdt.h> +typedef struct _D3DKMT_CLOSEADAPTER +{ + D3DKMT_HANDLE hAdapter; +} D3DKMT_CLOSEADAPTER; + typedef struct _D3DKMT_CREATEDCFROMMEMORY { void *pMemory; @@ -45,6 +50,7 @@ extern "C" { #endif /* __cplusplus */ +NTSTATUS WINAPI D3DKMTCloseAdapter(const D3DKMT_CLOSEADAPTER *desc); NTSTATUS WINAPI D3DKMTCreateDCFromMemory(D3DKMT_CREATEDCFROMMEMORY *desc); NTSTATUS WINAPI D3DKMTDestroyDCFromMemory(const D3DKMT_DESTROYDCFROMMEMORY *desc);

1 0

Francois Gouget : comsvcs/tests: Fix a typo in an ok() message.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 93e1a5f270659e9089fc6f44df0e5e84c8328c09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93e1a5f270659e9089fc6f44… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:41:15 2019 +0100 comsvcs/tests: Fix a typo in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/tests/dispenser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 7af38d0..98d2a91 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -70,7 +70,7 @@ static HRESULT WINAPI driver_QueryInterface(IDispenserDriver *iface, REFIID riid return S_OK; } - ok(0, "Unknown iterface %s\n", wine_dbgstr_guid(riid)); + ok(0, "Unknown interface %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; }

1 0

Francois Gouget : windowscodecs/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 17276a8e40f27ca0a97dec437a7ca8af195367d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17276a8e40f27ca0a97dec43… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:40:42 2019 +0100 windowscodecs/tests: Add a trailing '\n' to an ok() call. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 3750c32..048f132 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -765,7 +765,7 @@ static void test_StreamOnIStream(void) ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); hr = IWICStream_InitializeFromMemory(stream, memory, sizeof(memory)); - ok(hr == S_OK, "Failed to initialize stream, hr %#x.", hr); + ok(hr == S_OK, "Failed to initialize stream, hr %#x.\n", hr); hr = IWICImagingFactory_CreateStream(factory, &substream); ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr);

1 0

Francois Gouget : vssapi: A spelling fix in a variable name.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 213b415fa9a327054053e044e3838be720aef481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=213b415fa9a327054053e044… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:40:15 2019 +0100 vssapi: A spelling fix in a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vsbackup.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vsbackup.idl b/include/vsbackup.idl index b2dca11..d2d8795 100644 --- a/include/vsbackup.idl +++ b/include/vsbackup.idl @@ -63,7 +63,7 @@ interface IVssBackupComponents : IUnknown HRESULT GetWriterStatus([in] UINT index, [out] VSS_ID *instance, [out] VSS_ID *id, [out] BSTR *writer, [out] VSS_WRITER_STATE *status, [out] HRESULT *failure); HRESULT SetBackupSucceeded([in] VSS_ID instance, [in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, - [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeded); + [in] LPCWSTR path, [in] LPCWSTR name, [in] BOOL succeeded); HRESULT SetBackupOptions([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path, [in] LPCWSTR name, [in] LPCWSTR options); HRESULT SetSelectedForRestore([in] VSS_ID id, [in] VSS_COMPONENT_TYPE ct, [in] LPCWSTR path,

1 0

Francois Gouget : setupapi/tests: Add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 9f2baf1dd49590a0f8dada5a050719b7e2be697c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2baf1dd49590a0f8dada5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:41:29 2019 +0100 setupapi/tests: Add a trailing '\n' to a couple of ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0f27783..004a956 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -63,13 +63,13 @@ static void test_create_device_list_ex(void) "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError());

1 0

Francois Gouget : vbscript/tests: A spelling fix in a comment.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: c05a2ae4a753e5f408b473bf5bf076fa743af5e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05a2ae4a753e5f408b473bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:40:30 2019 +0100 vbscript/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9f1d24c..afd7c24 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1366,7 +1366,7 @@ end sub call test_identifiers() sub test_dotIdentifiers - ' test keywords that can also be an indentifier after a dot + ' test keywords that can also be an identifier after a dot ' Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") Call ok(testObj.true = 10, "testObj.true = " & testObj.true & " expected 10") Call ok(testObj.false = 10, "testObj.false = " & testObj.false & " expected 10")

1 0

Francois Gouget : windowscodecs: Spelling fixes in a comment.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 603bd85a09b96c2330ab7829b5546bc3083bcae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=603bd85a09b96c2330ab7829… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:39:56 2019 +0100 windowscodecs: Spelling fixes in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/palette.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 1c1e858..f99cbe0 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -669,8 +669,8 @@ static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *palette, hr = IWICBitmapSource_GetPixelFormat(source, &format); if (hr != S_OK) return hr; - /* For interoperability with gdiplus where PixelFormat24bppRGB actully stored - * as BGR (and there is no a corresponding RGB format) we have to use 24bppBGR + /* For interoperability with gdiplus where PixelFormat24bppRGB is actually stored + * as BGR (and there is no corresponding RGB format), we have to use 24bppBGR * to avoid format conversions. */ if (!IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019