wine-commits February 2018

wine-commits@winehq.org

2 participants
804 discussions

Henri Verbeet : ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on buffers.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 3bb34ac938e525497e55cb51016025259d00585f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb34ac938e525497e55cb51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Feb 10 01:00:39 2018 +0330 ddraw: Set WINED3D_RESOURCE_ACCESS_MAP on buffers. Since ddraw buffers can always be mapped. WINED3D_RESOURCE_ACCESS_MAP is currently not enforced on buffers in wined3d, but we'd like to change that. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/vertexbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index d710b34..59ff83b 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -632,7 +632,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer * desc.byte_width = new_size * sizeof(D3DTLVERTEX); desc.usage = WINED3DUSAGE_STATICDECL; - desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; if (FAILED(hr = wined3d_buffer_create(buffer->d3ddev->wined3d_device, &desc, NULL, NULL, &ddraw_null_wined3d_parent_ops, &dst_buffer))) diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index df8531d..0ce5446 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -127,7 +127,7 @@ static HRESULT d3d_vertex_buffer_create_wined3d_buffer(struct d3d_vertex_buffer if (buffer->Caps & D3DVBCAPS_SYSTEMMEMORY) desc.access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; else - desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Zebediah Figura : msvfw32/tests: Simplify swapped-case test.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: f4ebb7d57d7f6a3870e4a40b6e2efbbc3c6748e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ebb7d57d7f6a3870e4a40b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 9 10:16:10 2018 -0600 msvfw32/tests: Simplify swapped-case test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/tests/msvfw.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index 3fe6702..c6fe0f2 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -303,18 +303,9 @@ static void test_ICInfo(void) found++; /* Test getting info with a different case - bug 41602 */ - if (fcc[0] & 0x20) - { - fcc[0] &= ~0x20; - ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x using lowercase fccHandler\n", info.fccHandler); - } - else - { - fcc[0] |= 0x20; - ok(ICInfo(info.fccType, info.fccHandler, &info2), - "ICInfo failed on fcc 0x%08x using uppercase fccHandler\n", info.fccHandler); - } + fcc[0] ^= 0x20; + ok(ICInfo(info.fccType, info.fccHandler, &info2), + "ICInfo failed on fcc 0x%08x\n", info.fccHandler); } ok(found != 0, "expected at least one codec\n"); }

1 0

Zebediah Figura : server: Fix pointer arithmetic in get_selector_entry().
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: c6dfce272309c1ad869886a0fce186c795f3e5b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6dfce272309c1ad869886a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 10 10:46:07 2018 -0600 server: Fix pointer arithmetic in get_selector_entry(). The selector table is exclusively 32-bit, so trying to get selector entries with a 64-bit wineserver will return the wrong values due to the different size of (long *). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/ptrace.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index a647df9..704b17d 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -517,13 +517,13 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } if (suspend_for_ptrace( thread )) { - unsigned char flags_buf[sizeof(long)]; - long *addr = (long *)(unsigned long)thread->process->ldt_copy + entry; - if (read_thread_long( thread, addr, (long *)base ) == -1) goto done; - if (read_thread_long( thread, addr + 8192, (long *)limit ) == -1) goto done; - addr = (long *)(unsigned long)thread->process->ldt_copy + 2*8192 + (entry / sizeof(long)); - if (read_thread_long( thread, addr, (long *)flags_buf ) == -1) goto done; - *flags = flags_buf[entry % sizeof(long)]; + unsigned char flags_buf[4]; + unsigned long addr = (unsigned long)thread->process->ldt_copy + (entry * 4); + if (read_thread_long( thread, (long *)addr, (long *)base ) == -1) goto done; + if (read_thread_long( thread, (long *)(addr + (8192 * 4)), (long *)limit ) == -1) goto done; + addr = (unsigned long)thread->process->ldt_copy + (2 * 8192 * 4) + (entry & ~3); + if (read_thread_long( thread, (long *)addr, (long *)flags_buf ) == -1) goto done; + *flags = flags_buf[entry % 4]; done: resume_after_ptrace( thread ); }

1 0

Zebediah Figura : winedbg: Remove a misplaced \n.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 67d7eb980e0d3caf98b9cc62437dfa854d467240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d7eb980e0d3caf98b9cc62… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 10 10:46:06 2018 -0600 winedbg: Remove a misplaced \n. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 78a0493..970e81a 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -581,7 +581,7 @@ void print_bare_address(const ADDRESS64* addr) memory_offset_to_string(hexbuf, addr->Offset, 32)); break; default: - dbg_printf("Unknown mode %x\n", addr->Mode); + dbg_printf("Unknown mode %x", addr->Mode); break; } }

1 0

Nikolay Sivov : comctl32/static: Reuse existing system colors helper.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 1d5cc6efdfef9737d86d2ebfc588b821bab986ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5cc6efdfef9737d86d2ebf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:56 2018 +0300 comctl32/static: Reuse existing system colors helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/static.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 49127fa..d9e2fe3 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -55,8 +55,6 @@ static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); -static COLORREF color_3dshadow, color_3ddkshadow, color_3dhighlight; - /* offsets for GetWindowLong for static private information */ #define HFONT_GWL_OFFSET 0 #define HICON_GWL_OFFSET (sizeof(HFONT)) @@ -292,13 +290,6 @@ static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) return hBrush; } -static VOID STATIC_InitColours(void) -{ - color_3ddkshadow = GetSysColor(COLOR_3DDKSHADOW); - color_3dshadow = GetSysColor(COLOR_3DSHADOW); - color_3dhighlight = GetSysColor(COLOR_3DHIGHLIGHT); -} - /*********************************************************************** * hasTextStyle * @@ -336,7 +327,6 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, ERR("Unknown style 0x%02x\n", style ); return -1; } - STATIC_InitColours(); break; case WM_NCDESTROY: @@ -391,7 +381,7 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, break; case WM_SYSCOLORCHANGE: - STATIC_InitColours(); + COMCTL32_RefreshSysColors(); STATIC_TryPaintFcn( hwnd, full_style ); break; @@ -644,27 +634,27 @@ static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) switch (style & SS_TYPEMASK) { case SS_BLACKRECT: - hBrush = CreateSolidBrush(color_3ddkshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); FillRect( hdc, &rc, hBrush ); break; case SS_GRAYRECT: - hBrush = CreateSolidBrush(color_3dshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); FillRect( hdc, &rc, hBrush ); break; case SS_WHITERECT: - hBrush = CreateSolidBrush(color_3dhighlight); + hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); FillRect( hdc, &rc, hBrush ); break; case SS_BLACKFRAME: - hBrush = CreateSolidBrush(color_3ddkshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dDkShadow); FrameRect( hdc, &rc, hBrush ); break; case SS_GRAYFRAME: - hBrush = CreateSolidBrush(color_3dshadow); + hBrush = CreateSolidBrush(comctl32_color.clr3dShadow); FrameRect( hdc, &rc, hBrush ); break; case SS_WHITEFRAME: - hBrush = CreateSolidBrush(color_3dhighlight); + hBrush = CreateSolidBrush(comctl32_color.clr3dHilight); FrameRect( hdc, &rc, hBrush ); break; default:

1 0

Nikolay Sivov : comctl32/button: Invalidate on BM_SETCHECK.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 287c5a25b6ea35830bcb4b21b2a2adb8e2853232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=287c5a25b6ea35830bcb4b21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:55 2018 +0300 comctl32/button: Invalidate on BM_SETCHECK. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- dlls/comctl32/tests/button.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 85aa47f..2f5a5b3 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -663,7 +663,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L if ((state & 3) != wParam) { set_button_state( hWnd, (state & ~3) | wParam ); - paint_button( hWnd, btn_type, ODA_SELECT ); + InvalidateRect( hWnd, NULL, FALSE ); } if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) BUTTON_CheckAutoRadioButton( hWnd ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 38446aa..96b8bea 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -440,8 +440,7 @@ static const struct message setcheck_radio_redraw_seq[] = { WM_STYLECHANGED, sent|wparam|defwinproc, GWL_STYLE }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { 0 } }; @@ -661,7 +660,9 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETCHECK, BST_CHECKED, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); + state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); if (button[i].style == BS_PUSHBUTTON || button[i].style == BS_DEFPUSHBUTTON || button[i].style == BS_GROUPBOX || @@ -672,16 +673,10 @@ static void test_button_messages(void) button[i].style == BS_COMMANDLINK || button[i].style == BS_DEFCOMMANDLINK) { - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", FALSE); - state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); ok(state == BST_UNCHECKED, "expected check BST_UNCHECKED, got %04x\n", state); } else - { - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setcheck, "BM_SETCHECK on a button", TRUE); - state = SendMessageA(hwnd, BM_GETCHECK, 0, 0); ok(state == BST_CHECKED, "expected check BST_CHECKED, got %04x\n", state); - } style = GetWindowLongA(hwnd, GWL_STYLE); style &= ~(WS_CHILD | BS_NOTIFY | WS_VISIBLE);

1 0

Nikolay Sivov : comctl32/button: Invalidate on BM_SETSTATE.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: f8eb74e10c450335eac706818df95d42514a7322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8eb74e10c450335eac70681… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:54 2018 +0300 comctl32/button: Invalidate on BM_SETSTATE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 22 +++++++++++++++------- dlls/comctl32/tests/button.c | 10 +++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index c8f85d9..85aa47f 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -305,7 +305,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L POINT pt; LONG style = GetWindowLongW( hWnd, GWL_STYLE ); UINT btn_type = get_button_type( style ); - LONG state; + LONG state, new_state; HANDLE oldHbitmap; HTHEME theme; @@ -674,12 +674,21 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L case BM_SETSTATE: state = get_button_state( hWnd ); - if (wParam) - set_button_state( hWnd, state | BST_PUSHED ); - else - set_button_state( hWnd, state & ~BST_PUSHED ); + new_state = wParam ? BST_PUSHED : 0; + + if ((state ^ new_state) & BST_PUSHED) + { + if (wParam) + state |= BST_PUSHED; + else + state &= ~BST_PUSHED; - paint_button( hWnd, btn_type, ODA_SELECT ); + if (btn_type == BS_USERBUTTON) + BUTTON_NOTIFY_PARENT( hWnd, (state & BST_PUSHED) ? BN_HILITE : BN_UNHILITE ); + set_button_state( hWnd, state ); + + InvalidateRect( hWnd, NULL, FALSE ); + } break; case WM_NCHITTEST: @@ -1206,7 +1215,6 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ) break; default: - BUTTON_NOTIFY_PARENT( hwnd, BN_PAINT ); break; } } diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 425e145..38446aa 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -350,8 +350,6 @@ static const struct message setstate_seq[] = { BM_SETSTATE, sent }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_PAINT, sent|optional }, { 0 } }; @@ -372,8 +370,6 @@ static const struct message setstate_user_seq[] = { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_HILITE) }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc|optional }, { 0 } }; @@ -596,7 +592,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTYLE, button[i].style | BS_BOTTOM, TRUE); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - todo = button[i].style == BS_USERBUTTON || button[i].style == BS_OWNERDRAW; + todo = button[i].style == BS_OWNERDRAW; ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstyle, "BM_SETSTYLE on a button", todo); style = GetWindowLongA(hwnd, GWL_STYLE); @@ -612,7 +608,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTATE, TRUE, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstate, "BM_SETSTATE/TRUE on a button", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].setstate, "BM_SETSTATE/TRUE on a button", FALSE); state = SendMessageA(hwnd, BM_GETSTATE, 0, 0); ok(state == BST_PUSHED, "expected state 0x0004, got %04x\n", state); @@ -626,7 +622,7 @@ static void test_button_messages(void) SendMessageA(hwnd, BM_SETSTATE, FALSE, 0); SendMessageA(hwnd, WM_APP, 0, 0); /* place a separator mark here */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].clearstate, "BM_SETSTATE/FALSE on a button", TRUE); + ok_sequence(sequences, COMBINED_SEQ_INDEX, button[i].clearstate, "BM_SETSTATE/FALSE on a button", FALSE); state = SendMessageA(hwnd, BM_GETSTATE, 0, 0); ok(state == 0, "expected state 0, got %04x\n", state);

1 0

Nikolay Sivov : comctl32/button: Merge theming logic.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: f1cc2da207d00ea989b659221f77410fcd8b966e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1cc2da207d00ea989b65922… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 11 19:19:53 2018 +0300 comctl32/button: Merge theming logic. 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 | 400 ++++++++++++++++++++++++++++++++++------ dlls/comctl32/theme_button.c | 423 ------------------------------------------- dlls/comctl32/theming.c | 7 - 4 files changed, 348 insertions(+), 483 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1cc2da207d00ea989b6…

1 0

Michael Müller : shell32: Use manual redirection for RunDLL_CallEntry16.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 2723e9473cc67b723c654b1859c49a9ddd6b0539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2723e9473cc67b723c654b18… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Feb 12 05:11:25 2018 +0000 shell32: Use manual redirection for RunDLL_CallEntry16. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/control.c | 22 ++++++++++++++++++++++ dlls/shell32/shell32.spec | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 748b2d2..88d0ae8 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -883,3 +883,25 @@ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, D FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6); return 0x0deadbee; } + +/************************************************************************* + * RunDLL_CallEntry16 [SHELL32.122] + * Manually relay this function to make Tages Protection v5 happy + */ +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) +{ + static HMODULE shell16 = NULL; + static void (WINAPI *pRunDLL_CallEntry16)( DWORD proc, HWND hwnd, HINSTANCE inst, + LPCSTR cmdline, INT cmdshow ) = NULL; + + if (!pRunDLL_CallEntry16) + { + if (!shell16 && !(shell16 = LoadLibraryA( "shell.dll16" ))) + return; + if (!(pRunDLL_CallEntry16 = (void *)GetProcAddress( shell16, "RunDLL_CallEntry16" ))) + return; + } + + pRunDLL_CallEntry16( proc, hwnd, inst, cmdline, cmdshow ); +} diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 81fae6d..91e4f6b 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16 + 122 stdcall -noname RunDLL_CallEntry16(long long ptr str long) 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr)

1 0

Jacek Caban : mshtml: Use nsIDOMElement for Gecko elements in npplugin.c.
by Alexandre Julliard 12 Feb '18

12 Feb '18

Module: wine Branch: master Commit: 364e1c87a55483dea8dd527a759965d35fc630fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=364e1c87a55483dea8dd527a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 12 01:30:40 2018 +0100 mshtml: Use nsIDOMElement for Gecko elements in npplugin.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/npplugin.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 302ff42..0d94d0d 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -211,11 +211,10 @@ typedef struct _NPPluginFuncs { NPP_LostFocusPtr lostfocus; } NPPluginFuncs; -static nsIDOMHTMLElement *get_dom_element(NPP instance) +static nsIDOMElement *get_dom_element(NPP instance) { nsISupports *instance_unk = (nsISupports*)instance->ndata; nsIPluginInstance *plugin_instance; - nsIDOMHTMLElement *html_elem; nsIDOMElement *elem; nsresult nsres; @@ -232,24 +231,17 @@ static nsIDOMHTMLElement *get_dom_element(NPP instance) return NULL; } - nsres = nsIDOMElement_QueryInterface(elem, &IID_nsIDOMHTMLElement, (void**)&html_elem); - nsIDOMElement_Release(elem); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLElement iface: %08x\n", nsres); - return NULL; - } - - return html_elem; + return elem; } -static HTMLInnerWindow *get_elem_window(nsIDOMHTMLElement *elem) +static HTMLInnerWindow *get_elem_window(nsIDOMElement *elem) { mozIDOMWindowProxy *mozwindow; nsIDOMDocument *nsdoc; HTMLOuterWindow *window; nsresult nsres; - nsres = nsIDOMHTMLElement_GetOwnerDocument(elem, &nsdoc); + nsres = nsIDOMElement_GetOwnerDocument(elem, &nsdoc); if(NS_FAILED(nsres)) return NULL; @@ -268,7 +260,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I char **argv, NPSavedData *saved) { HTMLPluginContainer *container; - nsIDOMHTMLElement *nselem; + nsIDOMElement *nselem; HTMLInnerWindow *window; HTMLDOMNode *node; NPError err = NPERR_NO_ERROR; @@ -285,12 +277,12 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I window = get_elem_window(nselem); if(!window) { ERR("Could not get element's window object\n"); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); return NPERR_GENERIC_ERROR; } hres = get_node(window->doc, (nsIDOMNode*)nselem, TRUE, &node); - nsIDOMHTMLElement_Release(nselem); + nsIDOMElement_Release(nselem); if(FAILED(hres)) return NPERR_GENERIC_ERROR;

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2018