wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Józef Kucia : dxgi: Allow wrapping factory objects.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: c1f5d396040e30934a6bf0a42f2149195330ff6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1f5d396040e30934a6bf0a4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 26 22:09:05 2018 +0100 dxgi: Allow wrapping factory objects. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/dxgi/factory.c | 18 +++++++++++++++--- include/wine/winedxgi.idl | 11 ++++++++++- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 9089398..c286e76 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -29,7 +29,7 @@ #include "winuser.h" #include "objbase.h" -#include "d3d11_1.h" +#include "d3d11_4.h" #ifdef D3D11_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 8d24078..3f8816b 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -35,7 +35,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IDXGIFactory4 *ifac TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_IDXGIFactory4) + if (IsEqualGUID(iid, &IID_IWineDXGIFactory) + || IsEqualGUID(iid, &IID_IDXGIFactory4) || IsEqualGUID(iid, &IID_IDXGIFactory3) || IsEqualGUID(iid, &IID_IDXGIFactory2) || (factory->extended && IsEqualGUID(iid, &IID_IDXGIFactory1)) @@ -504,10 +505,21 @@ static const struct IDXGIFactory4Vtbl dxgi_factory_vtbl = struct dxgi_factory *unsafe_impl_from_IDXGIFactory4(IDXGIFactory4 *iface) { + IWineDXGIFactory *wine_factory; + struct dxgi_factory *factory; + HRESULT hr; + if (!iface) return NULL; - assert(iface->lpVtbl == &dxgi_factory_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_factory, IDXGIFactory4_iface); + if (FAILED(hr = IDXGIFactory4_QueryInterface(iface, &IID_IWineDXGIFactory, (void **)&wine_factory))) + { + ERR("Failed to get IWineDXGIFactory interface, hr %#x.\n", hr); + return NULL; + } + assert(wine_factory->lpVtbl == (void *)&dxgi_factory_vtbl); + factory = CONTAINING_RECORD(wine_factory, struct dxgi_factory, IDXGIFactory4_iface); + IWineDXGIFactory_Release(wine_factory); + return factory; } static HRESULT dxgi_factory_init(struct dxgi_factory *factory, BOOL extended) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index 983cdba..c3564d5 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -18,7 +18,7 @@ #pragma makedep header -import "dxgi.idl"; +import "dxgi1_5.idl"; [ object, @@ -59,3 +59,12 @@ interface IWineDXGIDeviceParent : IUnknown interface IWineDXGIAdapter : IDXGIAdapter1 { } + +[ + object, + local, + uuid(ea02a0d1-4c95-488a-a82c-6034621e8c4f) +] +interface IWineDXGIFactory : IDXGIFactory4 +{ +}

1 0

Józef Kucia : dxgi: Allow wrapping adapter objects.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: de28d86057764efa2d8eaf35552449e734f2cd7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=de28d86057764efa2d8eaf35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 26 22:09:02 2018 +0100 dxgi: Allow wrapping adapter objects. 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/dxgi/adapter.c | 18 +++++++++++++++--- include/wine/winedxgi.idl | 9 +++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 5440f2a..2ebf24e 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -33,7 +33,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter1 *ifac { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_IDXGIAdapter1) + if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter1) || IsEqualGUID(iid, &IID_IDXGIAdapter) || IsEqualGUID(iid, &IID_IDXGIObject) || IsEqualGUID(iid, &IID_IUnknown)) @@ -260,10 +261,21 @@ static const struct IDXGIAdapter1Vtbl dxgi_adapter_vtbl = struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter1(IDXGIAdapter1 *iface) { + IWineDXGIAdapter *wine_adapter; + struct dxgi_adapter *adapter; + HRESULT hr; + if (!iface) return NULL; - assert(iface->lpVtbl == &dxgi_adapter_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_adapter, IDXGIAdapter1_iface); + if (FAILED(hr = IDXGIAdapter1_QueryInterface(iface, &IID_IWineDXGIAdapter, (void **)&wine_adapter))) + { + ERR("Failed to get IWineDXGIAdapter interface, hr %#x.\n", hr); + return NULL; + } + assert(wine_adapter->lpVtbl == (void *)&dxgi_adapter_vtbl); + adapter = CONTAINING_RECORD(wine_adapter, struct dxgi_adapter, IDXGIAdapter1_iface); + IWineDXGIAdapter_Release(wine_adapter); + return adapter; } static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory *factory, UINT ordinal) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index a4f715b..983cdba 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -50,3 +50,12 @@ interface IWineDXGIDeviceParent : IUnknown { struct wined3d_device_parent *get_wined3d_device_parent(); } + +[ + object, + local, + uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) +] +interface IWineDXGIAdapter : IDXGIAdapter1 +{ +}

1 0

Józef Kucia : widl: Reformat do_import().
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: 1d0ba302d9e03f6bf5503198f7765c445214f825 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0ba302d9e03f6bf5503198… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 26 22:09:04 2018 +0100 widl: Reformat do_import(). Use 4-space indents. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 88 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6afc3e7..a57ac64 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -495,63 +495,63 @@ void pop_import(void) } struct imports { - char *name; - struct imports *next; + char *name; + struct imports *next; } *first_import; int do_import(char *fname) { - FILE *f; - char *path, *name; - struct imports *import; - int ptr = import_stack_ptr; - int ret, fd; - - import = first_import; - while (import && strcmp(import->name, fname)) - import = import->next; - if (import) return 0; /* already imported */ - - import = xmalloc(sizeof(struct imports)); - import->name = xstrdup(fname); - import->next = first_import; - first_import = import; - - /* don't search for a file name with a path in the include directories, - * for compatibility with MIDL */ - if (strchr( fname, '/' ) || strchr( fname, '\\' )) - path = xstrdup( fname ); - else if (!(path = wpp_find_include( fname, input_name ))) - error_loc("Unable to open include file %s\n", fname); + FILE *f; + char *path, *name; + struct imports *import; + int ptr = import_stack_ptr; + int ret, fd; + + import = first_import; + while (import && strcmp(import->name, fname)) + import = import->next; + if (import) return 0; /* already imported */ + + import = xmalloc(sizeof(struct imports)); + import->name = xstrdup(fname); + import->next = first_import; + first_import = import; + + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = xstrdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) + error_loc("Unable to open include file %s\n", fname); if (import_stack_ptr == MAX_IMPORT_DEPTH) error_loc("Exceeded max import depth\n"); - import_stack[ptr].temp_name = temp_name; - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; - input_name = path; - line_number = 1; + import_stack[ptr].temp_name = temp_name; + import_stack[ptr].input_name = input_name; + import_stack[ptr].line_number = line_number; + import_stack_ptr++; + input_name = path; + line_number = 1; - name = xstrdup( "widl.XXXXXX" ); - if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + name = xstrdup( "widl.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); - temp_name = name; - if (!(f = fdopen(fd, "wt"))) - error("Could not open fd %s for writing\n", name); + temp_name = name; + if (!(f = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); - ret = wpp_parse( path, f ); - fclose( f ); - if (ret) exit(1); + ret = wpp_parse( path, f ); + fclose( f ); + if (ret) exit(1); - if((f = fopen(temp_name, "r")) == NULL) - error_loc("Unable to open %s\n", temp_name); + if((f = fopen(temp_name, "r")) == NULL) + error_loc("Unable to open %s\n", temp_name); - import_stack[ptr].state = YY_CURRENT_BUFFER; - yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); - return 1; + import_stack[ptr].state = YY_CURRENT_BUFFER; + yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); + return 1; } void abort_import(void)

1 0

Józef Kucia : widl: Increase max import depth.
by Alexandre Julliard 29 Jan '18

29 Jan '18

Module: wine Branch: master Commit: ba6b020b9f792539f4004ec93932231715e90051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba6b020b9f792539f4004ec9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 26 22:09:03 2018 +0100 widl: Increase max import depth. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6520ce7..6afc3e7 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -78,7 +78,7 @@ static int attr_token(const char *kw); static warning_list_t *disabled_warnings = NULL; -#define MAX_IMPORT_DEPTH 10 +#define MAX_IMPORT_DEPTH 20 struct { YY_BUFFER_STATE state; char *input_name; @@ -524,6 +524,9 @@ int do_import(char *fname) else if (!(path = wpp_find_include( fname, input_name ))) error_loc("Unable to open include file %s\n", fname); + if (import_stack_ptr == MAX_IMPORT_DEPTH) + error_loc("Exceeded max import depth\n"); + import_stack[ptr].temp_name = temp_name; import_stack[ptr].input_name = input_name; import_stack[ptr].line_number = line_number;

1 0

Martin Storsjo : msvcrt: Optimize the aarch64 setjmp/longjmp using stp/ ldp.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: 85635db0ea7c4a8fee6612fe10c9d4aacf45e659 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85635db0ea7c4a8fee6612fe… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Jan 22 00:04:29 2018 +0200 msvcrt: Optimize the aarch64 setjmp/longjmp using stp/ldp. stp/ldp don't require any more alignment than the normal str/ldr. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm64.c | 74 +++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 904d006..2576928 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -141,65 +141,45 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, * _setjmpex (MSVCRT.@) */ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, - "str x1, [x0]\n\t" /* jmp_buf->Frame */ - "str x19, [x0, #0x10]\n\t" /* jmp_buf->X19 */ - "str x20, [x0, #0x18]\n\t" /* jmp_buf->X20 */ - "str x21, [x0, #0x20]\n\t" /* jmp_buf->X21 */ - "str x22, [x0, #0x28]\n\t" /* jmp_buf->X22 */ - "str x23, [x0, #0x30]\n\t" /* jmp_buf->X23 */ - "str x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ - "str x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ - "str x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "str x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ - "str x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ - "str x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ - "str x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ + "str x1, [x0]\n\t" /* jmp_buf->Frame */ + "stp x19, x20, [x0, #0x10]\n\t" /* jmp_buf->X19, X20 */ + "stp x21, x22, [x0, #0x20]\n\t" /* jmp_buf->X21, X22 */ + "stp x23, x24, [x0, #0x30]\n\t" /* jmp_buf->X23, X24 */ + "stp x25, x26, [x0, #0x40]\n\t" /* jmp_buf->X25, X26 */ + "stp x27, x28, [x0, #0x50]\n\t" /* jmp_buf->X27, X28 */ + "stp x29, x30, [x0, #0x60]\n\t" /* jmp_buf->Fp, Lr */ "mov x2, sp\n\t" - "str x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ + "str x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ "mrs x2, fpcr\n\t" - "str w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ + "str w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ "mrs x2, fpsr\n\t" - "str w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ - "str d8, [x0, #0x80]\n\t" /* jmp_buf->D[0] */ - "str d9, [x0, #0x88]\n\t" /* jmp_buf->D[1] */ - "str d10, [x0, #0x90]\n\t" /* jmp_buf->D[2] */ - "str d11, [x0, #0x98]\n\t" /* jmp_buf->D[3] */ - "str d12, [x0, #0xa0]\n\t" /* jmp_buf->D[4] */ - "str d13, [x0, #0xa8]\n\t" /* jmp_buf->D[5] */ - "str d14, [x0, #0xb0]\n\t" /* jmp_buf->D[6] */ - "str d15, [x0, #0xb8]\n\t" /* jmp_buf->D[7] */ + "str w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ + "stp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->D[0-1] */ + "stp d10, d11, [x0, #0x90]\n\t" /* jmp_buf->D[2-3] */ + "stp d12, d13, [x0, #0xa0]\n\t" /* jmp_buf->D[4-5] */ + "stp d14, d15, [x0, #0xb0]\n\t" /* jmp_buf->D[6-7] */ "mov x0, #0\n\t" "ret"); extern void DECLSPEC_NORETURN CDECL longjmp_set_regs(struct MSVCRT___JUMP_BUFFER *jmp, int retval); __ASM_GLOBAL_FUNC(longjmp_set_regs, - "ldr x19, [x0, #0x10]\n\t" /* jmp_buf->X19 */ - "ldr x20, [x0, #0x18]\n\t" /* jmp_buf->X20 */ - "ldr x21, [x0, #0x20]\n\t" /* jmp_buf->X21 */ - "ldr x22, [x0, #0x28]\n\t" /* jmp_buf->X22 */ - "ldr x23, [x0, #0x30]\n\t" /* jmp_buf->X23 */ - "ldr x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ - "ldr x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ - "ldr x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "ldr x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ - "ldr x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ - "ldr x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ - "ldr x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ - "ldr x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ + "ldp x19, x20, [x0, #0x10]\n\t" /* jmp_buf->X19, X20 */ + "ldp x21, x22, [x0, #0x20]\n\t" /* jmp_buf->X21, X22 */ + "ldp x23, x24, [x0, #0x30]\n\t" /* jmp_buf->X23, X24 */ + "ldp x25, x26, [x0, #0x40]\n\t" /* jmp_buf->X25, X26 */ + "ldp x27, x28, [x0, #0x50]\n\t" /* jmp_buf->X27, X28 */ + "ldp x29, x30, [x0, #0x60]\n\t" /* jmp_buf->Fp, Lr */ + "ldr x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ "mov sp, x2\n\t" - "ldr w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ + "ldr w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ "msr fpcr, x2\n\t" - "ldr w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ + "ldr w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ "msr fpsr, x2\n\t" - "ldr d8, [x0, #0x80]\n\t" /* jmp_buf->D[0] */ - "ldr d9, [x0, #0x88]\n\t" /* jmp_buf->D[1] */ - "ldr d10, [x0, #0x90]\n\t" /* jmp_buf->D[2] */ - "ldr d11, [x0, #0x98]\n\t" /* jmp_buf->D[3] */ - "ldr d12, [x0, #0xa0]\n\t" /* jmp_buf->D[4] */ - "ldr d13, [x0, #0xa8]\n\t" /* jmp_buf->D[5] */ - "ldr d14, [x0, #0xb0]\n\t" /* jmp_buf->D[6] */ - "ldr d15, [x0, #0xb8]\n\t" /* jmp_buf->D[7] */ + "ldp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->D[0-1] */ + "ldp d10, d11, [x0, #0x90]\n\t" /* jmp_buf->D[2-3] */ + "ldp d12, d13, [x0, #0xa0]\n\t" /* jmp_buf->D[4-5] */ + "ldp d14, d15, [x0, #0xb0]\n\t" /* jmp_buf->D[6-7] */ "mov x0, x1\n\t" /* retval */ "ret");

1 0

Alexandre Julliard : mshtml: Avoid using a global display DC.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: 20074ac855a96b310f4e54d8a4fc70ef8e1b696e URL: https://source.winehq.org/git/wine.git/?a=commit;h=20074ac855a96b310f4e54d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:44:50 2018 +0100 mshtml: Avoid using a global display DC. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscreen.c | 8 +++++--- dlls/mshtml/main.c | 18 ------------------ dlls/mshtml/mshtml_private.h | 1 - 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index 2ddaad23..5c52e4c 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -123,10 +123,12 @@ static HRESULT WINAPI HTMLScreen_Invoke(IHTMLScreen *iface, DISPID dispIdMember, static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p) { HTMLScreen *This = impl_from_IHTMLScreen(iface); + HDC hdc = GetDC(0); TRACE("(%p)->(%p)\n", This, p); - *p = GetDeviceCaps(get_display_dc(), BITSPIXEL); + *p = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); return S_OK; } @@ -150,7 +152,7 @@ static HRESULT WINAPI HTMLScreen_get_width(IHTMLScreen *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - *p = GetDeviceCaps(get_display_dc(), HORZRES); + *p = GetSystemMetrics(SM_CXSCREEN); return S_OK; } @@ -160,7 +162,7 @@ static HRESULT WINAPI HTMLScreen_get_height(IHTMLScreen *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - *p = GetDeviceCaps(get_display_dc(), VERTRES); + *p = GetSystemMetrics(SM_CYSCREEN); return S_OK; } diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index af716d1..0227ccc 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -51,7 +51,6 @@ HINSTANCE hInst; DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; -static HDC display_dc; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static IMultiLanguage2 *mlang; @@ -140,8 +139,6 @@ static void process_detach(void) FreeLibrary(shdoclc); if(mshtml_tls != TLS_OUT_OF_INDEXES) TlsFree(mshtml_tls); - if(display_dc) - DeleteObject(display_dc); if(mlang) IMultiLanguage2_Release(mlang); @@ -210,21 +207,6 @@ HINSTANCE get_shdoclc(void) return shdoclc = LoadLibraryExW(wszShdoclc, NULL, LOAD_LIBRARY_AS_DATAFILE); } -HDC get_display_dc(void) -{ - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - - if(!display_dc) { - HDC hdc; - - hdc = CreateICW(displayW, NULL, NULL, NULL); - if(InterlockedCompareExchangePointer((void**)&display_dc, hdc, NULL)) - DeleteObject(hdc); - } - - return display_dc; -} - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { switch(fdwReason) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aef82cd..51a1add 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1348,7 +1348,6 @@ extern void *call_thiscall_func; UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; -HDC get_display_dc(void) DECLSPEC_HIDDEN; HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN; void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : wevtapi: Add EvtNext() stub.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: aaf4e1d93d9c25273a1d5af2be8ab7f41f418cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf4e1d93d9c25273a1d5af2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 26 16:57:21 2018 +0300 wevtapi: Add EvtNext() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 7 +++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 5b9949b..a978437 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -115,3 +115,10 @@ BOOL WINAPI EvtClose(EVT_HANDLE handle) FIXME("(%p) stub\n", handle); return TRUE; } + +BOOL WINAPI EvtNext(EVT_HANDLE result_set, DWORD size, EVT_HANDLE *array, DWORD timeout, DWORD flags, DWORD *ret_count) +{ + FIXME("(%p %u %p %u %#x %p) stub!\n", result_set, size, array, timeout, flags, ret_count); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index e2bec57..ddd2f32 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -25,7 +25,7 @@ @ stub EvtIntRetractConfig @ stub EvtIntSysprepCleanup @ stub EvtIntWriteXmlEventToLocalLogfile -@ stub EvtNext +@ stdcall EvtNext(ptr long ptr long long ptr) @ stdcall EvtNextChannelPath(ptr long ptr ptr) @ stub EvtNextEventMetadata @ stub EvtNextPublisherId

1 0

Dmitry Timoshkov : kerberos: Print verbose traces on gssapi failures.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: 10c2968ce8b53c1cdf920cef1deb3b52dfca3b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c2968ce8b53c1cdf920cef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 26 12:48:36 2018 +0800 kerberos: Print verbose traces on gssapi failures. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 56b78fc..b4a37f7 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -189,6 +189,7 @@ static void *libgssapi_krb5_handle; MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); +MAKE_FUNCPTR(gss_display_status); MAKE_FUNCPTR(gss_get_mic); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); @@ -219,6 +220,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) + LOAD_FUNCPTR(gss_display_status) LOAD_FUNCPTR(gss_get_mic) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) @@ -293,6 +295,37 @@ static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) } } +static void trace_gss_status_ex( OM_uint32 code, int type ) +{ + OM_uint32 ret, minor_status; + gss_buffer_desc buf; + OM_uint32 message_context = 0; + + for (;;) + { + ret = pgss_display_status( &minor_status, code, type, GSS_C_NULL_OID, &message_context, &buf ); + if (GSS_ERROR(ret)) + { + TRACE( "gss_display_status(0x%08x,%d) returned %08x minor status %08x\n", + code, type, ret, minor_status ); + return; + } + TRACE( "GSS-API error: 0x%08x: %s\n", code, debugstr_an(buf.value, buf.length) ); + pgss_release_buffer( &minor_status, &buf ); + + if (!message_context) return; + } +} + +static void trace_gss_status( OM_uint32 major_status, OM_uint32 minor_status ) +{ + if (TRACE_ON(kerberos)) + { + trace_gss_status_ex( major_status, GSS_C_GSS_CODE ); + trace_gss_status_ex( minor_status, GSS_C_MECH_CODE ); + } +} + static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) { SYSTEMTIME time; @@ -319,6 +352,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam ret = pgss_import_name( &minor_status, &buf, type, name ); TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); HeapFree( GetProcessHeap(), 0, buf.value ); return status_gss_to_sspi( ret ); @@ -414,6 +448,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( ret = pgss_acquire_cred( &minor_status, principal, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, &cred_handle, NULL, &expiry_time ); TRACE( "gss_acquire_cred returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { credhandle_gss_to_sspi( cred_handle, credential ); @@ -444,6 +479,7 @@ static NTSTATUS NTAPI kerberos_SpFreeCredentialsHandle( LSA_SEC_HANDLE credentia ret = pgss_release_cred( &minor_status, &cred_handle ); TRACE( "gss_release_cred returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); return status_gss_to_sspi( ret ); #else @@ -495,6 +531,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, &expiry_time ); TRACE( "gss_init_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ @@ -564,6 +601,7 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential ret = pgss_accept_sec_context( &minor_status, &ctxt_handle, cred_handle, &input_token, GSS_C_NO_CHANNEL_BINDINGS, &target, NULL, &output_token, &ret_flags, &expiry_time, NULL ); TRACE( "gss_accept_sec_context returned %08x minor status %08x ctxt_handle %p\n", ret, minor_status, ctxt_handle ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ @@ -607,6 +645,7 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) ret = pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); TRACE( "gss_delete_sec_context returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); return status_gss_to_sspi( ret ); #else @@ -770,6 +809,7 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); @@ -809,6 +849,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL ); TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0; return status_gss_to_sspi( ret ); @@ -860,6 +901,7 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual ret = pgss_wrap_iov( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { memcpy( message->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); @@ -910,6 +952,7 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe ret = pgss_unwrap_iov( &minor_status, ctxt_handle, &conf_state, NULL, iov, 4 ); TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); return status_gss_to_sspi( ret );

1 0

Dmitry Timoshkov : kerberos: Fix printing of the sequence message number.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: 40f317749f697a6e127df9344743dda0ca595765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f317749f697a6e127df934… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 26 12:48:20 2018 +0800 kerberos: Fix printing of the sequence message number. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 2d3b601..56b78fc 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -754,7 +754,7 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); @@ -794,7 +794,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont int data_idx, token_idx; TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); @@ -833,7 +833,7 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual FIXME( "flags %08x not supported\n", quality_of_protection ); return SEC_E_UNSUPPORTED_FUNCTION; } - if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); @@ -884,7 +884,7 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe int token_idx, data_idx, conf_state; TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context );

1 0

Louis Lenders : uxtheme: Add stub for SetWindowThemeAttribute.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: 28613fcd934bffb3a581830a8fa7568ab35e4140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28613fcd934bffb3a581830a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jan 4 21:00:27 2018 +0100 uxtheme: Add stub for SetWindowThemeAttribute. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxtheme.spec | 1 + include/uxtheme.h | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 08996e1..e11271a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -721,6 +721,16 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, } /*********************************************************************** + * SetWindowThemeAttribute (UXTHEME.@) + */ +HRESULT WINAPI SetWindowThemeAttribute(HWND hwnd, enum WINDOWTHEMEATTRIBUTETYPE type, + PVOID attribute, DWORD size) +{ + FIXME("(%p,%d,%p,%d): stub\n", hwnd, type, attribute, size); + return E_NOTIMPL; +} + +/*********************************************************************** * GetCurrentThemeName (UXTHEME.@) */ HRESULT WINAPI GetCurrentThemeName(LPWSTR pszThemeFileName, int dwMaxNameChars, diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 5b68fde..632129b 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -108,3 +108,4 @@ @ stdcall OpenThemeData(ptr wstr) @ stdcall SetThemeAppProperties(long) @ stdcall SetWindowTheme(ptr wstr wstr) +@ stdcall SetWindowThemeAttribute(ptr long ptr long) diff --git a/include/uxtheme.h b/include/uxtheme.h index 374b530..a35f4ae 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -206,6 +206,8 @@ HTHEME WINAPI GetWindowTheme(HWND); #define OTD_NONCLIENT 0x0002 #define OTD_VALIDBITS (OTD_FORCE_RECT_SIZING | OTD_NONCLIENT) +enum WINDOWTHEMEATTRIBUTETYPE { WTA_NONCLIENT = 1 }; + HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*, HRGN,POINT,WORD*); BOOL WINAPI IsAppThemed(void); @@ -218,7 +220,7 @@ HTHEME WINAPI OpenThemeData(HWND,LPCWSTR); HTHEME WINAPI OpenThemeDataEx(HWND,LPCWSTR,DWORD); void WINAPI SetThemeAppProperties(DWORD); HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR); - +HRESULT WINAPI SetWindowThemeAttribute(HWND,enum WINDOWTHEMEATTRIBUTETYPE,PVOID,DWORD); /* Double-buffered Drawing API */

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
64
Older →

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 January 2018