July 2013 - Wine-commits - list.winehq.org

Akira Nakagawa : po: Update Japanese translation.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 0fb9de61a5026ac6cf16bc3385c3828850a4c831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb9de61a5026ac6cf16bc338… Author: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Sun Jun 30 13:04:43 2013 +0900 po: Update Japanese translation. --- po/ja.po | 194 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 98 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fb9de61a5026ac6cf16b…

1 0

Alexandre Julliard : ntdll/tests: Don't test . and .. masks, they don' t work on Windows.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 4142fc9b52555d6a273c3a2d14893711e7e841a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4142fc9b52555d6a273c3a2d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 2 10:03:50 2013 +0200 ntdll/tests: Don't test . and .. masks, they don't work on Windows. --- dlls/ntdll/tests/directory.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index bc5d860..f495fb3 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -261,6 +261,8 @@ static void test_NtQueryDirectoryFile(void) for (i = 0; testfiles[i].name; i++) { UNICODE_STRING mask; + + if (testfiles[i].nameW[0] == '.') continue; /* . and .. as masks are broken on Windows */ mask.Buffer = testfiles[i].nameW; mask.Length = mask.MaximumLength = lstrlenW(testfiles[i].nameW) * sizeof(WCHAR); test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, TRUE);

1 0

Stefan Leichter : msvcp100/tests: Fix dynamically loaded functions for platform arm.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: 4c3e01143dedbce76f4b03db65f1fb6d89b0b0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3e01143dedbce76f4b03db6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jul 1 22:31:31 2013 +0200 msvcp100/tests: Fix dynamically loaded functions for platform arm. --- dlls/msvcp100/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 47f6410..554db2e 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -113,7 +113,7 @@ static BOOL init(void) }else { #ifdef __arm__ SET(p__Container_base12_copy_ctor, "??0_Container_base12(a)std@@QAA(a)ABU01@@Z"); - SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QAE(a)XZ"); + SET(p__Container_base12_ctor, "??0_Container_base12(a)std@@QAA(a)XZ"); SET(p__Container_base12__Orphan_all, "?_Orphan_all(a)_Container_base12@std@@QAAXXZ"); SET(p__Container_base12_dtor, "??1_Container_base12(a)std@@QAA(a)XZ"); SET(p__Container_base12__Getpfirst, "?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ");

1 0

Michael Stefaniuc : dsound/tests: Fix copy&paste error in ok() message.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: a158d42c0fbe3a29268280dc9b7d4ee9867f1046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a158d42c0fbe3a29268280dc9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 2 00:58:27 2013 +0200 dsound/tests: Fix copy&paste error in ok() message. --- dlls/dsound/tests/ds3d8.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 295a406..e5db2de 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -709,7 +709,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, int play, rc=IDirectSoundBuffer_SetPan(secondary,-1000); ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); rc=IDirectSoundBuffer_GetPan(secondary,&pan); - ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: %08x\n",rc); + ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: %08x\n",rc); ok(pan==-1000,"secondary: wrong pan %d instead of -1000\n", pan);

1 0

Dmitry Timoshkov : kernel32/tests: Fix a couple of typos.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: b0a3d93400f90a06da8ba314ed37a9e2b75a9293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0a3d93400f90a06da8ba314e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 2 10:24:23 2013 +0900 kernel32/tests: Fix a couple of typos. --- dlls/kernel32/tests/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 521ce6e..e605242 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -712,8 +712,8 @@ static void test_MapViewOfFile(void) ok(info.BaseAddress == ptr, "BaseAddress should have been %p but was %p instead\n", ptr, info.BaseAddress); ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%lx\n", info.RegionSize); - ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); - ok(info.Protect == PAGE_READONLY, "Protect should have been 0 instead of 0x%x\n", info.Protect); + ok(info.State == MEM_COMMIT, "State should have been MEM_COMMIT instead of 0x%x\n", info.State); + ok(info.Protect == PAGE_READONLY, "Protect should have been PAGE_READONLY instead of 0x%x\n", info.Protect); if (info.Type == MEM_PRIVATE) /* win9x is different for uncommitted mappings */ { ok(info.AllocationProtect == PAGE_NOACCESS,

1 0

Ken Thomases : winemac: Use screen color space for windows covered by OpenGL views.
by Alexandre Julliard 02 Jul '13

02 Jul '13

Module: wine Branch: master Commit: d30705bdfe1756aa9ac9102a293d96a05afec7b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30705bdfe1756aa9ac9102a2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 2 01:24:19 2013 -0500 winemac: Use screen color space for windows covered by OpenGL views. --- dlls/winemac.drv/cocoa_window.m | 55 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 770056e..0e2d7e6 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -158,6 +158,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @property (assign, nonatomic) void* imeData; @property (nonatomic) BOOL commandDone; + - (void) updateColorSpace; + @end @@ -256,12 +258,14 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) pendingGlContexts = [[NSMutableArray alloc] init]; [pendingGlContexts addObject:context]; [self setNeedsDisplay:YES]; + [(WineWindow*)[self window] updateColorSpace]; } - (void) removeGLContext:(WineOpenGLContext*)context { [glContexts removeObjectIdenticalTo:context]; [pendingGlContexts removeObjectIdenticalTo:context]; + [(WineWindow*)[self window] updateColorSpace]; } - (void) updateGLContexts @@ -270,6 +274,11 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) context.needsUpdate = TRUE; } + - (BOOL) hasGLContext + { + return [glContexts count] || [pendingGlContexts count]; + } + - (BOOL) acceptsFirstMouse:(NSEvent*)theEvent { return YES; @@ -919,7 +928,10 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if (NSEqualSizes(frame.size, oldFrame.size)) [self setFrameOrigin:frame.origin]; else + { [self setFrame:frame display:YES]; + [self updateColorSpace]; + } [self updateFullscreen]; @@ -1032,6 +1044,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [self setFrameTopLeftPoint:NSMakePoint(NSMinX(frame), NSMaxY(frame))]; frame = [self constrainFrameRect:[self frame] toScreen:primaryScreen]; [self setFrame:frame display:YES]; + [self updateColorSpace]; } if (activate) @@ -1182,6 +1195,37 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) } } + // We normally use the generic/calibrated RGB color space for the window, + // rather than the device color space, to avoid expensive color conversion + // which slows down drawing. However, for windows displaying OpenGL, having + // a different color space than the screen greatly reduces frame rates, often + // limiting it to the display refresh rate. + // + // To avoid this, we switch back to the screen color space whenever the + // window is covered by a view with an attached OpenGL context. + - (void) updateColorSpace + { + NSRect contentRect = [[self contentView] frame]; + BOOL coveredByGLView = FALSE; + for (WineContentView* view in [[self contentView] subviews]) + { + if ([view hasGLContext]) + { + NSRect frame = [view convertRect:[view bounds] toView:nil]; + if (NSContainsRect(frame, contentRect)) + { + coveredByGLView = TRUE; + break; + } + } + } + + if (coveredByGLView) + [self setColorSpace:nil]; + else + [self setColorSpace:[NSColorSpace genericRGBColorSpace]]; + } + /* * ---------- NSResponder method overrides ---------- @@ -1872,6 +1916,7 @@ macdrv_view macdrv_create_view(macdrv_window w, CGRect rect) name:NSApplicationDidChangeScreenParametersNotification object:NSApp]; [[window contentView] addSubview:view]; + [window updateColorSpace]; }); [pool release]; @@ -1890,6 +1935,7 @@ void macdrv_dispose_view(macdrv_view v) OnMainThread(^{ NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; + WineWindow* window = (WineWindow*)[view window]; [nc removeObserver:view name:NSViewGlobalFrameDidChangeNotification @@ -1899,6 +1945,7 @@ void macdrv_dispose_view(macdrv_view v) object:NSApp]; [view removeFromSuperview]; [view release]; + [window updateColorSpace]; }); [pool release]; @@ -1923,11 +1970,15 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec BOOL changedWindow = (window && window != [view window]); NSRect newFrame = NSRectFromCGRect(rect); NSRect oldFrame = [view frame]; + BOOL needUpdateWindowColorSpace = FALSE; if (changedWindow) { + WineWindow* oldWindow = (WineWindow*)[view window]; [view removeFromSuperview]; + [oldWindow updateColorSpace]; [[window contentView] addSubview:view]; + needUpdateWindowColorSpace = TRUE; } if (!NSEqualRects(oldFrame, newFrame)) @@ -1941,7 +1992,11 @@ void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rec else [view setFrame:newFrame]; [view setNeedsDisplay:YES]; + needUpdateWindowColorSpace = TRUE; } + + if (needUpdateWindowColorSpace) + [(WineWindow*)[view window] updateColorSpace]; }); [pool release];

1 0

Austin English : loader: Fix Makefile for BSD make.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: f191f26c6af5f4226693f132a4773cadc1c558ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f191f26c6af5f4226693f132a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jun 28 19:39:14 2013 -0700 loader: Fix Makefile for BSD make. --- loader/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index 3993fa3..0cb80a8 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -46,7 +46,7 @@ wine-installed: main.o Makefile.in wine_info.plist $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) wine_info.plist: wine_info.plist.in - LC_ALL=C sed -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' $< >$@ || ($(RM) $@ && false) + LC_ALL=C sed -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' $(srcdir)/wine_info.plist.in >$@ || ($(RM) $@ && false) $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 67307a9cf1bffdb99201e662d1e615909ed3c727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67307a9cf1bffdb99201e662d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 29 08:50:24 2013 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4556afc..1220b65 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -3320,7 +3320,7 @@ static void test_lighting_interface_versions(void) memset(&mat_desc, 0, sizeof(mat_desc)); mat_desc.dwSize = sizeof(mat_desc); - mat_desc.dcvEmissive.g = 1.0f; + U2(U3(mat_desc).dcvEmissive).g = 1.0f; hr = IDirect3D2_CreateMaterial(d3d, &emissive, NULL); ok(SUCCEEDED(hr), "Failed to create material, hr %#x.\n", hr); hr = IDirect3DMaterial2_SetMaterial(emissive, &mat_desc); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 45c399b..9597c8b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3633,7 +3633,7 @@ static void test_lighting_interface_versions(void) memset(&mat_desc, 0, sizeof(mat_desc)); mat_desc.dwSize = sizeof(mat_desc); - mat_desc.dcvEmissive.g = 1.0f; + U2(U3(mat_desc).dcvEmissive).g = 1.0f; hr = IDirect3D3_CreateMaterial(d3d, &emissive, NULL); ok(SUCCEEDED(hr), "Failed to create material, hr %#x.\n", hr); hr = IDirect3DMaterial3_SetMaterial(emissive, &mat_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ab5dae..45017f2 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3448,7 +3448,7 @@ static void test_lighting_interface_versions(void) ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); memset(&material, 0, sizeof(material)); - material.emissive.g = 1.0f; + U2(U3(material).emissive).g = 1.0f; hr = IDirect3DDevice7_SetMaterial(device, &material); ok(SUCCEEDED(hr), "Failed set material, hr %#x.\n", hr); hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE);

1 0

Jacek Caban : mshtml/tests: Fixed htmldoc tests on IE10.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: 84c34bcd936f6ed3f3e97c0eb7e0b20cbef6bea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c34bcd936f6ed3f3e97c0eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 29 14:35:13 2013 +0200 mshtml/tests: Fixed htmldoc tests on IE10. --- dlls/mshtml/tests/htmldoc.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d5fb9cc..535f6cb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -263,7 +263,7 @@ static const char *debugstr_guid(REFIID riid) if(!riid) return "(null)"; - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); @@ -1113,7 +1113,12 @@ static HRESULT WINAPI WinInetHttpInfo_QueryInterface( REFIID riid, void **ppvObject) { - ok(0, "unexpected call\n"); + *ppvObject = NULL; + + if(IsEqualGUID(&IID_IGetBindHandle, riid)) + return E_NOINTERFACE; + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1169,6 +1174,8 @@ static const IWinInetHttpInfoVtbl WinInetHttpInfoVtbl = { static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl }; +DEFINE_GUID(IID_unk_binding, 0xf3d8f080,0xa5eb,0x476f,0x9d,0x19,0xa5,0xef,0x24,0xe5,0xc2,0xe6); + static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid)) { @@ -1181,7 +1188,12 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void return S_OK; } - ok(0, "unexpected call\n"); + if(IsEqualGUID(&IID_unk_binding, riid)) { + *ppv = NULL; + return E_NOINTERFACE; + } + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -2930,6 +2942,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; + case 134: /* TODO */ + case 136: /* TODO */ + case 139: /* TODO */ case 143: /* TODO */ case 144: /* TODO */ return E_NOTIMPL; @@ -3230,13 +3245,14 @@ static IDispatch EventDispatch = { &EventDispatchVtbl }; static HRESULT WINAPI TravelLog_QueryInterface(ITravelLog *iface, REFIID riid, void **ppv) { static const IID IID_IIETravelLog2 = {0xb67cefd2,0xe3f1,0x478a,{0x9b,0xfa,0xd8,0x93,0x70,0x37,0x5e,0x94}}; + static const IID IID_unk_travellog = {0x6afc8b7f,0xbc17,0x4a95,{0x90,0x2f,0x6f,0x5c,0xb5,0x54,0xc3,0xd8}}; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITravelLog, riid)) { *ppv = iface; return S_OK; } - if(!IsEqualGUID(&IID_IIETravelLog2, riid)) + if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid)) ok(0, "unexpected call %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -3370,7 +3386,7 @@ static HRESULT WINAPI DocObjectService_FireBeforeNavigate2(IDocObjectService *i ok(!pDispatch, "pDispatch = %p\n", pDispatch); ok(!strcmp_wa(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), nav_url); - ok(dwFlags == 0x40 || !dwFlags, "dwFlags = %x\n", dwFlags); + ok(dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName)); ok(!pPostData, "pPostData = %p\n", pPostData); ok(!cbPostData, "cbPostData = %d\n", cbPostData); @@ -4916,6 +4932,7 @@ DEFINE_GUID(IID_IThumbnailView, 0x7BB0B520,0xB1A7,0x11D2,0xBB,0x23,0x00,0xC0,0x4 DEFINE_GUID(IID_IRenMailEditor, 0x000670BA,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_unk4, 0x305104a6,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); DEFINE_GUID(IID_IDocHostUIHandlerPriv, 0xf0d241d1,0x5d0e,0x4e85,0xbc,0xb4,0xfa,0xd7,0xf7,0xc5,0x52,0x8c); +DEFINE_GUID(IID_unk5, 0x5f95accc,0xd7a1,0x4574,0xbc,0xcb,0x69,0x71,0x35,0xbc,0x41,0xde); static HRESULT QueryInterface(REFIID riid, void **ppv) { @@ -4955,6 +4972,8 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) return E_NOINTERFACE; /* ? */ else if(IsEqualGUID(&IID_unk4, riid)) return E_NOINTERFACE; /* ? */ + else if(IsEqualGUID(&IID_unk5, riid)) + return E_NOINTERFACE; /* IE10 */ else if(IsEqualGUID(&IID_IDocHostUIHandlerPriv, riid)) return E_NOINTERFACE; /* ? */ else

1 0

Jacek Caban : mshtml/tests: Fixed script tests on IE10.
by Alexandre Julliard 01 Jul '13

01 Jul '13

Module: wine Branch: master Commit: b09b9d3cb9091dd38c536943c8a295c08771fe9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09b9d3cb9091dd38c536943c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 29 15:00:23 2013 +0200 mshtml/tests: Fixed script tests on IE10. --- dlls/mshtml/tests/script.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index af1103d..0c3c542 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1768,6 +1768,8 @@ static HRESULT WINAPI ActiveScriptProperty_SetProperty(IActiveScriptProperty *if ok(V_VT(pvarValue) == VT_BOOL, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); ok(V_BOOL(pvarValue) == VARIANT_TRUE, "V_BOOL(pvarValue)=%x\n", V_BOOL(pvarValue)); break; + case 0x70000003: /* Undocumented property set by IE10 */ + return E_NOTIMPL; default: ok(0, "unexpected property %x\n", dwProperty); return E_NOTIMPL;

1 0