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

Alexandre Julliard : pdh: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 0a23d04270631f4ace3648d5fab224ade441641a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a23d04270631f4ace3648d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:05:33 2019 +0200 pdh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/Makefile.in | 2 ++ dlls/pdh/pdh_main.c | 53 ++++++++++++++++++++++++++-------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index 86e14a0..d3ce7a4 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,5 +1,7 @@ MODULE = pdh.dll IMPORTLIB = pdh +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ pdh_main.c diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 11c917a..daa0e2d 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -34,7 +34,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(pdh); @@ -53,7 +52,7 @@ static inline WCHAR *pdh_strdup( const WCHAR *src ) WCHAR *dst; if (!src) return NULL; - if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); return dst; } @@ -213,21 +212,21 @@ static BOOL is_local_machine( const WCHAR *name, DWORD len ) DWORD buflen = ARRAY_SIZE(buf); if (!GetComputerNameW( buf, &buflen )) return FALSE; - return len == buflen && !strncmpiW( name, buf, buflen ); + return len == buflen && !wcsnicmp( name, buf, buflen ); } static BOOL pdh_match_path( LPCWSTR fullpath, LPCWSTR path ) { const WCHAR *p; - if (path[0] == '\\' && path[1] == '\\' && (p = strchrW( path + 2, '\\' )) && + if (path[0] == '\\' && path[1] == '\\' && (p = wcschr( path + 2, '\\' )) && is_local_machine( path + 2, p - path - 2 )) { path += p - path; } - if (strchrW( path, '\\' )) p = fullpath; - else p = strrchrW( fullpath, '\\' ) + 1; - return !strcmpW( p, path ); + if (wcschr( path, '\\' )) p = fullpath; + else p = wcsrchr( fullpath, '\\' ) + 1; + return !wcscmp( p, path ); } /*********************************************************************** @@ -929,13 +928,13 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST { if (counter_sources[i].index == index) { - WCHAR *p = strrchrW( counter_sources[i].path, '\\' ) + 1; - unsigned int required = strlenW( p ) + 1; + WCHAR *p = wcsrchr( counter_sources[i].path, '\\' ) + 1; + unsigned int required = lstrlenW( p ) + 1; if (*size < required) ret = PDH_MORE_DATA; else { - strcpyW( buffer, p ); + lstrcpyW( buffer, p ); ret = ERROR_SUCCESS; } *size = required; @@ -1061,7 +1060,7 @@ PDH_STATUS WINAPI PdhValidatePathA( LPCSTR path ) static PDH_STATUS validate_path( LPCWSTR path ) { if (!path || !*path) return PDH_INVALID_ARGUMENT; - if (*path++ != '\\' || !strchrW( path, '\\' )) return PDH_CSTATUS_BAD_COUNTERNAME; + if (*path++ != '\\' || !wcschr( path, '\\' )) return PDH_CSTATUS_BAD_COUNTERNAME; return ERROR_SUCCESS; } @@ -1202,30 +1201,30 @@ PDH_STATUS WINAPI PdhMakeCounterPathW( PDH_COUNTER_PATH_ELEMENTS_W *e, LPWSTR bu path[0] = 0; if (e->szMachineName) { - strcatW(path, bslash); - strcatW(path, bslash); - strcatW(path, e->szMachineName); + lstrcatW(path, bslash); + lstrcatW(path, bslash); + lstrcatW(path, e->szMachineName); } - strcatW(path, bslash); - strcatW(path, e->szObjectName); + lstrcatW(path, bslash); + lstrcatW(path, e->szObjectName); if (e->szInstanceName) { - strcatW(path, lparen); + lstrcatW(path, lparen); if (e->szParentInstance) { - strcatW(path, e->szParentInstance); - strcatW(path, fslash); + lstrcatW(path, e->szParentInstance); + lstrcatW(path, fslash); } - strcatW(path, e->szInstanceName); - sprintfW(instance, fmt, e->dwInstanceIndex); - strcatW(path, instance); - strcatW(path, rparen); + lstrcatW(path, e->szInstanceName); + swprintf(instance, ARRAY_SIZE(instance), fmt, e->dwInstanceIndex); + lstrcatW(path, instance); + lstrcatW(path, rparen); } - strcatW(path, bslash); - strcatW(path, e->szCounterName); + lstrcatW(path, bslash); + lstrcatW(path, e->szCounterName); - len = strlenW(path) + 1; - if (*buflen >= len) strcpyW(buffer, path); + len = lstrlenW(path) + 1; + if (*buflen >= len) lstrcpyW(buffer, path); else ret = PDH_MORE_DATA; *buflen = len; return ret;

1 0

Alexandre Julliard : photometadatahandler: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: aa16c7da445526d4e9d2929b479e257e1c7fb5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa16c7da445526d4e9d2929b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:05:44 2019 +0200 photometadatahandler: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/photometadatahandler/Makefile.in | 2 ++ dlls/photometadatahandler/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/photometadatahandler/Makefile.in b/dlls/photometadatahandler/Makefile.in index 8b52cb0..c791b4c 100644 --- a/dlls/photometadatahandler/Makefile.in +++ b/dlls/photometadatahandler/Makefile.in @@ -1,5 +1,7 @@ MODULE = photometadatahandler.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/photometadatahandler/main.c b/dlls/photometadatahandler/main.c index 9ad44ff..7a9878d 100644 --- a/dlls/photometadatahandler/main.c +++ b/dlls/photometadatahandler/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : pidgen: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 6a2d4277d6542e90504574b6148200e20c1791aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a2d4277d6542e90504574b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:05:52 2019 +0200 pidgen: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/Makefile.in | 2 ++ dlls/pidgen/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in index e70764e..5923cb2 100644 --- a/dlls/pidgen/Makefile.in +++ b/dlls/pidgen/Makefile.in @@ -1,5 +1,7 @@ MODULE = pidgen.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 95f5389..35af226 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : powrprof: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 15eb79cca300ea5d9e8b36bf3167337590eee090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15eb79cca300ea5d9e8b36bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:01 2019 +0200 powrprof: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/powrprof/Makefile.in | 2 ++ dlls/powrprof/powrprof.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in index e51fc62..a410e9b 100644 --- a/dlls/powrprof/Makefile.in +++ b/dlls/powrprof/Makefile.in @@ -2,4 +2,6 @@ MODULE = powrprof.dll IMPORTLIB = powrprof IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = powrprof.c diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index d870fe2..92bab03 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -18,6 +18,7 @@ #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -28,7 +29,6 @@ #include "winternl.h" #include "powrprof.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(powrprof); @@ -178,7 +178,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) TRACE("Using default: 3600\n"); *RangeMax = 3600; } else { - *RangeMax = atoiW((LPCWSTR)lpValue); + *RangeMax = wcstol((LPCWSTR)lpValue, NULL, 10); } cbValue = sizeof(lpValue); @@ -189,7 +189,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) TRACE("Using default: 3\n"); *RangeMin = 3; } else { - *RangeMin = atoiW((LPCWSTR)lpValue); + *RangeMin = wcstol((LPCWSTR)lpValue, NULL, 10); } RegCloseKey(hKey);

1 0

Alexandre Julliard : printui: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 4b08c00e0f5ca25704133acb364169be5bbdc4d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b08c00e0f5ca25704133acb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:12 2019 +0200 printui: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/printui/Makefile.in | 2 ++ dlls/printui/printui.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index 112d418..8e76c7c 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,6 +1,8 @@ MODULE = printui.dll IMPORTS = shell32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ printui.c diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 32e7b52..f35107f 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -31,7 +31,6 @@ #include "winnls.h" #include "shellapi.h" -#include "wine/unicode.h" #include "wine/debug.h" #include "printui_private.h" @@ -151,7 +150,7 @@ static BOOL parse_rundll(context_t * cx) while ( c ) { txtW[0] = c; - ptr = strchrW(optionsW, c); + ptr = wcschr(optionsW, c); if (ptr) { index = ptr - optionsW; cx->options[index] = get_next_wstr(cx); @@ -160,7 +159,7 @@ static BOOL parse_rundll(context_t * cx) } else { - ptr = strchrW(flagsW, c); + ptr = wcschr(flagsW, c); if (ptr) { index = ptr - flagsW; cx->flags[index] = TRUE;

1 0

Alexandre Julliard : prntvpt: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: b41cc47292b11e951b4d936f1a6b417b9b214125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b41cc47292b11e951b4d936f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:20 2019 +0200 prntvpt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/Makefile.in | 2 ++ dlls/prntvpt/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index ce05f50..5efd1c4 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,4 +1,6 @@ MODULE = prntvpt.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index cdf1b6c..ec7cf7c 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : propsys: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 445af46a1838b724d12c012f0be4bc62445e6864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=445af46a1838b724d12c012f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:45 2019 +0200 propsys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/Makefile.in | 2 ++ dlls/propsys/propstore.c | 2 -- dlls/propsys/propsys_main.c | 10 ++++------ dlls/propsys/propvar.c | 9 +++------ 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index a445922..ec0b223 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -2,6 +2,8 @@ MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ propstore.c \ propsys_main.c \ diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 9c848fc..6212f29 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -29,7 +28,6 @@ #include "rpcproxy.h" #include "propsys.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" #include "initguid.h" diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 65d157d..7ae3870 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -20,7 +20,6 @@ */ #define COBJMACROS -#include "config.h" #include <stdarg.h> @@ -30,7 +29,6 @@ #include "rpcproxy.h" #include "propsys.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "propsys_private.h" @@ -307,7 +305,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch return E_NOT_SUFFICIENT_BUFFER; } - sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, + swprintf(psz, cch, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], pkey->fmtid.Data4[2], pkey->fmtid.Data4[3], pkey->fmtid.Data4[4], pkey->fmtid.Data4[5], pkey->fmtid.Data4[6], pkey->fmtid.Data4[7]); @@ -317,11 +315,11 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch *p++ = ' '; cch -= GUIDSTRING_MAX - 1 + 1; - len = sprintfW(pidW, pid_fmtW, pkey->pid); + len = swprintf(pidW, ARRAY_SIZE(pidW), pid_fmtW, pkey->pid); if (cch >= len + 1) { - strcpyW(p, pidW); + lstrcpyW(p, pidW); return S_OK; } else @@ -497,7 +495,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) } /* Overflow is not checked. */ - while (isdigitW(*pszString)) + while (iswdigit(*pszString)) { pkey->pid *= 10; pkey->pid += (*pszString - '0'); diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 98fb129..dcfee2b 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdarg.h> #include <stdio.h> @@ -37,7 +35,6 @@ #include "strsafe.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(propsys); @@ -124,7 +121,7 @@ static HRESULT PROPVAR_ConvertNumber(REFPROPVARIANT pv, int dest_bits, case VT_BSTR: { WCHAR *end; - *res = strtolW(pv->u.pwszVal, &end, 0); + *res = wcstol(pv->u.pwszVal, &end, 0); if (pv->u.pwszVal == end) return DISP_E_TYPEMISMATCH; src_signed = *res < 0; @@ -587,7 +584,7 @@ static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str) '-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%','0','2','X', '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - sprintfW(str, format, guid->Data1, guid->Data2, guid->Data3, + swprintf(str, 39, format, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } @@ -764,7 +761,7 @@ HRESULT WINAPI PropVariantToGUID(const PROPVARIANT *ppropvar, GUID *guid) case VT_BSTR: return PROPVAR_WCHARToGUID(ppropvar->u.bstrVal, SysStringLen(ppropvar->u.bstrVal), guid); case VT_LPWSTR: - return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, strlenW(ppropvar->u.pwszVal), guid); + return PROPVAR_WCHARToGUID(ppropvar->u.pwszVal, lstrlenW(ppropvar->u.pwszVal), guid); case VT_CLSID: memcpy(guid, ppropvar->u.puuid, sizeof(*ppropvar->u.puuid)); return S_OK;

1 0

Alexandre Julliard : pstorec: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: eb018308ab3f77957333a12afa709b09d36e5105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb018308ab3f77957333a12a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 09:06:49 2019 +0200 pstorec: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index d09f82c..f8009e2 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -1,6 +1,8 @@ MODULE = pstorec.dll IMPORTS = uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ pstorec.c

1 0

Dmitry Timoshkov : mshtml: Add better stub for HTMLDocument7:: get_onmsthumbnailclick.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 756d9cdc6f43052fca5be1cc26a8e08b70515138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=756d9cdc6f43052fca5be1cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 14:09:36 2019 +0800 mshtml: Add better stub for HTMLDocument7::get_onmsthumbnailclick. 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/mshtml/htmldoc.c | 6 ++++-- dlls/mshtml/htmlevent.c | 3 +++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/dom.c | 7 +++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 868a9a0..54787f0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3339,8 +3339,10 @@ static HRESULT WINAPI HTMLDocument7_put_onmsthumbnailclick(IHTMLDocument7 *iface static HRESULT WINAPI HTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MSTHUMBNAILCLICK, p); } static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 453fe32..b090d1c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -88,6 +88,7 @@ static const WCHAR mouseoutW[] = {'m','o','u','s','e','o','u','t',0}; static const WCHAR mouseoverW[] = {'m','o','u','s','e','o','v','e','r',0}; static const WCHAR mouseupW[] = {'m','o','u','s','e','u','p',0}; static const WCHAR mousewheelW[] = {'m','o','u','s','e','w','h','e','e','l',0}; +static const WCHAR msthumbnailclickW[] = {'m','s','t','h','u','m','b','n','a','i','l','c','l','i','c','k',0}; static const WCHAR pasteW[] = {'p','a','s','t','e',0}; static const WCHAR readystatechangeW[] = {'r','e','a','d','y','s','t','a','t','e','c','h','a','n','g','e',0}; static const WCHAR resizeW[] = {'r','e','s','i','z','e',0}; @@ -208,6 +209,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {mousewheelW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, EVENT_FIXME}, + {msthumbnailclickW, EVENT_TYPE_MOUSE, DISPID_EVPROP_ONMSTHUMBNAILCLICK, + EVENT_FIXME}, {pasteW, EVENT_TYPE_CLIPBOARD, DISPID_EVMETH_ONPASTE, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {readystatechangeW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONREADYSTATECHANGE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e2f45dc..c5d9753 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -46,6 +46,7 @@ typedef enum { EVENTID_MOUSEOVER, EVENTID_MOUSEUP, EVENTID_MOUSEWHEEL, + EVENTID_MSTHUMBNAILCLICK, EVENTID_PASTE, EVENTID_READYSTATECHANGE, EVENTID_RESIZE, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 01c6191..e152c4f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7014,6 +7014,7 @@ static void test_dom_implementation(IHTMLDocument2 *doc) IHTMLDocument7 *new_document; IHTMLLocation *location; IHTMLWindow2 *window; + VARIANT v; IDispatch *disp; test_disp((IUnknown*)dom_implementation, &DIID_DispHTMLDOMImplementation, NULL, "[object]"); @@ -7045,6 +7046,12 @@ static void test_dom_implementation(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_location(new_document2, &location); ok(hres == E_UNEXPECTED, "get_location returned: %08x\n", hres); + memset(&v, 0xcc, sizeof(v)); + hres = IHTMLDocument7_get_onmsthumbnailclick(new_document, &v); + ok(hres == S_OK, "get_onmsthumbnailclick returned: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "got %u\n", V_VT(&v)); + ok((DWORD)(DWORD_PTR)V_DISPATCH(&v) == 0xcccccccc, "got %p\n", V_DISPATCH(&v)); + IHTMLDocument2_Release(new_document2); IHTMLDocument7_Release(new_document); IHTMLDOMImplementation2_Release(dom_implementation2);

1 0

Dmitry Timoshkov : mshtml: Add recently added GUIDs to debugstr_mshtml_guid().
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 63946a2942595016c83659ee3d8840e19a58fb62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63946a2942595016c83659ee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 14:09:43 2019 +0800 mshtml: Add recently added GUIDs to debugstr_mshtml_guid(). 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/mshtml/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 7cb3006..29396a5 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -705,6 +705,7 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IDispatch); X(IID_IDispatchEx); X(IID_IDispatchJS); + X(IID_IDisplayServices); X(IID_UndocumentedScriptIface); X(IID_IEnumConnections); X(IID_IEnumVARIANT); @@ -719,6 +720,8 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IInternetProtocol); X(IID_IInternetProtocolRoot); X(IID_IManagedObject); + X(IID_IMarkupContainer); + X(IID_IMarkupServices); X(IID_IMarshal); X(IID_IMonikerProp); X(IID_IObjectIdentity);

1 0