February 2018 - Wine-Commits

Józef Kucia : wined3d: Use wined3d_bit_scan() in context_apply_compute_state().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 9ab04c564e1a14348a4b81c2f61744821b65e61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ab04c564e1a14348a4b81c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:04 2018 +0100 wined3d: Use wined3d_bit_scan() in context_apply_compute_state(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 81a0f4f..ccfe630 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3983,7 +3983,7 @@ void context_apply_compute_state(struct wined3d_context *context, { const struct StateEntry *state_table = context->state_table; const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int state_id, i, j; + unsigned int state_id, i; context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], @@ -3991,11 +3991,13 @@ void context_apply_compute_state(struct wined3d_context *context, for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) { - for (j = 0; j < sizeof(*context->dirty_compute_states) * CHAR_BIT; ++j, ++state_id) + unsigned int dirty_mask = context->dirty_compute_states[i]; + while (dirty_mask) { - if (context->dirty_compute_states[i] & (1u << j)) - state_table[state_id].apply(context, state, state_id); + unsigned int current_state_id = state_id + wined3d_bit_scan(&dirty_mask); + state_table[current_state_id].apply(context, state, current_state_id); } + state_id += sizeof(*context->dirty_compute_states) * CHAR_BIT; } memset(context->dirty_compute_states, 0, sizeof(*context->dirty_compute_states));

1 0

Zebediah Figura : urlmon/tests: Fix a couple of allocations.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 8d773e2c8332c5c0b3fac1235c104d6ab273221f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d773e2c8332c5c0b3fac123… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 5 18:40:14 2018 -0600 urlmon/tests: Fix a couple of allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 73c6374..e88c960 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -2332,7 +2332,7 @@ static void test_bsc_marshaling(void) rem_bindinfo.stgmedData.tymed = TYMED_HGLOBAL; - buf = GlobalAlloc(0, sizeof(5)); + buf = GlobalAlloc(0, 5); strcpy(buf, "test"); rem_bindinfo.stgmedData.u.hGlobal = buf; rem_bindinfo.cbstgmedData = 5; @@ -2549,7 +2549,7 @@ static void test_bsc_marshaling(void) rem_bindinfo.stgmedData.tymed = TYMED_HGLOBAL; - buf = GlobalAlloc(0, sizeof(5)); + buf = GlobalAlloc(0, 5); strcpy(buf, "test"); rem_bindinfo.stgmedData.u.hGlobal = buf; rem_bindinfo.cbstgmedData = 5;

1 0

Michael Stefaniuc : oleaut32: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: d0ecd514b4de6e0761322b1e688c344f0412d08e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0ecd514b4de6e0761322b1e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Feb 3 00:17:55 2018 +0100 oleaut32: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 1 + dlls/oleaut32/typelib.h | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 49366ae..4ee6aa5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -73,6 +73,7 @@ #include "typelib.h" #include "wine/debug.h" #include "variant.h" +#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index d977dfb..2003c75 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -596,26 +596,6 @@ WORD typeofarray #include "poppack.h" -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, size ); -} - -static inline BOOL heap_free( LPVOID mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN; extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Properly set the MsiNetAssemblySupport property.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 691a7fa9faecdf10abb3a87ee6f498836c3556f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=691a7fa9faecdf10abb3a87e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 6 13:56:16 2018 +0100 msi: Properly set the MsiNetAssemblySupport property. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 100 ++++++++++++++++++++++++----------------------- dlls/msi/tests/package.c | 5 +++ 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 477fa0f..5aa3dd0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -528,71 +528,73 @@ done: static LPWSTR get_fusion_filename(MSIPACKAGE *package) { - HKEY netsetup; + static const WCHAR fusion[] = + {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR subkey[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'N','E','T',' ','F','r','a','m','e','w','o','r','k',' ','S','e','t','u','p','\\','N','D','P',0}; + static const WCHAR subdir[] = + {'M','i','c','r','o','s','o','f','t','.','N','E','T','\\','F','r','a','m','e','w','o','r','k','\\',0}; + static const WCHAR v2050727[] = + {'v','2','.','0','.','5','0','7','2','7',0}; + static const WCHAR v4client[] = + {'v','4','\\','C','l','i','e','n','t',0}; + static const WCHAR installpath[] = + {'I','n','s','t','a','l','l','P','a','t','h',0}; + HKEY netsetup, hkey; LONG res; - LPWSTR file = NULL; - DWORD index = 0, size; - WCHAR ver[MAX_PATH]; - WCHAR name[MAX_PATH]; - WCHAR windir[MAX_PATH]; - - static const WCHAR fusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; - static const WCHAR sub[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'N','E','T',' ','F','r','a','m','e','w','o','r','k',' ','S','e','t','u','p','\\', - 'N','D','P',0 - }; - static const WCHAR subdir[] = { - 'M','i','c','r','o','s','o','f','t','.','N','E','T','\\', - 'F','r','a','m','e','w','o','r','k','\\',0 - }; + DWORD size, len, type; + WCHAR windir[MAX_PATH], path[MAX_PATH], *filename = NULL; - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, sub, 0, KEY_ENUMERATE_SUB_KEYS, &netsetup); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, subkey, 0, KEY_CREATE_SUB_KEY, &netsetup); if (res != ERROR_SUCCESS) return NULL; - GetWindowsDirectoryW(windir, MAX_PATH); - - ver[0] = '\0'; - size = MAX_PATH; - while (RegEnumKeyExW(netsetup, index, name, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + if (!RegCreateKeyExW(netsetup, v4client, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - index++; - - /* verify existence of fusion.dll .Net 3.0 does not install a new one */ - if (strcmpW( ver, name ) < 0) + size = sizeof(path)/sizeof(path[0]); + if (!RegQueryValueExW(hkey, installpath, NULL, &type, (BYTE *)path, &size)) { - LPWSTR check; - size = lstrlenW(windir) + lstrlenW(subdir) + lstrlenW(name) +lstrlenW(fusion) + 3; - check = msi_alloc(size * sizeof(WCHAR)); + len = strlenW(path) + strlenW(fusion) + 2; + if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; - if (!check) + strcpyW(filename, path); + strcatW(filename, szBackSlash); + strcatW(filename, fusion); + if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) { - msi_free(file); - return NULL; + TRACE( "found %s\n", debugstr_w(filename) ); + RegCloseKey(hkey); + RegCloseKey(netsetup); + return filename; } + } + RegCloseKey(hkey); + } - lstrcpyW(check, windir); - lstrcatW(check, szBackSlash); - lstrcatW(check, subdir); - lstrcatW(check, name); - lstrcatW(check, szBackSlash); - lstrcatW(check, fusion); + if (!RegCreateKeyExW(netsetup, v2050727, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) + { + RegCloseKey(hkey); + GetWindowsDirectoryW(windir, MAX_PATH); + len = strlenW(windir) + strlenW(subdir) + strlenW(v2050727) + strlenW(fusion) + 3; + if (!(filename = msi_alloc(len * sizeof(WCHAR)))) return NULL; - if(GetFileAttributesW(check) != INVALID_FILE_ATTRIBUTES) - { - msi_free(file); - file = check; - lstrcpyW(ver, name); - } - else - msi_free(check); + strcpyW(filename, windir); + strcatW(filename, szBackSlash); + strcatW(filename, subdir); + strcatW(filename, v2050727); + strcatW(filename, szBackSlash); + strcatW(filename, fusion); + if (GetFileAttributesW(filename) != INVALID_FILE_ATTRIBUTES) + { + TRACE( "found %s\n", debugstr_w(filename) ); + RegCloseKey(netsetup); + return filename; } } RegCloseKey(netsetup); - return file; + return filename; } typedef struct tagLANGANDCODEPAGE diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e4cee59..2022953 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5652,6 +5652,11 @@ static void test_installprops(void) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); + buf[0] = 0; + size = MAX_PATH; + r = MsiGetPropertyA(hpkg, "MsiNetAssemblySupport", buf, &size); + if (r == ERROR_SUCCESS) trace( "MsiNetAssemblySupport \"%s\"\n", buf ); + if (pGetSystemInfo && pSHGetFolderPathA) { pGetSystemInfo(&si);

1 0

Mark Jansen : comctl32/listview: Include the checkbox in column width calculation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 71cf0a31d99febf0e260fdc1552465529144bde9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71cf0a31d99febf0e260fdc1… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Tue Feb 6 15:37:39 2018 +0300 comctl32/listview: Include the checkbox in column width calculation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 ++ dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c085578..0d7f7ec 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8406,6 +8406,8 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) if (infoPtr->himlSmall && (nColumn == 0 || (LISTVIEW_GetColumnInfo(infoPtr, nColumn)->fmt & LVCFMT_IMAGE))) max_cx += infoPtr->iconSize.cx; max_cx += TRAILING_LABEL_PADDING; + if (nColumn == 0 && (infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES)) + max_cx += GetSystemMetrics(SM_CXSMICON); } /* autosize based on listview items width */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0506eaa..c9a165c 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6298,7 +6298,6 @@ static void test_LVSCW_AUTOSIZE(void) width2 = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); ok(width2 > 0, "Unexpected column width %d.\n", width2); -todo_wine ok(width2 > width, "Expected increased column width.\n"); /* Turn off checkboxes. */ @@ -6310,7 +6309,6 @@ todo_wine width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); ok(width > 0, "Unexpected column width %d.\n", width2); -todo_wine ok(width2 > width, "Expected reduced column width.\n"); DestroyWindow(hwnd);

1 0

Nikolay Sivov : comctl32/tests: Add some tests for LVSCW_AUTOSIZE.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e00a2379fcc22eb417c45da1b50d50e01e2eedd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e00a2379fcc22eb417c45da1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 15:37:38 2018 +0300 comctl32/tests: Add some tests for LVSCW_AUTOSIZE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c6e3127..0506eaa 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6270,6 +6270,52 @@ static void test_state_image(void) } } +static void test_LVSCW_AUTOSIZE(void) +{ + int width, width2; + HWND hwnd; + BOOL ret; + + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + insert_item(hwnd, 0); + + ret = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, LVSCW_AUTOSIZE); + ok(ret, "Failed to set column width.\n"); + + width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + ok(width > 0, "Unexpected column width %d.\n", width); + + /* Turn on checkboxes. */ + ret = SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, LVS_EX_CHECKBOXES); + ok(ret == 0, "Unexpected previous extended style.\n"); + + ret = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, LVSCW_AUTOSIZE); + ok(ret, "Failed to set column width.\n"); + + width2 = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + ok(width2 > 0, "Unexpected column width %d.\n", width2); +todo_wine + ok(width2 > width, "Expected increased column width.\n"); + + /* Turn off checkboxes. */ + ret = SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_CHECKBOXES, 0); + ok(ret == LVS_EX_CHECKBOXES, "Unexpected previous extended style.\n"); + + ret = SendMessageA(hwnd, LVM_SETCOLUMNWIDTH, 0, LVSCW_AUTOSIZE); + ok(ret, "Failed to set column width.\n"); + + width = SendMessageA(hwnd, LVM_GETCOLUMNWIDTH, 0, 0); + ok(width > 0, "Unexpected column width %d.\n", width2); +todo_wine + ok(width2 > width, "Expected reduced column width.\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6330,6 +6376,7 @@ START_TEST(listview) test_oneclickactivate(); test_callback_mask(); test_state_image(); + test_LVSCW_AUTOSIZE(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -6371,6 +6418,7 @@ START_TEST(listview) test_LVM_REDRAWITEMS(); test_oneclickactivate(); test_state_image(); + test_LVSCW_AUTOSIZE(); unload_v6_module(ctx_cookie, hCtx);

1 0

Nikolay Sivov : msxml3/tests: Use the global HeapAlloc() helpers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 75782e7cc3a14f46273f24d2bd0aa03147bb4deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=75782e7cc3a14f46273f24d2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:57:32 2018 +0300 msxml3/tests: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 5 +++-- dlls/msxml3/tests/httpreq.c | 5 +++-- dlls/msxml3/tests/saxreader.c | 20 +++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 81e2493..7aeafa5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -40,6 +40,7 @@ #include "initguid.h" #include "asptlb.h" +#include "wine/heap.h" #include "wine/test.h" /* undef the #define in msxml2 so that we can access all versions */ @@ -172,7 +173,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -232,7 +233,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = HeapAlloc(GetProcessHeap(), 0, sizeof(*event)); + dispevent *event = heap_alloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 538e23f..4f51ef9 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -35,6 +35,7 @@ #include "objsafe.h" #include "mshtml.h" +#include "wine/heap.h" #include "wine/test.h" #define EXPECT_HR(hr,hr_exp) \ @@ -1243,7 +1244,7 @@ static ULONG WINAPI dispevent_Release(IDispatch *iface) ULONG ref = InterlockedDecrement( &This->ref ); if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -1320,7 +1321,7 @@ static const IDispatchVtbl dispeventVtbl = static IDispatch* create_dispevent(void) { - dispevent *event = HeapAlloc(GetProcessHeap(), 0, sizeof(*event)); + dispevent *event = heap_alloc(sizeof(*event)); event->IDispatch_iface.lpVtbl = &dispeventVtbl; event->ref = 1; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 34d11e6..9ebed62 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -33,6 +33,7 @@ #include "ocidl.h" #include "dispex.h" +#include "wine/heap.h" #include "wine/test.h" static const WCHAR emptyW[] = {0}; @@ -257,16 +258,13 @@ static void add_call(struct call_sequence **seq, int sequence_index, if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = HeapAlloc(GetProcessHeap(), 0, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = heap_alloc(call_seq->size * sizeof (struct call_entry)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - call_seq->sequence, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = heap_realloc(call_seq->sequence, call_seq->size * sizeof (struct call_entry)); } assert(call_seq->sequence); @@ -301,7 +299,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].attributes[j].qnameW); SysFreeString(call_seq->sequence[i].attributes[j].valueW); } - HeapFree(GetProcessHeap(), 0, call_seq->sequence[i].attributes); + heap_free(call_seq->sequence[i].attributes); call_seq->sequence[i].attr_count = 0; SysFreeString(call_seq->sequence[i].arg1W); @@ -309,7 +307,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index SysFreeString(call_seq->sequence[i].arg3W); } - HeapFree(GetProcessHeap(), 0, call_seq->sequence); + heap_free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -536,7 +534,7 @@ static void init_call_sequences(struct call_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct call_sequence)); + seq[i] = heap_alloc_zero(sizeof(struct call_sequence)); } static const WCHAR szSimpleXML[] = { @@ -1223,7 +1221,7 @@ static HRESULT WINAPI contentHandler_startElement( int i; struct attribute_entry *attr; - attr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len*sizeof(struct attribute_entry)); + attr = heap_alloc_zero(len * sizeof(*attr)); v = VARIANT_TRUE; hr = ISAXXMLReader_getFeature(g_reader, _bstr_("http://xml.org/sax/features/namespaces"), &v); @@ -3307,7 +3305,7 @@ static void test_mxwriter_flush(void) ok(pos2.QuadPart == 0, "expected stream beginning\n"); len = 2048; - buff = HeapAlloc(GetProcessHeap(), 0, len+1); + buff = heap_alloc(len + 1); memset(buff, 'A', len); buff[len] = 0; hr = ISAXContentHandler_characters(content, _bstr_(buff), len); @@ -3390,7 +3388,7 @@ static void test_mxwriter_flush(void) ok(SysStringLen(V_BSTR(&dest)) == len, "got len=%d, expected %d\n", SysStringLen(V_BSTR(&dest)), len); VariantClear(&dest); - HeapFree(GetProcessHeap(), 0, buff); + heap_free(buff); ISAXContentHandler_Release(content); IStream_Release(stream); IMXWriter_Release(writer);

1 0

Hans Leidekker : kerberos: Support non-DCE style contexts.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: ddfa042db1112488e2b110963aa78226107742be URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddfa042db1112488e2b11096… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 6 09:55:00 2018 +0100 kerberos: Support non-DCE style contexts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 168 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 139 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddfa042db1112488e2b1…

1 0

Fabian Maurer : comctl32/tests: Add test for v6 combobox dropdown size.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 1f1e7259e6d0f6e87f79c31f3ff4710ac2a84d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1e7259e6d0f6e87f79c31f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Feb 6 10:26:25 2018 +0300 comctl32/tests: Add test for v6 combobox dropdown size. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/combo.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 895d942..da2ded2 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1151,6 +1151,114 @@ static void test_combo_WS_VSCROLL(void) DestroyWindow(hCombo); } +static void test_combo_dropdown_size(DWORD style) +{ + static const char wine_test[] = "Wine Test"; + HWND hCombo, hList; + COMBOBOXINFO cbInfo; + int i, test, ret; + + static const struct list_size_info + { + int num_items; + int height_combo; + int limit; + } info_height[] = { + {33, 50, -1}, + {35, 50, 40}, + {15, 50, 3}, + }; + + for (test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + { + const struct list_size_info *info_test = &info_height[test]; + int height_item; /* Height of a list item */ + int height_list; /* Height of the list we got */ + int expected_height_list; + RECT rect_list_client; + int min_visible_expected; + + hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100, + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + min_visible_expected = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == 30, "Unexpected number of items %d.\n", min_visible_expected); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + ret = SendMessageA(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + ok(ret, "Failed to get combo info, %d\n", ret); + + hList = cbInfo.hwndList; + for (i = 0; i < info_test->num_items; i++) + { + ret = SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test); + ok(ret == i, "Failed to add string %d, returned %d.\n", i, ret); + } + + if (info_test->limit != -1) + { + int min_visible_actual; + min_visible_expected = info_test->limit; + + ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); + todo_wine + ok(ret, "Failed to set visible limit.\n"); + min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == min_visible_actual, "test %d: unexpected number of items %d.\n", + test, min_visible_actual); + } + + ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0); + ok(ret, "Failed to show dropdown.\n"); + ret = SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0); + ok(ret, "Unexpected dropped state.\n"); + + GetClientRect(hList, &rect_list_client); + height_list = rect_list_client.bottom - rect_list_client.top; + height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0); + + if (style & CBS_NOINTEGRALHEIGHT) + { + RECT rect_list_complete; + int list_height_nonclient; + int list_height_calculated; + int edit_padding_size = cbInfo.rcItem.top; /* edit client rect top is the padding it has to its parent + We assume it's the same on the bottom */ + + GetWindowRect(hList, &rect_list_complete); + + list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top) + - (rect_list_client.bottom - rect_list_client.top); + + /* Calculate the expected client size of the listbox popup from the size of the combobox. */ + list_height_calculated = info_test->height_combo /* Take height we created combobox with */ + - (cbInfo.rcItem.bottom - cbInfo.rcItem.top) /* Subtract size of edit control */ + - list_height_nonclient /* Subtract list nonclient area */ + - edit_padding_size * 2; /* subtract space around the edit control */ + + expected_height_list = min(list_height_calculated, height_item * info_test->num_items); + if (expected_height_list < 0) + expected_height_list = 0; + + todo_wine + ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", + test, expected_height_list, height_list); + } + else + { + expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; + + todo_wine + ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", + test, expected_height_list, height_list); + } + + DestroyWindow(hCombo); + } +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1192,6 +1300,8 @@ START_TEST(combo) test_combo_listbox_styles(CBS_SIMPLE); test_combo_listbox_styles(CBS_DROPDOWN); test_combo_listbox_styles(CBS_DROPDOWNLIST); + test_combo_dropdown_size(0); + test_combo_dropdown_size(CBS_NOINTEGRALHEIGHT); cleanup(); unload_v6_module(ctx_cookie, hCtx);

1 0

Alexandre Julliard : ntdll: Fix crash on nested thread exit.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 7ccae68f6cf85388ef6eed98792127b7fbf01396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ccae68f6cf85388ef6eed98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 16:06:42 2018 +0100 ntdll: Fix crash on nested thread exit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_i386.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 3d25f13..fcadcf9 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2566,6 +2566,7 @@ __ASM_GLOBAL_FUNC( start_thread, extern void DECLSPEC_NORETURN call_thread_exit_func( int status, void (*func)(int) ); __ASM_GLOBAL_FUNC( call_thread_exit_func, + "movl 8(%esp),%ecx\n\t" /* fetch exit frame */ "movl %fs:0x1f4,%edx\n\t" /* x86_thread_data()->exit_frame */ "testl %edx,%edx\n\t" @@ -2573,7 +2574,6 @@ __ASM_GLOBAL_FUNC( call_thread_exit_func, "jmp *%ecx\n\t" /* switch to exit frame stack */ "1:\tmovl 4(%esp),%eax\n\t" - "movl 8(%esp),%ecx\n\t" "movl $0,%fs:0x1f4\n\t" "movl %edx,%ebp\n\t" __ASM_CFI(".cfi_def_cfa %ebp,4\n\t")

1 0

Alexandre Julliard : ntdll: Use MAP_SHARED also for read-only mappings.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: b1f8a91e6c1f9bf5524eb130a912fb8727f258ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f8a91e6c1f9bf5524eb130… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 10:43:12 2018 +0100 ntdll: Use MAP_SHARED also for read-only mappings. This essentially reverts commit dac252ecb42fb17c2f3f2deb559262514b58e990. It's necessary for macOS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 534daf9..426af01 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1146,7 +1146,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start { void *ptr; int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); - unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITE) ? MAP_SHARED : MAP_PRIVATE); + unsigned int flags = MAP_FIXED | ((vprot & VPROT_WRITECOPY) ? MAP_PRIVATE : MAP_SHARED); assert( start < view->size ); assert( start + size <= view->size ); @@ -1171,7 +1171,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start break; case ENOEXEC: case ENODEV: /* filesystem doesn't support mmap(), fall back to read() */ - if (flags & MAP_SHARED) + if (vprot & VPROT_WRITE) { ERR( "shared writable mmap not supported, broken filesystem?\n" ); return STATUS_NOT_SUPPORTED;

1 0

Józef Kucia : wined3d: Use wined3d_bit_scan() in wined3d_enable_clip_distances().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: dea7b8890cc9c7c2f2cf74a3974921927bb27bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea7b8890cc9c7c2f2cf74a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 11:40:03 2018 +0100 wined3d: Use wined3d_bit_scan() in wined3d_enable_clip_distances(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e12d75..81a0f4f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2368,16 +2368,16 @@ void context_enable_clip_distances(struct wined3d_context *context, unsigned int context->clip_distance_mask = enable_mask; enable_mask &= ~current_mask; - for (i = 0; enable_mask; enable_mask >>= 1, ++i) + while (enable_mask) { - if (enable_mask & 1) - gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); + i = wined3d_bit_scan(&enable_mask); + gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); } disable_mask &= current_mask; - for (i = 0; disable_mask; disable_mask >>= 1, ++i) + while (disable_mask) { - if (disable_mask & 1) - gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); + i = wined3d_bit_scan(&disable_mask); + gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); } checkGLcall("toggle clip distances"); }

1 0

Nikolay Sivov : msxml3: Use the global HeapAlloc() helpers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 9cb8629fb7d5b80dbaeef3c868b63ae5293e0ccb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb8629fb7d5b80dbaeef3c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:57:31 2018 +0300 msxml3: Use the global HeapAlloc() helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 6 +++--- dlls/msxml3/schema.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index be2caf9..e8d5b27 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -561,7 +561,7 @@ static BOOL bstr_pool_insert(struct bstrpool *pool, BSTR pool_entry) { if (!pool->pool) { - pool->pool = HeapAlloc(GetProcessHeap(), 0, 16 * sizeof(*pool->pool)); + pool->pool = heap_alloc(16 * sizeof(*pool->pool)); if (!pool->pool) return FALSE; @@ -570,7 +570,7 @@ static BOOL bstr_pool_insert(struct bstrpool *pool, BSTR pool_entry) } else if (pool->index == pool->len) { - BSTR *realloc = HeapReAlloc(GetProcessHeap(), 0, pool->pool, pool->len * 2 * sizeof(*realloc)); + BSTR *realloc = heap_realloc(pool->pool, pool->len * 2 * sizeof(*realloc)); if (!realloc) return FALSE; @@ -590,7 +590,7 @@ static void free_bstr_pool(struct bstrpool *pool) for (i = 0; i < pool->index; i++) SysFreeString(pool->pool[i]); - HeapFree(GetProcessHeap(), 0, pool->pool); + heap_free(pool->pool); pool->pool = NULL; pool->index = pool->len = 0; diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 30272cb..8087985 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -749,7 +749,7 @@ void schemasInit(void) /* Resource is loaded as raw data, * need a null-terminated string */ while (buf[datatypes_len - 1] != '>') datatypes_len--; - datatypes_src = HeapAlloc(GetProcessHeap(), 0, datatypes_len + 1); + datatypes_src = heap_alloc(datatypes_len + 1); memcpy(datatypes_src, buf, datatypes_len); datatypes_src[datatypes_len] = 0; @@ -763,7 +763,7 @@ void schemasInit(void) void schemasCleanup(void) { xmlSchemaFree(datatypes_schema); - HeapFree(GetProcessHeap(), 0, datatypes_src); + heap_free(datatypes_src); xmlSetExternalEntityLoader(_external_entity_loader); }

1 0

Jacek Caban : mshtml: Use IDOMKeyboardEvent instead of nsIDOMKeyEvent in IHTMLEventObj implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: b8c5f98c06abe74372f8373ff24e39872bb3fb96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8c5f98c06abe74372f8373f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:35 2018 +0100 mshtml: Use IDOMKeyboardEvent instead of nsIDOMKeyEvent in IHTMLEventObj implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 51 +++++++++---------------------------------------- 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c77f2b7..9f115a8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -414,16 +414,8 @@ static HRESULT WINAPI HTMLEventObj_get_altKey(IHTMLEventObj *iface, VARIANT_BOOL if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_altKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetAltKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_altKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -439,16 +431,8 @@ static HRESULT WINAPI HTMLEventObj_get_ctrlKey(IHTMLEventObj *iface, VARIANT_BOO if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_ctrlKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetCtrlKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_ctrlKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -464,16 +448,8 @@ static HRESULT WINAPI HTMLEventObj_get_shiftKey(IHTMLEventObj *iface, VARIANT_BO if(This->event && This->event->mouse_event) return IDOMMouseEvent_get_shiftKey(&This->event->IDOMMouseEvent_iface, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetShiftKey(key_event, &ret); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_shiftKey(&This->event->IDOMKeyboardEvent_iface, p); *p = variant_bool(ret); return S_OK; @@ -557,22 +533,13 @@ static HRESULT WINAPI HTMLEventObj_put_keyCode(IHTMLEventObj *iface, LONG v) static HRESULT WINAPI HTMLEventObj_get_keyCode(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); - UINT32 key_code = 0; TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMKeyEvent *key_event; - nsresult nsres; - - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); - if(NS_SUCCEEDED(nsres)) { - nsIDOMKeyEvent_GetKeyCode(key_event, &key_code); - nsIDOMKeyEvent_Release(key_event); - } - } + if(This->event && This->event->keyboard_event) + return IDOMKeyboardEvent_get_keyCode(&This->event->IDOMKeyboardEvent_iface, p); - *p = key_code; + *p = 0; return S_OK; }

1 0

Henri Verbeet : ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: a3ca7a308afc886af916e459d2a66b9936c2ee7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3ca7a308afc886af916e459… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:15 2018 +0330 ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index ea5a55c..6ce77e3 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -124,13 +124,19 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, if (buffer->index_size < index_count) { - struct wined3d_buffer *new_buffer; unsigned int new_size = max(buffer->index_size * 2, index_count); + struct wined3d_buffer *new_buffer; + struct wined3d_buffer_desc desc; + + desc.byte_width = new_size * sizeof(*indices); + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - hr = wined3d_buffer_create_ib(device->wined3d_device, new_size * sizeof(*indices), - WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, - NULL, &ddraw_null_wined3d_parent_ops, &new_buffer); - if (FAILED(hr)) + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &new_buffer))) return hr; buffer->index_size = new_size;

1 0

Henri Verbeet : d3d8: Use wined3d_buffer_create() in indexbuffer_init().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 9801f09b571e3a15f0c1a2fd8780e20390c1da33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9801f09b571e3a15f0c1a2fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:16 2018 +0330 d3d8: Use wined3d_buffer_create() in indexbuffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 43855f2..10ba302 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -565,25 +565,25 @@ static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; + desc.byte_width = size; + desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) - { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; - } + desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; buffer->IDirect3DIndexBuffer8_iface.lpVtbl = &d3d8_indexbuffer_vtbl; d3d8_resource_init(&buffer->resource); buffer->format = wined3dformat_from_d3dformat(format); wined3d_mutex_lock(); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) {

1 0

Henri Verbeet : dxgi: Use the global memory allocation helpers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: c1cf16189f6573a85743de8562a21b39958f7fc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1cf16189f6573a85743de85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:19 2018 +0330 dxgi: Use the global memory allocation helpers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 4 ++-- dlls/dxgi/device.c | 10 +++++----- dlls/dxgi/dxgi_main.c | 11 +++++------ dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/factory.c | 6 +++--- dlls/dxgi/output.c | 4 ++-- dlls/dxgi/surface.c | 2 +- dlls/dxgi/swapchain.c | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 64a18e6..ed2375a 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -73,7 +73,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface) { wined3d_private_store_cleanup(&adapter->private_store); IDXGIFactory4_Release(&adapter->factory->IDXGIFactory4_iface); - HeapFree(GetProcessHeap(), 0, adapter); + heap_free(adapter); } return refcount; @@ -356,7 +356,7 @@ static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory HRESULT dxgi_adapter_create(struct dxgi_factory *factory, UINT ordinal, struct dxgi_adapter **adapter) { - if (!(*adapter = HeapAlloc(GetProcessHeap(), 0, sizeof(**adapter)))) + if (!(*adapter = heap_alloc(sizeof(**adapter)))) return E_OUTOFMEMORY; dxgi_adapter_init(*adapter, factory, ordinal); diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 6015bbe..b4f36dc 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) wined3d_mutex_unlock(); IWineDXGIAdapter_Release(device->adapter); wined3d_private_store_cleanup(&device->private_store); - HeapFree(GetProcessHeap(), 0, device); + heap_free(device); } return refcount; @@ -287,7 +287,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa TRACE("iface %p, wined3d_texture %p, usage %#x, shared_resource %p, outer %p, surface %p.\n", iface, wined3d_texture, usage, shared_resource, outer, surface); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate DXGI surface object memory\n"); return E_OUTOFMEMORY; @@ -296,7 +296,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_texture))) { WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -316,7 +316,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i TRACE("iface %p, desc %p, wined3d_swapchain %p.\n", iface, desc, wined3d_swapchain); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate DXGI swapchain object memory\n"); return E_OUTOFMEMORY; @@ -325,7 +325,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i if (FAILED(hr = dxgi_swapchain_init(object, device, desc, implicit))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 36cf73b..df8761b 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -35,7 +35,7 @@ static struct dxgi_main dxgi_main; static void dxgi_main_cleanup(void) { - HeapFree(GetProcessHeap(), 0, dxgi_main.device_layers); + heap_free(dxgi_main.device_layers); FreeLibrary(dxgi_main.d3d10core); } @@ -188,8 +188,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I device_size = d3d10_layer.get_size(d3d10_layer.id, &get_size_args, 0); device_size += sizeof(*dxgi_device); - dxgi_device = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device_size); - if (!dxgi_device) + if (!(dxgi_device = heap_alloc_zero(device_size))) { ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; @@ -199,7 +198,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, dxgi_device); + heap_free(dxgi_device); *device = NULL; return hr; } @@ -220,9 +219,9 @@ HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, U wined3d_mutex_lock(); if (!dxgi_main.layer_count) - new_layers = HeapAlloc(GetProcessHeap(), 0, layer_count * sizeof(*new_layers)); + new_layers = heap_alloc(layer_count * sizeof(*new_layers)); else - new_layers = HeapReAlloc(GetProcessHeap(), 0, dxgi_main.device_layers, + new_layers = heap_realloc(dxgi_main.device_layers, (dxgi_main.layer_count + layer_count) * sizeof(*new_layers)); if (!new_layers) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 19c880b..ed79ca2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -20,6 +20,7 @@ #define __WINE_DXGI_PRIVATE_H #include "wine/debug.h" +#include "wine/heap.h" #include <assert.h> diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 832e2cb..50b7941 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory4 *iface) wined3d_decref(factory->wined3d); wined3d_mutex_unlock(); wined3d_private_store_cleanup(&factory->private_store); - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); } return refcount; @@ -547,13 +547,13 @@ HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) struct dxgi_factory *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = dxgi_factory_init(object, extended))) { WARN("Failed to initialize factory, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 9659c85..2b168fb 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) { wined3d_private_store_cleanup(&output->private_store); IWineDXGIAdapter_Release(&output->adapter->IWineDXGIAdapter_iface); - HeapFree(GetProcessHeap(), 0, output); + heap_free(output); } return refcount; @@ -447,7 +447,7 @@ static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *ad HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) { - if (!(*output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**output)))) + if (!(*output = heap_alloc_zero(sizeof(**output)))) return E_OUTOFMEMORY; dxgi_output_init(*output, adapter); diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 36fc1e6..ad72a2c 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) if (!refcount) { wined3d_private_store_cleanup(&surface->private_store); - HeapFree(GetProcessHeap(), 0, surface); + heap_free(surface); } return refcount; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e5d06c3..1f88d71 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -645,7 +645,7 @@ static void STDMETHODCALLTYPE dxgi_swapchain_wined3d_object_released(void *paren struct dxgi_swapchain *swapchain = parent; wined3d_private_store_cleanup(&swapchain->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops dxgi_swapchain_wined3d_parent_ops =

1 0

Nikolay Sivov : comctl32/button: Use push button paint handler for split and command link buttons.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 598d36993430023a6f53aa341d2e7e3e2f171c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598d36993430023a6f53aa34… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:50:22 2018 +0300 comctl32/button: Use push button paint handler for split and command link buttons. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index de036c6..b0eea99 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -120,7 +120,11 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BST_UNCHECKED, /* BS_USERBUTTON */ BST_CHECKED, /* BS_AUTORADIOBUTTON */ BST_UNCHECKED, /* BS_PUSHBOX */ - BST_UNCHECKED /* BS_OWNERDRAW */ + BST_UNCHECKED, /* BS_OWNERDRAW */ + BST_UNCHECKED, /* BS_SPLITBUTTON */ + BST_UNCHECKED, /* BS_DEFSPLITBUTTON */ + BST_UNCHECKED, /* BS_COMMANDLINK */ + BST_UNCHECKED /* BS_DEFCOMMANDLINK */ }; typedef void (*pfPaint)( HWND hwnd, HDC hdc, UINT action ); @@ -138,7 +142,11 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = UB_Paint, /* BS_USERBUTTON */ CB_Paint, /* BS_AUTORADIOBUTTON */ NULL, /* BS_PUSHBOX */ - OB_Paint /* BS_OWNERDRAW */ + OB_Paint, /* BS_OWNERDRAW */ + PB_Paint, /* BS_SPLITBUTTON */ + PB_Paint, /* BS_DEFSPLITBUTTON */ + PB_Paint, /* BS_COMMANDLINK */ + PB_Paint /* BS_DEFCOMMANDLINK */ }; /*********************************************************************

1 0

Michael Stefaniuc : wbemdisp: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 55d367fb6f96129d0970841ca871ee2253b79840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55d367fb6f96129d0970841c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:16 2018 +0100 wbemdisp: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 1 + dlls/wbemdisp/main.c | 1 + dlls/wbemdisp/wbemdisp_private.h | 10 ---------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index d1be48f..e782d1f 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -30,6 +30,7 @@ #include "wbemdisp.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wbemdisp_private.h" #include "wbemdisp_classes.h" diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 97cd1e7..9d9b0ad 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -29,6 +29,7 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wbemdisp_private.h" #include "wbemdisp_classes.h" diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h index 2891248..b03a13e 100644 --- a/dlls/wbemdisp/wbemdisp_private.h +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -17,13 +17,3 @@ */ HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -}

1 0

Nikolay Sivov : comctl32/tests: Remove some workarounds in ListBox tests.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e6d315bab6f283457d53bd6c2b22da70e7e36f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6d315bab6f283457d53bd6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:50:25 2018 +0300 comctl32/tests: Remove some workarounds in ListBox tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listbox.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 23aaac2..4d80bea 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -26,6 +26,7 @@ #include "wingdi.h" #include "winuser.h" #include "winnls.h" +#include "commctrl.h" #include "wine/test.h" #include "v6util.h" @@ -50,7 +51,7 @@ static HWND create_listbox(DWORD add_style, HWND parent) if (parent) ctl_id=1; - handle = CreateWindowA("LISTBOX", "TestList", (LBS_STANDARD & ~LBS_SORT) | add_style, 0, 0, 100, 100, + handle = CreateWindowA(WC_LISTBOXA, "TestList", (LBS_STANDARD & ~LBS_SORT) | add_style, 0, 0, 100, 100, parent, (HMENU)ctl_id, NULL, 0); ok(handle != NULL, "Failed to create listbox window.\n"); @@ -207,7 +208,7 @@ static void test_item_height(void) DestroyWindow (hLB); - hLB = CreateWindowA("LISTBOX", "TestList", LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, NULL, NULL, NULL, 0); + hLB = CreateWindowA(WC_LISTBOXA, "TestList", LBS_OWNERDRAWVARIABLE, 0, 0, 100, 100, NULL, NULL, NULL, 0); itemHeight = SendMessageA(hLB, LB_GETITEMHEIGHT, 0, 0); ok(itemHeight > 0 && itemHeight <= tm.tmHeight, "Unexpected item height %d, expected %d.\n", @@ -430,7 +431,7 @@ static void test_listbox_height(void) HWND hList; int r, id; - hList = CreateWindowA( "ListBox", "list test", 0, + hList = CreateWindowA( WC_LISTBOXA, "list test", 0, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ok( hList != NULL, "failed to create listbox\n"); @@ -470,21 +471,20 @@ static void test_itemfrompoint(void) without caption). LBS_NOINTEGRALHEIGHT is required in order to test behavior of partially-displayed item. */ - HWND hList = CreateWindowA( "ListBox", "list test", + HWND hList = CreateWindowA( WC_LISTBOXA, "list test", WS_VISIBLE|WS_POPUP|LBS_NOINTEGRALHEIGHT, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ULONG r, id; RECT rc; - /* For an empty listbox win2k returns 0x1ffff, win98 returns 0x10000, nt4 returns 0xffffffff */ r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 30 )); - ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + ok( r == MAKELPARAM(0xffff, 1), "Unexpected ret value %#x.\n", r ); r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 700, 30 )); - ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + ok( r == MAKELPARAM(0xffff, 1), "Unexpected ret value %#x.\n", r ); r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( 30, 300 )); - ok( r == 0x1ffff || r == 0x10000 || r == 0xffffffff, "ret %x\n", r ); + ok( r == MAKELPARAM(0xffff, 1), "Unexpected ret value %#x.\n", r ); id = SendMessageA( hList, LB_ADDSTRING, 0, (LPARAM) "hi"); ok( id == 0, "item id wrong\n"); @@ -495,7 +495,7 @@ static void test_itemfrompoint(void) ok( r == 0x1, "ret %x\n", r ); r = SendMessageA(hList, LB_ITEMFROMPOINT, 0, MAKELPARAM( /* x */ 30, /* y */ 601 )); - ok( r == 0x10001, "ret %x\n", r ); + ok( r == MAKELPARAM(1, 1), "Unexpected ret value %#x.\n", r ); /* Resize control so that below assertions about sizes are valid */ r = SendMessageA( hList, LB_GETITEMRECT, 0, (LPARAM)&rc); @@ -551,7 +551,7 @@ static void test_listbox_item_data(void) HWND hList; int r, id; - hList = CreateWindowA( "ListBox", "list test", 0, + hList = CreateWindowA( WC_LISTBOXA, "list test", 0, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); ok( hList != NULL, "failed to create listbox\n"); @@ -591,7 +591,7 @@ static void test_listbox_LB_DIR(void) one file that fits the wildcard w*.c . Normally, the test directory itself satisfies both conditions. */ - hList = CreateWindowA( "ListBox", "list test", WS_VISIBLE|WS_POPUP, + hList = CreateWindowA( WC_LISTBOXA, "list test", WS_VISIBLE|WS_POPUP, 1, 1, 600, 100, NULL, NULL, NULL, NULL ); assert(hList); @@ -902,7 +902,7 @@ static void test_listbox_LB_DIR(void) strcpy(pathBuffer, wildcard); SendMessageA(hList, LB_RESETCONTENT, 0, 0); res = SendMessageA(hList, LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, (LPARAM)pathBuffer); - ok (res != -1 || broken(res == -1), "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", + ok (res != -1, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err %u\n", GetLastError()); itemCount = SendMessageA(hList, LB_GETCOUNT, 0, 0); @@ -1010,11 +1010,11 @@ static HWND g_label; static BOOL on_listbox_container_create(HWND hwnd, CREATESTRUCTA *lpcs) { - g_label = CreateWindowA("Static", "Contents of static control before DlgDirList.", + g_label = CreateWindowA(WC_STATICA, "Contents of static control before DlgDirList.", WS_CHILD | WS_VISIBLE, 10, 10, 512, 32, hwnd, (HMENU)ID_TEST_LABEL, NULL, 0); if (!g_label) return FALSE; - g_listBox = CreateWindowA("ListBox", "DlgDirList test", + g_listBox = CreateWindowA(WC_LISTBOXA, "DlgDirList test", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER | WS_VSCROLL, 10, 60, 256, 256, hwnd, (HMENU)ID_TEST_LISTBOX, NULL, 0); if (!g_listBox) return FALSE;

1 0

Michael Stefaniuc : wmiutils: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 25692aefe0dfd2d09898f294f4790e6290e58c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=25692aefe0dfd2d09898f294… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:22 2018 +0100 wmiutils: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/wmiutils_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 6782bd8..6195f21 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -16,31 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst;

1 0

Michael Stefaniuc : wer: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 5da20294186873758badfbee0cd0238e9289c7f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da20294186873758badfbee… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:19 2018 +0100 wer: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wer/main.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index da44aa7..75a22a5 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winreg.h" #include "werapi.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -56,20 +57,6 @@ static const WCHAR regpath_exclude[] = 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; -/*********************************************************************** - * Memory allocation helper - */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);

1 0

Michael Stefaniuc : winhttp: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 91040ba231b3c465c31c531575b1be5ba132413d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91040ba231b3c465c31c5315… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:20 2018 +0100 winhttp: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/winhttp_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ee41481..0eb0dea 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -23,6 +23,7 @@ # error You must include config.h to use this header #endif +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -322,31 +323,11 @@ void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; extern HRESULT WinHttpRequest_create( void ** ) DECLSPEC_HIDDEN; void release_typelib( void ) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, size ); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero( LPVOID mem, SIZE_T size ) { return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size ); } -static inline BOOL heap_free( LPVOID mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst;

1 0

Jacek Caban : mshtml: Added IDOMKeyboardEvent stub implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: fff36a7896d92b129f526a226dab2208fd2aac8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fff36a7896d92b129f526a22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:48 2018 +0100 mshtml: Added IDOMKeyboardEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 187 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 2 + dlls/mshtml/tests/events.c | 15 ++++ 3 files changed, 204 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9ffce28..a574c26 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -855,6 +855,8 @@ static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, voi *ppv = &This->IDOMUIEvent_iface; else if(This->mouse_event && IsEqualGUID(&IID_IDOMMouseEvent, riid)) *ppv = &This->IDOMMouseEvent_iface; + else if(This->keyboard_event && IsEqualGUID(&IID_IDOMKeyboardEvent, riid)) + *ppv = &This->IDOMKeyboardEvent_iface; else if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; else { @@ -1636,6 +1638,186 @@ static const IDOMMouseEventVtbl DOMMouseEventVtbl = { DOMMouseEvent_get_which }; +static inline DOMEvent *impl_from_IDOMKeyboardEvent(IDOMKeyboardEvent *iface) +{ + return CONTAINING_RECORD(iface, DOMEvent, IDOMKeyboardEvent_iface); +} + +static HRESULT WINAPI DOMKeyboardEvent_QueryInterface(IDOMKeyboardEvent *iface, REFIID riid, void **ppv) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDOMEvent_QueryInterface(&This->IDOMEvent_iface, riid, ppv); +} + +static ULONG WINAPI DOMKeyboardEvent_AddRef(IDOMKeyboardEvent *iface) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDOMEvent_AddRef(&This->IDOMEvent_iface); +} + +static ULONG WINAPI DOMKeyboardEvent_Release(IDOMKeyboardEvent *iface) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDOMEvent_Release(&This->IDOMEvent_iface); +} + +static HRESULT WINAPI DOMKeyboardEvent_GetTypeInfoCount(IDOMKeyboardEvent *iface, UINT *pctinfo) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DOMKeyboardEvent_GetTypeInfo(IDOMKeyboardEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DOMKeyboardEvent_GetIDsOfNames(IDOMKeyboardEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI DOMKeyboardEvent_Invoke(IDOMKeyboardEvent *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DOMKeyboardEvent_get_key(IDOMKeyboardEvent *iface, BSTR *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_location(IDOMKeyboardEvent *iface, ULONG *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_ctrlKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_shiftKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_altKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_metaKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_repeat(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_getModifierState(IDOMKeyboardEvent *iface, BSTR key, + VARIANT_BOOL *state) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(key), state); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_initKeyboardEvent(IDOMKeyboardEvent *iface, BSTR type, + VARIANT_BOOL can_bubble, VARIANT_BOOL cancelable, IHTMLWindow2 *view, BSTR key, + ULONG location, BSTR modifiers_list, VARIANT_BOOL repeat, BSTR locale) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%s %x %x %p %s %u %s %x %s)\n", This, debugstr_w(type), can_bubble, + cancelable, view, debugstr_w(key), location, debugstr_w(modifiers_list), + repeat, debugstr_w(locale)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_keyCode(IDOMKeyboardEvent *iface, LONG *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_charCode(IDOMKeyboardEvent *iface, LONG *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_which(IDOMKeyboardEvent *iface, LONG *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_char(IDOMKeyboardEvent *iface, VARIANT *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMKeyboardEvent_get_locale(IDOMKeyboardEvent *iface, BSTR *p) +{ + DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IDOMKeyboardEventVtbl DOMKeyboardEventVtbl = { + DOMKeyboardEvent_QueryInterface, + DOMKeyboardEvent_AddRef, + DOMKeyboardEvent_Release, + DOMKeyboardEvent_GetTypeInfoCount, + DOMKeyboardEvent_GetTypeInfo, + DOMKeyboardEvent_GetIDsOfNames, + DOMKeyboardEvent_Invoke, + DOMKeyboardEvent_get_key, + DOMKeyboardEvent_get_location, + DOMKeyboardEvent_get_ctrlKey, + DOMKeyboardEvent_get_shiftKey, + DOMKeyboardEvent_get_altKey, + DOMKeyboardEvent_get_metaKey, + DOMKeyboardEvent_get_repeat, + DOMKeyboardEvent_getModifierState, + DOMKeyboardEvent_initKeyboardEvent, + DOMKeyboardEvent_get_keyCode, + DOMKeyboardEvent_get_charCode, + DOMKeyboardEvent_get_which, + DOMKeyboardEvent_get_char, + DOMKeyboardEvent_get_locale +}; + static const tid_t DOMEvent_iface_tids[] = { IDOMEvent_tid, 0 @@ -1689,6 +1871,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; event->IDOMUIEvent_iface.lpVtbl = &DOMUIEventVtbl; event->IDOMMouseEvent_iface.lpVtbl = &DOMMouseEventVtbl; + event->IDOMKeyboardEvent_iface.lpVtbl = &DOMKeyboardEventVtbl; event->ref = 1; event->event_id = event_id; if(event_id != EVENTID_LAST) { @@ -1718,6 +1901,10 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) else event->mouse_event = NULL; + nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMKeyEvent, (void**)&event->keyboard_event); + if(NS_FAILED(nsres)) + event->keyboard_event = NULL; + init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data); return event; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index fde9cb9..ccfa5f8 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -61,12 +61,14 @@ typedef struct { IDOMEvent IDOMEvent_iface; IDOMUIEvent IDOMUIEvent_iface; IDOMMouseEvent IDOMMouseEvent_iface; + IDOMKeyboardEvent IDOMKeyboardEvent_iface; LONG ref; nsIDOMEvent *nsevent; nsIDOMUIEvent *ui_event; nsIDOMMouseEvent *mouse_event; + nsIDOMKeyEvent *keyboard_event; eventid_t event_id; WCHAR *type; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d8dc8da..a219987 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2666,6 +2666,7 @@ static void test_iframe_connections(IHTMLDocument2 *doc) static void test_create_event(IHTMLDocument2 *doc) { + IDOMKeyboardEvent *keyboard_event; IDOMMouseEvent *mouse_event; IDocumentEvent *doc_event; IEventTarget *event_target; @@ -2756,6 +2757,20 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMEvent_Release(event); + str = a2bstr("KeyboardEvent"); + hres = IDocumentEvent_createEvent(doc_event, str, &event); + SysFreeString(str); + ok(hres == S_OK, "createEvent failed: %08x\n", hres); + + hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); + ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); + IDOMUIEvent_Release(ui_event); + hres = IDOMEvent_QueryInterface(event, &IID_IDOMKeyboardEvent, (void**)&keyboard_event); + ok(hres == S_OK, "QueryInterface(IID_IDOMKeyboardEvent returned %08x\n", hres); + IDOMKeyboardEvent_Release(keyboard_event); + + IDOMEvent_Release(event); + IDocumentEvent_Release(doc_event); }

1 0

Jacek Caban : mshtml: Added IDOMUIEvent::detail property implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 18ae7c7deb5f45f280cc02d436bb826f2977892d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ae7c7deb5f45f280cc02d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:20 2018 +0100 mshtml: Added IDOMUIEvent::detail property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b788b2e..a855b02 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1211,8 +1211,17 @@ static HRESULT WINAPI DOMUIEvent_get_view(IDOMUIEvent *iface, IHTMLWindow2 **p) static HRESULT WINAPI DOMUIEvent_get_detail(IDOMUIEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMUIEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 detail; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMUIEvent_GetDetail(This->ui_event, &detail); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = detail; + return S_OK; } static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARIANT_BOOL can_bubble,

1 0

Jacek Caban : mshtml: Added IDOMKeyboardEvent key state getters implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 4947c70fe27f343432ff017f21415ceb69426161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4947c70fe27f343432ff017f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:19 2018 +0100 mshtml: Added IDOMKeyboardEvent key state getters implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 65 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 14ab00d..c11f6d1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1715,36 +1715,81 @@ static HRESULT WINAPI DOMKeyboardEvent_get_location(IDOMKeyboardEvent *iface, UL static HRESULT WINAPI DOMKeyboardEvent_get_ctrlKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetCtrlKey(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_shiftKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetShiftKey(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_altKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetAltKey(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_metaKey(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetMetaKey(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_repeat(IDOMKeyboardEvent *iface, VARIANT_BOOL *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetRepeat(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = variant_bool(r); + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_getModifierState(IDOMKeyboardEvent *iface, BSTR key,

1 0

Jacek Caban : mshtml: Expose IDOMKeyboardEvent to scripts.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 169fde0d582d91eceabb4b400f9ed183149ecad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=169fde0d582d91eceabb4b40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:26 2018 +0100 mshtml: Expose IDOMKeyboardEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 17 ++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/events.js | 20 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c11f6d1..c77f2b7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1924,6 +1924,19 @@ static dispex_static_data_t DOMMouseEvent_dispex = { DOMMouseEvent_iface_tids }; +static const tid_t DOMKeyboardEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMUIEvent_tid, + IDOMKeyboardEvent_tid, + 0 +}; + +static dispex_static_data_t DOMKeyboardEvent_dispex = { + NULL, + DispDOMKeyboardEvent_tid, + DOMKeyboardEvent_iface_tids +}; + static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) { dispex_static_data_t *dispex_data = &DOMEvent_dispex; @@ -1972,7 +1985,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) event->mouse_event = NULL; nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMKeyEvent, (void**)&event->keyboard_event); - if(NS_FAILED(nsres)) + if(NS_SUCCEEDED(nsres)) + dispex_data = &DOMKeyboardEvent_dispex; + else event->keyboard_event = NULL; init_dispex(&event->dispex, (IUnknown*)&event->IDOMEvent_iface, dispex_data); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 79d0d6a..5ed6264 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -81,6 +81,7 @@ typedef struct EventTarget EventTarget; XDIID(DispCPlugins) \ XDIID(DispDOMChildrenCollection) \ XDIID(DispDOMEvent) \ + XDIID(DispDOMKeyboardEvent) \ XDIID(DispDOMMouseEvent) \ XDIID(DispDOMUIEvent) \ XDIID(DispHTMLAnchorElement) \ @@ -130,6 +131,7 @@ typedef struct EventTarget EventTarget; XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ XIID(IDOMEvent) \ + XIID(IDOMKeyboardEvent) \ XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 7d88852..bf37b3f 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -684,6 +684,25 @@ function test_ui_event() { next_test(); } +function test_keyboard_event() { + var e; + + e = document.createEvent("KeyboardEvent"); + + e.initEvent("test", true, true); + ok(e.key === "", "key = " + e.key); + ok(e.keyCode === 0, "keyCode = " + e.keyCode); + ok(e.charCode === 0, "charCode = " + e.charCode); + ok(e.repeat === false, "repeat = " + e.repeat); + ok(e.ctrlKey === false, "ctrlKey = " + e.ctrlKey); + ok(e.altKey === false, "altKey = " + e.altKey); + ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); + ok(e.metaKey === false, "metaKey = " + e.metaKey); + ok(e.detail === 0, "detail = " + e.detail); + + next_test(); +} + var tests = [ test_content_loaded, test_add_remove_listener, @@ -698,6 +717,7 @@ var tests = [ test_recursive_dispatch, test_ui_event, test_mouse_event, + test_keyboard_event, test_time_stamp, test_listener_order ];

1 0

Henri Verbeet : d3d9: Use wined3d_buffer_create() in indexbuffer_init().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 86baab093c05f91e836705bdf8ca0cd26c104cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86baab093c05f91e836705bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:18 2018 +0330 d3d9: Use wined3d_buffer_create() in indexbuffer_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 56a58bc..635483c 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -564,25 +564,25 @@ static const struct wined3d_parent_ops d3d9_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; + desc.byte_width = size; + desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) - { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; - } + desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; buffer->IDirect3DIndexBuffer9_iface.lpVtbl = &d3d9_indexbuffer_vtbl; buffer->format = wined3dformat_from_d3dformat(format); d3d9_resource_init(&buffer->resource); wined3d_mutex_lock(); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) {

1 0

Michael Stefaniuc : wbemprox: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: aae49dc7adcdd7e7d7f4c448017618849916a409 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae49dc7adcdd7e7d7f4c448… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:17 2018 +0100 wbemprox: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wbemprox_private.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 15ea9c6..54b1ba3 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -17,6 +17,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -227,26 +228,6 @@ HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassO HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst;

1 0

Michael Stefaniuc : webservices: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 0c91b5ebcdd6d429c3394f97bed406bf48119302 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c91b5ebcdd6d429c3394f97… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:18 2018 +0100 webservices: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 1 + dlls/webservices/error.c | 1 + dlls/webservices/heap.c | 1 + dlls/webservices/listener.c | 1 + dlls/webservices/msg.c | 1 + dlls/webservices/proxy.c | 1 + dlls/webservices/reader.c | 1 + dlls/webservices/string.c | 1 + dlls/webservices/url.c | 1 + dlls/webservices/webservices_private.h | 20 -------------------- dlls/webservices/writer.c | 1 + 11 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 0765e0d..685e13d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -25,6 +25,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index 747af2a..e4292db 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 080cc0d..5e1a273 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 41afb27..a178e27 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -23,6 +23,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index f4d167f..19a1076 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -25,6 +25,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index a4041fe..da30cb0 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 4c121d9..a56bb7e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -25,6 +25,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 45a5512..18c55e3 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "webservices_private.h" diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index e5e04e4..465857a 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -24,6 +24,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h" diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 3f6d2f4..cce49cc 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -394,27 +394,7 @@ static inline BOOL is_valid_parent( const struct node *node ) return (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 75cf7b4..9cba4e6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -28,6 +28,7 @@ #include "webservices.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "webservices_private.h"

1 0

Michael Stefaniuc : wininet: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: a6a059f8024116076982d704bff994378099a2d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a059f8024116076982d704… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:21 2018 +0100 wininet: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4cd1856..498a79b 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -24,6 +24,7 @@ #define _WINE_INTERNET_H_ #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #include <time.h> @@ -89,31 +90,11 @@ typedef struct BOOL is_valid_netconn(netconn_t *) DECLSPEC_HIDDEN; void close_netconn(netconn_t *) DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL;

1 0

Nikolay Sivov : comctl32: Introduce Button control.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 5d10abde503fc4a952c114c658fed74f97bff090 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d10abde503fc4a952c114c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:50:21 2018 +0300 comctl32: Introduce Button control. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/button.c | 1153 ++++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 2 + dlls/comctl32/tests/button.c | 18 +- dlls/comctl32/tests/misc.c | 3 +- dlls/user32/class.c | 1 - 7 files changed, 1164 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d10abde503fc4a952c1…

1 0

Nikolay Sivov : comctl32/monthcal: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 26cce5550c5afe7c5139f4719c834293c383148c URL: https://source.winehq.org/git/wine.git/?a=commit;h=26cce5550c5afe7c5139f471… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 6 08:50:24 2018 +0300 comctl32/monthcal: Use the global HeapAlloc() wrappers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b94345c..9d00094 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -56,6 +56,7 @@ #include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(monthcal); @@ -1966,7 +1967,7 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmds.nmhdr.code = MCN_GETDAYSTATE; nmds.cDayState = MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0); - nmds.prgDayState = state = Alloc(nmds.cDayState * sizeof(MONTHDAYSTATE)); + nmds.prgDayState = state = heap_alloc_zero(nmds.cDayState * sizeof(MONTHDAYSTATE)); MONTHCAL_GetMinDate(infoPtr, &nmds.stStart); nmds.stStart.wDay = 1; @@ -1975,7 +1976,7 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) memcpy(infoPtr->monthdayState, nmds.prgDayState, MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); - Free(state); + heap_free(state); } /* no valid range check performed */ @@ -2615,9 +2616,9 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) { infoPtr->dim.cx = x; infoPtr->dim.cy = y; - infoPtr->calendars = ReAlloc(infoPtr->calendars, MONTHCAL_GetCalCount(infoPtr)*sizeof(CALENDAR_INFO)); + infoPtr->calendars = heap_realloc(infoPtr->calendars, MONTHCAL_GetCalCount(infoPtr)*sizeof(CALENDAR_INFO)); - infoPtr->monthdayState = ReAlloc(infoPtr->monthdayState, + infoPtr->monthdayState = heap_realloc(infoPtr->monthdayState, MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); MONTHCAL_NotifyDayState(infoPtr); @@ -2773,7 +2774,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) MONTHCAL_INFO *infoPtr; /* allocate memory for info structure */ - infoPtr = Alloc(sizeof(MONTHCAL_INFO)); + infoPtr = heap_alloc_zero(sizeof(*infoPtr)); SetWindowLongPtrW(hwnd, 0, (DWORD_PTR)infoPtr); if (infoPtr == NULL) { @@ -2785,9 +2786,9 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->hwndNotify = lpcs->hwndParent; infoPtr->dwStyle = GetWindowLongW(hwnd, GWL_STYLE); infoPtr->dim.cx = infoPtr->dim.cy = 1; - infoPtr->calendars = Alloc(sizeof(CALENDAR_INFO)); + infoPtr->calendars = heap_alloc_zero(sizeof(CALENDAR_INFO)); if (!infoPtr->calendars) goto fail; - infoPtr->monthdayState = Alloc(3*sizeof(MONTHDAYSTATE)); + infoPtr->monthdayState = heap_alloc_zero(3 * sizeof(MONTHDAYSTATE)); if (!infoPtr->monthdayState) goto fail; /* initialize info structure */ @@ -2828,9 +2829,9 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) return 0; fail: - Free(infoPtr->monthdayState); - Free(infoPtr->calendars); - Free(infoPtr); + heap_free(infoPtr->monthdayState); + heap_free(infoPtr->calendars); + heap_free(infoPtr); return 0; } @@ -2840,8 +2841,8 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) INT i; /* free month calendar info data */ - Free(infoPtr->monthdayState); - Free(infoPtr->calendars); + heap_free(infoPtr->monthdayState); + heap_free(infoPtr->calendars); SetWindowLongPtrW(infoPtr->hwndSelf, 0, 0); CloseThemeData (GetWindowTheme (infoPtr->hwndSelf)); @@ -2849,7 +2850,7 @@ MONTHCAL_Destroy(MONTHCAL_INFO *infoPtr) for (i = 0; i < BrushLast; i++) DeleteObject(infoPtr->brushes[i]); for (i = 0; i < PenLast; i++) DeleteObject(infoPtr->pens[i]); - Free(infoPtr); + heap_free(infoPtr); return 0; }

1 0

Jacek Caban : mshtml: Expose IHTMLUIEvent to scripts.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 20159346c7403e22268be4386b7cd4e1229b482a URL: https://source.winehq.org/git/wine.git/?a=commit;h=20159346c7403e22268be438… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:35 2018 +0100 mshtml: Expose IHTMLUIEvent to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 17 ++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/events.js | 38 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a855b02..9ffce28 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1647,8 +1647,21 @@ static dispex_static_data_t DOMEvent_dispex = { DOMEvent_iface_tids }; +static const tid_t DOMUIEvent_iface_tids[] = { + IDOMEvent_tid, + IDOMUIEvent_tid, + 0 +}; + +static dispex_static_data_t DOMUIEvent_dispex = { + NULL, + DispDOMUIEvent_tid, + DOMUIEvent_iface_tids +}; + static const tid_t DOMMouseEvent_iface_tids[] = { IDOMEvent_tid, + IDOMUIEvent_tid, IDOMMouseEvent_tid, 0 }; @@ -1694,7 +1707,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) - time_epoch; nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMUIEvent, (void**)&event->ui_event); - if(NS_FAILED(nsres)) + if(NS_SUCCEEDED(nsres)) + dispex_data = &DOMUIEvent_dispex; + else event->ui_event = NULL; nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMMouseEvent, (void**)&event->mouse_event); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 83c30e6..79d0d6a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -82,6 +82,7 @@ typedef struct EventTarget EventTarget; XDIID(DispDOMChildrenCollection) \ XDIID(DispDOMEvent) \ XDIID(DispDOMMouseEvent) \ + XDIID(DispDOMUIEvent) \ XDIID(DispHTMLAnchorElement) \ XDIID(DispHTMLAreaElement) \ XDIID(DispHTMLAttributeCollection) \ @@ -130,6 +131,7 @@ typedef struct EventTarget EventTarget; XDIID(HTMLElementEvents2) \ XIID(IDOMEvent) \ XIID(IDOMMouseEvent) \ + XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index fd7a268..7d88852 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -610,6 +610,7 @@ function test_mouse_event() { ok(e.type === "test", "type = " + e.type); ok(e.cancelable === true, "cancelable = " + e.cancelable); ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.detail === 1, "detail = " + e.detail); ok(e.screenX === 2, "screenX = " + e.screenX); ok(e.screenY === 3, "screenY = " + e.screenY); ok(e.clientX === 4, "clientX = " + e.clientX); @@ -624,6 +625,7 @@ function test_mouse_event() { ok(e.type === "test", "type = " + e.type); ok(e.cancelable === false, "cancelable = " + e.cancelable); ok(e.bubbles === false, "bubbles = " + e.bubbles); + ok(e.detail === 9, "detail = " + e.detail); ok(e.screenX === 8, "screenX = " + e.screenX); ok(e.screenY === 7, "screenY = " + e.screenY); ok(e.clientX === 6, "clientX = " + e.clientX); @@ -638,6 +640,7 @@ function test_mouse_event() { ok(e.type === "testevent", "type = " + e.type); ok(e.cancelable === true, "cancelable = " + e.cancelable); ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.detail === 9, "detail = " + e.detail); ok(e.screenX === 8, "screenX = " + e.screenX); ok(e.screenY === 7, "screenY = " + e.screenY); ok(e.clientX === 6, "clientX = " + e.clientX); @@ -648,6 +651,36 @@ function test_mouse_event() { ok(e.metaKey === true, "metaKey = " + e.metaKey); ok(e.button === 127, "button = " + e.button); + e.initUIEvent("testevent", true, true, window, 6); + ok(e.type === "testevent", "type = " + e.type); + ok(e.cancelable === true, "cancelable = " + e.cancelable); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.detail === 6, "detail = " + e.detail); + ok(e.screenX === 8, "screenX = " + e.screenX); + ok(e.screenY === 7, "screenY = " + e.screenY); + ok(e.clientX === 6, "clientX = " + e.clientX); + ok(e.clientY === 5, "clientY = " + e.clientY); + ok(e.ctrlKey === true, "ctrlKey = " + e.ctrlKey); + ok(e.altKey === true, "altKey = " + e.altKey); + ok(e.shiftKey === true, "shiftKey = " + e.shiftKey); + ok(e.metaKey === true, "metaKey = " + e.metaKey); + ok(e.button === 127, "button = " + e.button); + + next_test(); +} + +function test_ui_event() { + var e; + + e = document.createEvent("UIEvent"); + ok(e.detail === 0, "detail = " + e.detail); + + e.initUIEvent("test", true, true, window, 3); + ok(e.type === "test", "type = " + e.type); + ok(e.cancelable === true, "cancelable = " + e.cancelable); + ok(e.bubbles === true, "bubbles = " + e.bubbles); + ok(e.detail === 3, "detail = " + e.detail); + next_test(); } @@ -663,7 +696,8 @@ var tests = [ test_current_target, test_dispatch_event, test_recursive_dispatch, + test_ui_event, + test_mouse_event, test_time_stamp, - test_listener_order, - test_mouse_event + test_listener_order ];

1 0

Michael Stefaniuc : usp10: Use the global HeapAlloc() wrappers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: b21eb6733fab6d777886a8e0271cecb8a5a9fbdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21eb6733fab6d777886a8e0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 6 01:07:15 2018 +0100 usp10: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 1 + dlls/usp10/breaking.c | 1 + dlls/usp10/indic.c | 1 + dlls/usp10/opentype.c | 1 + dlls/usp10/shape.c | 1 + dlls/usp10/usp10.c | 1 + dlls/usp10/usp10_internal.h | 15 --------------- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 5941ef8..d94dc7b 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -52,6 +52,7 @@ #include "usp10.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "usp10_internal.h" diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index f5e40ac..9b12d9e 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -32,6 +32,7 @@ #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index c9b0810..5a228e8 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -32,6 +32,7 @@ #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1fd9c4d..2d708a8 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -32,6 +32,7 @@ #include "usp10_internal.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b75be60..ca084e7 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -32,6 +32,7 @@ #include "usp10_internal.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 17f60a1..5f50332 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -39,6 +39,7 @@ #include "usp10_internal.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 832d894..eae0255 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -219,21 +219,6 @@ typedef struct { enum {lex_Halant, lex_Composed_Vowel, lex_Matra_post, lex_Matra_pre, lex_Matra_above, lex_Matra_below, lex_ZWJ, lex_ZWNJ, lex_NBSP, lex_Modifier, lex_Vowel, lex_Consonant, lex_Generic, lex_Ra, lex_Vedic, lex_Anudatta, lex_Nukta}; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline BOOL is_consonant( int type ) { return (type == lex_Ra || type == lex_Consonant);

1 0

Henri Verbeet : d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_index_buffer().
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 112579f4ba8e81e5983f01c898a82dc77c7b9ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=112579f4ba8e81e5983f01c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 6 03:22:17 2018 +0330 d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_index_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7faf8e7..590ab45 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2196,15 +2196,22 @@ static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; }

1 0

Jacek Caban : mshtml: Added key and char code IDOMKeyboardEvent getters implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: e9f0b4ff610b78717ea48257da070f2f97595bc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9f0b4ff610b78717ea48257… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:10:07 2018 +0100 mshtml: Added key and char code IDOMKeyboardEvent getters implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a574c26..14ab00d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1694,8 +1694,15 @@ static HRESULT WINAPI DOMKeyboardEvent_Invoke(IDOMKeyboardEvent *iface, DISPID d static HRESULT WINAPI DOMKeyboardEvent_get_key(IDOMKeyboardEvent *iface, BSTR *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString key_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + + nsAString_Init(&key_str, NULL); + nsres = nsIDOMKeyEvent_GetKey(This->keyboard_event, &key_str); + return return_nsstr(nsres, &key_str, p); } static HRESULT WINAPI DOMKeyboardEvent_get_location(IDOMKeyboardEvent *iface, ULONG *p) @@ -1762,15 +1769,33 @@ static HRESULT WINAPI DOMKeyboardEvent_initKeyboardEvent(IDOMKeyboardEvent *ifac static HRESULT WINAPI DOMKeyboardEvent_get_keyCode(IDOMKeyboardEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetKeyCode(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_charCode(IDOMKeyboardEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMKeyboardEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMKeyEvent_GetKeyCode(This->keyboard_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMKeyboardEvent_get_which(IDOMKeyboardEvent *iface, LONG *p)

1 0

Jacek Caban : mshtml: Added IDOMUIEvent::initUIEvent implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: f5a0252670e3d1687f2fafa5a3a6fd450b4e14c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5a0252670e3d1687f2fafa5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:09 2018 +0100 mshtml: Added IDOMUIEvent::initUIEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 88b9e85..b788b2e 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1219,8 +1219,31 @@ static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARI VARIANT_BOOL cancelable, IHTMLWindow2 *view, LONG detail) { DOMEvent *This = impl_from_IDOMUIEvent(iface); - FIXME("(%p)->(%s %x %x %p %x)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail); - return E_NOTIMPL; + nsAString type_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %x %x %p %x)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail); + + if(This->target) { + TRACE("called on already dispatched event\n"); + return S_OK; + } + + hres = IDOMEvent_initEvent(&This->IDOMEvent_iface, type, can_bubble, cancelable); + if(FAILED(hres)) + return hres; + + nsAString_InitDepend(&type_str, type); + nsres = nsIDOMUIEvent_InitUIEvent(This->ui_event, &type_str, can_bubble, cancelable, + NULL /* FIXME */, detail); + nsAString_Finish(&type_str); + if(NS_FAILED(nsres)) { + FIXME("InitUIEvent failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static const IDOMUIEventVtbl DOMUIEventVtbl = {

1 0

Jacek Caban : mshtml: Added IDOMUIEvent stub implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 28e2f7a85ecd2f5a9ab418feda918fbc53aa9a11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e2f7a85ecd2f5a9ab418fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:08:46 2018 +0100 mshtml: Added IDOMUIEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlevent.h | 2 + dlls/mshtml/tests/events.c | 19 +++++++++ 3 files changed, 120 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 633c1f9..6c51819 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -861,6 +861,8 @@ static HRESULT WINAPI DOMEvent_QueryInterface(IDOMEvent *iface, REFIID riid, voi *ppv = &This->IDOMEvent_iface; else if(IsEqualGUID(&IID_IDOMEvent, riid)) *ppv = &This->IDOMEvent_iface; + else if(This->ui_event && IsEqualGUID(&IID_IDOMUIEvent, riid)) + *ppv = &This->IDOMUIEvent_iface; else if(This->mouse_event && IsEqualGUID(&IID_IDOMMouseEvent, riid)) *ppv = &This->IDOMMouseEvent_iface; else if(dispex_query_interface(&This->dispex, riid, ppv)) @@ -893,6 +895,10 @@ static ULONG WINAPI DOMEvent_Release(IDOMEvent *iface) TRACE("(%p) ref=%u\n", This, ref); if(!ref) { + if(This->ui_event) + nsIDOMUIEvent_Release(This->ui_event); + if(This->mouse_event) + nsIDOMMouseEvent_Release(This->mouse_event); if(This->target) IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); nsIDOMEvent_Release(This->nsevent); @@ -1152,6 +1158,94 @@ static const IDOMEventVtbl DOMEventVtbl = { DOMEvent_get_srcElement }; +static inline DOMEvent *impl_from_IDOMUIEvent(IDOMUIEvent *iface) +{ + return CONTAINING_RECORD(iface, DOMEvent, IDOMUIEvent_iface); +} + +static HRESULT WINAPI DOMUIEvent_QueryInterface(IDOMUIEvent *iface, REFIID riid, void **ppv) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDOMEvent_QueryInterface(&This->IDOMEvent_iface, riid, ppv); +} + +static ULONG WINAPI DOMUIEvent_AddRef(IDOMUIEvent *iface) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDOMEvent_AddRef(&This->IDOMEvent_iface); +} + +static ULONG WINAPI DOMUIEvent_Release(IDOMUIEvent *iface) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDOMEvent_Release(&This->IDOMEvent_iface); +} + +static HRESULT WINAPI DOMUIEvent_GetTypeInfoCount(IDOMUIEvent *iface, UINT *pctinfo) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DOMUIEvent_GetTypeInfo(IDOMUIEvent *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DOMUIEvent_GetIDsOfNames(IDOMUIEvent *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI DOMUIEvent_Invoke(IDOMUIEvent *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DOMUIEvent_get_view(IDOMUIEvent *iface, IHTMLWindow2 **p) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMUIEvent_get_detail(IDOMUIEvent *iface, LONG *p) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI DOMUIEvent_initUIEvent(IDOMUIEvent *iface, BSTR type, VARIANT_BOOL can_bubble, + VARIANT_BOOL cancelable, IHTMLWindow2 *view, LONG detail) +{ + DOMEvent *This = impl_from_IDOMUIEvent(iface); + FIXME("(%p)->(%s %x %x %p %x)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail); + return E_NOTIMPL; +} + +static const IDOMUIEventVtbl DOMUIEventVtbl = { + DOMUIEvent_QueryInterface, + DOMUIEvent_AddRef, + DOMUIEvent_Release, + DOMUIEvent_GetTypeInfoCount, + DOMUIEvent_GetTypeInfo, + DOMUIEvent_GetIDsOfNames, + DOMUIEvent_Invoke, + DOMUIEvent_get_view, + DOMUIEvent_get_detail, + DOMUIEvent_initUIEvent +}; + static inline DOMEvent *impl_from_IDOMMouseEvent(IDOMMouseEvent *iface) { return CONTAINING_RECORD(iface, DOMEvent, IDOMMouseEvent_iface); @@ -1558,6 +1652,7 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) return NULL; event->IDOMEvent_iface.lpVtbl = &DOMEventVtbl; + event->IDOMUIEvent_iface.lpVtbl = &DOMUIEventVtbl; event->IDOMMouseEvent_iface.lpVtbl = &DOMMouseEventVtbl; event->ref = 1; event->event_id = event_id; @@ -1576,6 +1671,10 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, eventid_t event_id) event->time_stamp = (((ULONGLONG)time.dwHighDateTime<<32) + time.dwLowDateTime) / 10000 - time_epoch; + nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMUIEvent, (void**)&event->ui_event); + if(NS_FAILED(nsres)) + event->ui_event = NULL; + nsres = nsIDOMEvent_QueryInterface(nsevent, &IID_nsIDOMMouseEvent, (void**)&event->mouse_event); if(NS_SUCCEEDED(nsres)) dispex_data = &DOMMouseEvent_dispex; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index d1b8470..fde9cb9 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -59,11 +59,13 @@ typedef enum { typedef struct { DispatchEx dispex; IDOMEvent IDOMEvent_iface; + IDOMUIEvent IDOMUIEvent_iface; IDOMMouseEvent IDOMMouseEvent_iface; LONG ref; nsIDOMEvent *nsevent; + nsIDOMUIEvent *ui_event; nsIDOMMouseEvent *mouse_event; eventid_t event_id; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ef9b102..d8dc8da 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2669,6 +2669,7 @@ static void test_create_event(IHTMLDocument2 *doc) IDOMMouseEvent *mouse_event; IDocumentEvent *doc_event; IEventTarget *event_target; + IDOMUIEvent *ui_event; IHTMLElement *elem; IDOMEvent *event; VARIANT_BOOL b; @@ -2721,6 +2722,8 @@ static void test_create_event(IHTMLDocument2 *doc) IEventTarget_Release(event_target); + hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); hres = IDOMEvent_QueryInterface(event, &IID_IDOMMouseEvent, (void**)&mouse_event); ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); @@ -2731,12 +2734,28 @@ static void test_create_event(IHTMLDocument2 *doc) SysFreeString(str); ok(hres == S_OK, "createEvent failed: %08x\n", hres); + hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); + ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); + IDOMUIEvent_Release(ui_event); hres = IDOMEvent_QueryInterface(event, &IID_IDOMMouseEvent, (void**)&mouse_event); ok(hres == S_OK, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); IDOMMouseEvent_Release(mouse_event); IDOMEvent_Release(event); + str = a2bstr("UIEvent"); + hres = IDocumentEvent_createEvent(doc_event, str, &event); + SysFreeString(str); + ok(hres == S_OK, "createEvent failed: %08x\n", hres); + + hres = IDOMEvent_QueryInterface(event, &IID_IDOMUIEvent, (void**)&ui_event); + ok(hres == S_OK, "QueryInterface(IID_IDOMUIEvent returned %08x\n", hres); + IDOMUIEvent_Release(ui_event); + hres = IDOMEvent_QueryInterface(event, &IID_IDOMMouseEvent, (void**)&mouse_event); + ok(hres == E_NOINTERFACE, "QueryInterface(IID_IDOMMouseEvent returned %08x\n", hres); + + IDOMEvent_Release(event); + IDocumentEvent_Release(doc_event); }

1 0

Jacek Caban : mshtml: Use nsIDOMUIEvent stored in DOMEvent in IHTMLEventObj::get_[xy] implementation.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: wine Branch: master Commit: 90bccb498af821597e52f49e244eb565e68b808e URL: https://source.winehq.org/git/wine.git/?a=commit;h=90bccb498af821597e52f49e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 6 00:09:01 2018 +0100 mshtml: Use nsIDOMUIEvent stored in DOMEvent in IHTMLEventObj::get_[xy] implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6c51819..88b9e85 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -635,17 +635,12 @@ static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMUIEvent *ui_event; + if(This->event && This->event->ui_event) { nsresult nsres; - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); - if(NS_SUCCEEDED(nsres)) { - /* NOTE: pageX is not exactly right here. */ - nsres = nsIDOMUIEvent_GetPageX(ui_event, &x); - assert(nsres == NS_OK); - nsIDOMUIEvent_Release(ui_event); - } + /* NOTE: pageX is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageX(This->event->ui_event, &x); + assert(nsres == NS_OK); } *p = x; @@ -659,17 +654,12 @@ static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - if(This->event) { - nsIDOMUIEvent *ui_event; + if(This->event && This->event->ui_event) { nsresult nsres; - nsres = nsIDOMEvent_QueryInterface(This->event->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); - if(NS_SUCCEEDED(nsres)) { - /* NOTE: pageY is not exactly right here. */ - nsres = nsIDOMUIEvent_GetPageY(ui_event, &y); - assert(nsres == NS_OK); - nsIDOMUIEvent_Release(ui_event); - } + /* NOTE: pageY is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageY(This->event->ui_event, &y); + assert(nsres == NS_OK); } *p = y;

1 0

Francois Gouget : testbot/web: Add the job' s remarks as a tooltip on the activity page.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: tools Branch: master Commit: ad65021749ba75744e5b3decb63010efe1b2e072 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ad65021749ba75744e5b3de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 6 03:12:10 2018 +0100 testbot/web: Add the job's remarks as a tooltip on the activity page. This allows getting a quick sense of what the task is about without having to change page or bloating the content of the table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Activity.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 6ca3199..13c77c6 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -228,7 +228,9 @@ EOF $Label .= "/64" if ($Bitness); } } - $Label = "<a href='/JobDetails.pl?Key=". $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No) ."'>$Label</a>"; + my $Key = $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No); + my $Title = $self->escapeHTML($VMStatus->{job}->Remarks); + $Label = "<a href='/JobDetails.pl?Key=$Key' title='$Title'>$Label</a>"; } elsif ($VMStatus->{status} eq "dirty") {

1 0

Francois Gouget : testbot: Simplify computing the min and max activity values.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: tools Branch: master Commit: ab64e577473ba0546d10341fee81cd20c77b4329 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ab64e577473ba0546d10341… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 6 02:57:08 2018 +0100 testbot: Simplify computing the min and max activity values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Activity.pm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 2c21d9f..a2bd1b0 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -38,6 +38,17 @@ require Exporter; @EXPORT = qw(&GetActivity &GetStatistics); +sub _UpdateMin($$) +{ + $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); +} + +sub _UpdateMax($$) +{ + $_[0] = $_[1] if (!defined $_[0] or $_[0] < $_[1]); +} + + =pod =over 12 @@ -110,7 +121,7 @@ sub GetActivity($;$) start => $RecordGroup->Timestamp }; $ActivityHash->{$RecordGroup->Id} = $Group; push @$Activity, $Group; - $MinId = $RecordGroup->Id if (!defined $MinId or $RecordGroup->Id < $MinId); + _UpdateMin($MinId, $RecordGroup->Id); } if (!defined $MinId) { @@ -375,14 +386,8 @@ sub GetStatistics($) _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; - if (!exists $GlobalStats->{start} or $GlobalStats->{start} > $Job->Submitted) - { - $GlobalStats->{start} = $Job->Submitted; - } - if (!exists $GlobalStats->{end} or $GlobalStats->{end} < $Job->Ended) - { - $GlobalStats->{end} = $Job->Ended; - } + _UpdateMin($GlobalStats->{start}, $Job->Submitted); + _UpdateMax($GlobalStats->{end}, $Job->Ended); } } @@ -401,14 +406,8 @@ sub GetStatistics($) $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) { - if (!$VMsStats->{start} or $VMsStats->{start} > $Group->{start}) - { - $VMsStats->{start} = $Group->{start}; - } - if (!$VMsStats->{end} or $VMsStats->{end} < $Group->{end}) - { - $VMsStats->{end} = $Group->{end}; - } + _UpdateMin($VMsStats->{start}, $Group->{start}); + _UpdateMax($VMsStats->{end}, $Group->{end}); next if (!$Group->{statusvms}); my ($IsGroupBusy, %IsHostBusy);

1 0

Józef Kucia : libs/vkd3d: Use PFN prefix for function pointer typedefs.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: vkd3d Branch: master Commit: 65aab7b47b6ae7a2ce6056ff9957131c4fb25712 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=65aab7b47b6ae7a2ce6056f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:04 2018 +0100 libs/vkd3d: Use PFN prefix for function pointer typedefs. A more common convention, e.g. Vulkan uses it. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 52 ++++++++++++++++++------------------- libs/vkd3d-utils/vkd3d_utils_main.c | 2 +- libs/vkd3d/device.c | 12 ++++----- libs/vkd3d/vkd3d_private.h | 12 ++++----- tests/vkd3d_api.c | 8 +++--- 5 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 99a6222..6ec85db 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -34,24 +34,24 @@ extern "C" { #endif /* __cplusplus */ -typedef bool (*vkd3d_signal_event_pfn)(HANDLE event); +typedef bool (*PFN_vkd3d_signal_event)(HANDLE event); -typedef void * (*vkd3d_thread_pfn)(void *data); +typedef void * (*PFN_vkd3d_thread)(void *data); -typedef void * (*vkd3d_create_thread_pfn)(vkd3d_thread_pfn thread_main, void *data); -typedef bool (*vkd3d_join_thread_pfn)(void *thread); +typedef void * (*PFN_vkd3d_create_thread)(PFN_vkd3d_thread thread_main, void *data); +typedef bool (*PFN_vkd3d_join_thread)(void *thread); struct vkd3d_instance; struct vkd3d_instance_create_info { - vkd3d_signal_event_pfn signal_event_pfn; - vkd3d_create_thread_pfn create_thread_pfn; - vkd3d_join_thread_pfn join_thread_pfn; + PFN_vkd3d_signal_event pfn_signal_event; + PFN_vkd3d_create_thread pfn_create_thread; + PFN_vkd3d_join_thread pfn_join_thread; size_t wchar_size; /* If set to NULL, libvkd3d loads libvulkan. */ - PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr_pfn; + PFN_vkGetInstanceProcAddr pfn_vkGetInstanceProcAddr; const char * const *instance_extensions; uint32_t instance_extension_count; @@ -114,35 +114,35 @@ VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); /* * Function pointer typedefs for vkd3d functions. */ -typedef HRESULT (*vkd3d_create_instance_pfn)(const struct vkd3d_instance_create_info *create_info, +typedef HRESULT (*PFN_vkd3d_create_instance)(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); -typedef ULONG (*vkd3d_instance_decref_pfn)(struct vkd3d_instance *instance); -typedef VkInstance (*vkd3d_instance_get_vk_instance_pfn)(struct vkd3d_instance *instance); -typedef ULONG (*vkd3d_instance_incref_pfn)(struct vkd3d_instance *instance); +typedef ULONG (*PFN_vkd3d_instance_decref)(struct vkd3d_instance *instance); +typedef VkInstance (*PFN_vkd3d_instance_get_vk_instance)(struct vkd3d_instance *instance); +typedef ULONG (*PFN_vkd3d_instance_incref)(struct vkd3d_instance *instance); -typedef HRESULT (*vkd3d_create_device_pfn)(const struct vkd3d_device_create_info *create_info, +typedef HRESULT (*PFN_vkd3d_create_device)(const struct vkd3d_device_create_info *create_info, REFIID iid, void **device); -typedef IUnknown * (*vkd3d_get_device_parent_pfn)(ID3D12Device *device); -typedef VkDevice (*vkd3d_get_vk_device_pfn)(ID3D12Device *device); -typedef VkPhysicalDevice (*vkd3d_get_vk_physical_device_pfn)(ID3D12Device *device); -typedef struct vkd3d_instance * (*vkd3d_instance_from_device_pfn)(ID3D12Device *device); +typedef IUnknown * (*PFN_vkd3d_get_device_parent)(ID3D12Device *device); +typedef VkDevice (*PFN_vkd3d_get_vk_device)(ID3D12Device *device); +typedef VkPhysicalDevice (*PFN_vkd3d_get_vk_physical_device)(ID3D12Device *device); +typedef struct vkd3d_instance * (*PFN_vkd3d_instance_from_device)(ID3D12Device *device); -typedef uint32_t (*vkd3d_get_vk_queue_family_index_pfn)(ID3D12CommandQueue *queue); -typedef VkQueue (*vkd3d_acquire_vk_queue_pfn)(ID3D12CommandQueue *queue); -typedef void (*vkd3d_release_vk_queue_pfn)(ID3D12CommandQueue *queue); +typedef uint32_t (*PFN_vkd3d_get_vk_queue_family_index)(ID3D12CommandQueue *queue); +typedef VkQueue (*PFN_vkd3d_acquire_vk_queue)(ID3D12CommandQueue *queue); +typedef void (*PFN_vkd3d_release_vk_queue)(ID3D12CommandQueue *queue); -typedef HRESULT (*vkd3d_create_image_resource_pfn)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, +typedef HRESULT (*PFN_vkd3d_create_image_resource)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); -typedef ULONG (*vkd3d_resource_decref_pfn)(ID3D12Resource *resource); -typedef ULONG (*vkd3d_resource_incref_pfn)(ID3D12Resource *resource); +typedef ULONG (*PFN_vkd3d_resource_decref)(ID3D12Resource *resource); +typedef ULONG (*PFN_vkd3d_resource_incref)(ID3D12Resource *resource); -typedef HRESULT (*vkd3d_serialize_root_signature_pfn)(const D3D12_ROOT_SIGNATURE_DESC *desc, +typedef HRESULT (*PFN_vkd3d_serialize_root_signature)(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); -typedef HRESULT (*vkd3d_create_root_signature_deserializer_pfn)(const void *data, SIZE_T data_size, +typedef HRESULT (*PFN_vkd3d_create_root_signature_deserializer)(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); -typedef VkFormat (*vkd3d_get_vk_format_pfn)(DXGI_FORMAT format); +typedef VkFormat (*PFN_vkd3d_get_vk_format)(DXGI_FORMAT format); #ifdef __cplusplus } diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 4537de0..ba64d40 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -48,7 +48,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, FIXME("Ignoring adapter %p.\n", adapter); memset(&instance_create_info, 0, sizeof(instance_create_info)); - instance_create_info.signal_event_pfn = vkd3d_signal_event; + instance_create_info.pfn_signal_event = vkd3d_signal_event; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c59ba87..31fee8a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -246,12 +246,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, VkResult vr; HRESULT hr; - if (!create_info->signal_event_pfn) + if (!create_info->pfn_signal_event) { ERR("Invalid signal event function pointer.\n"); return E_INVALIDARG; } - if (!create_info->create_thread_pfn != !create_info->join_thread_pfn) + if (!create_info->pfn_create_thread != !create_info->pfn_join_thread) { ERR("Invalid create/join thread function pointers.\n"); return E_INVALIDARG; @@ -262,12 +262,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, return E_INVALIDARG; } - instance->signal_event = create_info->signal_event_pfn; - instance->create_thread = create_info->create_thread_pfn; - instance->join_thread = create_info->join_thread_pfn; + instance->signal_event = create_info->pfn_signal_event; + instance->create_thread = create_info->pfn_create_thread; + instance->join_thread = create_info->pfn_join_thread; instance->wchar_size = create_info->wchar_size; - if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->vkGetInstanceProcAddr_pfn))) + if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr))) { ERR("Failed to initialize Vulkan global procs, hr %#x.\n", hr); return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index acf7824..f222871 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -87,9 +87,9 @@ struct vkd3d_instance VkInstance vk_instance; struct vkd3d_vk_instance_procs vk_procs; - vkd3d_signal_event_pfn signal_event; - vkd3d_create_thread_pfn create_thread; - vkd3d_join_thread_pfn join_thread; + PFN_vkd3d_signal_event signal_event; + PFN_vkd3d_create_thread create_thread; + PFN_vkd3d_join_thread join_thread; size_t wchar_size; struct vkd3d_vulkan_info vk_info; @@ -640,7 +640,7 @@ struct d3d12_device VkDevice vk_device; VkPhysicalDevice vk_physical_device; struct vkd3d_vk_device_procs vk_procs; - vkd3d_signal_event_pfn signal_event; + PFN_vkd3d_signal_event signal_event; size_t wchar_size; struct vkd3d_gpu_va_allocator gpu_va_allocator; @@ -663,8 +663,8 @@ struct d3d12_device struct vkd3d_instance *vkd3d_instance; - vkd3d_create_thread_pfn create_thread; - vkd3d_join_thread_pfn join_thread; + PFN_vkd3d_create_thread create_thread; + PFN_vkd3d_join_thread join_thread; IUnknown *parent; LUID adapter_luid; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 7135737..abef867 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -46,7 +46,7 @@ static bool signal_event(HANDLE event) static const struct vkd3d_instance_create_info instance_default_create_info = { .wchar_size = sizeof(WCHAR), - .signal_event_pfn = signal_event, + .pfn_signal_event = signal_event, }; static const struct vkd3d_device_create_info device_default_create_info = @@ -134,12 +134,12 @@ static void test_create_instance(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); create_info = instance_default_create_info; - create_info.signal_event_pfn = NULL; + create_info.pfn_signal_event = NULL; hr = vkd3d_create_instance(&create_info, &instance); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); create_info = instance_default_create_info; - create_info.vkGetInstanceProcAddr_pfn = vkGetInstanceProcAddr; + create_info.pfn_vkGetInstanceProcAddr = vkGetInstanceProcAddr; hr = vkd3d_create_instance(&create_info, &instance); ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); refcount = vkd3d_instance_decref(instance); @@ -405,7 +405,7 @@ static void test_required_device_extensions(void) HRESULT hr; instance_create_info = instance_default_create_info; - instance_create_info.vkGetInstanceProcAddr_pfn = fake_vkGetInstanceProcAddr; + instance_create_info.pfn_vkGetInstanceProcAddr = fake_vkGetInstanceProcAddr; hr = vkd3d_create_instance(&instance_create_info, &instance); ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);

1 0

Józef Kucia : libs/vkd3d-shader: Implement vDomain.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: vkd3d Branch: master Commit: 26c5a1ef738eb7b9cf26ef21a9756399a3031db1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26c5a1ef738eb7b9cf26ef2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:02 2018 +0100 libs/vkd3d-shader: Implement vDomain. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4673f85..817af6c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2816,6 +2816,8 @@ vkd3d_spirv_builtin_table[] = {VKD3D_SIV_NONE, VKD3DSPR_GSINSTID, VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}, {VKD3D_SIV_NONE, VKD3DSPR_OUTPOINTID, VKD3D_TYPE_INT, 1, SpvBuiltInInvocationId}, + {VKD3D_SIV_NONE, VKD3DSPR_TESSCOORD, VKD3D_TYPE_FLOAT, 3, SpvBuiltInTessCoord}, + {VKD3D_SIV_NONE, VKD3DSPR_DEPTHOUT, VKD3D_TYPE_FLOAT, 1, SpvBuiltInFragDepth}, {VKD3D_SIV_POSITION, ~0u, VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition},

1 0

Józef Kucia : libs/vkd3d-shader: Translate dcl_tessellator_domain instructions.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: vkd3d Branch: master Commit: f1de58c58e0b09ab184cbfaaa3f1a1599faf3513 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1de58c58e0b09ab184cbfa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:00 2018 +0100 libs/vkd3d-shader: Translate dcl_tessellator_domain instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8a45676..85e2593 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3704,6 +3704,31 @@ static void vkd3d_dxbc_compiler_emit_dcl_gs_instances(struct vkd3d_dxbc_compiler SpvExecutionModeInvocations, instruction->declaration.count); } +static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + enum vkd3d_tessellator_domain domain = instruction->declaration.tessellator_domain; + SpvExecutionMode mode; + + switch (domain) + { + case VKD3D_TESSELLATOR_DOMAIN_LINE: + mode = SpvExecutionModeIsolines; + break; + case VKD3D_TESSELLATOR_DOMAIN_TRIANGLE: + mode = SpvExecutionModeTriangles; + break; + case VKD3D_TESSELLATOR_DOMAIN_QUAD: + mode = SpvExecutionModeQuads; + break; + default: + FIXME("Invalid tessellator domain %#x.\n", domain); + return; + } + + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); +} + static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5644,6 +5669,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DCL_GS_INSTANCES: vkd3d_dxbc_compiler_emit_dcl_gs_instances(compiler, instruction); break; + case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: + vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); + break; case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break;

1 0

Józef Kucia : include: Add typedefs for vkd3d function pointers.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: vkd3d Branch: master Commit: 23b33e7b2451cd7c414cbe17d85dfa0bf74c36b9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=23b33e7b2451cd7c414cbe1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:03 2018 +0100 include: Add typedefs for vkd3d function pointers. It makes easier to load vkd3d dynamically. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 32e8123..99a6222 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -77,6 +77,8 @@ struct vkd3d_device_create_info #define VKD3D_RESOURCE_INITIAL_STATE_TRANSITION 0x00000001 #define VKD3D_RESOURCE_SWAPCHAIN_IMAGE 0x00000002 +#ifndef VKD3D_NO_PROTOTYPES + HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); @@ -99,7 +101,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_D ULONG vkd3d_resource_decref(ID3D12Resource *resource); ULONG vkd3d_resource_incref(ID3D12Resource *resource); -HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *root_signature_desc, +HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, @@ -107,6 +109,41 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); +#endif /* VKD3D_NO_PROTOTYPES */ + +/* + * Function pointer typedefs for vkd3d functions. + */ +typedef HRESULT (*vkd3d_create_instance_pfn)(const struct vkd3d_instance_create_info *create_info, + struct vkd3d_instance **instance); +typedef ULONG (*vkd3d_instance_decref_pfn)(struct vkd3d_instance *instance); +typedef VkInstance (*vkd3d_instance_get_vk_instance_pfn)(struct vkd3d_instance *instance); +typedef ULONG (*vkd3d_instance_incref_pfn)(struct vkd3d_instance *instance); + +typedef HRESULT (*vkd3d_create_device_pfn)(const struct vkd3d_device_create_info *create_info, + REFIID iid, void **device); +typedef IUnknown * (*vkd3d_get_device_parent_pfn)(ID3D12Device *device); +typedef VkDevice (*vkd3d_get_vk_device_pfn)(ID3D12Device *device); +typedef VkPhysicalDevice (*vkd3d_get_vk_physical_device_pfn)(ID3D12Device *device); +typedef struct vkd3d_instance * (*vkd3d_instance_from_device_pfn)(ID3D12Device *device); + +typedef uint32_t (*vkd3d_get_vk_queue_family_index_pfn)(ID3D12CommandQueue *queue); +typedef VkQueue (*vkd3d_acquire_vk_queue_pfn)(ID3D12CommandQueue *queue); +typedef void (*vkd3d_release_vk_queue_pfn)(ID3D12CommandQueue *queue); + +typedef HRESULT (*vkd3d_create_image_resource_pfn)(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, + VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); +typedef ULONG (*vkd3d_resource_decref_pfn)(ID3D12Resource *resource); +typedef ULONG (*vkd3d_resource_incref_pfn)(ID3D12Resource *resource); + +typedef HRESULT (*vkd3d_serialize_root_signature_pfn)(const D3D12_ROOT_SIGNATURE_DESC *desc, + D3D_ROOT_SIGNATURE_VERSION version, ID3DBlob **blob, ID3DBlob **error_blob); + +typedef HRESULT (*vkd3d_create_root_signature_deserializer_pfn)(const void *data, SIZE_T data_size, + REFIID iid, void **deserializer); + +typedef VkFormat (*vkd3d_get_vk_format_pfn)(DXGI_FORMAT format); + #ifdef __cplusplus } #endif /* __cplusplus */

1 0

Józef Kucia : libs/vkd3d-shader: Translate dcl_tessellator_partitioning instructions.
by Alexandre Julliard Feb. 6, 2018

Feb. 6, 2018

Module: vkd3d Branch: master Commit: 2759ea7857d50cc8cbcc0e9f117147c9d9739dc7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2759ea7857d50cc8cbcc0e9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 6 13:03:01 2018 +0100 libs/vkd3d-shader: Translate dcl_tessellator_partitioning instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 85e2593..4673f85 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3729,6 +3729,32 @@ static void vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(struct vkd3d_dxbc_co vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); } +static void vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + enum vkd3d_tessellator_partitioning partitioning = instruction->declaration.tessellator_partitioning; + SpvExecutionMode mode; + + switch (partitioning) + { + case VKD3D_TESSELLATOR_PARTITIONING_INTEGER: + case VKD3D_TESSELLATOR_PARTITIONING_POW2: + mode = SpvExecutionModeSpacingEqual; + break; + case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: + mode = SpvExecutionModeSpacingFractionalOdd; + break; + case VKD3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: + mode = SpvExecutionModeSpacingFractionalEven; + break; + default: + FIXME("Invalid tessellator partitioning %#x.\n", partitioning); + return; + } + + vkd3d_dxbc_compiler_emit_execution_mode(compiler, mode, NULL, 0); +} + static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -5672,6 +5698,9 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); break; + case VKD3DSIH_DCL_TESSELLATOR_PARTITIONING: + vkd3d_dxbc_compiler_emit_dcl_tessellator_partitioning(compiler, instruction); + break; case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break;

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent stub implementation.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: a2d61dd4d71135d6123707095ac437e0c9be6355 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d61dd4d71135d612370709… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:29:36 2018 +0100 mshtml: Added IDOMMouseEvent stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 275 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlevent.h | 3 + dlls/mshtml/tests/events.c | 15 +++ 3 files changed, 291 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2d61dd4d71135d61237…

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent:: button property implementation.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 17eb66c798670eaeee6249cfd6363c157f4c2468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17eb66c798670eaeee6249cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:30:16 2018 +0100 mshtml: Added IDOMMouseEvent::button property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fbe44f5..2353d95 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1391,8 +1391,17 @@ static HRESULT WINAPI DOMMouseEvent_get_metaKey(IDOMMouseEvent *iface, VARIANT_B static HRESULT WINAPI DOMMouseEvent_get_button(IDOMMouseEvent *iface, USHORT *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT16 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetButton(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_relatedTarget(IDOMMouseEvent *iface, IEventTarget **p)

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent::initMouseEvent implementation.
by Alexandre Julliard Feb. 5, 2018

Feb. 5, 2018

Module: wine Branch: master Commit: 05b0c8f72b1c1cf373bd370683996617e42229ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b0c8f72b1c1cf373bd3706… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 5 17:30:28 2018 +0100 mshtml: Added IDOMMouseEvent::initMouseEvent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2353d95..c037709 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1418,10 +1418,35 @@ static HRESULT WINAPI DOMMouseEvent_initMouseEvent(IDOMMouseEvent *iface, BSTR t IEventTarget *related_target) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%s %x %x %p %d %d %d %d %d %x %x %x %x %u %p)\n", This, debugstr_w(type), + nsAString type_str; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s %x %x %p %d %d %d %d %d %x %x %x %x %u %p)\n", This, debugstr_w(type), can_bubble, cancelable, view, detail, screen_x, screen_y, client_x, client_y, ctrl_key, alt_key, shift_key, meta_key, button, related_target); - return E_NOTIMPL; + + if(This->target) { + TRACE("called on already dispatched event\n"); + return S_OK; + } + + hres = IDOMEvent_initEvent(&This->IDOMEvent_iface, type, can_bubble, cancelable); + if(FAILED(hres)) + return hres; + + nsAString_InitDepend(&type_str, type); + nsres = nsIDOMMouseEvent_InitMouseEvent(This->mouse_event, &type_str, can_bubble, cancelable, + NULL /* FIXME */, detail, screen_x, screen_y, + client_x, client_y, ctrl_key, alt_key, shift_key, + meta_key, button, NULL /* FIXME */); + nsAString_Finish(&type_str); + if(NS_FAILED(nsres)) { + FIXME("InitMouseEvent failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI DOMMouseEvent_getModifierState(IDOMMouseEvent *iface, BSTR key,

1 0