wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

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

17 May '19

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 GetIUriPriv stub.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 39cc1216403a8d286c713fff92f2316742929c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39cc1216403a8d286c713fff… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 17 15:04:47 2019 +0800 urlmon: Add GetIUriPriv 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 | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index b651018..0f9f075 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -53,6 +53,7 @@ @ stdcall GetClassFileOrMime(ptr wstr ptr long wstr long ptr) @ stub GetClassURL @ stub GetComponentIDFromCLSSPEC +@ stdcall GetIUriPriv(ptr ptr) @ stub GetMarkOfTheWeb @ stdcall GetSoftwareUpdateInfo(wstr ptr) @ stub HlinkGoBack diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 53d5d29..5dc0d24 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -838,3 +838,15 @@ BOOL WINAPI ShouldShowIntranetWarningSecband(DWORD unk) FIXME("%x: stub\n", unk); return FALSE; } + +/*********************************************************************** + * GetIUriPriv (urlmon.@) + * + * Not documented. + */ +HRESULT WINAPI GetIUriPriv(IUri *uri, void **p) +{ + FIXME("(%p,%p): stub\n", uri, p); + *p = NULL; + return E_NOTIMPL; +}

1 0

Dmitry Timoshkov : urlmon: Add ShouldShowIntranetWarningSecband stub.
by Alexandre Julliard 17 May '19

17 May '19

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 17 May '19

17 May '19

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

Philip Rebohle : d3dcompiler: Accept a stat chunk size of 28 for reflection.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: b1f9cd57be74c52ab0d56cbaf47065d8f560827c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f9cd57be74c52ab0d56cba… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Thu May 16 17:05:59 2019 +0200 d3dcompiler: Accept a stat chunk size of 28 for reflection. Fixes "unhandled size" error for Crysis shaders. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 24190f6..7c67c92 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1127,7 +1127,12 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &r->gs_max_output_vertex_count); TRACE("GSMaxOutputVertexCount: %u\n", r->gs_max_output_vertex_count); - skip_dword_unknown(&ptr, 3); + skip_dword_unknown(&ptr, 2); + + /* old dx10 stat size */ + if (size == 28) return S_OK; + + skip_dword_unknown(&ptr, 1); /* dx10 stat size */ if (size == 29) return S_OK;

1 0

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

17 May '19

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 17 May '19

17 May '19

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

Alexandre Julliard : winebuild: Don' t change %fs and %gs when calling 16-bit register functions.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 075e561f5cff26a80d2c21a7bb6d74d4a4585cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=075e561f5cff26a80d2c21a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 17 16:43:06 2019 +0200 winebuild: Don't change %fs and %gs when calling 16-bit register functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 2 -- dlls/krnl386.exe16/ne_module.c | 2 -- dlls/krnl386.exe16/ne_segment.c | 4 ---- dlls/krnl386.exe16/thunk.c | 8 -------- dlls/system.drv16/system.c | 2 -- tools/winebuild/relay.c | 4 ---- 6 files changed, 22 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 99da47a..5b72bfa 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -222,8 +222,6 @@ static LRESULT call_hook16( WNDPROC16 hook, HWND hwnd, UINT msg, WPARAM wp, LPAR memset( &context, 0, sizeof(context) ); context.SegDs = context.SegEs = SELECTOROF( NtCurrentTeb()->WOW32Reserved ); - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.SegCs = SELECTOROF( hook ); context.Eip = OFFSETOF( hook ); context.Ebp = OFFSETOF( NtCurrentTeb()->WOW32Reserved ) + FIELD_OFFSET( STACK16FRAME, bp ); diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 1979358..76ef355 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -1234,8 +1234,6 @@ DWORD NE_StartTask(void) context.SegCs = GlobalHandleToSel16(pSegTable[SELECTOROF(pModule->ne_csip) - 1].hSeg); context.SegDs = GlobalHandleToSel16(pTask->hInstance); context.SegEs = pTask->hPDB; - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.Eip = OFFSETOF(pModule->ne_csip); context.Ebx = pModule->ne_stack; context.Ecx = pModule->ne_heap; diff --git a/dlls/krnl386.exe16/ne_segment.c b/dlls/krnl386.exe16/ne_segment.c index 1ceb714..000c576 100644 --- a/dlls/krnl386.exe16/ne_segment.c +++ b/dlls/krnl386.exe16/ne_segment.c @@ -689,8 +689,6 @@ static BOOL NE_InitDLL( NE_MODULE *pModule ) context.Edi = hInst; context.SegDs = ds; context.SegEs = ds; /* who knows ... */ - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.SegCs = SEL(pSegTable[SELECTOROF(pModule->ne_csip)-1].hSeg); context.Eip = OFFSETOF(pModule->ne_csip); context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); @@ -794,8 +792,6 @@ static void NE_CallDllEntryPoint( NE_MODULE *pModule, DWORD dwReason ) memset( &context, 0, sizeof(context) ); context.SegDs = ds; context.SegEs = ds; /* who knows ... */ - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.SegCs = HIWORD(entryPoint); context.Eip = LOWORD(entryPoint); context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index b4ba7d2..c8ad382 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -431,8 +431,6 @@ void WINAPI __regs_QT_Thunk( CONTEXT *context ) context16 = *context; - context16.SegFs = wine_get_fs(); - context16.SegGs = wine_get_gs(); context16.SegCs = HIWORD(context->Edx); context16.Eip = LOWORD(context->Edx); /* point EBP to the STACK16FRAME on the stack @@ -561,8 +559,6 @@ void WINAPI __regs_FT_Thunk( CONTEXT *context ) context16 = *context; - context16.SegFs = wine_get_fs(); - context16.SegGs = wine_get_gs(); context16.SegCs = HIWORD(callTarget); context16.Eip = LOWORD(callTarget); context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); @@ -720,8 +716,6 @@ void WINAPI __regs_Common32ThkLS( CONTEXT *context ) context16 = *context; - context16.SegFs = wine_get_fs(); - context16.SegGs = wine_get_gs(); context16.Edi = LOWORD(context->Ecx); context16.SegCs = HIWORD(context->Eax); context16.Eip = LOWORD(context->Eax); @@ -779,8 +773,6 @@ void WINAPI __regs_OT_32ThkLSF( CONTEXT *context ) context16 = *context; - context16.SegFs = wine_get_fs(); - context16.SegGs = wine_get_gs(); context16.SegCs = HIWORD(context->Edx); context16.Eip = LOWORD(context->Edx); context16.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME,bp); diff --git a/dlls/system.drv16/system.c b/dlls/system.drv16/system.c index 8bb5cf9..b6fd51c 100644 --- a/dlls/system.drv16/system.c +++ b/dlls/system.drv16/system.c @@ -68,8 +68,6 @@ static void CALLBACK SYSTEM_TimerTick( LPVOID arg, DWORD low, DWORD high ) SYS_Timers[i].ticks += SYS_Timers[i].rate; memset( &context, 0, sizeof(context) ); - context.SegFs = wine_get_fs(); - context.SegGs = wine_get_gs(); context.SegCs = SELECTOROF( proc ); context.Eip = OFFSETOF( proc ); context.Ebp = OFFSETOF(NtCurrentTeb()->WOW32Reserved) + FIELD_OFFSET(STACK16FRAME, bp); diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 1adbda0..8718346 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -492,10 +492,6 @@ static void BuildCallTo16Core( int reg_func ) output( "\tpushw 0x98(%%edx)\n"); /* SegDs */ output( "\tpushl 0x94(%%edx)\n"); /* SegEs */ output( "\tpopl %%es\n" ); - output( "\tpushl 0x90(%%edx)\n"); /* SegFs */ - output( "\tpopl %%fs\n" ); - output( "\tpushl 0x8c(%%edx)\n"); /* SegGs */ - output( "\tpopl %%gs\n" ); output( "\tmovl 0xb4(%%edx),%%ebp\n"); /* Ebp */ output( "\tmovl 0xa0(%%edx),%%esi\n"); /* Esi */ output( "\tmovl 0x9c(%%edx),%%edi\n"); /* Edi */

1 0

Marcus Meissner : setupapi: Fix size to MultiByteToWideChar().
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: 92919001f37f2d07fb7efb2b1c79ab1611ce57b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92919001f37f2d07fb7efb2b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri May 17 09:40:08 2019 +0200 setupapi: Fix size to MultiByteToWideChar(). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 943f7bb..5a49247 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3596,7 +3596,7 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO devinfo, paramsW.FileQueue = params->FileQueue; paramsW.ClassInstallReserved = params->ClassInstallReserved; paramsW.Reserved = params->Reserved; - MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, sizeof(paramsW.DriverPath)); + MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, ARRAY_SIZE(paramsW.DriverPath)); return SetupDiSetDeviceInstallParamsW(devinfo, device_data, &paramsW); }

1 0

Jacek Caban : urlmon/tests: Make ParseUrl call tests more strict.
by Alexandre Julliard 17 May '19

17 May '19

Module: wine Branch: master Commit: a9b27c2b0d2ac196fc627c75310bda4b4bd44fcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9b27c2b0d2ac196fc627c75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 21:59:39 2019 +0200 urlmon/tests: Make ParseUrl call tests more strict. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index ff0f24e..de0c654 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -61,6 +61,7 @@ DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xA }while(0) DEFINE_EXPECT(ParseUrl); +DEFINE_EXPECT(ParseUrl_ENCODE); DEFINE_EXPECT(QI_IInternetProtocolInfo); DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(unk_Release); @@ -875,9 +876,9 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD *pcchResult, DWORD dwReserved) { - CHECK_EXPECT2(ParseUrl); - - if(ParseAction == PARSE_SECURITY_URL) { + switch(ParseAction) { + case PARSE_SECURITY_URL: + CHECK_EXPECT2(ParseUrl); if(pcchResult) *pcchResult = ARRAY_SIZE(url1); @@ -886,6 +887,12 @@ static HRESULT WINAPI InternetProtocolInfo_ParseUrl(IInternetProtocolInfo *iface memcpy(pwzResult, url1, sizeof(url1)); return S_OK; + case PARSE_ENCODE: + CHECK_EXPECT2(ParseUrl_ENCODE); + break; + default: + CHECK_EXPECT2(ParseUrl); + break; } return E_NOTIMPL; @@ -1030,24 +1037,24 @@ static void test_NameSpace(void) expect_cf = &test_protocol_cf; SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(CreateInstance); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); CHECK_CALLED(CreateInstance); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); qiret = S_OK; SET_EXPECT(QI_IInternetProtocolInfo); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); SET_EXPECT(QI_IInternetProtocolInfo); SET_EXPECT(ParseUrl); @@ -1097,38 +1104,38 @@ static void test_NameSpace(void) ok(hres == S_OK, "RegisterNameSpace failed: %08x\n", hres); SET_EXPECT(QI_IInternetProtocolInfo); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); SET_EXPECT(QI_IInternetProtocolInfo); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres); expect_cf = &test_protocol_cf2; SET_EXPECT(QI_IInternetProtocolInfo); - SET_EXPECT(ParseUrl); + SET_EXPECT(ParseUrl_ENCODE); hres = pCoInternetParseUrl(url8, PARSE_ENCODE, 0, buf, ARRAY_SIZE(buf), &size, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); CHECK_CALLED(QI_IInternetProtocolInfo); - CHECK_CALLED(ParseUrl); + CHECK_CALLED(ParseUrl_ENCODE); hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest); ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres);

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 May 2019