wine-commits March 2014

wine-commits@winehq.org

2 participants
530 discussions

Ken Thomases : wined3d: Don't call GetPixelFormat() to set a flag that' s already set.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: ffb357b717680b52917f280b3716da7b387f4af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb357b717680b52917f280b3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:45:54 2014 -0500 wined3d: Don't call GetPixelFormat() to set a flag that's already set. --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f90557e..3341ae2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1116,7 +1116,7 @@ static void context_enter(struct wined3d_context *context) context->restore_dc = wglGetCurrentDC(); context->needs_set = 1; } - else if (context->pixel_format != GetPixelFormat(context->hdc)) + else if (!context->needs_set && context->pixel_format != GetPixelFormat(context->hdc)) context->needs_set = 1; } }

1 0

Ken Thomases : wined3d: Simplify the error path of context_update_window() .
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 90d7f3e03f584f15f94fa7c75b51342f725d2f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d7f3e03f584f15f94fa7c75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:45:50 2014 -0500 wined3d: Simplify the error path of context_update_window(). --- dlls/wined3d/context.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 73e2c39..f90557e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -894,13 +894,8 @@ static void context_update_window(struct wined3d_context *context) if (!(context->hdc = GetDC(context->win_handle))) { ERR("Failed to get a device context for window %p.\n", context->win_handle); - goto err; + context->valid = 0; } - - return; - -err: - context->valid = 0; } static void context_destroy_gl_resources(struct wined3d_context *context)

1 0

Ken Thomases : wined3d: Don' t leak the HDC of an invalid context in context_update_window().
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 03ca2b2932b38e0b79592787e32013c1e5ae66bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ca2b2932b38e0b79592787e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 23 22:45:44 2014 -0500 wined3d: Don't leak the HDC of an invalid context in context_update_window(). If context_set_gl_context() fails, it marks the context as invalid. It still has an HDC, though, and context_update_window() would lose the reference to it. --- dlls/wined3d/context.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 56673c7..73e2c39 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -884,13 +884,12 @@ static void context_update_window(struct wined3d_context *context) TRACE("Updating context %p window from %p to %p.\n", context, context->win_handle, context->swapchain->win_handle); - if (context->valid) + if (context->hdc) wined3d_release_dc(context->win_handle, context->hdc); - else - context->valid = 1; context->win_handle = context->swapchain->win_handle; context->needs_set = 1; + context->valid = 1; if (!(context->hdc = GetDC(context->win_handle))) {

1 0

Nikolay Sivov : oleaut32/tests: Move string allocation after function pointer check (Coverity).
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: e5e86776664a19aeb009fb27f5fe6efcf04494ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e86776664a19aeb009fb27f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 24 20:01:50 2014 +0400 oleaut32/tests: Move string allocation after function pointer check (Coverity). --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d28b5c1..bfbc0b2 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6000,11 +6000,11 @@ static void test_VarAnd(void) VARTYPE i; HRESULT hres; + CHECKPTR(VarAnd); + true_str = SysAllocString(szTrue); false_str = SysAllocString(szFalse); - CHECKPTR(VarAnd); - /* Test all possible flag/vt combinations & the resulting vt type */ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) { @@ -7479,11 +7479,11 @@ static void test_VarDiv(void) HRESULT hres; double r; + CHECKPTR(VarDiv); + num1_str = SysAllocString(str1); num2_str = SysAllocString(str2); - CHECKPTR(VarDiv); - /* Test all possible flag/vt combinations & the resulting vt type */ for (i = 0; i < sizeof(ExtraFlags)/sizeof(ExtraFlags[0]); i++) {

1 0

Nikolay Sivov : oleaut32/tests: Remove early returns on test failure that never happen.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 02228ff5854083a688f85b0f623c7cc8e1421026 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02228ff5854083a688f85b0f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 24 20:00:57 2014 +0400 oleaut32/tests: Remove early returns on test failure that never happen. --- dlls/oleaut32/tests/safearray.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index cc6a62c..2be8b06 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1080,8 +1080,6 @@ static void test_SafeArrayGetPutElement(void) return; /* Some early versions can't handle > 3 dims */ ok(sa->cbElements == sizeof(value), "int size mismatch\n"); - if (sa->cbElements != sizeof(value)) - return; /* Failure cases */ for (x = 0; x < NUM_DIMENSIONS; x++) @@ -1233,8 +1231,6 @@ static void test_SafeArrayGetPutElement_BSTR(void) return; ok(sa->cbElements == sizeof(BSTR), "BSTR size mismatch\n"); - if (sa->cbElements != sizeof(BSTR)) - return; indices[0] = sab.lLbound; value = SysAllocString(szTest); @@ -1297,8 +1293,6 @@ static void test_SafeArrayGetPutElement_IUnknown(void) return; ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); - if (sa->cbElements != sizeof(LPUNKNOWN)) - return; indices[0] = sab.lLbound; xtunk.ref = 1; @@ -1331,8 +1325,6 @@ static void test_SafeArrayRedim_IUnknown(void) return; ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); - if (sa->cbElements != sizeof(LPUNKNOWN)) - return; indices[0] = 2; xtunk.ref = 1; @@ -1363,8 +1355,6 @@ static void test_SafeArrayGetPutElement_VARIANT(void) return; ok(sa->cbElements == sizeof(VARIANT), "VARIANT size mismatch\n"); - if (sa->cbElements != sizeof(VARIANT)) - return; indices[0] = sab.lLbound; V_VT(&value) = VT_I4; @@ -1418,8 +1408,6 @@ static void test_SafeArrayCopyData(void) return; ok(sa->cbElements == sizeof(int), "int size mismatch\n"); - if (sa->cbElements != sizeof(int)) - return; /* Fill the source array with some data; it doesn't matter what */ for (dimension = 0; dimension < size; dimension++)

1 0

Jacek Caban : wininet: Fixed tests on some old Windows versions.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: cfb4b0a305140ff018e117d0c8ce330eb7ba74ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb4b0a305140ff018e117d0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 16:25:16 2014 +0100 wininet: Fixed tests on some old Windows versions. --- dlls/wininet/tests/http.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 5edc55a..70e82db 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2196,7 +2196,7 @@ static DWORD CALLBACK server_thread(LPVOID param) if (!memcmp(buffer, "GET ", sizeof("GET ")-1) && !strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); else if (strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); - send(c, notokmsg, sizeof(notokmsg)-1, 0); + else send(c, notokmsg, sizeof(notokmsg)-1, 0); } if (strstr(buffer, "GET /test_premature_disconnect")) trace("closing connection\n"); @@ -3055,12 +3055,17 @@ static void test_no_content(int port) CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); - CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); - CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); close_async_handle(session, hCompleteEvent, 2); CloseHandle(hCompleteEvent); + + /* + * The connection should be closed before closing handle. This is true for most + * wininet versions (including Wine), but some old win2k versions fail to do that. + */ + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); } static void test_conn_close(int port) @@ -3910,6 +3915,7 @@ static void test_cache_control_verb(int port) ret = HttpSendRequestA(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); + InternetCloseHandle(request); request = HttpOpenRequestA(connect, "POST", "/test_cache_control_verb", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); @@ -3917,6 +3923,7 @@ static void test_cache_control_verb(int port) ret = HttpSendRequestA(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); + InternetCloseHandle(request); request = HttpOpenRequestA(connect, "HEAD", "/test_cache_control_verb", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); @@ -3924,6 +3931,7 @@ static void test_cache_control_verb(int port) ret = HttpSendRequestA(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); + InternetCloseHandle(request); request = HttpOpenRequestA(connect, "GET", "/test_cache_control_verb", NULL, NULL, NULL, INTERNET_FLAG_NO_CACHE_WRITE, 0); @@ -3931,8 +3939,8 @@ static void test_cache_control_verb(int port) ret = HttpSendRequestA(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); test_status_code(request, 200); - InternetCloseHandle(request); + InternetCloseHandle(connect); InternetCloseHandle(session); }

1 0

Jacek Caban : wininet: Merge GetLastError() test into other request tests.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 858caa9aa0c6ce7124e03894941bc1e8b7a301b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858caa9aa0c6ce7124e038949… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 16:25:02 2014 +0100 wininet: Merge GetLastError() test into other request tests. --- dlls/wininet/tests/http.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e40cdb6..5edc55a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2213,7 +2213,7 @@ static DWORD CALLBACK server_thread(LPVOID param) static void test_basic_request(int port, const char *verb, const char *url) { HINTERNET hi, hc, hr; - DWORD r, count; + DWORD r, count, error; char buffer[0x100]; hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2225,7 +2225,10 @@ static void test_basic_request(int port, const char *verb, const char *url) hr = HttpOpenRequestA(hc, verb, url, NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n"); + SetLastError(0xdeadbeef); r = HttpSendRequestA(hr, NULL, 0, NULL, 0); + error = GetLastError(); + ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error); ok(r, "HttpSendRequest failed\n"); count = 0; @@ -2241,32 +2244,6 @@ static void test_basic_request(int port, const char *verb, const char *url) InternetCloseHandle(hi); } -static void test_last_error(int port) -{ - HINTERNET hi, hc, hr; - DWORD error; - BOOL r; - - hi = InternetOpenA(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); - ok(hi != NULL, "open failed\n"); - - hc = InternetConnectA(hi, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); - ok(hc != NULL, "connect failed\n"); - - hr = HttpOpenRequestA(hc, NULL, "/test1", NULL, NULL, NULL, 0, 0); - ok(hr != NULL, "HttpOpenRequest failed\n"); - - SetLastError(0xdeadbeef); - r = HttpSendRequestA(hr, NULL, 0, NULL, 0); - error = GetLastError(); - ok(r, "HttpSendRequest failed\n"); - ok(error == ERROR_SUCCESS || broken(error != ERROR_SUCCESS), "expected ERROR_SUCCESS, got %u\n", error); - - InternetCloseHandle(hr); - InternetCloseHandle(hc); - InternetCloseHandle(hi); -} - static void test_proxy_indirect(int port) { HINTERNET hi, hc, hr; @@ -3994,7 +3971,6 @@ static void test_http_connection(void) test_response_without_headers(si.port); test_HttpQueryInfo(si.port); test_HttpSendRequestW(si.port); - test_last_error(si.port); test_options(si.port); test_no_content(si.port); test_conn_close(si.port);

1 0

Hans Leidekker : wbemprox: Add support for WBEM_FLAG_NONSYSTEM_ONLY and WBEM_FLAG_SYSTEM_ONLY in IWbemClassObject ::GetNames.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: c3566b088d3f1843aaf974e9ad80567dc0246ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3566b088d3f1843aaf974e9a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 24 11:42:00 2014 +0100 wbemprox: Add support for WBEM_FLAG_NONSYSTEM_ONLY and WBEM_FLAG_SYSTEM_ONLY in IWbemClassObject::GetNames. --- dlls/wbemprox/class.c | 14 +++++++------- dlls/wbemprox/query.c | 8 +++++++- dlls/wbemprox/tests/query.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 +- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 58fbbf8..5a9e2e4 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -476,17 +476,17 @@ static HRESULT WINAPI class_object_GetNames( TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); - if (wszQualifierName || pQualifierVal) - { - FIXME("qualifier not supported\n"); - return E_NOTIMPL; - } - if (lFlags != WBEM_FLAG_ALWAYS) + if (lFlags != WBEM_FLAG_ALWAYS && + lFlags != WBEM_FLAG_NONSYSTEM_ONLY && + lFlags != WBEM_FLAG_SYSTEM_ONLY) { FIXME("flags %08x not supported\n", lFlags); return E_NOTIMPL; } - return get_properties( ec->query->view, pNames ); + if (wszQualifierName || pQualifierVal) + FIXME("qualifier not supported\n"); + + return get_properties( ec->query->view, lFlags, pNames ); } static HRESULT WINAPI class_object_BeginEnumeration( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 921c3cd..fdfcc16 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -959,7 +959,7 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR return set_value( view->table, row, column, val, type ); } -HRESULT get_properties( const struct view *view, SAFEARRAY **props ) +HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) { SAFEARRAY *sa; BSTR str; @@ -970,8 +970,14 @@ HRESULT get_properties( const struct view *view, SAFEARRAY **props ) for (i = 0; i < view->table->num_cols; i++) { + BOOL is_system; + if (is_method( view->table, i )) continue; + is_system = is_system_prop( view->table->columns[i].name ); + if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; + else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; + str = SysAllocString( view->table->columns[i].name ); if (!str || SafeArrayPutElement( sa, &i, str ) != S_OK) { diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 9b77b4c..e99e4ea 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -616,6 +616,40 @@ static void test_query_async( IWbemServices *services ) SysFreeString( query ); } +void test_GetNames( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + IWbemClassObject *obj; + SAFEARRAY *names; + ULONG count; + VARIANT val; + + IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (!count) break; + + VariantInit( &val ); + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + + SafeArrayDestroy( names ); + IWbemClassObject_Release( obj ); + } + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -647,6 +681,7 @@ START_TEST(query) test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services ); + test_GetNames( services ); SysFreeString( path ); IWbemServices_Release( services ); diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index da4f84f..c047ac1 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -200,7 +200,7 @@ HRESULT to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN; VARTYPE to_vartype( CIMTYPE ) DECLSPEC_HIDDEN; void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN; -HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; +HRESULT get_properties( const struct view *, LONG, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; BSTR get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : vbscript: Fixed a leak.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 7aaf597db12477a1d9d05737742dbed882f49694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aaf597db12477a1d9d057377… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 13:49:33 2014 +0100 vbscript: Fixed a leak. --- dlls/vbscript/compile.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 609bb66..e1245d6 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -873,8 +873,10 @@ static HRESULT compile_select_statement(compile_ctx_t *ctx, select_statement_t * if(FAILED(hres)) break; - if(!emit_catch_jmp(ctx, 0, case_labels[i])) - return E_OUTOFMEMORY; + if(!emit_catch_jmp(ctx, 0, case_labels[i])) { + hres = E_OUTOFMEMORY; + break; + } } }

1 0

Jacek Caban : mshtml: Added IHTMLStyle:: listStyleType property implementation.
by Alexandre Julliard 24 Mar '14

24 Mar '14

Module: wine Branch: master Commit: 20108162408c7cf571e6424b35b573bb1a098dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=20108162408c7cf571e6424b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 24 13:47:56 2014 +0100 mshtml: Added IHTMLStyle::listStyleType property implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c85e4db..d2d2fc8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -126,6 +126,8 @@ static const WCHAR attrLetterSpacing[] = {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; static const WCHAR attrLineHeight[] = {'l','i','n','e','-','h','e','i','g','h','t',0}; +static const WCHAR attrListStyleType[] = + {'l','i','s','t','-','s','t','y','l','e','-','t','y','p','e',0}; static const WCHAR attrMargin[] = {'m','a','r','g','i','n',0}; static const WCHAR attrMarginBottom[] = @@ -241,6 +243,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT}, + {attrListStyleType, DISPID_IHTMLSTYLE_LISTSTYLETYPE}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMarginBottom, DISPID_IHTMLSTYLE_MARGINBOTTOM}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, @@ -2168,15 +2171,19 @@ static HRESULT WINAPI HTMLStyle_get_visibility(IHTMLStyle *iface, BSTR *p) static HRESULT WINAPI HTMLStyle_put_listStyleType(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_attr(This, STYLEID_LISTSTYLETYPE, v, 0); } static HRESULT WINAPI HTMLStyle_get_listStyleType(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_attr(This, STYLEID_LISTSTYLETYPE, p); } static HRESULT WINAPI HTMLStyle_put_listStylePosition(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9294015..030d8a1 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -78,6 +78,7 @@ typedef enum { STYLEID_LEFT, STYLEID_LETTER_SPACING, STYLEID_LINE_HEIGHT, + STYLEID_LISTSTYLETYPE, STYLEID_MARGIN, STYLEID_MARGIN_BOTTOM, STYLEID_MARGIN_LEFT, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 2df585a..3c68f61 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2092,6 +2092,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(str, "nowrap"), "whiteSpace = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + /* listStyleType */ + hres = IHTMLStyle_get_listStyleType(style, &str); + ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres); + ok(!str, "listStyleType = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("square"); + hres = IHTMLStyle_put_listStyleType(style, str); + ok(hres == S_OK, "put_listStyleType failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle_get_listStyleType(style, &str); + ok(hres == S_OK, "get_listStyleType failed: %08x\n", hres); + ok(!strcmp_wa(str, "square"), "listStyleType = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
53
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 March 2014