March 2019 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Access document object via browser object in nsChannelBSC_init_bindinfo.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 225b2f67b11c6c6d21fb954f7cfe921d6b2d2fa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=225b2f67b11c6c6d21fb954f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:45 2019 +0100 mshtml: Access document object via browser object in nsChannelBSC_init_bindinfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 49549b9..05b8ec0 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1320,12 +1320,12 @@ static HRESULT nsChannelBSC_init_bindinfo(BSCallback *bsc) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); nsChannel *nschannel = This->nschannel; - HTMLDocumentObj *doc_obj; + GeckoBrowser *browser; HRESULT hres; if(This->is_doc_channel && This->bsc.window && This->bsc.window->base.outer_window - && (doc_obj = This->bsc.window->base.outer_window->doc_obj)) { - if(doc_obj->hostinfo.dwFlags & DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION) + && (browser = This->bsc.window->base.outer_window->browser)) { + if(browser->doc->hostinfo.dwFlags & DOCHOSTUIFLAG_ENABLE_REDIRECT_NOTIFICATION) This->bsc.bindinfo_options |= BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS; }

1 0

Jacek Caban : mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 120bf0eba9c50708b80f6ee7529d5e0e041483fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=120bf0eba9c50708b80f6ee7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:38 2019 +0100 mshtml: Get rid of no longer needed HTMLOuterWindow doc_obj pointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlwindow.c | 2 -- dlls/mshtml/mshtml_private.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d5e2a70..013fffb 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5321,10 +5321,8 @@ static ULONG WINAPI HTMLDocumentObj_Release(IUnknown *iface) This->basedoc.doc_node->basedoc.doc_obj = NULL; htmldoc_release(&This->basedoc.doc_node->basedoc); } - if(This->basedoc.window) { - This->basedoc.window->doc_obj = NULL; + if(This->basedoc.window) IHTMLWindow2_Release(&This->basedoc.window->base.IHTMLWindow2_iface); - } if(This->advise_holder) IOleAdviseHolder_Release(This->advise_holder); @@ -5498,8 +5496,6 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii doc->basedoc.window = doc->nscontainer->content_window; IHTMLWindow2_AddRef(&doc->basedoc.window->base.IHTMLWindow2_iface); - doc->basedoc.window->doc_obj = doc; - if(!doc->basedoc.doc_node && doc->basedoc.window->base.inner_window->doc) { doc->basedoc.doc_node = doc->basedoc.window->base.inner_window->doc; htmldoc_addref(&doc->basedoc.doc_node->basedoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fd18ce0..92b0537 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3567,8 +3567,6 @@ HRESULT create_outer_window(GeckoBrowser *browser, mozIDOMWindowProxy *mozwindow window->base.outer_window = window; window->base.inner_window = NULL; - - window->doc_obj = browser->doc; window->browser = browser; list_add_head(&browser->outer_windows, &window->browser_entry); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 966da77..f2939da 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -475,7 +475,6 @@ struct HTMLOuterWindow { LONG task_magic; - HTMLDocumentObj *doc_obj; nsIDOMWindow *nswindow; mozIDOMWindowProxy *window_proxy; HTMLOuterWindow *parent;

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetPixelShader() helper.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 7ce336969ca4f7adba33c45f5f746a8f656348cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ce336969ca4f7adba33c45f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:53 2019 +0100 d3dx9: Merge the d3dx_effect_GetPixelShader() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 993e613..554d43d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1582,24 +1582,6 @@ static HRESULT d3dx9_base_effect_get_texture(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_pixel_shader(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) - { - if ((*shader = *(struct IDirect3DPixelShader9 **)param->data)) - IDirect3DPixelShader9_AddRef(*shader); - TRACE("Returning %p.\n", *shader); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -3606,13 +3588,24 @@ static HRESULT WINAPI d3dx_effect_GetTexture(struct ID3DXEffect *iface, D3DXHAND } static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DPixelShader9 **shader) + IDirect3DPixelShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); - return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader); + if (shader && param && !param->element_count && param->type == D3DXPT_PIXELSHADER) + { + if ((*shader = *(IDirect3DPixelShader9 **)param->data)) + IDirect3DPixelShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Jacek Caban : mshtml: Access document object via browser object in navigate_uri.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 2a6cb251f9ccd52ec5b9cc0d818b40124265178b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6cb251f9ccd52ec5b9cc0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:14:26 2019 +0100 mshtml: Access document object via browser object in navigate_uri. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 81c9db5..6fe3fc8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2404,7 +2404,10 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis TRACE("%s\n", debugstr_w(display_uri)); - if(window->doc_obj && window->doc_obj->webbrowser) { + if(!window->browser) + return E_UNEXPECTED; + + if(window->browser->doc->webbrowser) { DWORD post_data_len = request_data ? request_data->post_data_len : 0; void *post_data = post_data_len ? request_data->post_data : NULL; const WCHAR *headers = request_data ? request_data->headers : NULL; @@ -2413,13 +2416,13 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis BSTR frame_name = NULL; BOOL cancel = FALSE; - if(window != window->doc_obj->basedoc.window) { + if(!is_main_content_window(window)) { hres = IHTMLWindow2_get_name(&window->base.IHTMLWindow2_iface, &frame_name); if(FAILED(hres)) return hres; } - hres = IDocObjectService_FireBeforeNavigate2(window->doc_obj->doc_object_service, NULL, display_uri, 0x40, + hres = IDocObjectService_FireBeforeNavigate2(window->browser->doc->doc_object_service, NULL, display_uri, 0x40, frame_name, post_data, post_data_len ? post_data_len+1 : 0, headers, TRUE, &cancel); SysFreeString(frame_name); if(SUCCEEDED(hres) && cancel) { @@ -2428,11 +2431,11 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis } } - if(window == window->doc_obj->basedoc.window) + if(is_main_content_window(window)) return super_navigate(window, uri, flags, headers, post_data, post_data_len); } - if(window->doc_obj && window == window->doc_obj->basedoc.window) { + if(is_main_content_window(window)) { BOOL cancel; hres = hlink_frame_navigate(&window->base.inner_window->doc->basedoc, display_uri, NULL, 0, &cancel); @@ -2478,10 +2481,10 @@ static HRESULT translate_uri(HTMLOuterWindow *window, IUri *orig_uri, BSTR *ret_ if(FAILED(hres)) return hres; - if(window->doc_obj && window->doc_obj->hostui) { + if(window->browser->doc->hostui) { OLECHAR *translated_url = NULL; - hres = IDocHostUIHandler_TranslateUrl(window->doc_obj->hostui, 0, display_uri, + hres = IDocHostUIHandler_TranslateUrl(window->browser->doc->hostui, 0, display_uri, &translated_url); if(hres == S_OK && translated_url) { TRACE("%08x %s -> %s\n", hres, debugstr_w(display_uri), debugstr_w(translated_url));

1 0

Jacek Caban : mshtml: Access document object via browser object in nsIChannel::AsyncOpen.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 892be572cbf3724b92e6a4d2545b6fd0f94d258c URL: https://source.winehq.org/git/wine.git/?a=commit;h=892be572cbf3724b92e6a4d2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 14:13:06 2019 +0100 mshtml: Access document object via browser object in nsIChannel::AsyncOpen. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7a1d204..9b9e575 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1063,17 +1063,17 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen cancel = TRUE; } - if(window == window->doc_obj->basedoc.window) { + if(is_main_content_window(window)) { if(!This->uri->channel_bsc) { /* top window navigation initiated by Gecko */ - nsres = before_async_open(This, window->doc_obj->nscontainer, &cancel); + nsres = before_async_open(This, window->browser, &cancel); if(NS_SUCCEEDED(nsres) && cancel) { TRACE("canceled\n"); nsres = NS_BINDING_ABORTED; } - }else if(window->doc_obj->mime) { + }else if(window->browser->doc->mime) { heap_free(This->content_type); - This->content_type = heap_strdupWtoA(window->doc_obj->mime); + This->content_type = heap_strdupWtoA(window->browser->doc->mime); } } }

1 0

Jacek Caban : mshtml: Access document object via browser object in IOmHistory::get_length.
by Alexandre Julliard March 14, 2019

March 14, 2019

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: Use is_main_content_window in a few more places.
by Alexandre Julliard March 14, 2019

March 14, 2019

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

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetParameterDesc() helper.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: 262238d46752700c2041cb9548724c66bd017eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=262238d46752700c2041cb95… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:52 2019 +0100 d3dx9: Merge the d3dx_effect_GetParameterDesc() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b12127b..993e613 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -989,33 +989,6 @@ static inline DWORD d3dx9_effect_version(DWORD major, DWORD minor) return (0xfeff0000 | ((major) << 8) | (minor)); } -static HRESULT d3dx9_base_effect_get_parameter_desc(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!desc || !param) - { - WARN("Invalid argument specified.\n"); - return D3DERR_INVALIDCALL; - } - - desc->Name = param->name; - desc->Semantic = param->semantic; - desc->Class = param->class; - desc->Type = param->type; - desc->Rows = param->rows; - desc->Columns = param->columns; - desc->Elements = param->element_count; - desc->Annotations = is_top_level_parameter(param) - ? top_level_parameter_from_parameter(param)->annotation_count : 0; - desc->StructMembers = param->member_count; - desc->Flags = param->flags; - desc->Bytes = param->bytes; - - return D3D_OK; -} - static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param, BOOL update_all, BOOL *param_dirty) @@ -2335,10 +2308,30 @@ static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDL D3DXPARAMETER_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); - return d3dx9_base_effect_get_parameter_desc(&effect->base_effect, parameter, desc); + if (!desc || !param) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + desc->Name = param->name; + desc->Semantic = param->semantic; + desc->Class = param->class; + desc->Type = param->type; + desc->Rows = param->rows; + desc->Columns = param->columns; + desc->Elements = param->element_count; + desc->Annotations = is_top_level_parameter(param) + ? top_level_parameter_from_parameter(param)->annotation_count : 0; + desc->StructMembers = param->member_count; + desc->Flags = param->flags; + desc->Bytes = param->bytes; + + return D3D_OK; } static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDLE technique,

1 0

Louis Lenders : gdi32: Add D3DKMTCloseAdapter() stub.
by Alexandre Julliard March 14, 2019

March 14, 2019

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

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetString() helper.
by Alexandre Julliard March 14, 2019

March 14, 2019

Module: wine Branch: master Commit: ea45ed1751860905daa33af5e45d38cbbeadd0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea45ed1751860905daa33af5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Mar 13 00:10:54 2019 +0100 d3dx9: Merge the d3dx_effect_GetString() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 554d43d..a81e330 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1515,23 +1515,6 @@ static HRESULT d3dx9_base_effect_set_string(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_string(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char **string) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (string && param && !param->element_count && param->type == D3DXPT_STRING) - { - *string = *(const char **)param->data; - TRACE("Returning %s.\n", debugstr_a(*string)); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) { @@ -3561,10 +3544,20 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); - return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string); + if (string && param && !param->element_count && param->type == D3DXPT_STRING) + { + *string = *(const char **)param->data; + TRACE("Returning %s.\n", debugstr_a(*string)); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter,

1 0