June 2014 - Wine-Commits - list.winehq.org

Bruno Jesus : user32/tests: Fix a memory leak (valgrind).
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d90d2ab558fc81aee64a29b3f566bab4aa4c8f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90d2ab558fc81aee64a29b3f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 29 20:35:13 2014 -0300 user32/tests: Fix a memory leak (valgrind). --- dlls/user32/tests/cursoricon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 9540f3d..54d7963 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1699,6 +1699,7 @@ static void test_GetCursorFrameInfo(void) ret = DestroyCursor(h1); ok(ret, "DestroyCursor() failed (error = %d).\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, hotspot); cleanup: if(bmpOld) SelectObject(hdc, bmpOld); if(bmp) DeleteObject(bmp);

1 0

Nikolay Sivov : shell32: Update to FolderItem2.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: c318cda8d17c2c7751c954b0ef9ada2db3d33904 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c318cda8d17c2c7751c954b0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 24 18:23:52 2014 +0400 shell32: Update to FolderItem2. --- dlls/shell32/shelldispatch.c | 93 +++++++++++++++++++++++++----------------- include/shldisp.idl | 12 ++++++ 2 files changed, 67 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c318cda8d17c2c7751c95…

1 0

Huw Davies : gdi32/tests: tmLastChar is solely governed by the last entry before 0xffff in the cmap.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 0987e77089880680ae9deb01f3b550bce43f0ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0987e77089880680ae9deb01f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 23 11:33:54 2014 +0100 gdi32/tests: tmLastChar is solely governed by the last entry before 0xffff in the cmap. --- dlls/gdi32/tests/font.c | 40 ++++++++++++---------------------------- dlls/gdi32/tests/wine_test.sfd | 39 +++++++++++++++++++-------------------- dlls/gdi32/tests/wine_test.ttf | Bin 1760 -> 1776 bytes 3 files changed, 31 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0e75088..e978166 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3255,42 +3255,20 @@ static BOOL get_first_last_from_cmap4(void *ptr, DWORD *first, DWORD *last, DWOR int i; cmap_format_4 *cmap = (cmap_format_4*)ptr; USHORT seg_count = GET_BE_WORD(cmap->seg_countx2) / 2; - USHORT const *glyph_ids = cmap->end_count + 4 * seg_count + 1; *first = 0x10000; for(i = 0; i < seg_count; i++) { - DWORD code, index; cmap_format_4_seg seg; get_seg4(cmap, i, &seg); - for(code = seg.start_count; code <= seg.end_count; code++) - { - if(seg.id_range_offset == 0) - index = (seg.id_delta + code) & 0xffff; - else - { - index = seg.id_range_offset / 2 - + code - seg.start_count - + i - seg_count; - /* some fonts have broken last segment */ - if ((char *)(glyph_ids + index + 1) < (char *)ptr + limit) - index = GET_BE_WORD(glyph_ids[index]); - else - { - trace("segment %04x/%04x index %04x points to nowhere\n", - seg.start_count, seg.end_count, index); - index = 0; - } - if(index) index += seg.id_delta; - } - if(*first == 0x10000) - *last = *first = code; - else if(index) - *last = code; - } + if(seg.start_count > 0xfffe) break; + + if(*first == 0x10000) *first = seg.start_count; + + *last = min(seg.end_count, 0xfffe); } if(*first == 0x10000) return FALSE; @@ -3560,7 +3538,7 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) else { expect_first_W = cmap_first; - expect_last_W = min(cmap_last, os2_last_char); + expect_last_W = cmap_last; if(os2_first_char <= 1) expect_break_W = os2_first_char + 2; else if(os2_first_char > 0xff) @@ -5064,6 +5042,7 @@ static void test_GetGlyphOutline_metric_clipping(void) HFONT hfont, hfont_prev; GLYPHMETRICS gm; TEXTMETRICA tm; + TEXTMETRICW tmW; DWORD ret; memset(&lf, 0, sizeof(lf)); @@ -5092,6 +5071,11 @@ static void test_GetGlyphOutline_metric_clipping(void) "Glyph bottom(%d) exceeds descent(%d)\n", gm.gmptGlyphOrigin.y - gm.gmBlackBoxY, -tm.tmDescent); + /* Test tmLastChar - wine_test has code points fffb-fffe mapped to glyph 0 */ + GetTextMetricsW(hdc, &tmW); +todo_wine + ok( tmW.tmLastChar == 0xfffe, "got %04x\n", tmW.tmLastChar); + SelectObject(hdc, hfont_prev); DeleteObject(hfont); ReleaseDC(NULL, hdc); diff --git a/dlls/gdi32/tests/wine_test.sfd b/dlls/gdi32/tests/wine_test.sfd index 4c19377..c985b43 100644 --- a/dlls/gdi32/tests/wine_test.sfd +++ b/dlls/gdi32/tests/wine_test.sfd @@ -12,15 +12,13 @@ Ascent: 1638 Descent: 410 sfntRevision: 0x00010000 LayerCount: 2 -Layer: 0 1 "Back" 1 -Layer: 1 1 "Fore" 0 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 XUID: [1021 905 592216984 1247726] FSType: 0 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 -CreationTime: 1288336343 -ModificationTime: 1366465321 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 @@ -92,6 +90,7 @@ BeginChars: 65539 7 StartChar: .notdef Encoding: 65536 -1 0 +AltUni2: 00fffe.ffffffff.0 00fffd.ffffffff.0 00fffc.ffffffff.0 00fffb.ffffffff.0 Width: 748 Flags: W TtInstrs: @@ -212,14 +211,14 @@ Flags: WO LayerCount: 2 Fore SplineSet -459 1258 m 29,0,-1 - 462 1639 l 5,1,-1 - 389 1638 l 5,2,-1 - 492 1815 l 5,3,-1 - 609 1638.5 l 5,4,-1 - 531 1637.5 l 5,5,-1 - 523 1258 l 5,6,-1 - 459 1258 l 29,0,-1 +459 1258 m 25,0,-1 + 462 1639 l 1,1,-1 + 389 1638 l 1,2,-1 + 492 1815 l 1,3,-1 + 609 1638.5 l 1,4,-1 + 531 1637.5 l 1,5,-1 + 523 1258 l 1,6,-1 + 459 1258 l 25,0,-1 EndSplineSet EndChar @@ -231,14 +230,14 @@ Flags: WO LayerCount: 2 Fore SplineSet -461 -30.7998 m 29,0,-1 - 464 -411.8 l 5,1,-1 - 391 -410.8 l 5,2,-1 - 494 -587.8 l 5,3,-1 - 611 -411.3 l 5,4,-1 - 533 -410.3 l 5,5,-1 - 525 -30.7998 l 5,6,-1 - 461 -30.7998 l 29,0,-1 +461 -30.7998 m 25,0,-1 + 464 -411.8 l 1,1,-1 + 391 -410.8 l 1,2,-1 + 494 -587.8 l 1,3,-1 + 611 -411.3 l 1,4,-1 + 533 -410.3 l 1,5,-1 + 525 -30.7998 l 1,6,-1 + 461 -30.7998 l 25,0,-1 EndSplineSet EndChar EndChars diff --git a/dlls/gdi32/tests/wine_test.ttf b/dlls/gdi32/tests/wine_test.ttf index 0868802..1562a32 100644 Binary files a/dlls/gdi32/tests/wine_test.ttf and b/dlls/gdi32/tests/wine_test.ttf differ

1 0

Jacek Caban : mshtml: Added function object default value getter implementation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 62624922528d640cb1a86a699960233c562b316d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62624922528d640cb1a86a699… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 2 15:45:13 2014 +0200 mshtml: Added function object default value getter implementation. --- dlls/mshtml/dispex.c | 31 +++++++++++++++++++++++++++++++ dlls/mshtml/tests/jstest.html | 3 +++ dlls/mshtml/tests/script.c | 37 ++++++++++++++++++++++++++++++++++--- 3 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d68a132..a81bf7c 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -717,6 +717,37 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR return E_UNEXPECTED; hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; + case DISPATCH_PROPERTYGET: { + unsigned name_len; + WCHAR *ptr; + BSTR str; + + static const WCHAR func_prefixW[] = + {'\n','f','u','n','c','t','i','o','n',' '}; + static const WCHAR func_suffixW[] = + {'(',')',' ','{','\n',' ',' ',' ',' ','[','n','a','t','i','v','e',' ','c','o','d','e',']','\n','}','\n'}; + + /* FIXME: This probably should be more generic. Also we should try to get IID_IActiveScriptSite and SID_GetCaller. */ + if(!caller) + return E_ACCESSDENIED; + + name_len = SysStringLen(This->info->name); + ptr = str = SysAllocStringLen(NULL, name_len + (sizeof(func_prefixW)+sizeof(func_suffixW))/sizeof(WCHAR)); + if(!str) + return E_OUTOFMEMORY; + + memcpy(ptr, func_prefixW, sizeof(func_prefixW)); + ptr += sizeof(func_prefixW)/sizeof(WCHAR); + + memcpy(ptr, This->info->name, name_len*sizeof(WCHAR)); + ptr += name_len; + + memcpy(ptr, func_suffixW, sizeof(func_suffixW)); + + V_VT(res) = VT_BSTR; + V_BSTR(res) = str; + return S_OK; + } default: FIXME("Unimplemented flags %x\n", flags); hres = E_NOTIMPL; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index bfa98c0..b47de42 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -165,6 +165,9 @@ function test_override_functions() { var tmp = div.addBehavior(); ok(tmp === "test", "div.addBehavior() = " + tmp); + + tmp = String(div.attachEvent); + ok(tmp == "\nfunction attachEvent() {\n [native code]\n}\n", "String(div.attachEvent) = " + tmp); } function test_forin() { diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index df52a75..5e9ca60 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -132,6 +132,8 @@ DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller_secmgr); DEFINE_EXPECT(AXSetInterfaceSafetyOptions_IDispatchEx_caller); DEFINE_EXPECT(external_success); DEFINE_EXPECT(QS_VariantConversion); +DEFINE_EXPECT(QS_IActiveScriptSite); +DEFINE_EXPECT(QS_GetCaller); DEFINE_EXPECT(ChangeType); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" @@ -162,6 +164,9 @@ static HRESULT ax_getopt_hres = S_OK, ax_setopt_dispex_hres = S_OK; static HRESULT ax_setopt_disp_caller_hres = S_OK, ax_setopt_disp_data_hres = S_OK; static BOOL skip_loadobject_tests; +static IActiveScriptSite *site; +static SCRIPTSTATE state; + static int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -332,6 +337,19 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return S_OK; } + if(IsEqualGUID(guidService, &IID_IActiveScriptSite)) { + CHECK_EXPECT(QS_IActiveScriptSite); + ok(IsEqualGUID(riid, &IID_IOleCommandTarget), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + return IActiveScriptSite_QueryInterface(site, riid, ppv); + } + + if(IsEqualGUID(guidService, &SID_GetCaller)) { + CHECK_EXPECT(QS_GetCaller); + ok(IsEqualGUID(riid, &IID_IServiceProvider), "uenxpected riid %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -1280,9 +1298,6 @@ static void load_doc(IHTMLDocument2 *doc, const char *str) IHTMLElement_Release(body); } -static IActiveScriptSite *site; -static SCRIPTSTATE state; - static HRESULT WINAPI ObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -1902,6 +1917,22 @@ static void test_func(IDispatchEx *obj) hres = dispex_propput(obj, id, 0, &var, NULL); ok(hres == E_NOTIMPL, "InvokeEx failed: %08x\n", hres); + hres = dispex_propget(dispex, DISPID_VALUE, &var, NULL); + ok(hres == E_ACCESSDENIED, "InvokeEx returned: %08x, expected E_ACCESSDENIED\n", hres); + if(SUCCEEDED(hres)) + VariantClear(&var); + + SET_EXPECT(QS_IActiveScriptSite); + SET_EXPECT(QS_GetCaller); + hres = dispex_propget(dispex, DISPID_VALUE, &var, &caller_sp); + ok(hres == S_OK, "InvokeEx returned: %08x, expected S_OK\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + ok(!strcmp_wa(V_BSTR(&var), "\nfunction toString() {\n [native code]\n}\n"), + "V_BSTR(var) = %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + todo_wine CHECK_CALLED(QS_IActiveScriptSite); + todo_wine CHECK_CALLED(QS_GetCaller); + IDispatchEx_Release(dispex); }

1 0

Nikolay Sivov : include: Add more error codes.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 056a8f1d2362240d9db6889895e0f500636e2e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056a8f1d2362240d9db688989… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:10:06 2014 +0400 include: Add more error codes. --- include/winbase.h | 1 - include/winerror.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/include/winbase.h b/include/winbase.h index 29ff218..7432983 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1045,7 +1045,6 @@ typedef struct COPYFILE2_EXTENDED_PARAMETERS #define WAIT_ABANDONED STATUS_ABANDONED_WAIT_0 #define WAIT_ABANDONED_0 STATUS_ABANDONED_WAIT_0 #define WAIT_IO_COMPLETION STATUS_USER_APC -#define WAIT_TIMEOUT STATUS_TIMEOUT #define STILL_ACTIVE STATUS_PENDING #define FILE_BEGIN 0 diff --git a/include/winerror.h b/include/winerror.h index 9d988fb..3c3a53b 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -239,6 +239,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_MAX_THRDS_REACHED 164 #define ERROR_LOCK_FAILED 167 #define ERROR_BUSY 170 +#define ERROR_DEVICE_SUPPORT_IN_PROGRESS 171 #define ERROR_CANCEL_VIOLATION 173 #define ERROR_ATOMIC_LOCKS_NOT_SUPPORTED 174 #define ERROR_INVALID_SEGMENT_NUMBER 180 @@ -272,6 +273,16 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_TOO_MANY_MODULES 214 #define ERROR_NESTING_NOT_ALLOWED 215 #define ERROR_EXE_MACHINE_TYPE_MISMATCH 216 +#define ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY 217 +#define ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY 218 +#define ERROR_FILE_CHECKED_OUT 220 +#define ERROR_CHECKOUT_REQUIRED 221 +#define ERROR_BAD_FILE_TYPE 222 +#define ERROR_FILE_TOO_LARGE 223 +#define ERROR_FORMS_AUTH_REQUIRED 224 +#define ERROR_VIRUS_INFECTED 225 +#define ERROR_VIRUS_DELETED 226 +#define ERROR_PIPE_LOCAL 229 #define ERROR_BAD_PIPE 230 #define ERROR_PIPE_BUSY 231 #define ERROR_NO_DATA 232 @@ -280,6 +291,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_VC_DISCONNECTED 240 #define ERROR_INVALID_EA_NAME 254 #define ERROR_EA_LIST_INCONSISTENT 255 +#define WAIT_TIMEOUT 258 #define ERROR_NO_MORE_ITEMS 259 #define ERROR_CANNOT_COPY 266 #define ERROR_DIRECTORY 267 @@ -294,8 +306,44 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_OPLOCK_NOT_GRANTED 300 #define ERROR_INVALID_OPLOCK_PROTOCOL 301 #define ERROR_DISK_TOO_FRAGMENTED 302 +#define ERROR_DELETE_PENDING 303 +#define ERROR_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING 304 +#define ERROR_SHORT_NAMES_NOT_ENABLED_ON_VOLUME 305 +#define ERROR_SECURITY_STREAM_IS_INCONSISTENT 306 +#define ERROR_INVALID_LOCK_RANGE 307 +#define ERROR_IMAGE_SUBSYSTEM_NOT_PRESENT 308 +#define ERROR_NOTIFICATION_GUID_ALREADY_DEFINED 309 +#define ERROR_INVALID_EXCEPTION_HANDLER 310 +#define ERROR_DUPLICATE_PRIVILEGES 311 +#define ERROR_NO_RANGES_PROCESSED 312 +#define ERROR_NOT_ALLOWED_ON_SYSTEM_FILE 313 +#define ERROR_DISK_RESOURCES_EXHAUSTED 314 +#define ERROR_INVALID_TOKEN 315 +#define ERROR_DEVICE_FEATURE_NOT_SUPPORTED 316 #define ERROR_MR_MID_NOT_FOUND 317 #define ERROR_SCOPE_NOT_FOUND 318 +#define ERROR_UNDEFINED_SCOPE 319 +#define ERROR_INVALID_CAP 320 +#define ERROR_DEVICE_UNREACHABLE 321 +#define ERROR_DEVICE_NO_RESOURCES 322 +#define ERROR_DATA_CHECKSUM_ERROR 323 +#define ERROR_INTERMIXED_KERNEL_EA_OPERATION 324 +#define ERROR_FILE_LEVEL_TRIM_NOT_SUPPORTED 326 +#define ERROR_OFFSET_ALIGNMENT_VIOLATION 327 +#define ERROR_INVALID_FIELD_IN_PARAMETER_LIST 328 +#define ERROR_OPERATION_IN_PROGRESS 329 +#define ERROR_BAD_DEVICE_PATH 330 +#define ERROR_TOO_MANY_DESCRIPTORS 331 +#define ERROR_SCRUB_DATA_DISABLED 332 +#define ERROR_NOT_REDUNDANT_STORAGE 333 +#define ERROR_RESIDENT_FILE_NOT_SUPPORTED 334 +#define ERROR_COMPRESSED_FILE_NOT_SUPPORTED 335 +#define ERROR_DIRECTORY_NOT_SUPPORTED 336 +#define ERROR_NOT_READ_FROM_COPY 337 +#define ERROR_FT_WRITE_FAILURE 338 +#define ERROR_FT_DI_SCAN_REQUIRED 339 +#define ERROR_INVALID_KERNEL_INFO_VERSION 340 +#define ERROR_INVALID_PEP_INFO_VERSION 341 #define ERROR_FAIL_NOACTION_REBOOT 350 #define ERROR_FAIL_SHUTDOWN 351 #define ERROR_FAIL_RESTART 352 @@ -463,7 +511,15 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_FIRMWARE_UPDATED 728 #define ERROR_DRIVERS_LEAKING_LOCKED_PAGES 729 #define ERROR_WAKE_SYSTEM 730 +#define ERROR_WAIT_1 731 +#define ERROR_WAIT_2 732 +#define ERROR_WAIT_3 733 +#define ERROR_WAIT_63 734 #define ERROR_ABANDONED_WAIT_0 735 +#define ERROR_ABANDONED_WAIT_63 736 +#define ERROR_USER_APC 737 +#define ERROR_KERNEL_APC 738 +#define ERROR_ALERTED 739 #define ERROR_ELEVATION_REQUIRED 740 #define ERROR_REPARSE 741 #define ERROR_OPLOCK_BREAK_IN_PROGRESS 742 @@ -515,6 +571,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED 788 #define ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR 789 #define ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR 790 +#define ERROR_NO_ACE_CONDITION 804 +#define ERROR_INVALID_ACE_CONDITION 805 #define ERROR_EA_ACCESS_DENIED 994 #define ERROR_OPERATION_ABORTED 995 #define ERROR_IO_INCOMPLETE 996

1 0

Huw Davies : riched20: Don' t skip the final carriage return in SFF_SELECTION mode.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b89c7c8fc2b1e1de06ddb49a8cc8326b45573961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89c7c8fc2b1e1de06ddb49a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 29 15:47:42 2014 +0100 riched20: Don't skip the final carriage return in SFF_SELECTION mode. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index bc5bc08..0127616 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1620,7 +1620,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre CR/LF counters, since RTF streaming presents only \para tokens, which are converted according to the standard rules: \r for 2.0, \r\n for 1.0 */ - if (stripLastCR) { + if (stripLastCR && !(format & SFF_SELECTION)) { int newto; ME_GetSelection(editor, &selStart, &selEnd); newto = ME_GetCursorOfs(selEnd); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e14d7f6..2a85357 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5072,10 +5072,12 @@ static void test_EM_STREAMIN(void) LRESULT result; EDITSTREAM es; char buffer[1024] = {0}, tmp[16]; + CHARRANGE range; const char * streamText0 = "{\\rtf1 TestSomeText}"; const char * streamText0a = "{\\rtf1 TestSomeText\\par}"; const char * streamText0b = "{\\rtf1 TestSomeText\\par\\par}"; + const char * ptr; const char * streamText1 = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\deflang12298{\\fonttbl{\\f0\\fswiss\\fprq2\\fcharset0 System;}}\r\n" @@ -5132,7 +5134,8 @@ static void test_EM_STREAMIN(void) ok(es.dwError == 0, "EM_STREAMIN: Test 0 set error %d, expected %d\n", es.dwError, 0); /* Native richedit 2.0 ignores last \par */ - es.dwCookie = (DWORD_PTR)&streamText0a; + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback; result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); @@ -5161,6 +5164,43 @@ static void test_EM_STREAMIN(void) "EM_STREAMIN: Test 0-b set wrong text: Result: %s\n",buffer); ok(es.dwError == 0, "EM_STREAMIN: Test 0-b set error %d, expected %d\n", es.dwError, 0); + /* Show that when using SFF_SELECTION the last \par is not ignored. */ + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SF_RTF, (LPARAM)&es); + ok(result == 12, "got %ld, expected %d\n", result, 12); + + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (result == 12, + "EM_STREAMIN: Test 0-a returned %ld, expected 12\n", result); + result = strcmp (buffer,"TestSomeText"); + ok (result == 0, + "EM_STREAMIN: Test 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test 0-a set error %d, expected %d\n", es.dwError, 0); + + range.cpMin = 0; + range.cpMax = -1; + result = SendMessageA(hwndRichEdit, EM_EXSETSEL, 0, (LPARAM)&range); + ok (result == 13, "got %ld\n", result); + + ptr = streamText0a; + es.dwCookie = (DWORD_PTR)&ptr; + es.dwError = 0; + es.pfnCallback = test_EM_STREAMIN_esCallback; + + result = SendMessageA(hwndRichEdit, EM_STREAMIN, SFF_SELECTION | SF_RTF, (LPARAM)&es); + ok(result == 13, "got %ld, expected 13\n", result); + + result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); + ok (result == 14, + "EM_STREAMIN: Test SFF_SELECTION 0-a returned %ld, expected 14\n", result); + result = strcmp (buffer,"TestSomeText\r\n"); + ok (result == 0, + "EM_STREAMIN: Test SFF_SELECTION 0-a set wrong text: Result: %s\n",buffer); + ok(es.dwError == 0, "EM_STREAMIN: Test SFF_SELECTION 0-a set error %d, expected %d\n", es.dwError, 0); + es.dwCookie = (DWORD_PTR)&streamText1; es.dwError = 0; es.pfnCallback = test_EM_STREAMIN_esCallback;

1 0

Nikolay Sivov : ntdll: Fix LdrLockLoaderLock()/LdrUnlockLoaderLock() on 64bit.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 5a8d73283cf637e3d00dbb781cc4cd49027a29b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8d73283cf637e3d00dbb781… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 28 08:58:59 2014 +0400 ntdll: Fix LdrLockLoaderLock()/LdrUnlockLoaderLock() on 64bit. --- dlls/kernel32/module.c | 7 ++++--- dlls/kernel32/tests/loader.c | 6 +++--- dlls/ntdll/actctx.c | 4 ++-- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/tests/rtl.c | 15 ++++++++------- include/winternl.h | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index d1555f1..514b6be 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -538,7 +538,7 @@ BOOL WINAPI GetModuleHandleExW( DWORD flags, LPCWSTR name, HMODULE *module ) { NTSTATUS status = STATUS_SUCCESS; HMODULE ret; - ULONG magic; + ULONG_PTR magic; BOOL lock; if (!module) @@ -666,7 +666,8 @@ DWORD WINAPI GetModuleFileNameA( */ DWORD WINAPI GetModuleFileNameW( HMODULE hModule, LPWSTR lpFileName, DWORD size ) { - ULONG magic, len = 0; + ULONG len = 0; + ULONG_PTR magic; LDR_MODULE *pldr; NTSTATUS nts; WIN16_SUBSYSTEM_TIB *win16_tib; @@ -911,7 +912,7 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) if (flags & LOAD_LIBRARY_AS_DATAFILE) { - ULONG magic; + ULONG_PTR magic; LdrLockLoaderLock( 0, NULL, &magic ); if (!LdrGetDllHandle( load_path, flags, libname, &hModule )) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e749238..af43779 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -61,8 +61,8 @@ static void (WINAPI *pLdrShutdownProcess)(void); static BOOLEAN (WINAPI *pRtlDllShutdownInProgress)(void); static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); -static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG *); -static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG_PTR *); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, @@ -1367,7 +1367,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) if (ret == WAIT_OBJECT_0) break; else if (ret == WAIT_OBJECT_0 + 1) { - ULONG loader_lock_magic; + ULONG_PTR loader_lock_magic; trace("%04u: mutex_thread_proc: Entering loader lock\n", GetCurrentThreadId()); ret = pLdrLockLoaderLock(0, NULL, &loader_lock_magic); ok(!ret, "LdrLockLoaderLock error %#x\n", ret); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 14e196f..9a9dec9 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2435,7 +2435,7 @@ static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsigned int extra_len ) { NTSTATUS status; - ULONG magic; + ULONG_PTR magic; LDR_MODULE *pldr; LdrLockLoaderLock(0, NULL, &magic); @@ -2934,7 +2934,7 @@ static NTSTATUS find_query_actctx( HANDLE *handle, DWORD flags, ULONG class ) } else if (flags & (QUERY_ACTCTX_FLAG_ACTCTX_IS_ADDRESS|QUERY_ACTCTX_FLAG_ACTCTX_IS_HMODULE)) { - ULONG magic; + ULONG_PTR magic; LDR_MODULE *pldr; if (!*handle) return STATUS_INVALID_PARAMETER; diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 6471290..79aa341 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1340,7 +1340,7 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) * Note: some flags are not implemented. * Flag 0x01 is used to raise exceptions on errors. */ -NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) +NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG_PTR *magic ) { if (flags & ~0x2) FIXME( "flags %x not supported\n", flags ); @@ -1372,7 +1372,7 @@ NTSTATUS WINAPI LdrLockLoaderLock( ULONG flags, ULONG *result, ULONG *magic ) /****************************************************************** * LdrUnlockLoaderUnlock (NTDLL.@) */ -NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG magic ) +NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) { if (magic) { diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 72cee05..e8eb04a 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -90,8 +90,8 @@ static CHAR * (WINAPI *pRtlIpv4AddressToStringA)(const IN_ADDR *, LPSTR); static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, LPSTR, PULONG); static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); -static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG*); -static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG); +static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); +static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -1549,7 +1549,8 @@ static void test_LdrAddRefDll(void) static void test_LdrLockLoaderLock(void) { - ULONG result, magic; + ULONG_PTR magic; + ULONG result; NTSTATUS status; if (!pLdrLockLoaderLock) @@ -1564,12 +1565,12 @@ static void test_LdrLockLoaderLock(void) status = pLdrLockLoaderLock(0x10, &result, &magic); ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); ok(result == 0, "got %d\n", result); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); magic = 0xdeadbeef; status = pLdrLockLoaderLock(0x10, NULL, &magic); ok(status == STATUS_INVALID_PARAMETER_1, "got 0x%08x\n", status); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); result = 10; status = pLdrLockLoaderLock(0x10, &result, NULL); @@ -1580,7 +1581,7 @@ static void test_LdrLockLoaderLock(void) magic = 0xdeadbeef; status = pLdrLockLoaderLock(0x2, NULL, &magic); ok(status == STATUS_INVALID_PARAMETER_2, "got 0x%08x\n", status); - ok(magic == 0, "got 0x%08x\n", magic); + ok(magic == 0, "got %lx\n", magic); /* magic pointer is null */ result = 10; @@ -1594,7 +1595,7 @@ static void test_LdrLockLoaderLock(void) status = pLdrLockLoaderLock(0x2, &result, &magic); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); ok(result == 1, "got %d\n", result); - ok(magic != 0, "got 0x%08x\n", magic); + ok(magic != 0, "got %lx\n", magic); pLdrUnlockLoaderLock(0, magic); } diff --git a/include/winternl.h b/include/winternl.h index d7f2f50..a95a016 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2020,14 +2020,14 @@ NTSYSAPI NTSTATUS WINAPI LdrGetDllHandle(LPCWSTR, ULONG, const UNICODE_STRING*, NTSYSAPI NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE, const ANSI_STRING*, ULONG, void**); NTSYSAPI void WINAPI LdrInitializeThunk(void*,ULONG_PTR,ULONG_PTR,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMODULE*); -NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG*); +NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG_PTR*); IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR); NTSYSAPI NTSTATUS WINAPI LdrQueryImageFileExecutionOptions(const UNICODE_STRING*,LPCWSTR,ULONG,void*,ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*); NTSYSAPI void WINAPI LdrShutdownProcess(void); NTSYSAPI void WINAPI LdrShutdownThread(void); NTSYSAPI NTSTATUS WINAPI LdrUnloadDll(HMODULE); -NTSYSAPI NTSTATUS WINAPI LdrUnlockLoaderLock(ULONG,ULONG); +NTSYSAPI NTSTATUS WINAPI LdrUnlockLoaderLock(ULONG,ULONG_PTR); NTSYSAPI NTSTATUS WINAPI NtAcceptConnectPort(PHANDLE,ULONG,PLPC_MESSAGE,BOOLEAN,PLPC_SECTION_WRITE,PLPC_SECTION_READ); NTSYSAPI NTSTATUS WINAPI NtAccessCheck(PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,PGENERIC_MAPPING,PPRIVILEGE_SET,PULONG,PULONG,NTSTATUS*); NTSYSAPI NTSTATUS WINAPI NtAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN);

1 0

Michael Stefaniuc : dswave/tests: Test some IPersistStream methods of DirectSoundWave.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 0ade62e03c62fb97e37eeec3aae932bec12a1df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ade62e03c62fb97e37eeec3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:43:58 2014 +0200 dswave/tests: Test some IPersistStream methods of DirectSoundWave. --- dlls/dswave/tests/dswave.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index 154c899..1a96548 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -86,6 +86,37 @@ static void test_COM(void) while (IDirectMusicObject_Release(dmo)); } +static void test_dswave(void) +{ + IDirectMusicObject *dmo; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectSoundWave, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "DirectSoundWave create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectSoundWave), + "Expected class CLSID_DirectSoundWave got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicObject_Release(dmo)); +} + START_TEST(dswave) { CoInitialize(NULL); @@ -97,6 +128,7 @@ START_TEST(dswave) return; } test_COM(); + test_dswave(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmscript/tests: Test unimplemented IPersistStream methods in DMScript.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 41b1dce0e241684d11a31b54be046d3abbd5b08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b1dce0e241684d11a31b54b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:41:10 2014 +0200 dmscript/tests: Test unimplemented IPersistStream methods in DMScript. --- dlls/dmscript/script.c | 2 -- dlls/dmscript/tests/dmscript.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 872b7af..6b9be6f 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -430,8 +430,6 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSIS } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - FIXME("(%p): stub, always S_FALSE\n", This); return S_FALSE; } diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index b2912a4..204cf7c 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -175,6 +175,33 @@ static void test_COM_scripttrack(void) while (IDirectMusicTrack_Release(dmt)); } +static void test_dmscript(void) +{ + IDirectMusicScript *dms; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicScript, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicScript, (void**)&dms); + ok(hr == S_OK, "DirectMusicScript create failed: %08x, expected S_OK\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IDirectMusicScript_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicScript_Release(dms)); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -187,6 +214,7 @@ START_TEST(dmscript) } test_COM(); test_COM_scripttrack(); + test_dmscript(); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Added new helper for GetAttribute based getters and use it in IHTMLMetaElement implementation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: b79ef6769bb841d34cfdb876e41ed93b14c724b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79ef6769bb841d34cfdb876e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:04 2014 +0200 mshtml: Added new helper for GetAttribute based getters and use it in IHTMLMetaElement implementation. --- dlls/mshtml/htmlelem.c | 17 +++++++++++++++++ dlls/mshtml/htmlmeta.c | 30 +++--------------------------- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6a9d396..8e246fe 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -175,6 +175,23 @@ nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsASt return NS_OK; } +HRESULT elem_string_attr_getter(HTMLElement *elem, const WCHAR *name, BSTR *p) +{ + const PRUnichar *val; + nsAString val_str; + nsresult nsres; + + nsres = get_elem_attr_value(elem->nselem, name, &val_str, &val); + if(NS_FAILED(nsres)) + return E_FAIL; + + TRACE("%s: returning %s\n", debugstr_w(name), debugstr_w(val)); + + *p = SysAllocString(val); + nsAString_Finish(&val_str); + return *p ? S_OK : E_OUTOFMEMORY; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index b4ff82e..e9783c8 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -104,19 +104,11 @@ static HRESULT WINAPI HTMLMetaElement_put_httpEquiv(IHTMLMetaElement *iface, BST static HRESULT WINAPI HTMLMetaElement_get_httpEquiv(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString httpequiv_str, val_str; - nsresult nsres; - static const PRUnichar httpEquivW[] = {'h','t','t','p','-','e','q','u','i','v',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&httpequiv_str, httpEquivW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &httpequiv_str, &val_str); - nsAString_Finish(&httpequiv_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, httpEquivW, p); } static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR v) @@ -129,19 +121,11 @@ static HRESULT WINAPI HTMLMetaElement_put_content(IHTMLMetaElement *iface, BSTR static HRESULT WINAPI HTMLMetaElement_get_content(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString content_str, val_str; - nsresult nsres; - static const PRUnichar contentW[] = {'c','o','n','t','e','n','t',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&content_str, contentW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &content_str, &val_str); - nsAString_Finish(&content_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, contentW, p); } static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) @@ -154,19 +138,11 @@ static HRESULT WINAPI HTMLMetaElement_put_name(IHTMLMetaElement *iface, BSTR v) static HRESULT WINAPI HTMLMetaElement_get_name(IHTMLMetaElement *iface, BSTR *p) { HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - nsAString name_str, val_str; - nsresult nsres; - static const PRUnichar nameW[] = {'n','a','m','e',0}; TRACE("(%p)->(%p)\n", This, p); - nsAString_InitDepend(&name_str, nameW); - nsAString_Init(&val_str, NULL); - nsres = nsIDOMHTMLElement_GetAttribute(This->element.nselem, &name_str, &val_str); - nsAString_Finish(&name_str); - - return return_nsstr(nsres, &val_str, p); + return elem_string_attr_getter(&This->element, nameW, p); } static HRESULT WINAPI HTMLMetaElement_put_url(IHTMLMetaElement *iface, BSTR v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3181ee2..8be7141 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -960,6 +960,7 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOM IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; +HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BSTR*) DECLSPEC_HIDDEN; /* commands */ typedef struct {

1 0

Jacek Caban : mshtml: Added new helper for getting element attribute value and use it in script.c.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 39e24713e9f18e1216be7285b1f17fd8b9393364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e24713e9f18e1216be7285b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:28:56 2014 +0200 mshtml: Added new helper for getting element attribute value and use it in script.c. --- dlls/mshtml/htmlelem.c | 19 +++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/script.c | 18 +++++------------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 04ca05c..6a9d396 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -156,6 +156,25 @@ HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, cons return hres; } +nsresult get_elem_attr_value(nsIDOMHTMLElement *nselem, const WCHAR *name, nsAString *val_str, const PRUnichar **val) +{ + nsAString name_str; + nsresult nsres; + + nsAString_InitDepend(&name_str, name); + nsAString_Init(val_str, NULL); + nsres = nsIDOMHTMLElement_GetAttribute(nselem, &name_str, val_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("GetAttribute(%s) failed: %08x\n", debugstr_w(name), nsres); + nsAString_Finish(val_str); + return nsres; + } + + nsAString_GetData(val_str, val); + return NS_OK; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 068c18e..3181ee2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -959,6 +959,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; + /* commands */ typedef struct { DWORD id; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4d49587..e5f4ab1 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -784,7 +784,7 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script return; } }else { - ERR("GetAttribute(event) failed: %08x\n", nsres); + ERR("GetEvent failed: %08x\n", nsres); } nsAString_Finish(&event_str); @@ -849,7 +849,8 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { - nsAString attr_str, val_str; + const PRUnichar *language; + nsAString val_str; BOOL ret = FALSE; nsresult nsres; @@ -871,26 +872,17 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns ERR("GetType failed: %08x\n", nsres); } - nsAString_InitDepend(&attr_str, languageW); - nsres = nsIDOMHTMLScriptElement_GetAttribute(nsscript, &attr_str, &val_str); - nsAString_Finish(&attr_str); + nsres = get_elem_attr_value((nsIDOMHTMLElement*)nsscript, languageW, &val_str, &language); if(NS_SUCCEEDED(nsres)) { - const PRUnichar *language; - - nsAString_GetData(&val_str, &language); - if(*language) { ret = get_guid_from_language(language, guid); }else { *guid = get_default_script_guid(window); ret = TRUE; } - }else { - ERR("GetAttribute(language) failed: %08x\n", nsres); + nsAString_Finish(&val_str); } - nsAString_Finish(&val_str); - return ret; }

1 0

Jacek Caban : mshtml: Call unlink from HTMLDOMNode::Release.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 4745fd03d4c246be377214fb6d7d39f599b9439d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4745fd03d4c246be377214fb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:28:44 2014 +0200 mshtml: Call unlink from HTMLDOMNode::Release. --- dlls/mshtml/htmldoc.c | 6 +----- dlls/mshtml/htmlnode.c | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index dd4949f..a9db920 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4330,11 +4330,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) This->nsnode_selector = NULL; } - if(This->nsdoc) { - assert(!This->window); - release_document_mutation(This); - nsIDOMHTMLDocument_Release(This->nsdoc); - }else if(This->window) { + if(!This->nsdoc && This->window) { /* document fragments own reference to inner window */ IHTMLWindow2_Release(&This->window->base.IHTMLWindow2_iface); This->window = NULL; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 42e7c6a..a89b0ca 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -492,6 +492,8 @@ static ULONG WINAPI HTMLDOMNode_Release(IHTMLDOMNode *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->vtbl->unlink) + This->vtbl->unlink(This); This->vtbl->destructor(This); release_dispex(&This->dispex); heap_free(This);

1 0

Huw Davies : crypt32: Add a new element to SIP_ADD_NEWPROVIDER.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: f4f01301f0007442ae5f40650615f2e00a5fbc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f01301f0007442ae5f40650… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 27 13:25:01 2014 +0100 crypt32: Add a new element to SIP_ADD_NEWPROVIDER. --- dlls/crypt32/sip.c | 2 +- dlls/msisip/main.c | 1 + dlls/wintrust/register.c | 1 + include/mssip.h | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 4a32cad..8b561fd 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -210,7 +210,7 @@ BOOL WINAPI CryptSIPAddProvider(SIP_ADD_NEWPROVIDER *psNewProv) TRACE("%p\n", psNewProv); if (!psNewProv || - psNewProv->cbStruct != sizeof(SIP_ADD_NEWPROVIDER) || + psNewProv->cbStruct < FIELD_OFFSET(SIP_ADD_NEWPROVIDER, pwszGetCapFuncName) || !psNewProv->pwszGetFuncName || !psNewProv->pwszPutFuncName || !psNewProv->pwszCreateFuncName || diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 0b4d2c3..882db3d 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -81,6 +81,7 @@ HRESULT WINAPI DllRegisterServer(void) prov.pwszVerifyFuncName = verifyIndirectData; prov.pwszRemoveFuncName = removeSignedDataMsg; prov.pwszIsFunctionNameFmt2 = isMyTypeOfFile; + prov.pwszGetCapFuncName = NULL; return CryptSIPAddProvider(&prov) ? S_OK : S_FALSE; } diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index f039fbd..9981fbc 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -911,6 +911,7 @@ static BOOL WINTRUST_SIPPAddProvider(GUID* Subject, WCHAR* MagicNumber) NewProv.pwszVerifyFuncName = CryptSIPVerifyIndirectData; NewProv.pwszRemoveFuncName = CryptSIPRemoveSignedDataMsg; NewProv.pwszIsFunctionNameFmt2 = NULL; + NewProv.pwszGetCapFuncName = NULL; Ret = CryptSIPAddProvider(&NewProv); diff --git a/include/mssip.h b/include/mssip.h index b0b21a6..c14f02d 100644 --- a/include/mssip.h +++ b/include/mssip.h @@ -156,6 +156,9 @@ typedef struct SIP_ADD_NEWPROVIDER_ WCHAR *pwszRemoveFuncName; WCHAR *pwszIsFunctionNameFmt2; + + /* NTDDI_VERSION >= NTDDI_WIN8 */ + WCHAR *pwszGetCapFuncName; } SIP_ADD_NEWPROVIDER, *PSIP_ADD_NEWPROVIDER; #include <poppack.h>

1 0

Nikolay Sivov : propsys: Implement PSGetPropertySystem().
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d897b32598db0864a2188adc12fb3cca66f648ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d897b32598db0864a2188adc1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 26 21:03:54 2014 +0400 propsys: Implement PSGetPropertySystem(). --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 108 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index a64d53a..92b6d7c 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -84,7 +84,7 @@ @ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName -@ stub PSGetPropertySystem +@ stdcall PSGetPropertySystem(ptr ptr) @ stub PSGetPropertyValue @ stub PSLookupPropertyHandlerCLSID @ stdcall PSPropertyKeyFromString(wstr ptr) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index ad96aab..4bb9d26 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -139,6 +139,114 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +static HRESULT WINAPI propsys_QueryInterface(IPropertySystem *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IPropertySystem) || IsEqualIID(riid, &IID_IUnknown)) { + *obj = iface; + IPropertySystem_AddRef(iface); + return S_OK; + } + + FIXME("%s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI propsys_AddRef(IPropertySystem *iface) +{ + return 2; +} + +static ULONG WINAPI propsys_Release(IPropertySystem *iface) +{ + return 1; +} + +static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, + REFPROPERTYKEY propkey, REFIID riid, void **ppv) +{ + FIXME("%p %s %p: stub\n", propkey, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, + LPCWSTR canonical_name, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(canonical_name), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, + LPCWSTR proplist, REFIID riid, void **ppv) +{ + FIXME("%s %s %p: stub\n", debugstr_w(proplist), debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, + PROPDESC_ENUMFILTER filter, REFIID riid, void **ppv) +{ + FIXME("%d %s %p: stub\n", filter, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR dest, DWORD destlen) +{ + FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, + REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, + LPWSTR *text) +{ + FIXME("%p %p %x %p: stub\n", key, propvar, flags, text); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + FIXME("%s: stub\n", debugstr_w(path)); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) +{ + FIXME("%s: stub\n", debugstr_w(path)); + return E_NOTIMPL; +} + +static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) +{ + FIXME("refresh: stub\n"); + return E_NOTIMPL; +} + +static const IPropertySystemVtbl propsysvtbl = { + propsys_QueryInterface, + propsys_AddRef, + propsys_Release, + propsys_GetPropertyDescription, + propsys_GetPropertyDescriptionByName, + propsys_GetPropertyDescriptionListFromString, + propsys_EnumeratePropertyDescriptions, + propsys_FormatForDisplay, + propsys_FormatForDisplayAlloc, + propsys_RegisterPropertySchema, + propsys_UnregisterPropertySchema, + propsys_RefreshPropertySchema +}; + +static IPropertySystem propsys = { &propsysvtbl }; + +HRESULT WINAPI PSGetPropertySystem(REFIID riid, void **obj) +{ + return IPropertySystem_QueryInterface(&propsys, riid, obj); +} + HRESULT WINAPI PSRegisterPropertySchema(PCWSTR path) { FIXME("%s stub\n", debugstr_w(path));

1 0

Michael Stefaniuc : dmcompos/tests: Test some IPersistStream methods of DMChordMap.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: fa51f080a4fc7e0beb63c87accee134578a9050f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa51f080a4fc7e0beb63c87ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:50:52 2014 +0200 dmcompos/tests: Test some IPersistStream methods of DMChordMap. --- dlls/dmcompos/tests/dmcompos.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index ecb7745..aaaa4ac 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -230,6 +230,37 @@ static void test_COM_track(void) } } +static void test_chordmap(void) +{ + IDirectMusicChordMap *dmcm; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void**)&dmcm); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMap), + "Expected class CLSID_DirectMusicChordMap got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods */ + hr = IPersistStream_IsDirty(ps); + todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicChordMap_Release(dmcm)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -244,6 +275,7 @@ START_TEST(dmcompos) test_COM_chordmap(); test_COM_template(); test_COM_track(); + test_chordmap(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmscript: IPersistStream_GetClassID() is not implemented for DMScript.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 444fff43437cb74e911b7d04c34eb1e0fd1848f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444fff43437cb74e911b7d04c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:12:40 2014 +0200 dmscript: IPersistStream_GetClassID() is not implemented for DMScript. --- dlls/dmscript/script.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index a7f26a6..872b7af 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -424,10 +424,9 @@ static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTRE } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - TRACE("(%p, %p)\n", This, pClassID); - *pClassID = CLSID_DirectMusicScript; - return S_OK; + TRACE("(%p, %p) method not implemented\n", iface, pClassID); + + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {

1 0

Nikolay Sivov : propsys: Forward corresponding methods to exports.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 47de869fda08f564d45bb48ea2983458a1965de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47de869fda08f564d45bb48ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 27 15:13:49 2014 +0400 propsys: Forward corresponding methods to exports. --- dlls/propsys/propsys_main.c | 15 +++++---------- include/propsys.idl | 2 ++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 4bb9d26..6713adf 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -166,8 +166,7 @@ static ULONG WINAPI propsys_Release(IPropertySystem *iface) static HRESULT WINAPI propsys_GetPropertyDescription(IPropertySystem *iface, REFPROPERTYKEY propkey, REFIID riid, void **ppv) { - FIXME("%p %s %p: stub\n", propkey, debugstr_guid(riid), ppv); - return E_NOTIMPL; + return PSGetPropertyDescription(propkey, riid, ppv); } static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *iface, @@ -180,8 +179,7 @@ static HRESULT WINAPI propsys_GetPropertyDescriptionByName(IPropertySystem *ifac static HRESULT WINAPI propsys_GetPropertyDescriptionListFromString(IPropertySystem *iface, LPCWSTR proplist, REFIID riid, void **ppv) { - FIXME("%s %s %p: stub\n", debugstr_w(proplist), debugstr_guid(riid), ppv); - return E_NOTIMPL; + return PSGetPropertyDescriptionListFromString(proplist, riid, ppv); } static HRESULT WINAPI propsys_EnumeratePropertyDescriptions(IPropertySystem *iface, @@ -209,20 +207,17 @@ static HRESULT WINAPI propsys_FormatForDisplayAlloc(IPropertySystem *iface, static HRESULT WINAPI propsys_RegisterPropertySchema(IPropertySystem *iface, LPCWSTR path) { - FIXME("%s: stub\n", debugstr_w(path)); - return E_NOTIMPL; + return PSRegisterPropertySchema(path); } static HRESULT WINAPI propsys_UnregisterPropertySchema(IPropertySystem *iface, LPCWSTR path) { - FIXME("%s: stub\n", debugstr_w(path)); - return E_NOTIMPL; + return PSUnregisterPropertySchema(path); } static HRESULT WINAPI propsys_RefreshPropertySchema(IPropertySystem *iface) { - FIXME("refresh: stub\n"); - return E_NOTIMPL; + return PSRefreshPropertySchema(); } static const IPropertySystemVtbl propsysvtbl = { diff --git a/include/propsys.idl b/include/propsys.idl index 0117090..04d3fbf 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -804,6 +804,8 @@ cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") +cpp_quote("HRESULT WINAPI PSRegisterPropertySchema(LPCWSTR);") +cpp_quote("HRESULT WINAPI PSUnregisterPropertySchema(LPCWSTR);") /* TODO: Add remainder of the C api here */

1 0

Piotr Caban : msvcrt: Return string in _wcslwr and _wcslwr_l.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 28830b4b363111b9f04fbf1a336387ff107ca8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28830b4b363111b9f04fbf1a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 27 11:02:42 2014 +0200 msvcrt: Return string in _wcslwr and _wcslwr_l. --- dlls/msvcrt/wcs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 548c907..7c299a7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -273,17 +273,19 @@ int CDECL MSVCRT__wcslwr_s( MSVCRT_wchar_t* str, MSVCRT_size_t n ) /****************************************************************** * _wcslwr_l (MSVCRT.@) */ -int CDECL MSVCRT__wcslwr_l( MSVCRT_wchar_t* str, MSVCRT__locale_t locale ) +MSVCRT_wchar_t* CDECL MSVCRT__wcslwr_l( MSVCRT_wchar_t* str, MSVCRT__locale_t locale ) { - return MSVCRT__wcslwr_s_l(str, -1, locale); + MSVCRT__wcslwr_s_l(str, -1, locale); + return str; } /****************************************************************** * _wcslwr (MSVCRT.@) */ -int CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) +MSVCRT_wchar_t* CDECL MSVCRT__wcslwr( MSVCRT_wchar_t* str ) { - return MSVCRT__wcslwr_s_l(str, -1, NULL); + MSVCRT__wcslwr_s_l(str, -1, NULL); + return str; } /*********************************************************************

1 0

Michael Stefaniuc : dmband/tests: Test some IPersistStream methods of DMBand.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 32699d6f6664cf9532f2961729aedb033239cee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32699d6f6664cf9532f296172… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 27 22:43:14 2014 +0200 dmband/tests: Test some IPersistStream methods of DMBand. --- dlls/dmband/tests/dmband.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 60dbaca..cfbf34d 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -146,6 +146,33 @@ static void test_COM_bandtrack(void) while (IDirectMusicTrack_Release(dmbt)); } +static void test_dmband(void) +{ + IDirectMusicBand *dmb; + IPersistStream *ps; + CLSID class; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicBand, (void**)&dmb); + ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + + /* Unimplemented IPersistStream methods */ + hr = IDirectMusicBand_QueryInterface(dmb, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + todo_wine ok(hr == E_NOTIMPL, "IPersistStream_GetClassID failed: %08x\n", hr); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicBand_Release(dmb)); +} + START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -159,6 +186,7 @@ START_TEST(dmband) test_COM(); test_COM_bandtrack(); + test_dmband(); CoUninitialize(); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 8c944b0da4919b55e2a1ba5fccfa472076ab2d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c944b0da4919b55e2a1ba5fc… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon May 26 01:36:03 2014 +0200 po: Update German translation. --- po/de.po | 145 ++++++++++++++++++++++---------------------------------------- 1 file changed, 52 insertions(+), 93 deletions(-) diff --git a/po/de.po b/po/de.po index 6291a37..e68ed94 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-04-17 03:01+0200\n" +"PO-Revision-Date: 2014-05-26 01:33+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -7129,206 +7129,164 @@ msgid "outline button" msgstr "Gliederung Schaltfläche" #: oleacc.rc:97 -#, fuzzy -#| msgid "Normal" msgctxt "object state" msgid "normal" -msgstr "Mittel" +msgstr "normal" #: oleacc.rc:98 -#, fuzzy -#| msgid "Unavailable" msgctxt "object state" msgid "unavailable" -msgstr "Nicht verfügbar" +msgstr "nicht verfügbar" #: oleacc.rc:99 -#, fuzzy -#| msgid "Select" msgctxt "object state" msgid "selected" -msgstr "Auswählen" +msgstr "ausgewählt" #: oleacc.rc:100 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focused" -msgstr "Angehalten" +msgstr "fokussiert" #: oleacc.rc:101 -#, fuzzy -#| msgid "&Compressed" msgctxt "object state" msgid "pressed" -msgstr "&Komprimiert" +msgstr "geklickt" #: oleacc.rc:102 msgctxt "object state" msgid "checked" -msgstr "" +msgstr "angekreuzt" #: oleacc.rc:103 -#, fuzzy -#| msgid "Mixed" msgctxt "object state" msgid "mixed" -msgstr "Mixed" +msgstr "gemischt" #: oleacc.rc:104 -#, fuzzy -#| msgid "&Read Only" msgctxt "object state" msgid "read only" -msgstr "&Schreibgeschützt" +msgstr "schreibgeschützt" #: oleacc.rc:105 -#, fuzzy -#| msgid "Hot Tracked Item" msgctxt "object state" msgid "hot tracked" -msgstr "Heiß verfolgtes Element" +msgstr "aktiv hervorgehoben" #: oleacc.rc:106 -#, fuzzy -#| msgid "Defaults" msgctxt "object state" msgid "default" -msgstr "Standards" +msgstr "standard" #: oleacc.rc:107 msgctxt "object state" msgid "expanded" -msgstr "" +msgstr "ausgeklappt" #: oleacc.rc:108 msgctxt "object state" msgid "collapsed" -msgstr "" +msgstr "eingeklappt" #: oleacc.rc:109 msgctxt "object state" msgid "busy" -msgstr "" +msgstr "beschäftigt" #: oleacc.rc:110 msgctxt "object state" msgid "floating" -msgstr "" +msgstr "schwebend" #: oleacc.rc:111 msgctxt "object state" msgid "marqueed" -msgstr "" +msgstr "Lauftext" #: oleacc.rc:112 -#, fuzzy -#| msgid "animation" msgctxt "object state" msgid "animated" -msgstr "Animation" +msgstr "animiert" #: oleacc.rc:113 msgctxt "object state" msgid "invisible" -msgstr "" +msgstr "unsichtbar" #: oleacc.rc:114 msgctxt "object state" msgid "offscreen" -msgstr "" +msgstr "nicht im Bild" #: oleacc.rc:115 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "sizeable" -msgstr "&aktiv" +msgstr "größenänderbar" #: oleacc.rc:116 -#, fuzzy -#| msgid "&enable" msgctxt "object state" msgid "moveable" -msgstr "&aktiv" +msgstr "verschiebbar" #: oleacc.rc:117 msgctxt "object state" msgid "self voicing" -msgstr "" +msgstr "selbst sprechend" #: oleacc.rc:118 -#, fuzzy -#| msgid "Paused" msgctxt "object state" msgid "focusable" -msgstr "Angehalten" +msgstr "fokussierbar" #: oleacc.rc:119 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "selectable" -msgstr "Tabelle" +msgstr "auswählbar" #: oleacc.rc:120 -#, fuzzy -#| msgid "link" msgctxt "object state" msgid "linked" -msgstr "Link" +msgstr "verknüpft" #: oleacc.rc:121 msgctxt "object state" msgid "traversed" -msgstr "" +msgstr "durchlaufen" #: oleacc.rc:122 -#, fuzzy -#| msgid "table" msgctxt "object state" msgid "multi selectable" -msgstr "Tabelle" +msgstr "mehrfach auswählbar" #: oleacc.rc:123 -#, fuzzy -#| msgid "Please select a file." msgctxt "object state" msgid "extended selectable" -msgstr "Bitte wählen Sie eine Datei." +msgstr "erweitert auswählbar" #: oleacc.rc:124 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert low" -msgstr "Warnung" +msgstr "niedrige Priorität" #: oleacc.rc:125 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert medium" -msgstr "Warnung" +msgstr "mittlere Priorität" #: oleacc.rc:126 -#, fuzzy -#| msgid "alert" msgctxt "object state" msgid "alert high" -msgstr "Warnung" +msgstr "hohe Priorität" #: oleacc.rc:127 -#, fuzzy -#| msgid "Write protected.\n" msgctxt "object state" msgid "protected" -msgstr "Schreibgeschützt.\n" +msgstr "geschützt" #: oleacc.rc:128 msgctxt "object state" msgid "has popup" -msgstr "" +msgstr "hat Popup" #: oleaut32.rc:30 oleview.rc:147 msgid "True" @@ -13514,7 +13472,7 @@ msgstr "Alternativer Steuerelementhintergrund" #: winecfg.rc:120 msgid "Hot Tracked Item" -msgstr "Heiß verfolgtes Element" +msgstr "Aktiv hervorgehobenes Element" #: winecfg.rc:121 msgid "Active Title Bar Gradient" @@ -13534,7 +13492,7 @@ msgstr "Menüleiste" #: wineconsole.rc:63 msgid "Cursor size" -msgstr "Cursor Größe" +msgstr "Cursorgröße" #: wineconsole.rc:64 msgid "&Small" @@ -13574,23 +13532,23 @@ msgstr "&aktiv" #: wineconsole.rc:75 msgid "Command history" -msgstr "Befehlsspeicher" +msgstr "Befehlsverlauf" #: wineconsole.rc:76 msgid "&Number of recalled commands:" -msgstr "&Anzahl der Puffer:" +msgstr "Anzahl der gespeicherten &Befehle:" #: wineconsole.rc:79 msgid "&Remove doubles" -msgstr "Alte &Duplikate löschen" +msgstr "&Duplikate entfernen" #: wineconsole.rc:87 msgid "&Font" -msgstr "Schrift&art" +msgstr "&Schriftart" #: wineconsole.rc:89 msgid "&Color" -msgstr "F&arbe" +msgstr "&Farbe" #: wineconsole.rc:100 msgid "Configuration" @@ -13598,7 +13556,7 @@ msgstr "Konfiguration" #: wineconsole.rc:103 msgid "Buffer zone" -msgstr "Fensterpuffergröße" +msgstr "Zeichenpuffer" #: wineconsole.rc:104 msgid "&Width:" @@ -13638,15 +13596,15 @@ msgstr "Konsolenparameter" #: wineconsole.rc:131 msgid "Retain these settings for later sessions" -msgstr "Übernehme diese Einstellungen für spätere Sitzungen" +msgstr "Einstellungen für spätere Sitzungen übernehmen" #: wineconsole.rc:132 msgid "Modify only current session" -msgstr "Verändere nur die aktuelle Sitzung" +msgstr "Nur für aktuelle Sitzung ändern" #: wineconsole.rc:29 msgid "Set &Defaults" -msgstr "Stan&dard" +msgstr "&Standards festlegen" #: wineconsole.rc:31 msgid "&Mark" @@ -13678,11 +13636,12 @@ msgstr "Konfigurationsfehler" #: wineconsole.rc:42 msgid "Screen buffer size must be greater or equal to the window's one" -msgstr "Die Bildschirmgröße muss größer oder gleich der des Fensters sein" +msgstr "" +"Die Größe des Zeichenpuffers muss mindestens der Fenstergröße entsprechen" #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high" -msgstr "Jeder Buchstabe ist %1!u! Pixel breit und %2!u! Pixel hoch" +msgstr "Jedes Zeichen ist %1!u! Pixel breit und %2!u! Pixel hoch" #: wineconsole.rc:38 msgid "This is a test" @@ -13698,7 +13657,7 @@ msgstr "wineconsole: Ungültiges Backend\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole: Nicht erkannte Befehlszeilenoption\n" +msgstr "wineconsole: Unbekannte Befehlszeilenoption\n" #: wineconsole.rc:47 msgid "Starts a program in a Wine console\n" @@ -13758,7 +13717,7 @@ msgstr "" #: winedbg.rc:49 msgid "Program Error" -msgstr "Programm Fehler" +msgstr "Programmfehler" #: winedbg.rc:54 msgid "" @@ -13776,7 +13735,7 @@ msgid "" msgstr "" "Die Ursache kann ein Problem im Programm oder ein Fehler in Wine sein. Sie " "können in der <a href=\"http://appdb.winehq.org\">Anwendungsdatenbank</a> " -"Tipps zum ausführen der Anwendung einholen." +"Tipps zum Ausführen der Anwendung einholen." #: winedbg.rc:61 msgid "Show &Details" @@ -13784,7 +13743,7 @@ msgstr "&Details anzeigen" #: winedbg.rc:66 msgid "Program Error Details" -msgstr "Programm Fehler Details" +msgstr "Programmfehler-Details" #: winedbg.rc:73 msgid "" @@ -13800,7 +13759,7 @@ msgstr "" #: winedbg.rc:38 msgid "Wine program crash" -msgstr "Wine Programm Absturz" +msgstr "Wine Programmabsturz" #: winedbg.rc:39 msgid "Internal errors - invalid parameters received"

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in is_elem_name.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: d0898685a686befe0fdcd8d0310f1a9b74906887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0898685a686befe0fdcd8d03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:28 2014 +0200 mshtml: Use get_elem_attr_value helper in is_elem_name. --- dlls/mshtml/htmlelemcol.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index cb7bad1..8fd61ed 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -368,7 +368,7 @@ static BOOL is_elem_id(HTMLElement *elem, LPCWSTR name) static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) { const PRUnichar *str; - nsAString nsstr, nsname; + nsAString nsstr; BOOL ret = FALSE; nsresult nsres; @@ -385,15 +385,12 @@ static BOOL is_elem_name(HTMLElement *elem, LPCWSTR name) return TRUE; } - nsAString_InitDepend(&nsname, nameW); - nsres = nsIDOMHTMLElement_GetAttribute(elem->nselem, &nsname, &nsstr); - nsAString_Finish(&nsname); + nsres = get_elem_attr_value(elem->nselem, nameW, &nsstr, &str); if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&nsstr, &str); ret = !strcmpiW(str, name); + nsAString_Finish(&nsstr); } - nsAString_Finish(&nsstr); return ret; }

1 0

Andrei Slăvoiu : wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don' t support EXT_GPU_SHADER4.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: fbdf618251c7d9c3f01f53bc53266d081089361c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbdf618251c7d9c3f01f53bc5… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Fri May 23 01:23:30 2014 +0300 wined3d: Recognize cards that expose GLSL 1.30 as DX10 capable even if they don't support EXT_GPU_SHADER4. --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 224992d..d6bb3836 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1667,7 +1667,8 @@ static UINT d3d_level_from_gl_info(const struct wined3d_gl_info *gl_info) if (level == 8 && gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) level = 9; - if (level == 9 && gl_info->supported[EXT_GPU_SHADER4]) + if (level == 9 && (gl_info->supported[EXT_GPU_SHADER4] + || gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30))) level = 10; return level;

1 0

Jacek Caban : mshtml: Use get_elem_attr_value helper in get_font_size.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 3efaaacf3c5add5e99c689d40ddeea574c6dfd2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3efaaacf3c5add5e99c689d40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 27 11:29:11 2014 +0200 mshtml: Use get_elem_attr_value helper in get_font_size. --- dlls/mshtml/editor.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index cfab2ed..14aab53 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -263,7 +263,7 @@ static void remove_child_attr(nsIDOMElement *elem, LPCWSTR tag, nsAString *attr_ static void get_font_size(HTMLDocument *This, WCHAR *ret) { nsISelection *nsselection = get_ns_selection(This); - nsIDOMElement *elem = NULL; + nsIDOMHTMLElement *elem = NULL; nsIDOMNode *node = NULL, *tmp_node; nsAString tag_str; LPCWSTR tag; @@ -284,36 +284,29 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) break; if(node_type == ELEMENT_NODE) { - nsIDOMNode_QueryInterface(node, &IID_nsIDOMElement, (void**)&elem); + nsIDOMNode_QueryInterface(node, &IID_nsIDOMHTMLElement, (void**)&elem); nsAString_Init(&tag_str, NULL); - nsIDOMElement_GetTagName(elem, &tag_str); + nsIDOMHTMLElement_GetTagName(elem, &tag_str); nsAString_GetData(&tag_str, &tag); if(!strcmpiW(tag, fontW)) { - nsAString size_str, val_str; - LPCWSTR val; + nsAString val_str; + const PRUnichar *val; TRACE("found font tag %p\n", elem); - nsAString_InitDepend(&size_str, sizeW); - nsAString_Init(&val_str, NULL); - - nsIDOMElement_GetAttribute(elem, &size_str, &val_str); - nsAString_GetData(&val_str, &val); - + get_elem_attr_value(elem, sizeW, &val_str, &val); if(*val) { TRACE("found size %s\n", debugstr_w(val)); strcpyW(ret, val); } - nsAString_Finish(&size_str); nsAString_Finish(&val_str); } nsAString_Finish(&tag_str); - - nsIDOMElement_Release(elem); + nsIDOMHTMLElement_Release(elem); } if(*ret)

1 0

Michael Stefaniuc : dmusic: Return S_FALSE for the unimplemented IPersistStream_IsDirty().
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 5d7e93dc54d0b5ad86ad57ad7e8537ad0278d162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7e93dc54d0b5ad86ad57ad7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:06:00 2014 +0200 dmusic: Return S_FALSE for the unimplemented IPersistStream_IsDirty(). --- dlls/dmusic/collection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index acbc2a5..3d09815 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -499,7 +499,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPER static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) { - return E_NOTIMPL; + return S_FALSE; } static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream)

1 0

Michael Stefaniuc : dmstyle/tests: Test some IPersistStream methods of DMStyle.
by Alexandre Julliard June 11, 2014

June 11, 2014

Module: wine Branch: master Commit: 834bae99359bf122a9d0fa4ac4b034699723162e URL: http://source.winehq.org/git/wine.git/?a=commit;h=834bae99359bf122a9d0fa4ac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 26 23:10:43 2014 +0200 dmstyle/tests: Test some IPersistStream methods of DMStyle. --- dlls/dmstyle/tests/dmstyle.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 58c15eb..be9de42 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -208,6 +208,37 @@ static void test_COM_track(void) } } +static void test_dmstyle(void) +{ + IDirectMusicStyle *dms; + IPersistStream *ps; + CLSID class = { 0 }; + ULARGE_INTEGER size; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicStyle, (void**)&dms); + ok(hr == S_OK, "DirectMusicStyle create failed: %08x, expected S_OK\n", hr); + + /* IPersistStream */ + hr = IDirectMusicStyle_QueryInterface(dms, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + hr = IPersistStream_GetClassID(ps, &class); + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicStyle), + "Expected class CLSID_DirectMusicStyle got %s\n", wine_dbgstr_guid(&class)); + + /* Unimplemented IPersistStream methods*/ + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + hr = IPersistStream_GetSizeMax(ps, &size); + ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); + hr = IPersistStream_Save(ps, NULL, TRUE); + ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); + + while (IDirectMusicStyle_Release(dms)); +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -221,6 +252,7 @@ START_TEST(dmstyle) test_COM(); test_COM_section(); test_COM_track(); + test_dmstyle(); CoUninitialize(); }

1 0