November 2014 - Wine-Commits

Nikolay Sivov : dwrite: Implement GetLastWriteTime() for local stream.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: f16960aeb827037bd933e4d61e0fc9f3dc06c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16960aeb827037bd933e4d61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 12:43:10 2014 +0300 dwrite: Implement GetLastWriteTime() for local stream. --- dlls/dwrite/font.c | 26 ++++++++++++++++---------- dlls/dwrite/tests/font.c | 7 +++++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 91aca96..ed38a6f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1973,11 +1973,17 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW } /* IDWriteLocalFontFileLoader and its required IDWriteFontFileStream */ +struct local_refkey +{ + FILETIME writetime; + WCHAR name[1]; +}; + struct local_cached_stream { struct list entry; IDWriteFontFileStream *stream; - void *key; + struct local_refkey *key; UINT32 key_size; }; @@ -1990,12 +1996,6 @@ struct dwrite_localfontfilestream HANDLE handle; }; -struct local_refkey -{ - FILETIME writetime; - WCHAR name[1]; -}; - struct dwrite_localfontfileloader { IDWriteLocalFontFileLoader IDWriteLocalFontFileLoader_iface; LONG ref; @@ -2106,9 +2106,15 @@ static HRESULT WINAPI localfontfilestream_GetFileSize(IDWriteFontFileStream *ifa static HRESULT WINAPI localfontfilestream_GetLastWriteTime(IDWriteFontFileStream *iface, UINT64 *last_writetime) { struct dwrite_localfontfilestream *This = impl_from_IDWriteFontFileStream(iface); - FIXME("(%p)->(%p): stub\n",This, last_writetime); - *last_writetime = 0; - return E_NOTIMPL; + ULARGE_INTEGER li; + + TRACE("(%p)->(%p)\n", This, last_writetime); + + li.LowPart = This->entry->key->writetime.dwLowDateTime; + li.HighPart = This->entry->key->writetime.dwHighDateTime; + *last_writetime = li.QuadPart; + + return S_OK; } static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b8ff22d..ba916a9 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2362,6 +2362,7 @@ static void test_CreateStreamFromKey(void) IDWriteFontFileLoader *loader; IDWriteFactory *factory; IDWriteFontFile *file; + UINT64 writetime; void *key; UINT32 size; HRESULT hr; @@ -2398,6 +2399,12 @@ static void test_CreateStreamFromKey(void) hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(stream, 1); + + writetime = 0; + hr = IDWriteFontFileStream_GetLastWriteTime(stream, &writetime); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(writetime != 0, "got %08x%08x\n", (UINT)(writetime >> 32), (UINT)writetime); + IDWriteFontFileStream_Release(stream); IDWriteLocalFontFileLoader_Release(localloader);

1 0

Sebastian Lackner : comctl32: Fix invalid usage of CompareString in StrRStr functions.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 194b7cd5ae69e8243f3fbd653b31417b45e23252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=194b7cd5ae69e8243f3fbd653… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 06:51:00 2014 +0100 comctl32: Fix invalid usage of CompareString in StrRStr functions. --- dlls/comctl32/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 8d41508..5e28b8f 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -683,7 +683,7 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); - while (lpszStr <= lpszEnd && *lpszStr) + while (lpszStr + iLen <= lpszEnd && *lpszStr) { ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | lpszStr[1] : *lpszStr; if (!COMCTL32_ChrCmpIA(ch1, ch2)) @@ -716,7 +716,7 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) iLen = strlenW(lpszSearch); - while (lpszStr <= lpszEnd && *lpszStr) + while (lpszStr + iLen <= lpszEnd && *lpszStr) { if (!COMCTL32_ChrCmpIW(*lpszSearch, *lpszStr)) {

1 0

Sebastian Lackner : comctl32: Fix incorrect usage of CompareString in SYSLINK_ParseText.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: e2c0694901638c803aaa88d5c49164e8e4802f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c0694901638c803aaa88d5c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 07:05:05 2014 +0100 comctl32: Fix incorrect usage of CompareString in SYSLINK_ParseText. --- dlls/comctl32/syslink.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index a5ba3dd..eeb46b9 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -184,6 +184,26 @@ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr) } /*********************************************************************** + * SYSLINK_StrCmpNIW + * Wrapper for StrCmpNIW to ensure 'len' is not too big. + */ +static INT SYSLINK_StrCmpNIW (LPCWSTR str, LPCWSTR comp, INT len) +{ + INT i; + + for(i = 0; i < len; i++) + { + if(!str[i]) + { + len = i + 1; + break; + } + } + + return StrCmpNIW(str, comp, len); +} + +/*********************************************************************** * SYSLINK_ParseText * Parses the window text string and creates a document. Returns the * number of document items created. @@ -203,7 +223,7 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { if(*current == '<') { - if(!StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) + if(!SYSLINK_StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -231,14 +251,14 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) CheckParameter: /* compare the current position with all known parameters */ - if(!StrCmpNIW(tmp, SL_HREF, 6)) + if(!SYSLINK_StrCmpNIW(tmp, SL_HREF, 6)) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!StrCmpNIW(tmp, SL_ID, 4)) + else if(!SYSLINK_StrCmpNIW(tmp, SL_ID, 4)) { taglen += 4; ValidParam = TRUE; @@ -312,7 +332,7 @@ CheckParameter: } } } - else if(!StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) + else if(!SYSLINK_StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) { /* there's a <a...> tag opened, first add the previous text, if present */ if(textstart != NULL && textlen > 0 && firsttag > textstart)

1 0

Sebastian Lackner : user32/tests: Add multi-threaded tests for [Get|Set] WindowText.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: c56ba461a2560c581ff8a792b220e5ae67e82d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c56ba461a2560c581ff8a792b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:13:27 2014 +0100 user32/tests: Add multi-threaded tests for [Get|Set]WindowText. --- dlls/user32/tests/win.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6922cd0..5ed0a06 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5693,13 +5693,47 @@ static void test_ShowWindow(void) ok(!IsWindow(hwnd), "window should not exist\n"); } +static DWORD CALLBACK gettext_msg_thread( LPVOID arg ) +{ + HWND hwnd = arg; + char buf[32]; + INT buf_len; + + /* test GetWindowTextA */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + return 0; +} + +static DWORD CALLBACK settext_msg_thread( LPVOID arg ) +{ + HWND hwnd = arg; + BOOL success; + + /* test SetWindowTextA */ + num_settext_msgs = 0; + success = SetWindowTextA( hwnd, "thread_caption" ); + ok( success, "SetWindowTextA failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + return 0; +} + static void test_gettext(void) { + DWORD tid, num_msgs; + HANDLE thread; BOOL success; char buf[32]; INT buf_len; HWND hwnd; LRESULT r; + MSG msg; hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); @@ -5746,6 +5780,42 @@ static void test_gettext(void) ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf ); ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + + /* test interthread GetWindowTextA */ + num_msgs = 0; + thread = CreateThread( NULL, 0, gettext_msg_thread, hwnd, 0, &tid ); + ok(thread != NULL, "CreateThread failed, error %d\n", GetLastError()); + while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_SENDMESSAGE ) != WAIT_OBJECT_0) + { + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + num_msgs++; + } + CloseHandle( thread ); + ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + + /* test interthread SetWindowText */ + num_msgs = 0; + thread = CreateThread( NULL, 0, settext_msg_thread, hwnd, 0, &tid ); + ok(thread != NULL, "CreateThread failed, error %d\n", GetLastError()); + while (MsgWaitForMultipleObjects( 1, &thread, FALSE, INFINITE, QS_SENDMESSAGE ) != WAIT_OBJECT_0) + { + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE | PM_QS_SENDMESSAGE )) + DispatchMessageA( &msg ); + num_msgs++; + } + CloseHandle( thread ); + ok( num_msgs == 1, "got %u wakeups from MsgWaitForMultipleObjects\n", num_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "thread_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + /* seems to crash on every modern Windows version */ if (0) {

1 0

Sebastian Lackner : user32/tests: Add single-threaded tests for WM_[ GET|SET]TEXT and [Get|Set]WindowText.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: d6bdae11df7a4481a68082e54d75360ecbd82236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bdae11df7a4481a68082e54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:11:10 2014 +0100 user32/tests: Add single-threaded tests for WM_[GET|SET]TEXT and [Get|Set]WindowText. --- dlls/user32/tests/win.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 24cbd78..6922cd0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -64,6 +64,7 @@ static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); static BOOL test_lbuttondown_flag; static DWORD num_gettext_msgs; +static DWORD num_settext_msgs; static HWND hwndMessage; static HWND hwndMain, hwndMain2; static HHOOK hhook; @@ -798,6 +799,9 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_GETTEXT: num_gettext_msgs++; break; + case WM_SETTEXT: + num_settext_msgs++; + break; } return DefWindowProcA(hwnd, msg, wparam, lparam); @@ -5691,12 +5695,57 @@ static void test_ShowWindow(void) static void test_gettext(void) { + BOOL success; + char buf[32]; + INT buf_len; HWND hwnd; LRESULT r; hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL ); ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + /* test GetWindowTextA */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test WM_GETTEXT */ + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + r = SendMessageA( hwnd, WM_GETTEXT, sizeof(buf), (LONG_PTR)buf ); + ok( r != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test SetWindowTextA */ + num_settext_msgs = 0; + success = SetWindowTextA( hwnd, "new_caption" ); + ok( success, "SetWindowTextA failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "new_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + /* test WM_SETTEXT */ + num_settext_msgs = 0; + r = SendMessageA( hwnd, WM_SETTEXT, 0, (ULONG_PTR)"another_caption" ); + ok( r != 0, "WM_SETTEXT failed\n" ); + ok( num_settext_msgs == 1, "got %u WM_SETTEXT messages\n", num_settext_msgs ); + + num_gettext_msgs = 0; + memset( buf, 0, sizeof(buf) ); + buf_len = GetWindowTextA( hwnd, buf, sizeof(buf) ); + ok( buf_len != 0, "expected a nonempty window text\n" ); + ok( !strcmp(buf, "another_caption"), "got wrong window text '%s'\n", buf ); + ok( num_gettext_msgs == 1, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + /* seems to crash on every modern Windows version */ if (0) {

1 0

Caron Wills : wined3d: Add NVIDIA GeForce GTX 970 to supported device list.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 9f36db8fa5a863971542e524c7546ed88def61dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f36db8fa5a863971542e524c… Author: Caron Wills <caron(a)codeweavers.com> Date: Mon Nov 17 10:12:58 2014 -0600 wined3d: Add NVIDIA GeForce GTX 970 to supported device list. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index abb25a1..d5dbd3d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1293,6 +1293,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1720,6 +1721,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ @@ -2074,6 +2076,7 @@ cards_amd_mesa[] = cards_nvidia_mesa[] = { /* Maxwell */ + {"NV124", CARD_NVIDIA_GEFORCE_GTX970}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b7803c9..193f10a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1524,6 +1524,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, + CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Jacek Caban : mshtml: Added IHTMLStyleSheet:: cssText property partial implementation.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: cc8d9f238d701b6f69d28d321f0bb9f39557e2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc8d9f238d701b6f69d28d321… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:03:01 2014 +0100 mshtml: Added IHTMLStyleSheet::cssText property partial implementation. --- dlls/mshtml/htmlstylesheet.c | 64 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 6480975..d2960d2 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -629,15 +630,70 @@ static HRESULT WINAPI HTMLStyleSheet_get_media(IHTMLStyleSheet *iface, BSTR *p) static HRESULT WINAPI HTMLStyleSheet_put_cssText(IHTMLStyleSheet *iface, BSTR v) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + do { + nsres = nsIDOMCSSStyleSheet_DeleteRule(This->nsstylesheet, 0); + }while(NS_SUCCEEDED(nsres)); + + if(v && *v) { + nsAString nsstr; + UINT32 idx; + + /* FIXME: This won't work for multiple rules in the string. */ + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMCSSStyleSheet_InsertRule(This->nsstylesheet, &nsstr, 0, &idx); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + FIXME("InsertRule failed for string %s. Probably multiple rules passed.\n", debugstr_w(v)); + return E_FAIL; + } + } + + return S_OK; } static HRESULT WINAPI HTMLStyleSheet_get_cssText(IHTMLStyleSheet *iface, BSTR *p) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMCSSRuleList *nslist = NULL; + nsIDOMCSSRule *nsrule; + nsAString nsstr; + UINT32 len; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMCSSStyleSheet_GetCssRules(This->nsstylesheet, &nslist); + if(NS_FAILED(nsres)) { + ERR("GetCssRules failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMCSSRuleList_GetLength(nslist, &len); + assert(nsres == NS_OK); + + if(len) { + nsres = nsIDOMCSSRuleList_Item(nslist, 0, &nsrule); + if(NS_FAILED(nsres)) + ERR("Item failed: %08x\n", nsres); + } + + nsIDOMCSSRuleList_Release(nslist); + if(NS_FAILED(nsres)) + return E_FAIL; + + if(!len) { + *p = NULL; + return S_OK; + } + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMCSSRule_GetCssText(nsrule, &nsstr); + nsIDOMCSSRule_Release(nsrule); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLStyleSheet_get_rules(IHTMLStyleSheet *iface,

1 0

Michael Stefaniuc : regedit: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: a542a13a02ac0e7de3c2c9706333cb7366d9f669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a542a13a02ac0e7de3c2c9706… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:25:22 2014 +0100 regedit: Simplify check for an empty string (PVS-Studio). --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 1635b50..0a56f94 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -286,7 +286,7 @@ static UINT_PTR CALLBACK ExportRegistryFile_OFNHookProc(HWND hdlg, UINT uiMsg, W BOOL export_branch = FALSE; WCHAR* path = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); SendDlgItemMessageW(hdlg, IDC_EXPORT_PATH, WM_SETTEXT, 0, (LPARAM)path); - if (path && strlenW(path) > 0) + if (path && path[0]) export_branch = TRUE; HeapFree(GetProcessHeap(), 0, path); CheckRadioButton(hdlg, IDC_EXPORT_ALL, IDC_EXPORT_SELECTED, export_branch ? IDC_EXPORT_SELECTED : IDC_EXPORT_ALL);

1 0

Michael Stefaniuc : winemapi: Simplify check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: 2beb5518c5afd9ca0028c04ba74532b5f5687d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2beb5518c5afd9ca0028c04ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 18 10:23:53 2014 +0100 winemapi: Simplify check for an empty string (PVS-Studio). --- dlls/winemapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index 8cd6b6d..b627d49 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -100,7 +100,7 @@ ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, TRACE("(0x%08lx 0x%08lx %s 0x%08x 0x%08x %p)\n", session, uiparam, debugstr_a(name), flags, reserved, recip); - if (!name || !strlen(name)) + if (!name || !name[0]) return MAPI_E_FAILURE; scode = MAPIAllocateBuffer(sizeof(**recip) + sizeof(smtp) + strlen(name),

1 0

Sebastian Lackner : user32: Avoid sending window messages in FindWindowExW.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: d5ba7451a34bcdd1af5734cfc320f52abc957258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ba7451a34bcdd1af5734cfc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Nov 18 05:15:52 2014 +0100 user32: Avoid sending window messages in FindWindowExW. --- dlls/user32/tests/win.c | 3 --- dlls/user32/win.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5ed0a06..404017f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7055,7 +7055,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); num_gettext_msgs = 0; @@ -7066,7 +7065,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "caption" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); DestroyWindow( hwnd ); @@ -7077,7 +7075,6 @@ static void test_FindWindowEx(void) num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); - todo_wine ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); num_gettext_msgs = 0; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 73cad0c..0516193 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1941,7 +1941,7 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t { while (list[i]) { - if (GetWindowTextW( list[i], buffer, len + 1 )) + if (InternalGetWindowText( list[i], buffer, len + 1 )) { if (!strcmpiW( buffer, title )) break; }

1 0