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

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_entry().
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: f9224e72840200f2c0723f37c829bfbff3dab16d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9224e72840200f2c0723f37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 17 16:33:13 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7cd16d5..aa4606e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -704,10 +704,10 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex } /* Context activation is done by the caller. */ -static void context_apply_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) +static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *context_gl, + GLenum target, struct fbo_entry *entry) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLuint read_binding, draw_binding; unsigned int i; @@ -717,8 +717,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ return; } - read_binding = context->fbo_read_binding; - draw_binding = context->fbo_draw_binding; + read_binding = context_gl->c.fbo_read_binding; + draw_binding = context_gl->c.fbo_draw_binding; wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, entry->id); if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) @@ -734,11 +734,11 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(context, target, i, &entry->key.objects[i + 1], + context_attach_surface_fbo(&context_gl->c, target, i, &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); } - context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], + context_attach_depth_stencil_fbo(&context_gl->c, target, &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility @@ -784,7 +784,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ { context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); - context_apply_fbo_entry(context, target, context->current_fbo); + wined3d_context_gl_apply_fbo_entry(context_gl, target, context->current_fbo); } }

1 0

Nikolay Sivov : mfplat: Handle null destination for GetItem().
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: e1d23a336eb00a0480847d2d6c3951bc1560b59b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1d23a336eb00a0480847d2d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 17 15:35:22 2019 +0300 mfplat: Handle null destination for GetItem(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 2 +- dlls/mfplat/tests/mfplat.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 14b9e23..e80408d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1112,7 +1112,7 @@ HRESULT attributes_GetItem(struct attributes *attributes, REFGUID key, PROPVARIA EnterCriticalSection(&attributes->cs); if ((attribute = attributes_find_item(attributes, key, NULL))) - hr = PropVariantCopy(value, &attribute->value); + hr = value ? PropVariantCopy(value, &attribute->value) : S_OK; else hr = MF_E_ATTRIBUTENOTFOUND; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3afb330..7fa3ddd 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -763,6 +763,12 @@ static void test_attributes(void) PropVariantClear(&ret_propvar); CHECK_ATTR_COUNT(attributes, 1); + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, NULL); + ok(hr == S_OK, "Item check failed, hr %#x.\n", hr); + + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID2, NULL); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + PropVariantInit(&ret_propvar); ret_propvar.vt = MF_ATTRIBUTE_STRING; U(ret_propvar).pwszVal = NULL;

1 0

Dmitry Timoshkov : urlmon: Add ShouldShowIntranetWarningSecband stub.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: d622ebdb10a98a9cb6891578f9dfa662cea63417 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d622ebdb10a98a9cb6891578… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 17 15:04:29 2019 +0800 urlmon: Add ShouldShowIntranetWarningSecband stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/urlmon.spec | 1 + dlls/urlmon/urlmon_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 9c7a6d3..b651018 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -77,6 +77,7 @@ @ stdcall RevokeBindStatusCallback(ptr ptr) @ stdcall RevokeFormatEnumerator(ptr ptr) @ stub SetSoftwareUpdateAdvertisementState +@ stdcall ShouldShowIntranetWarningSecband(long) @ stub URLDownloadA @ stdcall URLDownloadToCacheFileA(ptr str str long long ptr) @ stdcall URLDownloadToCacheFileW(ptr wstr wstr long long ptr) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 06f0698..53d5d29 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -828,3 +828,13 @@ HRESULT WINAPI RegisterMediaTypes(UINT types, LPCSTR *szTypes, CLIPFORMAT *cfTyp FIXME("stub: %u %p %p\n", types, szTypes, cfTypes); return E_INVALIDARG; } + +/*********************************************************************** + * ShouldShowIntranetWarningSecband + * Undocumented, added in IE7 + */ +BOOL WINAPI ShouldShowIntranetWarningSecband(DWORD unk) +{ + FIXME("%x: stub\n", unk); + return FALSE; +}

1 0

Dmitry Timoshkov : urlmon: Add support for PARSE_UNESCAPE to CoInternetParseUrl.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 422b625c9b31763e1542bbc1947c13bc5609ceda URL: https://source.winehq.org/git/wine.git/?a=commit;h=422b625c9b31763e1542bbc1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 17 15:04:16 2019 +0800 urlmon: Add support for PARSE_UNESCAPE to CoInternetParseUrl. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/internet.c | 7 ++++--- dlls/urlmon/tests/misc.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 7c997a0..da4fa9a 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -218,7 +218,7 @@ static HRESULT parse_security_url(LPCWSTR url, DWORD flags, LPWSTR result, DWORD return E_FAIL; } -static HRESULT parse_encode(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize) +static HRESULT parse_encode(LPCWSTR url, PARSEACTION action, DWORD flags, LPWSTR result, DWORD size, DWORD *rsize) { IInternetProtocolInfo *protocol_info; DWORD prsize; @@ -229,7 +229,7 @@ static HRESULT parse_encode(LPCWSTR url, DWORD flags, LPWSTR result, DWORD size, protocol_info = get_protocol_info(url); if(protocol_info) { - hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_ENCODE, + hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, action, flags, result, size, rsize, 0); IInternetProtocolInfo_Release(protocol_info); if(SUCCEEDED(hres)) @@ -401,7 +401,8 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD case PARSE_SECURITY_URL: return parse_security_url(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_ENCODE: - return parse_encode(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); + case PARSE_UNESCAPE: + return parse_encode(pwzUrl, ParseAction, dwFlags, pszResult, cchResult, pcchResult); case PARSE_PATH_FROM_URL: return parse_path_from_url(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_SCHEMA: diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index de0c654..6f4da47 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -62,6 +62,7 @@ DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xA DEFINE_EXPECT(ParseUrl); DEFINE_EXPECT(ParseUrl_ENCODE); +DEFINE_EXPECT(ParseUrl_UNESCAPE); DEFINE_EXPECT(QI_IInternetProtocolInfo); DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(unk_Release); @@ -383,6 +384,13 @@ static void test_CoInternetParseUrl(void) ok(!lstrcmpW(parse_tests[i].encoded_url, buf), "[%d] wrong encoded url\n", i); memset(buf, 0xf0, sizeof(buf)); + hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_UNESCAPE, 0, buf, + ARRAY_SIZE(buf), &size, 0); + ok(hres == S_OK, "[%d] encoding failed: %08x\n", i, hres); + ok(size == lstrlenW(parse_tests[i].encoded_url), "[%d] wrong size\n", i); + ok(!lstrcmpW(parse_tests[i].encoded_url, buf), "[%d] wrong encoded url\n", i); + + memset(buf, 0xf0, sizeof(buf)); hres = pCoInternetParseUrl(parse_tests[i].url, PARSE_PATH_FROM_URL, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == parse_tests[i].path_hres, "[%d] path failed: %08x, expected %08x\n", @@ -890,6 +898,11 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface case PARSE_ENCODE: CHECK_EXPECT2(ParseUrl_ENCODE); break; + + case PARSE_UNESCAPE: + CHECK_EXPECT2(ParseUrl_UNESCAPE); + break; + default: CHECK_EXPECT2(ParseUrl); break; @@ -1056,6 +1069,16 @@ static void test_NameSpace(void) CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(ParseUrl_ENCODE); + qiret = S_OK; + SET_EXPECT(QI_IInternetProtocolInfo); + SET_EXPECT(ParseUrl_UNESCAPE); + + hres = pCoInternetParseUrl(url8, PARSE_UNESCAPE, 0, buf, ARRAY_SIZE(buf), &size, 0); + ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); + + CHECK_CALLED(QI_IInternetProtocolInfo); + CHECK_CALLED(ParseUrl_UNESCAPE); + SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl);

1 0

Alexandre Julliard : include: Don't allow using wine/ library.h with msvcrt.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: a23c20eee1c6570847081c31c139396468f69310 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a23c20eee1c6570847081c31… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 16:46:47 2019 +0200 include: Don't allow using wine/library.h with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/kernel16_private.h | 1 + dlls/toolhelp.dll16/toolhelp.c | 1 + dlls/user.exe16/message.c | 1 + include/wine/library.h | 4 ++++ include/wine/winbase16.h | 1 - programs/winevdm/winevdm.c | 1 + 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 1fb4968..284b063 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -25,6 +25,7 @@ #include "winreg.h" #include "winternl.h" #include "wine/asm.h" +#include "wine/library.h" #include "pshpack1.h" diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index cf5e6ef..47c2d2d 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -36,6 +36,7 @@ #include "wine/winbase16.h" #include "toolhelp.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(toolhelp); diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 290f36b..c0b60ad 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -30,6 +30,7 @@ #include "winerror.h" #include "dde.h" #include "user_private.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msg); diff --git a/include/wine/library.h b/include/wine/library.h index 242bb69..af9deaf 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -31,6 +31,10 @@ #error This file should not be used in Wine tests #endif +#ifdef __WINE_USE_MSVCRT +#error This file should not be used with msvcrt headers +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 16c6324..d4a5096 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -24,7 +24,6 @@ #include <winbase.h> #include <winnls.h> #include <wine/windef16.h> -#include <wine/library.h> #include <pshpack1.h> diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index ccf6c8b..bde85a7 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -31,6 +31,7 @@ #include "winuser.h" #include "wincon.h" #include "wine/unicode.h" +#include "wine/library.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winevdm);

1 0

Alexandre Julliard : winebuild: Store wine_ldt_copy pointer in the NE header at load time.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 7b494f13e7e36afd994fa2e67e07fafe660b3ec0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b494f13e7e36afd994fa2e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 16:46:00 2019 +0200 winebuild: Store wine_ldt_copy pointer in the NE header at load time. Avoids having to import libwine from 16-bit modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 1 + tools/winebuild/relay.c | 8 +++----- tools/winebuild/spec16.c | 9 +++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 76ef355..357a0e9 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -921,6 +921,7 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons } patch_code_segment( pModule ); + *(void **)mz_header->e_res2 = &wine_ldt_copy; return hInstance; } diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 8718346..3b1f4cd 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -156,12 +156,10 @@ static void BuildCallFrom16Core( int reg_func, int thunk ) output( "\tandl $0xfff8, %%edx\n" ); output( "\tshrl $1, %%edx\n" ); if (UsePIC) - { - output( "\taddl wine_ldt_copy_ptr-1b(%%ecx),%%edx\n" ); - output( "\tmovl (%%edx), %%edx\n" ); - } + output( "\taddl .Lwine_ldt_copy_ptr-1b(%%ecx),%%edx\n" ); else - output( "\tmovl %s(%%edx), %%edx\n", asm_name("wine_ldt_copy") ); + output( "\taddl .Lwine_ldt_copy_ptr,%%edx\n" ); + output( "\tmovl (%%edx), %%edx\n" ); output( "\tmovzwl %%sp, %%ebp\n" ); output( "\tleal %d(%%ebp,%%edx), %%edx\n", reg_func ? 0 : -4 ); diff --git a/tools/winebuild/spec16.c b/tools/winebuild/spec16.c index 027580b..9dce748 100644 --- a/tools/winebuild/spec16.c +++ b/tools/winebuild/spec16.c @@ -355,11 +355,11 @@ static void output_call16_function( ORDDEF *odp ) if (UsePIC) { output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tmovl wine_ldt_copy_ptr-1b(%%eax),%%esi\n" ); + output( "1:\tmovl .Lwine_ldt_copy_ptr-1b(%%eax),%%esi\n" ); needs_get_pc_thunk = 1; } else - output( "\tmovl $%s,%%esi\n", asm_name("wine_ldt_copy") ); + output( "\tmovl .Lwine_ldt_copy_ptr,%%esi\n" ); } /* preserve 16-byte stack alignment */ @@ -584,7 +584,7 @@ static void output_module16( DLLSPEC *spec ) output( "\t.short 0,0,0,0\n" ); /* e_res */ output( "\t.short 0\n" ); /* e_oemid */ output( "\t.short 0\n" ); /* e_oeminfo */ - output( "\t.short 0,0,0,0,0,0,0,0,0,0\n" ); /* e_res2 */ + output( ".Lwine_ldt_copy_ptr:\t.long 0,0,0,0,0\n" ); /* e_res2, used for ldt_copy */ output( "\t.long .L__wine_spec_ne_header-.L__wine_spec_dos_header\n" );/* e_lfanew */ output( ".L__wine_spec_ne_header:\n" ); @@ -794,9 +794,6 @@ static void output_module16( DLLSPEC *spec ) output( "\n/* relay functions */\n\n" ); output( "\t.text\n" ); for ( i = 0; i < nb_funcs; i++ ) output_call16_function( typelist[i] ); - output( "\t.data\n" ); - output( "wine_ldt_copy_ptr:\n" ); - output( "\t.long %s\n", asm_name("wine_ldt_copy") ); } free( typelist );

1 0

Roman Stingler : kernel32: Add stub WerUnregisterRuntimeExceptionModule.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: e9dad9d733b8628b17e016898adda345fc83475e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9dad9d733b8628b17e01689… Author: Roman Stingler <roman.stingler(a)gmail.com> Date: Thu May 16 21:14:34 2019 +0200 kernel32: Add stub WerUnregisterRuntimeExceptionModule. Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-windowserrorreporting-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/wer.c | 9 +++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/werapi.h | 2 ++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec index 180ffed..0404830 100644 --- a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -5,6 +5,6 @@ @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock -@ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule @ stub WerpNotifyLoadStringResource @ stub WerpNotifyUseStringResource diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 691cc60..13d9351 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1591,7 +1591,7 @@ @ stdcall WerSetFlags(long) # @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) -# @ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) # @ stub WerpCleanupMessageMapping # @ stub WerpInitiateRemoteRecovery # @ stub WerpNotifyLoadStringResource diff --git a/dlls/kernel32/wer.c b/dlls/kernel32/wer.c index 3c517c4..2a7853b 100644 --- a/dlls/kernel32/wer.c +++ b/dlls/kernel32/wer.c @@ -81,3 +81,12 @@ HRESULT WINAPI WerUnregisterMemoryBlock(void *block) FIXME("(%p) stub\n", block); return E_NOTIMPL; } + +/*********************************************************************** + * WerUnregisterRuntimeExceptionModule (KERNEL32.@) + */ +HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, PVOID context) +{ + FIXME("(%s, %p) stub!\n", debugstr_w(callbackdll), context); + return S_OK; +} diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8294c95..9739644 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1709,7 +1709,7 @@ @ stdcall WerSetFlags(long) kernel32.WerSetFlags # @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock -# @ stub WerUnregisterRuntimeExceptionModule +@ stdcall WerUnregisterRuntimeExceptionModule(wstr ptr) kernel32.WerUnregisterRuntimeExceptionModule # @ stub WerpNotifyLoadStringResource # @ stub WerpNotifyUseStringResource @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) kernel32.WideCharToMultiByte diff --git a/include/werapi.h b/include/werapi.h index c66195f..247c612 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -186,6 +186,8 @@ HRESULT WINAPI WerReportSetUIOption(HREPORT, WER_REPORT_UI, PCWSTR); HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); HRESULT WINAPI WerSetFlags(DWORD flags); HRESULT WINAPI WerUnregisterMemoryBlock(void *block); +HRESULT WINAPI WerUnregisterRuntimeExceptionModule(PCWSTR callbackdll, void *context); + #ifdef __cplusplus }

1 0

Zebediah Figura : amstream: Reimplement IMediaStreamFilter::EnumPins().
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: f423c6e7079f797f81fe2f32db089eed5320b4d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f423c6e7079f797f81fe2f32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:31:05 2019 -0500 amstream: Reimplement IMediaStreamFilter::EnumPins(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream_private.h | 1 + dlls/amstream/mediastreamfilter.c | 167 +++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 16 ++-- 3 files changed, 174 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 8f25b8e..3cbc5c8 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -32,6 +32,7 @@ #include "mmstream.h" #include "austream.h" #include "amstream.h" +#include "wine/heap.h" HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index a61d1e7..e9f98b6 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -34,6 +34,142 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); +struct enum_pins +{ + IEnumPins IEnumPins_iface; + LONG refcount; + + IPin **pins; + unsigned int count, index; +}; + +static const IEnumPinsVtbl enum_pins_vtbl; + +static struct enum_pins *impl_from_IEnumPins(IEnumPins *iface) +{ + return CONTAINING_RECORD(iface, struct enum_pins, IEnumPins_iface); +} + +static HRESULT WINAPI enum_pins_QueryInterface(IEnumPins *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IEnumPins)) + { + IEnumPins_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI enum_pins_AddRef(IEnumPins *iface) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + ULONG refcount = InterlockedIncrement(&enum_pins->refcount); + TRACE("%p increasing refcount to %u.\n", enum_pins, refcount); + return refcount; +} + +static ULONG WINAPI enum_pins_Release(IEnumPins *iface) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + ULONG refcount = InterlockedDecrement(&enum_pins->refcount); + unsigned int i; + + TRACE("%p decreasing refcount to %u.\n", enum_pins, refcount); + if (!refcount) + { + for (i = 0; i < enum_pins->count; ++i) + IPin_Release(enum_pins->pins[i]); + heap_free(enum_pins->pins); + heap_free(enum_pins); + } + return refcount; +} + +static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, ULONG *ret_count) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + unsigned int i; + + TRACE("iface %p, count %u, pins %p, ret_count %p.\n", iface, count, pins, ret_count); + + if (!pins || (count > 1 && !ret_count)) + return E_POINTER; + + for (i = 0; i < count && enum_pins->index < enum_pins->count; ++i) + { + IPin_AddRef(pins[i] = enum_pins->pins[i]); + enum_pins->index++; + } + + if (ret_count) *ret_count = i; + return i == count ? S_OK : S_FALSE; +} + +static HRESULT WINAPI enum_pins_Skip(IEnumPins *iface, ULONG count) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + + TRACE("iface %p, count %u.\n", iface, count); + + enum_pins->index += count; + + return enum_pins->index >= enum_pins->count ? S_FALSE : S_OK; +} + +static HRESULT WINAPI enum_pins_Reset(IEnumPins *iface) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + + TRACE("iface %p.\n", iface); + + enum_pins->index = 0; + return S_OK; +} + +static HRESULT WINAPI enum_pins_Clone(IEnumPins *iface, IEnumPins **out) +{ + struct enum_pins *enum_pins = impl_from_IEnumPins(iface); + struct enum_pins *object; + unsigned int i; + + TRACE("iface %p, out %p.\n", iface, out); + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; + object->refcount = 1; + object->count = enum_pins->count; + object->index = enum_pins->index; + if (!(object->pins = heap_alloc(enum_pins->count * sizeof(*object->pins)))) + { + heap_free(object); + return E_OUTOFMEMORY; + } + for (i = 0; i < enum_pins->count; ++i) + IPin_AddRef(object->pins[i] = enum_pins->pins[i]); + + *out = &object->IEnumPins_iface; + return S_OK; +} + +static const IEnumPinsVtbl enum_pins_vtbl = +{ + enum_pins_QueryInterface, + enum_pins_AddRef, + enum_pins_Release, + enum_pins_Next, + enum_pins_Skip, + enum_pins_Reset, + enum_pins_Clone, +}; + typedef struct { BaseFilter filter; ULONG nb_streams; @@ -153,8 +289,35 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter *if static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, IEnumPins **enum_pins) { - IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - return BaseFilterImpl_EnumPins(&This->filter.IBaseFilter_iface, enum_pins); + IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter(iface); + struct enum_pins *object; + unsigned int i; + + TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); + + if (!enum_pins) + return E_POINTER; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; + object->refcount = 1; + object->count = filter->nb_streams; + object->index = 0; + if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) + { + heap_free(object); + return E_OUTOFMEMORY; + } + for (i = 0; i < filter->nb_streams; ++i) + { + if (FAILED(IAMMediaStream_QueryInterface(filter->streams[i], &IID_IPin, (void **)&object->pins[i]))) + WARN("Stream %p does not support IPin.\n", filter->streams[i]); + } + + *enum_pins = &object->IEnumPins_iface; + return S_OK; } static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, LPCWSTR id, IPin **pin) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 148e6bd..7215775 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -652,7 +652,7 @@ static void test_enum_pins(void) hr = IMediaStreamFilter_EnumPins(filter, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); @@ -666,7 +666,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Skip(enum1, 0); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Skip(enum1, 1); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -682,7 +682,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, NULL); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); IEnumPins_Release(enum1); @@ -690,7 +690,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); - ok(ref == 4, "Got unexpected refcount %d.\n", ref); + todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -700,7 +700,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); ref = get_refcount(filter); - ok(ref == 4, "Got unexpected refcount %d.\n", ref); + todo_wine ok(ref == 4, "Got unexpected refcount %d.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -723,7 +723,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum1, 2, pins, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#x.\n", hr); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum1, 2, pins, &count); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -741,7 +741,7 @@ static void test_enum_pins(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Skip(enum1, 1); - todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_FALSE, "Got hr %#x.\n", hr); @@ -759,7 +759,7 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); IMediaStream_Release(stream); ref = IPin_Release(pin); - todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_find_pin(void)

1 0

Zebediah Figura : setupapi: Define the correct platform extensions for each architecture.
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: c9e3307f9f90e31df2a15f9f8a2b2d48e7f93a52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9e3307f9f90e31df2a15f9f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:21:08 2019 -0500 setupapi: Define the correct platform extensions for each architecture. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index af91e09..e41389b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -55,7 +55,15 @@ static const WCHAR NoDisplayClass[] = {'N','o','D','i','s','p','l','a','y','C', static const WCHAR NoInstallClass[] = {'N','o','I','n','s','t','a','l','l','C','l','a','s','s',0}; static const WCHAR NoUseClass[] = {'N','o','U','s','e','C','l','a','s','s',0}; static const WCHAR NtExtension[] = {'.','N','T',0}; +#ifdef __i386__ static const WCHAR NtPlatformExtension[] = {'.','N','T','x','8','6',0}; +#elif defined(__x86_64__) +static const WCHAR NtPlatformExtension[] = {'.','N','T','a','m','d','6','4',0}; +#elif defined(__arm__) +static const WCHAR NtPlatformExtension[] = {'.','N','T','a','r','m',0}; +#elif defined(__aarch64__) +static const WCHAR NtPlatformExtension[] = {'.','N','T','a','r','m','6','4',0}; +#endif static const WCHAR Signature[] = {'S','i','g','n','a','t','u','r','e',0}; static const WCHAR Version[] = {'V','e','r','s','i','o','n',0}; static const WCHAR WinExtension[] = {'.','W','i','n',0};

1 0

Zebediah Figura : setupapi: Implement SetupDiGetActualSectionToInstallA().
by Alexandre Julliard May 17, 2019

May 17, 2019

Module: wine Branch: master Commit: 9c714c3b83ce3febb702f233cbb5cf11a017c63e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c714c3b83ce3febb702f233… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 17 00:21:07 2019 -0500 setupapi: Implement SetupDiGetActualSectionToInstallA(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 48b6ca3..af91e09 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1798,18 +1798,37 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO devinfo, SP_DEVINFO_DATA *devic } /*********************************************************************** - * SetupDiGetActualSectionToInstallA (SETUPAPI.@) + * SetupDiGetActualSectionToInstallA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetActualSectionToInstallA( - HINF InfHandle, - PCSTR InfSectionName, - PSTR InfSectionWithExt, - DWORD InfSectionWithExtSize, - PDWORD RequiredSize, - PSTR *Extension) +BOOL WINAPI SetupDiGetActualSectionToInstallA(HINF hinf, const char *section, + char *section_ext, DWORD size, DWORD *needed, char **extptr) { - FIXME("\n"); - return FALSE; + WCHAR sectionW[LINE_LEN], section_extW[LINE_LEN], *extptrW; + BOOL ret; + + MultiByteToWideChar(CP_ACP, 0, section, -1, sectionW, ARRAY_SIZE(sectionW)); + + ret = SetupDiGetActualSectionToInstallW(hinf, sectionW, section_extW, + ARRAY_SIZE(section_extW), NULL, &extptrW); + if (ret) + { + if (needed) + *needed = WideCharToMultiByte(CP_ACP, 0, section_extW, -1, NULL, 0, NULL, NULL); + + if (section_ext) + ret = !!WideCharToMultiByte(CP_ACP, 0, section_extW, -1, section_ext, size, NULL, NULL); + + if (extptr) + { + if (extptrW) + *extptr = section_ext + WideCharToMultiByte(CP_ACP, 0, section_extW, + extptrW - section_extW, NULL, 0, NULL, NULL); + else + *extptr = NULL; + } + } + + return ret; } /***********************************************************************

1 0