December 2008 - Wine-commits

Andrew Talbot : wined3d: Remove unneeded address-of operators from array names.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: c3cdc671a480be0b0dc09950ae08665d788f303b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3cdc671a480be0b0dc09950a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 8 18:53:42 2008 +0000 wined3d: Remove unneeded address-of operators from array names. --- dlls/wined3d/stateblock.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3faa5a0..78c57d9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -543,12 +543,12 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } for (i = 0; i < GL_LIMITS(clipplanes); i++) { - if (This->changed.clipplane[i] && memcmp(&targetStateBlock->clipplane[i], - &This->clipplane[i], + if (This->changed.clipplane[i] && memcmp(targetStateBlock->clipplane[i], + This->clipplane[i], sizeof(This->clipplane)) != 0) { TRACE("Updating clipplane %d\n", i); - memcpy(&This->clipplane[i], &targetStateBlock->clipplane[i], + memcpy(This->clipplane[i], targetStateBlock->clipplane[i], sizeof(This->clipplane)); } }

1 0

Lei Zhang : user32: Check input to GetAsyncKeyState().
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 54eebfe5e51801d8610baa5a100c06e04fab3b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54eebfe5e51801d8610baa5a1… Author: Lei Zhang <thestig(a)google.com> Date: Mon Dec 8 11:25:30 2008 -0800 user32: Check input to GetAsyncKeyState(). --- dlls/user32/input.c | 2 ++ dlls/user32/tests/input.c | 8 ++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 69bf2e8..625ecdc 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -272,6 +272,8 @@ HWND WINAPI GetCapture(void) */ SHORT WINAPI GetAsyncKeyState(INT nKey) { + if (nKey < 0 || nKey > 256) + return 0; return USER_Driver->pGetAsyncKeyState( nKey ); } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8211cdb..a242fba 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1240,6 +1240,13 @@ static void test_ToUnicode(void) todo_wine ok(ret == 0, "ToUnicode for CTRL + SHIFT + Return didn't return 0 (was %i)\n", ret); } +static void test_get_async_key_state(void) +{ + /* input value sanity checks */ + ok(0 == GetAsyncKeyState(1000000), "GetAsyncKeyState did not return 0\n"); + ok(0 == GetAsyncKeyState(-1000000), "GetAsyncKeyState did not return 0\n"); +} + START_TEST(input) { init_function_pointers(); @@ -1254,6 +1261,7 @@ START_TEST(input) test_mouse_ll_hook(); test_key_map(); test_ToUnicode(); + test_get_async_key_state(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Andrew Talbot : wininet: Sign-compare warnings fix.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: bc8d8e5211d366e03f858add3e1deb46d12df009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8d8e5211d366e03f858add3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 8 16:51:08 2008 +0000 wininet: Sign-compare warnings fix. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fad2e41..4a9954b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2205,7 +2205,7 @@ static BOOL HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel, BOOL bSuccess = FALSE; BOOL request_only = dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS; INT requested_index = lpdwIndex ? *lpdwIndex : 0; - INT level = (dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK); + DWORD level = (dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK); INT index = -1; /* Find requested header structure */ @@ -2327,7 +2327,7 @@ static BOOL HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLevel, default: assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); - if (level >= 0 && level < LAST_TABLE_HEADER && header_lookup[level]) + if (level < LAST_TABLE_HEADER && header_lookup[level]) index = HTTP_GetCustomHeaderIndex(lpwhr, header_lookup[level], requested_index,request_only); } diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 855ae4d..5dbbc48 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -462,8 +462,8 @@ static void dump_INTERNET_FLAGS(DWORD dwFlags) FE(INTERNET_FLAG_TRANSFER_BINARY) }; #undef FE - int i; - + unsigned int i; + for (i = 0; i < (sizeof(flag) / sizeof(flag[0])); i++) { if (flag[i].val & dwFlags) { TRACE(" %s", flag[i].name);

1 0

Andrew Talbot : shdocvw: Remove unneeded address-of operators from array name.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 9814ca98591ea24eb2968954410a33f75018efad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9814ca98591ea24eb29689544… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 8 18:53:39 2008 +0000 shdocvw: Remove unneeded address-of operators from array name. --- dlls/shdocvw/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 27276b6..d6c0e3e 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -791,7 +791,7 @@ HRESULT go_home(DocHost *This) return navigate_url(This, wszAboutBlank, NULL, NULL, NULL, NULL); size = sizeof(wszPageName); - res = RegQueryValueExW(hkey, wszStartPage, NULL, &type, (LPBYTE)&wszPageName, &size); + res = RegQueryValueExW(hkey, wszStartPage, NULL, &type, (LPBYTE)wszPageName, &size); RegCloseKey(hkey); if (res != ERROR_SUCCESS || type != REG_SZ) return navigate_url(This, wszAboutBlank, NULL, NULL, NULL, NULL);

1 0

Andrew Talbot : winhttp: Sign-compare warning fix.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 42a920144f43acfbd1b858f12b0c451a23ef2b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a920144f43acfbd1b858f12… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 8 16:51:01 2008 +0000 winhttp: Sign-compare warning fix. --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 032807a..e9937ce 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -276,7 +276,7 @@ end: static void request_destroy( object_header_t *hdr ) { request_t *request = (request_t *)hdr; - int i; + DWORD i; TRACE("%p\n", request);

1 0

Andrew Talbot : msi: Remove an unused declaration.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 94d22682c1da7b50323535ea341c76af2872a92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d22682c1da7b50323535ea3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Dec 8 16:50:52 2008 +0000 msi: Remove an unused declaration. --- dlls/msi/msipriv.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index f856e66..b72e1d7 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1040,7 +1040,6 @@ extern void ui_actiondata(MSIPACKAGE *, LPCWSTR, MSIRECORD *); /* string consts use a number of places and defined in helpers.c*/ extern const WCHAR cszSourceDir[]; extern const WCHAR cszSOURCEDIR[]; -extern const WCHAR szProductCode[]; extern const WCHAR cszRootDrive[]; extern const WCHAR cszbs[];

1 0

Hwang YunSong(황윤성) : cryptdlg: New Korean resource.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 22961e656042164376bb3c0bd5ed449ef3a26f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22961e656042164376bb3c0bd… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Dec 8 09:53:07 2008 +0900 cryptdlg: New Korean resource. --- dlls/cryptdlg/cryptdlg.rc | 1 + dlls/cryptdlg/cryptdlg_Ko.rc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg.rc b/dlls/cryptdlg/cryptdlg.rc index 714151d..eb68dff 100644 --- a/dlls/cryptdlg/cryptdlg.rc +++ b/dlls/cryptdlg/cryptdlg.rc @@ -23,3 +23,4 @@ #include "cryptres.h" #include "cryptdlg_En.rc" +#include "cryptdlg_Ko.rc" diff --git a/dlls/cryptdlg/cryptdlg_Ko.rc b/dlls/cryptdlg/cryptdlg_Ko.rc new file mode 100644 index 0000000..80bf28f --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Ko.rc @@ -0,0 +1,37 @@ +/* + * cryptdlg dll resources + * + * Copyright 2008 Juan Lang + * Copyright 2008 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_CERT_POLICY "�� å" + IDS_POLICY_ID "��å �ĺ��: " + IDS_POLICY_QUALIFIER_INFO "��å �� " + IDS_POLICY_QUALIFIER_ID "��å �� ̵�=" + IDS_CPS "CPS" + IDS_USER_NOTICE "�� " + IDS_QUALIFIER "��" + IDS_NOTICE_REF "�� " + IDS_ORGANIZATION "��=" + IDS_NOTICE_NUM "�� ȣ=" + IDS_NOTICE_TEXT "�� ؽ�Ʈ=" +}

1 0

Alex Balut : mshtml: Removed the reference counting of the DLL.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: fdac425f7fbd7d17ece4dec57bd6986192fb0b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdac425f7fbd7d17ece4dec57… Author: Alex Balut <alexandru.balut(a)gmail.com> Date: Fri Dec 5 20:04:03 2008 +0100 mshtml: Removed the reference counting of the DLL. --- dlls/mshtml/htmldoc.c | 4 ---- dlls/mshtml/main.c | 17 +++++------------ dlls/mshtml/mshtml_private.h | 4 ---- dlls/mshtml/protocol.c | 28 +++++----------------------- 4 files changed, 10 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index dc0d87a..0f4bcf4 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -214,8 +214,6 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) NSContainer_Release(This->nscontainer); heap_free(This); - - UNLOCK_MODULE(); } return ref; @@ -1810,8 +1808,6 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) if(FAILED(hres)) return hres; - LOCK_MODULE(); - doc->nscontainer = NSContainer_Create(doc, NULL); update_nsdocument(doc); diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8b441f0..b1c8756 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -44,7 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); HINSTANCE hInst; -LONG module_ref = 0; DWORD mshtml_tls = 0; static HINSTANCE shdoclc = NULL; @@ -141,7 +140,6 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) if(!ref) { heap_free(This); - UNLOCK_MODULE(); } return ref; @@ -158,11 +156,7 @@ static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%p)->(%x)\n", iface, dolock); - if(dolock) - LOCK_MODULE(); - else - UNLOCK_MODULE(); - + /* We never unload the DLL. See DllCanUnloadNow(). */ return S_OK; } @@ -184,9 +178,7 @@ static HRESULT ClassFactory_Create(REFIID riid, void **ppv, CreateInstanceFunc f ret->fnCreateInstance = fnCreateInstance; hres = IClassFactory_QueryInterface((IClassFactory*)ret, riid, ppv); - if(SUCCEEDED(hres)) { - LOCK_MODULE(); - }else { + if(FAILED(hres)) { heap_free(ret); *ppv = NULL; } @@ -230,8 +222,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - TRACE("() ref=%d\n", module_ref); - return module_ref ? S_FALSE : S_OK; + TRACE("()\n"); + /* The cost of keeping this DLL in memory is small. */ + return S_FALSE; } /*********************************************************************** diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a6e8783..60e250d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -668,10 +668,6 @@ DEFINE_GUID(CLSID_SysimageProtocol, 0x76E67A63, 0x06E9, 0x11D2, 0xA8,0x40, 0x00, DEFINE_GUID(CLSID_CMarkup,0x3050f4fb,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); -extern LONG module_ref; -#define LOCK_MODULE() InterlockedIncrement(&module_ref) -#define UNLOCK_MODULE() InterlockedDecrement(&module_ref) - /* memory allocation functions */ static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 4cdac9f..8483600 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -77,17 +77,13 @@ static HRESULT WINAPI InternetProtocolInfo_QueryInterface(IInternetProtocolInfo static ULONG WINAPI InternetProtocolInfo_AddRef(IInternetProtocolInfo *iface) { - ProtocolFactory *This = PROTOCOLINFO_THIS(iface); - TRACE("(%p)\n", This); - LOCK_MODULE(); + TRACE("(%p)\n", iface); return 2; } static ULONG WINAPI InternetProtocolInfo_Release(IInternetProtocolInfo *iface) { - ProtocolFactory *This = PROTOCOLINFO_THIS(iface); - TRACE("(%p)\n", This); - UNLOCK_MODULE(); + TRACE("(%p)\n", iface); return 1; } @@ -133,15 +129,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { - ProtocolFactory *This = CLASSFACTORY_THIS(iface); - - TRACE("(%p)->(%x)\n", This, dolock); - - if(dolock) - LOCK_MODULE(); - else - UNLOCK_MODULE(); - + TRACE("(%p)->(%x)\n", iface, dolock); return S_OK; } @@ -215,7 +203,6 @@ static ULONG WINAPI AboutProtocol_Release(IInternetProtocol *iface) if(!ref) { heap_free(This->data); heap_free(This); - UNLOCK_MODULE(); } return pUnkOuter ? IUnknown_Release(pUnkOuter) : ref; @@ -408,9 +395,7 @@ static HRESULT WINAPI AboutProtocolFactory_CreateInstance(IClassFactory *iface, hres = IInternetProtocol_QueryInterface(PROTOCOL(ret), riid, ppv); } - if(SUCCEEDED(hres)) - LOCK_MODULE(); - else + if(FAILED(hres)) heap_free(ret); return hres; @@ -583,7 +568,6 @@ static ULONG WINAPI ResProtocol_Release(IInternetProtocol *iface) if(!ref) { heap_free(This->data); heap_free(This); - UNLOCK_MODULE(); } return pUnkOuter ? IUnknown_Release(pUnkOuter) : ref; @@ -833,9 +817,7 @@ static HRESULT WINAPI ResProtocolFactory_CreateInstance(IClassFactory *iface, IU hres = IInternetProtocol_QueryInterface(PROTOCOL(ret), riid, ppv); } - if(SUCCEEDED(hres)) - LOCK_MODULE(); - else + if(FAILED(hres)) heap_free(ret); return hres;

1 0

Christian Costa : quartz: Turn some fixmes into traces.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 480e6970356fb27e745950861bf83524394ecaa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480e6970356fb27e745950861… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 7 12:09:43 2008 +0100 quartz: Turn some fixmes into traces. --- dlls/quartz/avisplit.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 513bd88..94d2c9b 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -359,8 +359,10 @@ static DWORD WINAPI AVISplitter_thread_reader(LPVOID data) AVISplitter_SendEndOfFile(This, streamnumber); } while (hr == S_OK); - FIXME("Thread %u terminated with hr %08x!\n", streamnumber, hr); - + if (hr != S_FALSE) + FIXME("Thread %u terminated with hr %08x!\n", streamnumber, hr); + else + TRACE("Thread %u terminated properly\n", streamnumber); return hr; } @@ -472,7 +474,7 @@ static HRESULT AVISplitter_first_request(LPVOID iface) args->This = This; args->stream = x; This->streams[x].thread = CreateThread(NULL, 0, AVISplitter_thread_reader, args, 0, &tid); - FIXME("Created stream %u thread 0x%08x\n", x, tid); + TRACE("Created stream %u thread 0x%08x\n", x, tid); } if (FAILED(hr)) @@ -491,7 +493,7 @@ static HRESULT AVISplitter_done_process(LPVOID iface) { StreamData *stream = This->streams + x; - FIXME("Waiting for %u to terminate\n", x); + TRACE("Waiting for %u to terminate\n", x); /* Make the thread return first */ SetEvent(stream->packet_queued); assert(WaitForSingleObject(stream->thread, 100000) != WAIT_TIMEOUT); @@ -504,7 +506,7 @@ static HRESULT AVISplitter_done_process(LPVOID iface) ResetEvent(stream->packet_queued); } - FIXME("All threads are now terminated\n"); + TRACE("All threads are now terminated\n"); return S_OK; } @@ -1194,7 +1196,7 @@ static HRESULT AVISplitter_Flush(LPVOID iface) AVISplitterImpl *This = (AVISplitterImpl*)iface; DWORD x; - ERR("(%p)->()\n", This); + TRACE("(%p)->()\n", This); for (x = 0; x < This->Parser.cStreams; ++x) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put posWidth.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: b6fa5a21009fb11d9ae3d4f394cad0506e7e7f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fa5a21009fb11d9ae3d4f39… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Dec 8 21:08:17 2008 +1100 mshtml: Implement IHTMLStyle get/put posWidth. --- dlls/mshtml/htmlstyle.c | 18 ++++++++++++++---- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index d81fdb5..b612f6a 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1909,15 +1909,25 @@ static HRESULT WINAPI HTMLStyle_get_posLeft(IHTMLStyle *iface, float *p) static HRESULT WINAPI HTMLStyle_put_posWidth(IHTMLStyle *iface, float v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%f)\n", This, v); + + return set_style_pos(This, STYLEID_WIDTH, v); } static HRESULT WINAPI HTMLStyle_get_posWidth(IHTMLStyle *iface, float *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!p) + return E_POINTER; + + if(get_nsstyle_pos(This, STYLEID_WIDTH, p) != S_OK) + *p = 0.0f; + + return S_OK; } static HRESULT WINAPI HTMLStyle_put_posHeight(IHTMLStyle *iface, float v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c7fcc74..cf8f8f0 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2340,12 +2340,26 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "get_textDecorationLineThrough failed: %08x\n", hres); ok(b == VARIANT_FALSE, "textDecorationLineThrough = %x\n", b); + hres = IHTMLStyle_get_posWidth(style, NULL); + ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres); + + hres = IHTMLStyle_get_posWidth(style, &f); + ok(hres == S_OK, "get_posWidth failed: %08x\n", hres); + ok(f == 0.0f, "f = %f\n", f); + V_VT(&v) = VT_EMPTY; hres = IHTMLStyle_get_width(style, &v); ok(hres == S_OK, "get_width failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(v)=%p\n", V_BSTR(&v)); + hres = IHTMLStyle_put_posWidth(style, 2.2); + ok(hres == S_OK, "get_posWidth failed: %08x\n", hres); + + hres = IHTMLStyle_get_posWidth(style, &f); + ok(hres == S_OK, "get_posWidth failed: %08x\n", hres); + ok(f == 2.0f, "f = %f\n", f); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("auto"); hres = IHTMLStyle_put_width(style, v);

1 0