June 2018 - Wine-commits - list.winehq.org

Zebediah Figura : devenum: Allow parsing display name without class ID.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 3bde76ccabcb5d980f9bebcea39be65d8a476405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bde76ccabcb5d980f9bebce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 6 20:57:09 2018 -0600 devenum: Allow parsing display name without class ID. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f49fc4c7ef940409a2c41ab7230a97e423980015) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/devenum_private.h | 5 +++ dlls/devenum/mediacatenum.c | 3 ++ dlls/devenum/parsedisplayname.c | 96 +++++++++++++++++++---------------------- dlls/devenum/tests/devenum.c | 37 ++++++++++++++++ 4 files changed, 90 insertions(+), 51 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index bcc5085..9a0b5ad 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -71,6 +71,10 @@ typedef struct IMoniker IMoniker_iface; LONG ref; HKEY hkey; + CLSID class; + BOOL has_class; + enum device_type type; + WCHAR *name; } MediaCatMoniker; MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; @@ -84,6 +88,7 @@ extern IParseDisplayName DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; * Global string constant declarations */ +static const WCHAR backslashW[] = {'\\',0}; static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; static const WCHAR instanceW[] = {'\\','I','n','s','t','a','n','c','e',0}; static const WCHAR wszActiveMovieKey[] = {'S','o','f','t','w','a','r','e','\\', diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 583ca7d..0f38a0e 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -345,6 +345,7 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(IMoniker *iface) if (ref == 0) { RegCloseKey(This->hkey); + CoTaskMemFree(This->name); CoTaskMemFree(This); DEVENUM_UnlockModule(); } @@ -695,6 +696,8 @@ MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; pMoniker->ref = 0; pMoniker->hkey = NULL; + pMoniker->has_class = FALSE; + pMoniker->name = NULL; DEVENUM_IMediaCatMoniker_AddRef(&pMoniker->IMoniker_iface); diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index b5a3951..2875a8c 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -76,87 +76,81 @@ static ULONG WINAPI DEVENUM_IParseDisplayName_Release(IParseDisplayName *iface) * not in "@device:sw:{CLSID1}\<filter name or CLSID>" format */ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayName *iface, - IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) + IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { - LPOLESTR pszBetween = NULL; - LPOLESTR pszClass = NULL; - MediaCatMoniker * pMoniker = NULL; - CLSID clsidDevice; - HRESULT hr = S_OK; - WCHAR wszRegKeyName[MAX_PATH]; + WCHAR buffer[MAX_PATH]; enum device_type type; + MediaCatMoniker *mon; HKEY hbasekey; - int classlen; - LONG res; - static const WCHAR wszRegSeparator[] = {'\\', 0 }; + CLSID class; + LRESULT res; - TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut); + TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret); - *ppmkOut = NULL; - if (pchEaten) - *pchEaten = strlenW(pszDisplayName); + *ret = NULL; + if (eaten) + *eaten = strlenW(name); - pszDisplayName = strchrW(pszDisplayName, ':') + 1; - if (pszDisplayName[0] == 's' && pszDisplayName[1] == 'w' && pszDisplayName[2] == ':') + name = strchrW(name, ':') + 1; + + if (name[0] == 's' && name[1] == 'w' && name[2] == ':') { type = DEVICE_FILTER; if ((res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsidW, 0, 0, &hbasekey))) return HRESULT_FROM_WIN32(res); + name += 3; } - else if (pszDisplayName[0] == 'c' && pszDisplayName[1] == 'm' && pszDisplayName[2] == ':') + else if (name[0] == 'c' && name[1] == 'm' && name[2] == ':') { type = DEVICE_CODEC; if ((res = RegOpenKeyExW(HKEY_CURRENT_USER, wszActiveMovieKey, 0, 0, &hbasekey))) return HRESULT_FROM_WIN32(res); + name += 3; } else { - FIXME("unhandled device type %s\n", debugstr_w(pszDisplayName+1)); + FIXME("unhandled device type %s\n", debugstr_w(name)); return MK_E_SYNTAX; } - pszDisplayName = strchrW(pszDisplayName, '{'); - pszBetween = strchrW(pszDisplayName, '}') + 2; - - /* size = pszBetween - pszDisplayName - 1 (for '\\' after CLSID) - * + 1 (for NULL character) - */ - classlen = (int)(pszBetween - pszDisplayName - 1); - pszClass = CoTaskMemAlloc((classlen + 1) * sizeof(WCHAR)); - if (!pszClass) + if (!(mon = DEVENUM_IMediaCatMoniker_Construct())) return E_OUTOFMEMORY; - memcpy(pszClass, pszDisplayName, classlen * sizeof(WCHAR)); - pszClass[classlen] = 0; + lstrcpynW(buffer, name, CHARS_IN_GUID); + if (CLSIDFromString(buffer, &class) == S_OK) + { + mon->has_class = TRUE; + mon->class = class; + name += CHARS_IN_GUID; + } - TRACE("Device CLSID: %s\n", debugstr_w(pszClass)); + mon->type = type; - hr = CLSIDFromString(pszClass, &clsidDevice); + if (!(mon->name = CoTaskMemAlloc((strlenW(name) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&mon->IMoniker_iface); + return E_OUTOFMEMORY; + } + strcpyW(mon->name, name); - if (SUCCEEDED(hr)) + buffer[0] = 0; + if (mon->has_class) { - pMoniker = DEVENUM_IMediaCatMoniker_Construct(); - if (pMoniker) - { - strcpyW(wszRegKeyName, pszClass); - if (type == DEVICE_FILTER) - strcatW(wszRegKeyName, instanceW); - strcatW(wszRegKeyName, wszRegSeparator); - strcatW(wszRegKeyName, pszBetween); - if (RegCreateKeyW(hbasekey, wszRegKeyName, &pMoniker->hkey) == ERROR_SUCCESS) - *ppmkOut = &pMoniker->IMoniker_iface; - else - { - IMoniker_Release(&pMoniker->IMoniker_iface); - hr = MK_E_NOOBJECT; - } - } + StringFromGUID2(&mon->class, buffer, CHARS_IN_GUID); + if (mon->type == DEVICE_FILTER) + strcatW(buffer, instanceW); + strcatW(buffer, backslashW); } + strcatW(buffer, mon->name); - CoTaskMemFree(pszClass); + if (RegCreateKeyW(hbasekey, buffer, &mon->hkey)) + { + IMoniker_Release(&mon->IMoniker_iface); + return MK_E_NOOBJECT; + } + *ret = &mon->IMoniker_iface; - TRACE("-- returning: %x\n", hr); - return hr; + return S_OK; } /********************************************************************** diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index fd170bd..d665df3 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -378,6 +378,43 @@ static void test_directshow_filter(void) VariantClear(&var); IPropertyBag_Release(prop_bag); + + /* name can be anything */ + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, testW+1); + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(testW); + hr = IPropertyBag_Write(prop_bag, friendly_name, &var); + if (hr != E_ACCESSDENIED) + { + ok(hr == S_OK, "Write failed: %#x\n", hr); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(!lstrcmpW(V_BSTR(&var), testW), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + + IMoniker_Release(mon); + + /* vista+ stores it inside the Instance key */ + RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test\\Instance"); + + res = RegDeleteKeyA(HKEY_CLASSES_ROOT, "CLSID\\test"); + ok(!res, "RegDeleteKey failed: %lu\n", res); + } + + VariantClear(&var); + IPropertyBag_Release(prop_bag); IParseDisplayName_Release(parser); }

1 0

Louis Lenders : iexplore/iexplore.inf: Add svcVersion reg key and update to win7.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: e608f8e65efa781a7375da34fde04a16cb457557 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e608f8e65efa781a7375da34… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 6 11:29:11 2018 +0200 iexplore/iexplore.inf: Add svcVersion reg key and update to win7. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit add31e1d7a320a5f5a64bc1db8d2c0f62774cacc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/iexplore/iexplore.inf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/iexplore/iexplore.inf b/programs/iexplore/iexplore.inf index 68c17e3..d8c5352 100644 --- a/programs/iexplore/iexplore.inf +++ b/programs/iexplore/iexplore.inf @@ -36,9 +36,10 @@ HKLM,"Software\Microsoft\Windows\CurrentVersion\App Paths\iexplore.exe","Path",, [IE.Reg] -HKLM,"Software\Microsoft\Internet Explorer","Build",,"98112" -HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.0.8112.16421" -HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.0.8112.16421" +HKLM,"Software\Microsoft\Internet Explorer","Build",,"99600" +HKLM,"Software\Microsoft\Internet Explorer","Version",,"9.11.9600.18376" +HKLM,"Software\Microsoft\Internet Explorer","W2kVersion",,"9.11.9600.18376" +HKLM,"Software\Microsoft\Internet Explorer","svcVersion",,"11.0.9600.18376" [Strings]

1 0

Louis Lenders : msctf: Return S_OK in TextStoreACPSink_OnTextChange.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: c16ba6001e47eeea835a666858e6e07b03797071 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c16ba6001e47eeea835a6668… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Apr 4 11:47:59 2018 +0200 msctf: Return S_OK in TextStoreACPSink_OnTextChange. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a78d411b3892f86c081ab48781f6711a4382c49b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 54052f6..70b06e2 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -758,7 +758,7 @@ static HRESULT WINAPI TextStoreACPSink_OnTextChange(ITextStoreACPSink *iface, { Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *iface)

1 0

Louis Lenders : msctf: Return S_OK in TextStoreACPSink_OnSelectionChange.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: f5f70497f17e541432883de787dd8149351c7931 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f70497f17e541432883de7… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Apr 4 11:48:00 2018 +0200 msctf: Return S_OK in TextStoreACPSink_OnSelectionChange. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 08b077296cd7ab620646b5ab4fb48af38bb8716d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 70b06e2..d52884d 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -765,7 +765,7 @@ static HRESULT WINAPI TextStoreACPSink_OnSelectionChange(ITextStoreACPSink *ifac { Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI TextStoreACPSink_OnLayoutChange(ITextStoreACPSink *iface,

1 0

Louis Lenders : msctf: Return S_OK in TextStoreACPSink_OnLayoutChange.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 0ee4cf1e70f4f8a1a4cb6233e672743ab67856a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ee4cf1e70f4f8a1a4cb6233… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Apr 4 11:48:01 2018 +0200 msctf: Return S_OK in TextStoreACPSink_OnLayoutChange. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bd64a86f0cb5f46b77730b1cb8794cb43a06f52f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index d52884d..452895c 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -773,7 +773,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLayoutChange(ITextStoreACPSink *iface, { Context *This = impl_from_ITextStoreACPSink(iface); FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI TextStoreACPSink_OnStatusChange(ITextStoreACPSink *iface,

1 0

Alexandre Julliard : ntoskrnl: Add emulation of CRn and DRn registers on x86-64.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 79f47b4f45a26a5fbe4bd5c48573f688950652b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79f47b4f45a26a5fbe4bd5c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 3 11:46:01 2018 +0200 ntoskrnl: Add emulation of CRn and DRn registers on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ce09790d29630a6a4c0cd49459afc2097700ad10) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/instr.c | 112 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 103 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index 48f16f2..aef0ed0 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -608,6 +608,8 @@ static BYTE *INSTR_GetOperandAddr( CONTEXT *context, BYTE *instr, */ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { + static const char *reg_names[16] = { "rax", "rcx", "rdx", "rbx", "rsp", "rbp", "rsi", "rdi", + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" }; int prefix, segprefix, prefixlen, len, long_op, long_addr, rex; BYTE *instr; @@ -649,21 +651,34 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x67: long_addr = !long_addr; /* addr size prefix */ break; + case 0x40: /* rex */ + case 0x41: + case 0x42: + case 0x43: + case 0x44: + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4a: + case 0x4b: + case 0x4c: + case 0x4d: + case 0x4e: + case 0x4f: + rex = *instr; + break; case 0xf0: /* lock */ - break; + break; case 0xf2: /* repne */ - break; + break; case 0xf3: /* repe */ break; default: prefix = 0; /* no more prefixes */ break; } - if (*instr >= 0x40 && *instr < 0x50) /* rex */ - { - rex = *instr; - prefix = TRUE; - } if (prefix) { instr++; @@ -678,6 +693,84 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x0f: /* extended instruction */ switch(instr[1]) { + case 0x20: /* mov crX, Rd */ + { + int reg = REGMODRM_REG( instr[2], rex ); + int rm = REGMODRM_RM( instr[2], rex ); + DWORD64 *data = get_int_reg( context, rm ); + TRACE( "mov cr%u,%s at %lx\n", reg, reg_names[rm], context->Rip ); + switch (reg) + { + case 0: *data = 0x10; break; /* FIXME: set more bits ? */ + case 2: *data = 0; break; + case 3: *data = 0; break; + case 4: *data = 0; break; + case 8: *data = 0; break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 3; + return ExceptionContinueExecution; + } + case 0x21: /* mov drX, Rd */ + { + int reg = REGMODRM_REG( instr[2], rex ); + int rm = REGMODRM_RM( instr[2], rex ); + DWORD64 *data = get_int_reg( context, rm ); + TRACE( "mov dr%u,%s at %lx\n", reg, reg_names[rm], context->Rip ); + switch (reg) + { + case 0: *data = context->Dr0; break; + case 1: *data = context->Dr1; break; + case 2: *data = context->Dr2; break; + case 3: *data = context->Dr3; break; + case 4: /* dr4 and dr5 are obsolete aliases for dr6 and dr7 */ + case 6: *data = context->Dr6; break; + case 5: + case 7: *data = 0x400; break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 3; + return ExceptionContinueExecution; + } + case 0x22: /* mov Rd, crX */ + { + int reg = REGMODRM_REG( instr[2], rex ); + int rm = REGMODRM_RM( instr[2], rex ); + DWORD64 *data = get_int_reg( context, rm ); + TRACE( "mov %s,cr%u at %lx, %s=%lx\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data ); + switch (reg) + { + case 0: break; + case 2: break; + case 3: break; + case 4: break; + case 8: break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 3; + return ExceptionContinueExecution; + } + case 0x23: /* mov Rd, drX */ + { + int reg = REGMODRM_REG( instr[2], rex ); + int rm = REGMODRM_RM( instr[2], rex ); + DWORD64 *data = get_int_reg( context, rm ); + TRACE( "mov %s,dr%u at %lx, %s=%lx\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data ); + switch (reg) + { + case 0: context->Dr0 = *data; break; + case 1: context->Dr1 = *data; break; + case 2: context->Dr2 = *data; break; + case 3: context->Dr3 = *data; break; + case 4: /* dr4 and dr5 are obsolete aliases for dr6 and dr7 */ + case 6: context->Dr6 = *data; break; + case 5: + case 7: context->Dr7 = *data; break; + default: return ExceptionContinueSearch; + } + context->Rip += prefixlen + 3; + return ExceptionContinueExecution; + } case 0xb6: /* movzx Eb, Gv */ case 0xb7: /* movzx Ew, Gv */ { @@ -752,8 +845,9 @@ LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ) EXCEPTION_RECORD *record = ptrs->ExceptionRecord; CONTEXT *context = ptrs->ContextRecord; - if (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && - record->ExceptionInformation[0] == EXCEPTION_READ_FAULT) + if (record->ExceptionCode == EXCEPTION_PRIV_INSTRUCTION || + (record->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && + record->ExceptionInformation[0] == EXCEPTION_READ_FAULT)) { if (emulate_instruction( record, context ) == ExceptionContinueExecution) {

1 0

Sebastian Lackner : ntdll: Throw exception if invalid handle is passed to NtClose and debugger enabled.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 9d4bb9c7041d24708ceb35f6b19c21774c0e018d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d4bb9c7041d24708ceb35f6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Mar 31 09:59:25 2018 +0000 ntdll: Throw exception if invalid handle is passed to NtClose and debugger enabled. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c61c33ee66ea0e97450ac793ebc4ac41a1ccc793) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/om.c | 26 +++++++++++++++++ dlls/ntdll/tests/exception.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index febe5bd..0b56251 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -38,6 +38,7 @@ #include "winternl.h" #include "ntdll_misc.h" #include "wine/server.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -377,6 +378,12 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, return ret; } +static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) +{ + EXCEPTION_RECORD *rec = eptr->ExceptionRecord; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +} + /* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ NTSTATUS close_handle( HANDLE handle ) { @@ -390,6 +397,25 @@ NTSTATUS close_handle( HANDLE handle ) } SERVER_END_REQ; if (fd != -1) close( fd ); + + if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged) + { + __TRY + { + EXCEPTION_RECORD record; + record.ExceptionCode = EXCEPTION_INVALID_HANDLE; + record.ExceptionFlags = 0; + record.ExceptionRecord = NULL; + record.ExceptionAddress = NULL; + record.NumberParameters = 0; + RtlRaiseException( &record ); + } + __EXCEPT(invalid_handle_exception_handler) + { + } + __ENDTRY + } + return ret; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2308472..81dedaa 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -52,6 +52,7 @@ static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); +static NTSTATUS (WINAPI *pNtClose)(HANDLE); #if defined(__x86_64__) typedef struct @@ -1061,6 +1062,16 @@ static void test_debugger(void) if (stage == 10) continuestatus = DBG_EXCEPTION_NOT_HANDLED; } + else if (stage == 11 || stage == 12 || stage == 13) + { + ok(de.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_INVALID_HANDLE, + "unexpected exception code %08x, expected %08x\n", de.u.Exception.ExceptionRecord.ExceptionCode, + EXCEPTION_INVALID_HANDLE); + ok(de.u.Exception.ExceptionRecord.NumberParameters == 0, + "unexpected number of parameters %d, expected 0\n", de.u.Exception.ExceptionRecord.NumberParameters); + + if (stage == 12|| stage == 13) continuestatus = DBG_EXCEPTION_NOT_HANDLED; + } else ok(FALSE, "unexpected stage %x\n", stage); @@ -2566,6 +2577,54 @@ static void test_breakpoint(DWORD numexc) pRtlRemoveVectoredExceptionHandler(vectored_handler); } +static DWORD invalid_handle_exceptions; + +static LONG CALLBACK invalid_handle_vectored_handler(EXCEPTION_POINTERS *ExceptionInfo) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + trace("vect. handler %08x addr:%p\n", rec->ExceptionCode, rec->ExceptionAddress); + + ok(rec->ExceptionCode == EXCEPTION_INVALID_HANDLE, "ExceptionCode is %08x instead of %08x\n", + rec->ExceptionCode, EXCEPTION_INVALID_HANDLE); + ok(rec->NumberParameters == 0, "ExceptionParameters is %d instead of 0\n", rec->NumberParameters); + + invalid_handle_exceptions++; + return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_CONTINUE_EXECUTION : EXCEPTION_CONTINUE_SEARCH; +} + +static void test_closehandle(DWORD numexc, HANDLE handle) +{ + PVOID vectored_handler; + NTSTATUS status; + DWORD res; + + if (!pRtlAddVectoredExceptionHandler || !pRtlRemoveVectoredExceptionHandler || !pRtlRaiseException) + { + skip("RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler or RtlRaiseException not found\n"); + return; + } + + vectored_handler = pRtlAddVectoredExceptionHandler(TRUE, &invalid_handle_vectored_handler); + ok(vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n"); + + invalid_handle_exceptions = 0; + res = CloseHandle(handle); + + ok(!res || (is_wow64 && res), "CloseHandle(%p) unexpectedly succeeded\n", handle); + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error code %d instead of %d\n", + GetLastError(), ERROR_INVALID_HANDLE); + ok(invalid_handle_exceptions == numexc, "CloseHandle generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + invalid_handle_exceptions = 0; + status = pNtClose(handle); + ok(status == STATUS_INVALID_HANDLE || (is_wow64 && status == 0), "NtClose(%p) returned status %08x\n", handle, status); + ok(invalid_handle_exceptions == numexc, "NtClose generated %d exceptions, expected %d\n", + invalid_handle_exceptions, numexc); + + pRtlRemoveVectoredExceptionHandler(vectored_handler); +} + static void test_vectored_continue_handler(void) { PVOID handler1, handler2; @@ -2620,6 +2679,7 @@ START_TEST(exception) pNtGetContextThread = (void *)GetProcAddress( hntdll, "NtGetContextThread" ); pNtSetContextThread = (void *)GetProcAddress( hntdll, "NtSetContextThread" ); pNtReadVirtualMemory = (void *)GetProcAddress( hntdll, "NtReadVirtualMemory" ); + pNtClose = (void *)GetProcAddress( hntdll, "NtClose" ); pRtlUnwind = (void *)GetProcAddress( hntdll, "RtlUnwind" ); pRtlRaiseException = (void *)GetProcAddress( hntdll, "RtlRaiseException" ); pRtlCaptureContext = (void *)GetProcAddress( hntdll, "RtlCaptureContext" ); @@ -2691,6 +2751,12 @@ START_TEST(exception) test_breakpoint(0); test_stage = 10; test_breakpoint(1); + test_stage = 11; + test_closehandle(0, (HANDLE)0xdeadbeef); + test_stage = 12; + test_closehandle(1, (HANDLE)0xdeadbeef); + test_stage = 13; + test_closehandle(0, 0); /* Special case. */ } else skip( "RtlRaiseException not found\n" ); @@ -2707,6 +2773,7 @@ START_TEST(exception) test_ripevent(1); test_debug_service(1); test_breakpoint(1); + test_closehandle(0, (HANDLE)0xdeadbeef); test_vectored_continue_handler(); test_debugger(); test_simd_exceptions(); @@ -2740,6 +2807,7 @@ START_TEST(exception) test_ripevent(1); test_debug_service(1); test_breakpoint(1); + test_closehandle(0, (HANDLE)0xdeadbeef); test_vectored_continue_handler(); test_virtual_unwind(); test___C_specific_handler();

1 0

Louis Lenders : wine.inf: Create catroot directory.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 08a018b7a329ebbca6fae5f91c509ffe5375b96e URL: https://source.winehq.org/git/wine.git/?a=commit;h=08a018b7a329ebbca6fae5f9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Apr 11 15:47:00 2018 +0200 wine.inf: Create catroot directory. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c06d362b68e19ff0db50e484467ba40e48148e82) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a991319..3117296 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2578,6 +2578,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,inf, 10,logs, 10,temp, +11,catroot, 11,mui, 11,tasks, 11,spool\drivers\color,

1 0

Stefan Dösinger : ddraw: Fix D3DEXECUTEDATA.dwSize handling.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 44c8b8b76fcc1c6ee9f65383a658519308e3f494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c8b8b76fcc1c6ee9f65383… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 5 12:59:13 2018 +0200 ddraw: Fix D3DEXECUTEDATA.dwSize handling. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6f5028337e6f3e1712bafaaa1a0a3bfb983850a3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/executebuffer.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index ea5a55c..c002f81 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -604,6 +604,12 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * TRACE("iface %p, data %p.\n", iface, data); + if (data->dwSize != sizeof(*data)) + { + WARN("data->dwSize is %u, returning DDERR_INVALIDPARAMS.\n", data->dwSize); + return DDERR_INVALIDPARAMS; + } + /* Skip past previous vertex data. */ buffer->src_vertex_pos += buffer->data.dwVertexCount; @@ -680,12 +686,11 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * static HRESULT WINAPI d3d_execute_buffer_GetExecuteData(IDirect3DExecuteBuffer *iface, D3DEXECUTEDATA *data) { struct d3d_execute_buffer *buffer = impl_from_IDirect3DExecuteBuffer(iface); - DWORD dwSize; TRACE("iface %p, data %p.\n", iface, data); - dwSize = data->dwSize; - memcpy(data, &buffer->data, dwSize); + /* Tests show that dwSize is ignored. */ + memcpy(data, &buffer->data, sizeof(*data)); if (TRACE_ON(ddraw)) {

1 0

Stefan Dösinger : ddraw: Don' t read past the end of the executebuffer.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 1a10616677fdc043ca416546a250de69a7012288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a10616677fdc043ca416546… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 5 12:59:14 2018 +0200 ddraw: Don't read past the end of the executebuffer. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02f7b097b42553a1886610be6aa84959d25e00b0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/executebuffer.c | 10 ++-- dlls/ddraw/tests/ddraw1.c | 127 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index c002f81..d669dcc 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -601,6 +601,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * struct wined3d_map_desc map_desc; struct wined3d_box box = {0}; HRESULT hr; + DWORD buf_size = buffer->desc.dwBufferSize, copy_size; TRACE("iface %p, data %p.\n", iface, data); @@ -648,7 +649,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * buffer->src_vertex_pos = 0; } - if (data->dwVertexCount) + if (data->dwVertexCount && (!buf_size || data->dwVertexOffset < buf_size)) { box.left = buffer->src_vertex_pos * sizeof(D3DVERTEX); box.right = box.left + data->dwVertexCount * sizeof(D3DVERTEX); @@ -657,8 +658,11 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * if (FAILED(hr)) return hr; - memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, - data->dwVertexCount * sizeof(D3DVERTEX)); + copy_size = data->dwVertexCount * sizeof(D3DVERTEX); + if (buf_size) + copy_size = min(copy_size, buf_size - data->dwVertexOffset); + + memcpy(map_desc.data, ((BYTE *)buffer->desc.lpData) + data->dwVertexOffset, copy_size); wined3d_resource_unmap(wined3d_buffer_get_resource(buffer->src_vertex_buffer), 0); } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb56980..3e7b535 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11235,6 +11235,132 @@ static void test_enum_surfaces(void) IDirectDraw_Release(ddraw); } +static void test_execute_data(void) +{ + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DDevice *device; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + D3DEXECUTEDATA exec_data; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + memset(&exec_data, 0, sizeof(exec_data)); + + /* Success case. */ + exec_data.dwSize = sizeof(exec_data); + exec_data.dwVertexCount = 3; + exec_data.dwInstructionOffset = 3 * sizeof(D3DVERTEX); + exec_data.dwInstructionLength = 10; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + + /* dwSize is checked against the expected struct size. */ + exec_data.dwSize = sizeof(exec_data) - 1; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + exec_data.dwSize = sizeof(exec_data) + 1; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + /* The rest of the data is not checked for plausibility. */ + exec_data.dwSize = sizeof(exec_data); + exec_data.dwVertexCount = 0; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwVertexCount = exec_desc.dwBufferSize / sizeof(D3DVERTEX) - 1; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwVertexCount = exec_desc.dwBufferSize / sizeof(D3DVERTEX); + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwVertexCount = exec_desc.dwBufferSize / sizeof(D3DVERTEX) + 1; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwVertexCount = 999999; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwInstructionOffset = 999999 * sizeof(D3DVERTEX); + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + exec_data.dwInstructionLength = 10240; + hr = IDirect3DExecuteBuffer_SetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to set execute data, hr %#x.\n", hr); + + /* The input structure is not modified. */ + ok(exec_data.dwSize == sizeof(exec_data), "Got unexpected struct size %u\n", + exec_data.dwSize); + ok(exec_data.dwVertexCount == 999999, "Got unexpected vertex count %u\n", + exec_data.dwVertexCount); + ok(exec_data.dwInstructionOffset == 999999 * sizeof(D3DVERTEX), "Got unexpected instruction offset %u\n", + exec_data.dwInstructionOffset); + ok(exec_data.dwInstructionLength == 10240, "Got unexpected instruction length %u\n", + exec_data.dwInstructionLength); + + /* No validation in GetExecuteData. */ + memset(&exec_data, 0, sizeof(exec_data)); + exec_desc.dwSize = sizeof(exec_desc); + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + + ok(exec_data.dwSize == sizeof(exec_data), "Got unexpected struct size %u\n", + exec_data.dwSize); + ok(exec_data.dwVertexCount == 999999, "Got unexpected vertex count %u\n", + exec_data.dwVertexCount); + ok(exec_data.dwInstructionOffset == 999999 * sizeof(D3DVERTEX), "Got unexpected instruction offset %u\n", + exec_data.dwInstructionOffset); + ok(exec_data.dwInstructionLength == 10240, "Got unexpected instruction length %u\n", + exec_data.dwInstructionLength); + + memset(&exec_data, 0xaa, sizeof(exec_data)); + exec_desc.dwSize = sizeof(exec_desc) - 1; + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + ok(exec_data.dwSize == sizeof(exec_data), "Got unexpected struct size %u\n", + exec_data.dwSize); + ok(exec_data.dwVertexCount == 999999, "Got unexpected vertex count %u\n", + exec_data.dwVertexCount); + ok(exec_data.dwInstructionOffset == 999999 * sizeof(D3DVERTEX), "Got unexpected instruction offset %u\n", + exec_data.dwInstructionOffset); + ok(exec_data.dwInstructionLength == 10240, "Got unexpected instruction length %u\n", + exec_data.dwInstructionLength); + + exec_desc.dwSize = 0; + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + exec_desc.dwSize = sizeof(exec_desc) + 1; + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + exec_desc.dwSize = ~0U; + hr = IDirect3DExecuteBuffer_GetExecuteData(execute_buffer, &exec_data); + ok(SUCCEEDED(hr), "Failed to get execute data, hr %#x.\n", hr); + + IDirect3DExecuteBuffer_Release(execute_buffer); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -11336,4 +11462,5 @@ START_TEST(ddraw1) test_depth_readback(); test_clear(); test_enum_surfaces(); + test_execute_data(); }

1 0