January 2012 - Wine-Commits

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixArray() test.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 3efd2f9a1b03fa0c3deb8378533e61b7c8cab655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3efd2f9a1b03fa0c3deb83785… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 26 11:40:57 2012 +0100 d3dx9/tests: Add effect parameter value SetMatrixArray() test. --- dlls/d3dx9_36/tests/effect.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index e3c6dde..31edcb6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1931,6 +1931,47 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetMatrixArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < element * 16; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetMatrixArray(effect, parameter, (D3DXMATRIX *)input_value, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) + { + UINT n; + + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + UINT m; + + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l + m * 4 + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetVectorArray() test.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: d0fbe7f5a501e08c2d7c551a8d84a9fc8fc29b6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0fbe7f5a501e08c2d7c551a8… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 26 11:40:47 2012 +0100 d3dx9/tests: Add effect parameter value SetVectorArray() test. --- dlls/d3dx9_36/tests/effect.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6db1942..f3c5cf6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1640,7 +1640,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) FLOAT fvalue; DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - UINT l; + UINT l, element; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name); @@ -1865,6 +1865,39 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetVectorArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < element * 4; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetVectorArray(effect, parameter, (D3DXVECTOR4 *)input_value, element); + if (res_desc->Elements && res_desc->Class == D3DXPC_VECTOR && element <= res_desc->Elements) + { + UINT m; + + for (m = 0; m < element; ++m) + { + for (l = 0; l < res_desc->Columns; ++l) + { + set_number(expected_value + m * res_desc->Columns + l, res_desc->Type, input_value + m * 4 + l, D3DXPT_FLOAT); + } + } + ok(hr == D3D_OK, "%u - %s: SetVectorArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetVectorArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);

1 0

Thomas Faber : mscoree: Fix build with MSVC.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: d3918683e6a59b4068f5d28f72a7ab6f78e2c526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3918683e6a59b4068f5d28f7… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Jan 25 23:27:44 2012 +0100 mscoree: Fix build with MSVC. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 454a653..49fb0ee 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1171,7 +1171,7 @@ static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char MonoImageOpenStatus stat; static WCHAR fusiondll[] = {'f','u','s','i','o','n',0}; HMODULE hfusion=NULL; - static HRESULT WINAPI (*pCreateAssemblyCache)(IAssemblyCache**,DWORD); + static HRESULT (WINAPI *pCreateAssemblyCache)(IAssemblyCache**,DWORD); stringname = mono->mono_stringify_assembly_name(aname);

1 0

Austin English : iphlpapi: Add GetTcp6Table/GetTcp6Table2 stubs.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: ce2e7cdc9e2f6e77d6d9a11fafacba1b258da4b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2e7cdc9e2f6e77d6d9a11fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 25 14:29:48 2012 -0800 iphlpapi: Add GetTcp6Table/GetTcp6Table2 stubs. --- dlls/iphlpapi/iphlpapi.spec | 4 ++-- dlls/iphlpapi/iphlpapi_main.c | 18 ++++++++++++++++++ include/tcpmib.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index a6662c3..f168492 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -132,8 +132,8 @@ #@ stub GetPerTcpConnectionStats @ stdcall GetRTTAndHopCount( long ptr long ptr ) #@ stub GetSessionCompartmentId -#@ stub GetTcp6Table -#@ stub GetTcp6Table2 +@ stdcall GetTcp6Table( ptr ptr long ) +@ stdcall GetTcp6Table2( ptr ptr long ) #@ stub GetTcpStatisticsEx @ stdcall GetTcpStatistics( ptr ) @ stub GetTcpStatsFromStack diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ea759ae..2a3285f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2285,3 +2285,21 @@ ULONG WINAPI GetTcpTable2(PMIB_TCPTABLE2 table, PULONG size, BOOL order) FIXME("pTcpTable2 %p, pdwSize %p, bOrder %d: stub\n", table, size, order); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetTcp6Table (IPHLPAPI.@) + */ +ULONG WINAPI GetTcp6Table(PMIB_TCP6TABLE table, PULONG size, BOOL order) +{ + FIXME("pTcp6Table %p, size %p, order %d: stub\n", table, size, order); + return ERROR_NOT_SUPPORTED; +} + +/****************************************************************** + * GetTcp6Table2 (IPHLPAPI.@) + */ +ULONG WINAPI GetTcp6Table2(PMIB_TCP6TABLE2 table, PULONG size, BOOL order) +{ + FIXME("pTcp6Table2 %p, size %p, order %d: stub\n", table, size, order); + return ERROR_NOT_SUPPORTED; +} diff --git a/include/tcpmib.h b/include/tcpmib.h index 58be385..8c3efa1 100644 --- a/include/tcpmib.h +++ b/include/tcpmib.h @@ -67,6 +67,38 @@ typedef struct _MIB_TCPTABLE MIB_TCPROW table[1]; } MIB_TCPTABLE, *PMIB_TCPTABLE; +typedef struct _MIB_TCP6ROW { + MIB_TCP_STATE State; + IN6_ADDR LocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + IN6_ADDR RemoteAddr; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; +} MIB_TCP6ROW, *PMIB_TCP6ROW; + +typedef struct _MIB_TCP6TABLE { + DWORD dwNumEntries; + MIB_TCP6ROW table[1]; +} MIB_TCP6TABLE, *PMIB_TCP6TABLE; + +typedef struct _MIB_TCP6ROW2 { + IN6_ADDR LocalAddr; + DWORD dwLocalScopeId; + DWORD dwLocalPort; + IN6_ADDR RemoteAddr; + DWORD dwRemoteScopeId; + DWORD dwRemotePort; + MIB_TCP_STATE State; + DWORD dwOwningPid; + TCP_CONNECTION_OFFLOAD_STATE dwOffloadState; +} MIB_TCP6ROW2, *PMIB_TCP6ROW2; + +typedef struct _MIB_TCP6TABLE2 { + DWORD dwNumEntries; + MIB_TCP6ROW2 table[1]; +} MIB_TCP6TABLE2, *PMIB_TCP6TABLE2; + typedef struct _MIB_TCPROW_OWNER_PID { DWORD dwState;

1 0

Henri Verbeet : winecfg: Get rid of some unused constants.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: f355f59345e28dfc78f66f3c1208581c238e18a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f355f59345e28dfc78f66f3c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 00:21:18 2012 +0100 winecfg: Get rid of some unused constants. --- programs/winecfg/resource.h | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 6d9c450..fffc4da 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -46,7 +46,6 @@ #define IDS_LINKS_TO 17 #define IDS_WINECFG_TITLE_APP 18 /* App specific title */ #define IDI_WINECFG 100 -#define IDD_MAINDLG 101 #define IDI_LOGO 102 #define IDD_ABOUTCFG 107 #define IDD_APPCFG 108 @@ -55,20 +54,11 @@ #define IDD_DLLCFG 111 #define IDD_DRIVECFG 112 #define IDD_DESKTOP_INTEGRATION 115 -#define IDB_WINE_LOGO 200 -#define IDC_TABABOUT 1001 -#define IDC_APPLYBTN 1002 #define IDC_WINVER 1012 -#define IDC_SYSCOLORS 1017 -#define IDC_PRIVATEMAP 1018 -#define IDC_PERFECTGRAPH 1019 -#define IDC_MANAGED 1022 #define IDC_DESKTOP_WIDTH 1023 #define IDC_DESKTOP_HEIGHT 1024 #define IDC_DESKTOP_SIZE 1025 #define IDC_DESKTOP_BY 1026 -#define IDC_XDGA 1027 -#define IDC_XSHM 1028 /* dll editing */ #define IDC_RAD_BUILTIN 1029 @@ -100,21 +90,7 @@ #define IDC_BUTTON_ADD 1043 #define IDC_BUTTON_REMOVE 1044 #define IDC_BUTTON_EDIT 1045 -#define IDC_BUTTON7 1046 #define IDC_BUTTON_AUTODETECT 1046 -#define IDC_DRIVE_ADD 1047 -#define IDC_DRIVE_REMOVE 1048 -#define IDC_DRIVE_EDIT 1049 -#define IDC_DRIVE_EDIT_NAME 1050 -#define IDC_DRIVE_EDIT_LABEL 1051 -#define IDC_DRIVE_EDIT_TYPE 1052 -#define IDC_DRIVE_EDIT_FS 1053 -#define IDC_DRIVE_EDIT_PATH 1054 -#define IDC_DRIVE_EDIT_DEVICE 1055 -#define ID_DRIVE_OK 1056 -#define ID_DRIVE_CANCEL 1057 -#define ID_BUTTON_CANCEL 1058 -#define ID_BUTTON_OK 1059 #define IDC_EDIT_LABEL 1060 #define IDC_EDIT_PATH 1061 #define IDC_EDIT_SERIAL 1062 @@ -132,8 +108,6 @@ #define IDC_STATIC_TYPE 1077 #define IDC_SHOW_DOT_FILES 1080 -#define IDC_DRIVE_LABEL 1078 - #define IDS_DRIVE_UNKNOWN 8200 #define IDS_DRIVE_FIXED 8201 #define IDS_DRIVE_REMOTE 8202 @@ -152,8 +126,6 @@ #define IDC_ENABLE_MANAGED 1100 #define IDC_ENABLE_DECORATED 1101 #define IDC_FULLSCREEN_GRAB 1102 -#define IDC_USE_TAKE_FOCUS 1103 -#define IDC_DOUBLE_BUFFER 1104 #define IDC_RES_TRACKBAR 1107 #define IDC_RES_DPIEDIT 1108

1 0

Henri Verbeet : wined3d: Clear the device if we' re not removing the entry from the table in wined3d_unregister_window().
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: faa040cd9e9f34a6abdf80833912bfdd581b9921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa040cd9e9f34a6abdf80833… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 26 00:21:17 2012 +0100 wined3d: Clear the device if we're not removing the entry from the table in wined3d_unregister_window(). The device may be destroyed after the window is unregistered, causing device_process_message() to access freed memory. --- dlls/wined3d/wined3d_main.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1b7e493..ad7a5fc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -444,7 +444,11 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam proc = entry->proc; wined3d_wndproc_mutex_unlock(); - return device_process_message(device, window, unicode, message, wparam, lparam, proc); + if (device) + return device_process_message(device, window, unicode, message, wparam, lparam, proc); + if (unicode) + return CallWindowProcW(proc, window, message, wparam, lparam); + return CallWindowProcA(proc, window, message, wparam, lparam); } BOOL wined3d_register_window(HWND window, struct wined3d_device *device) @@ -515,6 +519,7 @@ void wined3d_unregister_window(HWND window) proc = GetWindowLongPtrW(window, GWLP_WNDPROC); if (proc != (LONG_PTR)wined3d_wndproc) { + entry->device = NULL; wined3d_wndproc_mutex_unlock(); WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", window, proc, wined3d_wndproc); @@ -528,6 +533,7 @@ void wined3d_unregister_window(HWND window) proc = GetWindowLongPtrA(window, GWLP_WNDPROC); if (proc != (LONG_PTR)wined3d_wndproc) { + entry->device = NULL; wined3d_wndproc_mutex_unlock(); WARN("Not unregistering window %p, window proc %#lx doesn't match wined3d window proc %p.\n", window, proc, wined3d_wndproc);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetVector() test.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 9c63b11372aff8f1da8745a23a7ea47f1c231d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c63b11372aff8f1da8745a23… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 26 11:40:37 2012 +0100 d3dx9/tests: Add effect parameter value SetVector() test. --- dlls/d3dx9_36/tests/effect.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index cd0423d..6db1942 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1827,6 +1827,44 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) } test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + + /* SetVector */ + fvalue = -1.33; + for (l = 0; l < 4; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + hr = effect->lpVtbl->SetVector(effect, parameter, (D3DXVECTOR4 *)input_value); + if (!res_desc->Elements && + (res_desc->Class == D3DXPC_SCALAR + || res_desc->Class == D3DXPC_VECTOR)) + { + /* only values between 0 and INT_FLOAT_MULTI are valid */ + if (res_desc->Type == D3DXPT_INT && res_desc->Bytes == 4) + { + *expected_value = (DWORD)(max(min(*(FLOAT *)(input_value + 2), 1.0f), 0.0f) * INT_FLOAT_MULTI); + *expected_value += ((DWORD)(max(min(*(FLOAT *)(input_value + 1), 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; + *expected_value += ((DWORD)(max(min(*(FLOAT *)input_value, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; + *expected_value += ((DWORD)(max(min(*(FLOAT *)(input_value + 3), 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; + } + else + { + for (l = 0; l < 4; ++l) + { + set_number(expected_value + l, res_desc->Type, input_value + l, D3DXPT_FLOAT); + } + } + ok(hr == D3D_OK, "%u - %s: SetVector failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetVector failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Ken Thomases : winex11: Remove some more leftover X Shm code.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: f2174155417b0493df1e3b60caf3855bb2c6c902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2174155417b0493df1e3b60c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 25 15:53:50 2012 -0600 winex11: Remove some more leftover X Shm code. --- dlls/winex11.drv/x11drv.h | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 64129a7..8e3c4c3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -90,13 +90,6 @@ typedef struct Pixmap pixmap; } X_PHYSBRUSH; -enum x11drv_shm_mode -{ - X11DRV_SHM_NONE = 0, - X11DRV_SHM_PIXMAP, - X11DRV_SHM_IMAGE, -}; - typedef struct { int shift; int scale;

1 0

Jacek Caban : mshtml: Added IHTMLStyle:: marginBottom property implementation.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 737dba7ae37dd837c036fef07bc6df18faefcc62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=737dba7ae37dd837c036fef07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:24 2012 +0100 mshtml: Added IHTMLStyle::marginBottom property implementation. --- dlls/mshtml/htmlstyle.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 9602f5e..77b7da1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1504,15 +1504,19 @@ static HRESULT WINAPI HTMLStyle_get_marginRight(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_marginBottom(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_BOTTOM, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_marginBottom(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_BOTTOM, p, 0); } static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 183d3f4..9033c8c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -382,6 +382,23 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginBottom(style, &v); + ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v)); + ok(!V_BSTR(&v), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_marginBottom(style, v); + ok(hres == S_OK, "put_marginBottom failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginBottom(style, &v); + ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + + V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginLeft(style, &v); ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v));

1 0

Jacek Caban : mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle:: put_marginRight.
by Alexandre Julliard Jan. 26, 2012

Jan. 26, 2012

Module: wine Branch: master Commit: 2858d44ed56e0b6bb2d6f64a25b08f43973eb99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2858d44ed56e0b6bb2d6f64a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 14:33:02 2012 +0100 mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginRight. --- dlls/mshtml/htmlstyle.c | 17 +---------------- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f006193..e21753b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1491,22 +1491,7 @@ static HRESULT WINAPI HTMLStyle_put_marginRight(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(v(%d))\n", This, V_VT(&v)); - switch(V_VT(&v)) { - case VT_NULL: - return set_style_attr(This, STYLEID_MARGIN_RIGHT, emptyW, 0); - case VT_I4: { - WCHAR buf[14]; - - wsprintfW(buf, px_formatW, V_I4(&v)); - return set_style_attr(This, STYLEID_MARGIN_RIGHT, buf, 0); - } - case VT_BSTR: - return set_style_attr(This, STYLEID_MARGIN_RIGHT, V_BSTR(&v), 0); - default: - FIXME("Unsupported vt=%d\n", V_VT(&v)); - } - - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_RIGHT, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_marginRight(IHTMLStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index bdb3dc2..4a0b9fb 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -370,6 +370,17 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_I4; + V_I4(&v) = 6; + hres = IHTMLStyle_put_marginRight(style, v); + ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginRight(style, &v); + ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_marginLeft(style, &v); ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres);

1 0