September 2012 - Wine-commits

Henri Verbeet : wined3d: wined3d_device_get_texture_stage_state() never fails.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: c0a83b1d960ac6863a9a9eb3e6ef323ed15ea2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a83b1d960ac6863a9a9eb3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 10:12:14 2012 +0200 wined3d: wined3d_device_get_texture_stage_state() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 17 ++++++++--------- dlls/wined3d/device.c | 15 ++++++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5dc3d53..6f7cce7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1785,7 +1785,6 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct tss_lookup *l; - HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, Type, value); @@ -1801,10 +1800,10 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, if (l->sampler_state) *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); else - hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state, value); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1012d04..71e2ca3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1752,7 +1752,6 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); @@ -1763,10 +1762,10 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface } wined3d_mutex_lock(); - hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, tss_lookup[state], value); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, tss_lookup[state]); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f4b403f..1ec8176 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2401,12 +2401,12 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, device->legacyTextureBlending = TRUE; - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_OP, &colorop); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG1, &colorarg1); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG2, &colorarg2); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_OP, &alphaop); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1, &alphaarg1); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG2, &alphaarg2); + colorop = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_OP); + colorarg1 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG1); + colorarg2 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG2); + alphaop = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_OP); + alphaarg1 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1); + alphaarg2 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG2); if (colorop == WINED3D_TOP_SELECT_ARG1 && colorarg1 == WINED3DTA_TEXTURE && alphaop == WINED3D_TOP_SELECT_ARG1 && alphaarg1 == WINED3DTA_TEXTURE) @@ -4543,7 +4543,6 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); const struct tss_lookup *l; - HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); @@ -4623,12 +4622,12 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, } else { - hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state, value); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state); } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d_device7_GetTextureStageState_FPUSetup(IDirect3DDevice7 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ae5283..d27e802 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3435,22 +3435,19 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, device_invalidate_state(device, STATE_TEXTURESTAGE(stage, state)); } -HRESULT CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, - UINT stage, enum wined3d_texture_stage_state state, DWORD *value) +DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, + UINT stage, enum wined3d_texture_stage_state state) { - TRACE("device %p, stage %u, state %s, value %p.\n", - device, stage, debug_d3dtexturestate(state), value); + TRACE("device %p, stage %u, state %s.\n", + device, stage, debug_d3dtexturestate(state)); if (state > WINED3D_HIGHEST_TEXTURE_STATE) { WARN("Invalid state %#x passed.\n", state); - return WINED3D_OK; + return 0; } - *value = device->updateStateBlock->state.texture_states[stage][state]; - TRACE("Returning %#x.\n", *value); - - return WINED3D_OK; + return device->updateStateBlock->state.texture_states[stage][state]; } HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 091f6d5..bedd63f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -86,7 +86,7 @@ @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) @ cdecl wined3d_device_get_texture(ptr long ptr) -@ cdecl wined3d_device_get_texture_stage_state(ptr long long ptr) +@ cdecl wined3d_device_get_texture_stage_state(ptr long long) @ cdecl wined3d_device_get_transform(ptr long ptr) @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ec099b5..e9c0cb1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2160,8 +2160,8 @@ struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct win UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_texture(const struct wined3d_device *device, UINT stage, struct wined3d_texture **texture); -HRESULT __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device *device, - UINT stage, enum wined3d_texture_stage_state state, DWORD *value); +DWORD __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device *device, + UINT stage, enum wined3d_texture_stage_state state); void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, enum wined3d_transform_state state, struct wined3d_matrix *matrix); struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: Add some basic SM4 bytecode dumping code.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 8168e184431d87f26e9f8cd681172d6c3794c2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8168e184431d87f26e9f8cd68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 10:12:15 2012 +0200 wined3d: Add some basic SM4 bytecode dumping code. --- dlls/wined3d/shader_sm4.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 007b9b1..f50fd76 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -22,6 +22,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (1 << 31) @@ -555,6 +556,16 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi opcode = opcode_token & WINED3D_SM4_OPCODE_MASK; len = ((opcode_token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; + if (TRACE_ON(d3d_bytecode)) + { + TRACE_(d3d_bytecode)("[ %08x ", opcode_token); + for (i = 0; i < len; ++i) + { + TRACE_(d3d_bytecode)("%08x ", (*ptr)[i]); + } + TRACE_(d3d_bytecode)("]\n"); + } + if (!(opcode_info = get_opcode_info(opcode))) { FIXME("Unrecognized opcode %#x, opcode_token 0x%08x.\n", opcode, opcode_token);

1 0

Alexandre Julliard : winex11: Add a workaround for XInput support with mouse drivers that don' t provide labels.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 0a9398421ce3d5a57419d1c8582d66ec31a31f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9398421ce3d5a57419d1c85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 25 19:25:02 2012 +0200 winex11: Add a workaround for XInput support with mouse drivers that don't provide labels. --- dlls/winex11.drv/mouse.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5808420..2f9831c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -286,6 +286,8 @@ static void enable_xinput2(void) class->number, class->min, class->max, class->resolution, class->mode, XGetAtomName( data->display, class->label )); if (class->label == x11drv_atom( Rel_X ) || class->label == x11drv_atom( Rel_Y )) count++; + /* workaround for drivers that don't provide labels */ + if (!class->label && class->number <= 1 && class->mode == XIModeRelative) count++; } if (count < 2) continue; TRACE( "Using %u (%s) as core pointer\n", @@ -1526,14 +1528,16 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) if (XIMaskIsSet( event->valuators.mask, class->number )) { double val = *values++; - if (class->label == x11drv_atom( Rel_X )) + if (class->label == x11drv_atom( Rel_X ) || + (!class->label && class->number == 0 && class->mode == XIModeRelative)) { input.u.mi.dx = dx = val; if (class->min < class->max) input.u.mi.dx = val * (virtual_screen_rect.right - virtual_screen_rect.left) / (class->max - class->min); } - else if (class->label == x11drv_atom( Rel_Y )) + else if (class->label == x11drv_atom( Rel_Y ) || + (!class->label && class->number == 1 && class->mode == XIModeRelative)) { input.u.mi.dy = dy = val; if (class->min < class->max)

1 0

Alexandre Julliard : winex11: Store the full visual info for the default visual.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 988f2fde86a877f3b99ae384bd6b2410892c5bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988f2fde86a877f3b99ae384b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 25 15:51:03 2012 +0200 winex11: Store the full visual info for the default visual. --- dlls/winex11.drv/bitblt.c | 10 +++--- dlls/winex11.drv/brush.c | 19 ++---------- dlls/winex11.drv/clipboard.c | 36 +++-------------------- dlls/winex11.drv/desktop.c | 6 ++-- dlls/winex11.drv/init.c | 4 +- dlls/winex11.drv/mouse.c | 4 +- dlls/winex11.drv/opengl.c | 8 ++-- dlls/winex11.drv/palette.c | 30 ++++++++++---------- dlls/winex11.drv/window.c | 33 ++++++--------------- dlls/winex11.drv/x11drv.h | 3 +- dlls/winex11.drv/x11drv_main.c | 61 +++++++++++++++++++++++---------------- dlls/winex11.drv/xrender.c | 35 +++++++++-------------- 12 files changed, 101 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=988f2fde86a877f3b99ae…

1 0

Piotr Caban : wininet: Ignore unsupported flags in GetUrlCacheEntryInfoEx functions.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: f9e80f588a4716016483cd05dcc8191e8ddfdc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e80f588a4716016483cd05d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:35 2012 +0200 wininet: Ignore unsupported flags in GetUrlCacheEntryInfoEx functions. --- dlls/wininet/urlcache.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index befb9b7..eac3402 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1735,11 +1735,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( return FALSE; } if (dwFlags & ~GET_INSTALLED_ENTRY) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_FILE_NOT_FOUND); - return FALSE; - } + FIXME("ignorring unsupported flags: %x", dwFlags); error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1879,12 +1875,8 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - if (dwFlags != 0) - { - FIXME("Undocumented flag(s): %x\n", dwFlags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } + if (dwFlags) + FIXME("ignorring unsupported flags: %x", dwFlags); error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS)

1 0

Piotr Caban : wininet: Added more GetUrlCacheEntryInfo tests with GET_INSTALLED_ENTRY flag.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 306f53cbf25c37fc439e73a0530e013b50303f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=306f53cbf25c37fc439e73a05… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 17:31:55 2012 +0200 wininet: Added more GetUrlCacheEntryInfo tests with GET_INSTALLED_ENTRY flag. --- dlls/wininet/tests/urlcache.c | 188 ++++++++++++++++++++++------------------- 1 files changed, 101 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=306f53cbf25c37fc439e7…

1 0

Piotr Caban : inetcpl.cpl: Added support for clearing cookies and history cache.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 04453937e5cbff9e4c0bff815d22c1ee66188967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04453937e5cbff9e4c0bff815… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 25 18:12:48 2012 +0200 inetcpl.cpl: Added support for clearing cookies and history cache. --- dlls/inetcpl.cpl/Makefile.in | 2 +- dlls/inetcpl.cpl/general.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index aedaaa9..2f0c1f1 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,6 +1,6 @@ MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 -DELAYIMPORTS = cryptui wininet ole32 urlmon +DELAYIMPORTS = cryptui wininet ole32 urlmon shell32 C_SRCS = \ content.c \ diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index 1d8f027..42948ea 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -29,6 +29,7 @@ #include <winreg.h> #include <shlwapi.h> #include <prsht.h> +#include <shlobj.h> #include "inetcpl.h" #include "wine/debug.h" @@ -47,9 +48,7 @@ static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, IDC_HOME_DEFAULT, IDC_HISTORY_SETTINGS, 0}; -static DWORD disabled_delhist_buttons[] = {IDC_DELETE_COOKIES, - IDC_DELETE_HISTORY, - IDC_DELETE_FORM_DATA, +static DWORD disabled_delhist_buttons[] = {IDC_DELETE_FORM_DATA, IDC_DELETE_PASSWORDS, 0}; @@ -64,8 +63,25 @@ static INT_PTR delhist_on_command(HWND hdlg, WPARAM wparam) switch (wparam) { case MAKEWPARAM(IDOK, BN_CLICKED): - if (!FreeUrlCacheSpaceW(NULL, 100, FCS_PERCENT_CACHE_SPACE)) - break; /* Don't close the dialog. */ + if (IsDlgButtonChecked(hdlg, IDC_DELETE_TEMP_FILES)) + FreeUrlCacheSpaceW(NULL, 100, 0); + + if (IsDlgButtonChecked(hdlg, IDC_DELETE_COOKIES)) + { + WCHAR pathW[MAX_PATH]; + + if(SHGetSpecialFolderPathW(NULL, pathW, CSIDL_COOKIES, TRUE)) + FreeUrlCacheSpaceW(pathW, 100, 0); + } + + if (IsDlgButtonChecked(hdlg, IDC_DELETE_HISTORY)) + { + WCHAR pathW[MAX_PATH]; + + if(SHGetSpecialFolderPathW(NULL, pathW, CSIDL_HISTORY, TRUE)) + FreeUrlCacheSpaceW(pathW, 100, 0); + } + EndDialog(hdlg, IDOK); return TRUE;

1 0

Huw Davies : comdlg32: Use a ComboBoxEx control for the filename if the structure size is not the nt40 version size .
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: 7a2d68abc89b7ea07436dd5a7d2ecf34376d47a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2d68abc89b7ea07436dd5a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 25 12:40:19 2012 +0100 comdlg32: Use a ComboBoxEx control for the filename if the structure size is not the nt40 version size. --- dlls/comdlg32/comdlg32.rc | 1 + dlls/comdlg32/filedlg.c | 34 ++++++++++++++++++++++++++++------ po/ar.po | 18 +++++++++--------- po/bg.po | 18 +++++++++--------- po/ca.po | 18 +++++++++--------- po/cs.po | 18 +++++++++--------- po/da.po | 18 +++++++++--------- po/de.po | 18 +++++++++--------- po/el.po | 18 +++++++++--------- po/en.po | 18 +++++++++--------- po/en_US.po | 18 +++++++++--------- po/eo.po | 18 +++++++++--------- po/es.po | 18 +++++++++--------- po/fa.po | 18 +++++++++--------- po/fi.po | 18 +++++++++--------- po/fr.po | 18 +++++++++--------- po/he.po | 18 +++++++++--------- po/hi.po | 18 +++++++++--------- po/hu.po | 18 +++++++++--------- po/it.po | 18 +++++++++--------- po/ja.po | 18 +++++++++--------- po/ko.po | 18 +++++++++--------- po/lt.po | 18 +++++++++--------- po/ml.po | 18 +++++++++--------- po/nb_NO.po | 18 +++++++++--------- po/nl.po | 18 +++++++++--------- po/or.po | 18 +++++++++--------- po/pa.po | 18 +++++++++--------- po/pl.po | 18 +++++++++--------- po/pt_BR.po | 18 +++++++++--------- po/pt_PT.po | 18 +++++++++--------- po/rm.po | 18 +++++++++--------- po/ro.po | 18 +++++++++--------- po/ru.po | 18 +++++++++--------- po/sk.po | 18 +++++++++--------- po/sl.po | 18 +++++++++--------- po/sr_RS(a)cyrillic.po | 18 +++++++++--------- po/sr_RS(a)latin.po | 18 +++++++++--------- po/sv.po | 18 +++++++++--------- po/te.po | 18 +++++++++--------- po/th.po | 18 +++++++++--------- po/tr.po | 18 +++++++++--------- po/uk.po | 18 +++++++++--------- po/wa.po | 18 +++++++++--------- po/wine.pot | 18 +++++++++--------- po/zh_CN.po | 18 +++++++++--------- po/zh_TW.po | 18 +++++++++--------- 47 files changed, 434 insertions(+), 411 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a2d68abc89b7ea07436d…

1 0

Jacek Caban : mshtml: Added DISPATCH_PROPERTYGET|DISPATCH_METHOD flags support for elements exposed as window properties .
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: f90798572a0855361bde2935290cdfd3c539ad93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90798572a0855361bde29352… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:18:30 2012 +0200 mshtml: Added DISPATCH_PROPERTYGET|DISPATCH_METHOD flags support for elements exposed as window properties. --- dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/tests/vbtest.html | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fc432d8..7122b4b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2599,6 +2599,7 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD } case GLOBAL_ELEMENTVAR: switch(flags) { + case DISPATCH_PROPERTYGET|DISPATCH_METHOD: case DISPATCH_PROPERTYGET: { IHTMLElement *elem; diff --git a/dlls/mshtml/tests/vbtest.html b/dlls/mshtml/tests/vbtest.html index f023f98..44212e7 100644 --- a/dlls/mshtml/tests/vbtest.html +++ b/dlls/mshtml/tests/vbtest.html @@ -33,6 +33,7 @@ Sub runTest() Call ok(counter = 6, "counter = " & counter) Call ok(isNull(document.onkeyup), "document.onkeyup is not null") Call ok(document.formname.tagName = "FORM", "document.form.tagName = " & document.formname.tagName) + Call ok(formname.tagName = "FORM", "form.tagName = " & formname.tagName) Call external.reportSuccess() End Sub </script>

1 0

Jacek Caban : mshtml: Return S_OK in plugin host' s CanInPlaceActivate implementation.
by Alexandre Julliard 25 Sep '12

25 Sep '12

Module: wine Branch: master Commit: ff34939400805e75fda9c658c3b28bf54adeb5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff34939400805e75fda9c658c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 25 14:18:44 2012 +0200 mshtml: Return S_OK in plugin host's CanInPlaceActivate implementation. --- dlls/mshtml/pluginhost.c | 6 ++++-- dlls/mshtml/tests/activex.c | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index ee7773f..e4b85a8 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -875,8 +875,10 @@ static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *ifac static HRESULT WINAPI PHInPlaceSite_CanInPlaceActivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return S_OK; } static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index ebd2057..775a676 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -903,6 +903,9 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms hres = IOleClientSite_QueryInterface(pActiveSite, &IID_IOleInPlaceSiteEx, (void**)&ip_site); ok(hres == S_OK, "Could not get IOleInPlaceSiteEx iface: %08x\n", hres); + hres = IOleInPlaceSiteEx_CanInPlaceActivate(ip_site); + ok(hres == S_OK, "CanInPlaceActivate failed: %08x\n", hres); + SET_EXPECT(InPlaceObject_GetWindow); no_redraw = 0xdeadbeef; hres = IOleInPlaceSiteEx_OnInPlaceActivateEx(ip_site, &no_redraw, 0);

1 0