March 2012 - Wine-Commits - list.winehq.org

Andrew Eikum : dmloader: Add simple playing test.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: b235edb01423c169db85ca024754a564d5aebae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b235edb01423c169db85ca024… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 19 07:35:22 2012 -0500 dmloader: Add simple playing test. --- dlls/dmloader/tests/loader.c | 91 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 83 insertions(+), 8 deletions(-) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 18e86e4..ea5edca 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -22,34 +22,109 @@ #include "dmusici.h" #include "wine/test.h" +static unsigned char mp3file[] = "\xFF\xFB\x92\x04"; /* MP3 header */ +static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ + "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ + "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ + static void test_release_object(void) { HRESULT hr; IDirectMusicLoader8* loader = NULL; - hr = CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); if ( FAILED(hr) ) { - skip("CoInitialize failed.\n"); + skip("CoCreateInstance failed.\n"); return; } - hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); + hr = IDirectMusicLoader_ReleaseObject(loader, NULL); + ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr); + + IDirectMusicLoader_Release(loader); +} + +static void test_simple_playing(void) +{ + IDirectMusic *music = NULL; + IDirectMusicLoader8 *loader; + IDirectMusicPerformance8 *perf; + IDirectMusicAudioPath8 *path = NULL; + IDirectMusicSegment8 *segment = NULL; + IDirectMusicSegmentState *state = NULL; + IDirectSound *dsound = NULL; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, + (void**)&perf); if ( FAILED(hr) ) { skip("CoCreateInstance failed.\n"); - CoUninitialize(); return; } - hr = IDirectMusicLoader_ReleaseObject(loader, NULL); - ok(hr == E_POINTER, "Expected E_POINTER, received %#x\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, + (void**)&loader); + ok(hr == S_OK, "Couldn't create Loader %08x\n", hr); - IDirectMusicLoader_Release(loader); - CoUninitialize(); + hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, + DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); + ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + ok(music != NULL, "Didn't get IDirectMusic pointer\n"); + ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); + + hr = IDirectMusicPerformance8_CreateStandardAudioPath(perf, + DMUS_APATH_DYNAMIC_STEREO, 64, TRUE, &path); + ok(hr == S_OK, "CreateStandardAudioPath failed: %08x\n", hr); + ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); + + desc.dwSize = sizeof(DMUS_OBJECTDESC); + desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_MEMORY; + desc.guidClass = CLSID_DirectMusicSegment; + desc.pbMemData = mp3file; + desc.llMemLength = sizeof(mp3file); + hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, + (void**)&segment); + ok(hr == DMUS_E_UNSUPPORTED_STREAM, "GetObject gave wrong error: %08x\n", hr); + ok(segment == NULL, "Didn't get NULL IDirectMusicSegment pointer\n"); + + desc.pbMemData = rifffile; + desc.llMemLength = sizeof(rifffile); + hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, + (void**)&segment); + ok(hr == S_OK, "GetObject failed: %08x\n", hr); + ok(segment != NULL, "Didn't get IDirectMusicSegment pointer\n"); + + hr = IDirectMusicSegment8_Download(segment, (IUnknown*)path); + ok(hr == S_OK, "Download failed: %08x\n", hr); + + hr = IDirectMusicSegment8_SetRepeats(segment, 1); + ok(hr == S_OK, "SetRepeats failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)segment, + NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); + ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); + + hr = IDirectMusicPerformance8_CloseDown(perf); + ok(hr == S_OK, "CloseDown failed: %08x\n", hr); + + IDirectSound_Release(dsound); + IDirectMusicSegmentState_Release(state); + IDirectMusicSegment8_Release(segment); + IDirectMusic_Release(music); + IDirectMusicPerformance8_Release(perf); + IDirectMusicLoader8_Release(loader); } START_TEST(loader) { + CoInitialize(NULL); test_release_object(); + test_simple_playing(); + CoUninitialize(); }

1 0

André Hentschel : msi: Allow ARM installations.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: c000cbaf496f1bfdc493bfea4fc88079d2d1c34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c000cbaf496f1bfdc493bfea4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:26:50 2012 +0100 msi: Allow ARM installations. --- dlls/msi/msipriv.h | 4 +++- dlls/msi/package.c | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0591050..cd16baf 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -338,7 +338,8 @@ enum platform { PLATFORM_INTEL, PLATFORM_INTEL64, - PLATFORM_X64 + PLATFORM_X64, + PLATFORM_ARM }; enum clr_version @@ -1148,6 +1149,7 @@ static const WCHAR szIntel[] = {'I','n','t','e','l',0}; static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; +static const WCHAR szARM[] = {'A','r','m',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szWow6432Node[] = {'W','o','w','6','4','3','2','N','o','d','e',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index dd11374..25d00b4 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1297,6 +1297,8 @@ static UINT msi_parse_summary( MSISUMMARYINFO *si, MSIPACKAGE *package ) package->platform = PLATFORM_INTEL64; else if (!strcmpW( template, szX64 ) || !strcmpW( template, szAMD64 )) package->platform = PLATFORM_X64; + else if (!strcmpW( template, szARM )) + package->platform = PLATFORM_ARM; else { WARN("unknown platform %s\n", debugstr_w(template)); @@ -1341,9 +1343,11 @@ static UINT validate_package( MSIPACKAGE *package ) UINT i; if (package->platform == PLATFORM_INTEL64) - { return ERROR_INSTALL_PLATFORM_UNSUPPORTED; - } +#ifndef __arm__ + if (package->platform == PLATFORM_ARM) + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; +#endif IsWow64Process( GetCurrentProcess(), &is_wow64 ); if (package->platform == PLATFORM_X64) {

1 0

Michael Stefaniuc : hlink: Use the standard COM aggregation struct field names.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 04305e7f381ca0eda21400c346b5e69da089befa URL: http://source.winehq.org/git/wine.git/?a=commit;h=04305e7f381ca0eda21400c34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 19 00:29:07 2012 +0100 hlink: Use the standard COM aggregation struct field names. --- dlls/hlink/extserv.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 7f1d565..670bac2 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -24,13 +24,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hlink); typedef struct { - IUnknown IUnknown_iface; + IUnknown IUnknown_inner; IAuthenticate IAuthenticate_iface; IHttpNegotiate IHttpNegotiate_iface; IExtensionServices IExtensionServices_iface; + IUnknown *outer_unk; LONG ref; - IUnknown *outer; HWND hwnd; LPWSTR username; @@ -40,7 +40,7 @@ typedef struct { static inline ExtensionService *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, ExtensionService, IUnknown_iface); + return CONTAINING_RECORD(iface, ExtensionService, IUnknown_inner); } static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) @@ -51,7 +51,7 @@ static HRESULT WINAPI ExtServUnk_QueryInterface(IUnknown *iface, REFIID riid, vo if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = &This->IUnknown_iface; + *ppv = &This->IUnknown_inner; }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { TRACE("(%p)->(IID_IAuthenticate %p)\n", This, ppv); *ppv = &This->IAuthenticate_iface; @@ -113,19 +113,19 @@ static inline ExtensionService *impl_from_IAuthenticate(IAuthenticate *iface) static HRESULT WINAPI Authenticate_QueryInterface(IAuthenticate *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI Authenticate_AddRef(IAuthenticate *iface) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI Authenticate_Release(IAuthenticate *iface) { ExtensionService *This = impl_from_IAuthenticate(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI Authenticate_Authenticate(IAuthenticate *iface, @@ -160,19 +160,19 @@ static inline ExtensionService *impl_from_IHttpNegotiate(IHttpNegotiate *iface) static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI HttpNegotiate_AddRef(IHttpNegotiate *iface) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI HttpNegotiate_Release(IHttpNegotiate *iface) { ExtensionService *This = impl_from_IHttpNegotiate(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, @@ -218,19 +218,19 @@ static inline ExtensionService *impl_from_IExtensionServices(IExtensionServices static HRESULT WINAPI ExtServ_QueryInterface(IExtensionServices *iface, REFIID riid, void **ppv) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_QueryInterface(This->outer, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI ExtServ_AddRef(IExtensionServices *iface) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_AddRef(This->outer); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI ExtServ_Release(IExtensionServices *iface) { ExtensionService *This = impl_from_IExtensionServices(iface); - return IUnknown_Release(This->outer); + return IUnknown_Release(This->outer_unk); } static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR pwzAdditionalHeaders) @@ -311,7 +311,7 @@ HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, ret = heap_alloc(sizeof(*ret)); - ret->IUnknown_iface.lpVtbl = &ExtServUnkVtbl; + ret->IUnknown_inner.lpVtbl = &ExtServUnkVtbl; ret->IAuthenticate_iface.lpVtbl = &AuthenticateVtbl; ret->IHttpNegotiate_iface.lpVtbl = &HttpNegotiateVtbl; ret->IExtensionServices_iface.lpVtbl = &ExtServVtbl; @@ -325,14 +325,14 @@ HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR pwzAdditionalHeaders, ExtServ_ImplSetAdditionalHeaders(ret, pwzAdditionalHeaders); if(!punkOuter) { - ret->outer = &ret->IUnknown_iface; - hres = IUnknown_QueryInterface(&ret->IUnknown_iface, riid, ppv); - IUnknown_Release(&ret->IUnknown_iface); + ret->outer_unk = &ret->IUnknown_inner; + hres = IUnknown_QueryInterface(&ret->IUnknown_inner, riid, ppv); + IUnknown_Release(&ret->IUnknown_inner); }else if(IsEqualGUID(&IID_IUnknown, riid)) { - ret->outer = punkOuter; - *ppv = &ret->IUnknown_iface; + ret->outer_unk = punkOuter; + *ppv = &ret->IUnknown_inner; }else { - IUnknown_Release(&ret->IUnknown_iface); + IUnknown_Release(&ret->IUnknown_inner); hres = E_INVALIDARG; }

1 0

Andrew Eikum : dmloader: Don't claim partial success when loading fails.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 5e522a1d1c7c84a4c89f67770ff391f05662d35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e522a1d1c7c84a4c89f67770… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Mar 19 07:35:17 2012 -0500 dmloader: Don't claim partial success when loading fails. --- dlls/dmloader/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 868f4e0..1c25435 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -304,7 +304,7 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR result = IPersistStream_Load (pPersistStream, pStream); if (result != S_OK) { WARN(": failed to (completely) load object (%s)\n", debugstr_dmreturn(result)); - ret = DMUS_S_PARTIALLOAD /*result*/; + return result; } /* get descriptor */ DM_STRUCT_INIT(&GotDesc);

1 0

Thomas Faber : xmllite/tests: Fix build with MSVC.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 4cd00f2b5ed377575678ebbee85e1f649e0f860f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd00f2b5ed377575678ebbee… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Mar 19 17:01:19 2012 +0100 xmllite/tests: Fix build with MSVC. --- dlls/xmllite/tests/reader.c | 4 ++-- dlls/xmllite/tests/writer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ec47453..1f1b2ec 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -33,8 +33,8 @@ DEFINE_GUID(IID_IXmlReaderInput, 0x0b3ccc9b, 0x9214, 0x428b, 0xa2, 0xae, 0xef, 0x3a, 0xa8, 0x71, 0xaf, 0xda); -static HRESULT WINAPI (*pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); -static HRESULT WINAPI (*pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, +static HRESULT (WINAPI *pCreateXmlReader)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +static HRESULT (WINAPI *pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, IMalloc *pMalloc, LPCWSTR encoding, BOOL hint, diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index e98db7b..af4e1a8 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -28,7 +28,7 @@ #include "xmllite.h" #include "wine/test.h" -static HRESULT WINAPI (*pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc); +static HRESULT (WINAPI *pCreateXmlWriter)(REFIID riid, void **ppvObject, IMalloc *pMalloc); static void test_writer_create(void) {

1 0

Vincent Povirk : mscoree: Search for an arch-specific mono dll first.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: c110a55f12a0dae4fdff9fb3e861eb4eb8bc0380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c110a55f12a0dae4fdff9fb3e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 19 12:54:55 2012 -0500 mscoree: Search for an arch-specific mono dll first. --- dlls/mscoree/metahost.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index e15a638..f915d73 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -564,6 +564,14 @@ HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **res return CLRRuntimeInfo_GetRuntimeHost(This, result); } +#ifdef __i386__ +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','-','x','8','6','.','d','l','l',0}; +#elif defined(__x86_64__) +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','-','x','8','6','_','6','4','.','d','l','l',0}; +#else +static const WCHAR libmono2_arch_dll[] = {'\\','b','i','n','\\','l','i','b','m','o','n','o','-','2','.','0','.','d','l','l',0}; +#endif + static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) { static const WCHAR mono_dll[] = {'\\','b','i','n','\\','m','o','n','o','.','d','l','l',0}; @@ -588,12 +596,19 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version) else if (abi_version == 2) { strcpyW(dll_path, path); - strcatW(dll_path, mono2_dll); + strcatW(dll_path, libmono2_arch_dll); attributes = GetFileAttributesW(dll_path); if (attributes == INVALID_FILE_ATTRIBUTES) { strcpyW(dll_path, path); + strcatW(dll_path, mono2_dll); + attributes = GetFileAttributesW(dll_path); + } + + if (attributes == INVALID_FILE_ATTRIBUTES) + { + strcpyW(dll_path, path); strcatW(dll_path, libmono2_dll); attributes = GetFileAttributesW(dll_path); }

1 0

Vincent Povirk : gdiplus: Draw hotkey underlines in GdipDrawString.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 8a0b57a9a1d1611f0b00170841fc526e3344d6c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0b57a9a1d1611f0b0017084… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 21 14:09:27 2012 -0500 gdiplus: Draw hotkey underlines in GdipDrawString. --- dlls/gdiplus/graphics.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c5ac9d1..89ed61b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5038,16 +5038,43 @@ static GpStatus draw_string_callback(HDC hdc, { struct draw_string_args *args = user_data; PointF position; - - if (underlined_index_count) - FIXME("hotkey underlines not drawn yet\n"); + GpStatus stat; position.X = args->x + bounds->X / args->rel_width; position.Y = args->y + bounds->Y / args->rel_height + args->ascent; - return GdipDrawDriverString(args->graphics, &string[index], length, font, + stat = GdipDrawDriverString(args->graphics, &string[index], length, font, args->brush, &position, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL); + + if (stat == Ok && underlined_index_count) + { + OUTLINETEXTMETRICW otm; + REAL underline_y, underline_height; + int i; + + GetOutlineTextMetricsW(hdc, sizeof(otm), &otm); + + underline_height = otm.otmsUnderscoreSize / args->rel_height; + underline_y = position.Y - otm.otmsUnderscorePosition / args->rel_height - underline_height / 2; + + for (i=0; i<underlined_index_count; i++) + { + REAL start_x, end_x; + SIZE text_size; + INT ofs = underlined_indexes[i] - index; + + GetTextExtentExPointW(hdc, string + index, ofs, INT_MAX, NULL, NULL, &text_size); + start_x = text_size.cx / args->rel_width; + + GetTextExtentExPointW(hdc, string + index, ofs+1, INT_MAX, NULL, NULL, &text_size); + end_x = text_size.cx / args->rel_width; + + GdipFillRectangle(args->graphics, (GpBrush*)args->brush, position.X+start_x, underline_y, end_x-start_x, underline_height); + } + } + + return stat; } GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string,

1 0

Hans Leidekker : msi: Mask off modifiers before setting the UILevel property.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 280af52666f66fc8185f9c482d254783550e87b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=280af52666f66fc8185f9c482… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 22 11:02:54 2012 +0100 msi: Mask off modifiers before setting the UILevel property. Spotted by Aric Stewart. --- dlls/msi/package.c | 6 +++--- dlls/msi/tests/package.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 25d00b4..43c6ff9 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1154,9 +1154,9 @@ void msi_adjust_privilege_properties( MSIPACKAGE *package ) MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) { - static const WCHAR szpi[] = {'%','i',0}; + static const WCHAR fmtW[] = {'%','u',0}; MSIPACKAGE *package; - WCHAR uilevel[10]; + WCHAR uilevel[11]; UINT r; TRACE("%p\n", db); @@ -1181,7 +1181,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) set_installed_prop( package ); set_installer_properties( package ); - sprintfW(uilevel,szpi,gUILevel); + sprintfW( uilevel, fmtW, gUILevel & INSTALLUILEVEL_MASK ); msi_set_property(package->db, szUILevel, uilevel); r = msi_load_summary_properties( package ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9808dfa..5a2ce9e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -10031,6 +10031,7 @@ static void test_installprops(void) UINT r; REGSAM access = KEY_ALL_ACCESS; SYSTEM_INFO si; + INSTALLUILEVEL uilevel; if (is_wow64) access |= KEY_WOW64_64KEY; @@ -10039,6 +10040,8 @@ static void test_installprops(void) lstrcat(path, "\\"); lstrcat(path, msifile); + uilevel = MsiSetInternalUI(INSTALLUILEVEL_BASIC|INSTALLUILEVEL_SOURCERESONLY, NULL); + hdb = create_package_db(); ok( hdb, "failed to create database\n"); @@ -10046,6 +10049,7 @@ static void test_installprops(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); + MsiSetInternalUI(uilevel, NULL); DeleteFile(msifile); return; } @@ -10053,6 +10057,21 @@ static void test_installprops(void) MsiCloseHandle(hdb); + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "UILevel", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, "3"), "Expected \"3\", got \"%s\"\n", buf); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + buf[0] = 0; + size = MAX_PATH; + r = MsiGetProperty(hpkg, "UILevel", buf, &size); + ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); + ok( !lstrcmp(buf, "3"), "Expected \"3\", got \"%s\"\n", buf); + + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "DATABASE", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); @@ -10071,6 +10090,7 @@ static void test_installprops(void) RegQueryValueEx(hkey2, "RegisteredOwner", NULL, &type, (LPBYTE)path, &size); } + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "USERNAME", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); @@ -10088,37 +10108,44 @@ static void test_installprops(void) if (*path) { + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "COMPANYNAME", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); ok( !lstrcmp(buf, path), "Expected %s, got %s\n", path, buf); } + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "VersionDatabase", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("VersionDatabase = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "VersionMsi", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("VersionMsi = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "Date", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("Date = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "Time", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("Time = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "PackageCode", buf, &size); ok( r == ERROR_SUCCESS, "failed to get property: %d\n", r); trace("PackageCode = %s\n", buf); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ComputerName", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); @@ -10127,18 +10154,21 @@ static void test_installprops(void) langid = GetUserDefaultLangID(); sprintf(path, "%d", langid); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "UserLanguageID", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); ok( !lstrcmpA(buf, path), "Expected \"%s\", got \"%s\"\n", path, buf); res = GetSystemMetrics(SM_CXSCREEN); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenX", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); ok(atol(buf) == res, "Expected %d, got %ld\n", res, atol(buf)); res = GetSystemMetrics(SM_CYSCREEN); + buf[0] = 0; size = MAX_PATH; r = MsiGetProperty(hpkg, "ScreenY", buf, &size); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS got %d\n", r); @@ -10350,6 +10380,7 @@ static void test_installprops(void) CloseHandle(hkey2); MsiCloseHandle(hpkg); DeleteFile(msifile); + MsiSetInternalUI(uilevel, NULL); } static void test_launchconditions(void)

1 0

Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DSurface8Impl_QueryInterface ().
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 30c3e84ee5691315e50790337ed80941cb6aea3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c3e84ee5691315e50790337… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 25 20:56:27 2012 +0200 d3d8: Don't return a pointer to the implementation in IDirect3DSurface8Impl_QueryInterface(). --- dlls/d3d8/surface.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 87c072a..fc212ea 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -33,19 +33,19 @@ static inline IDirect3DSurface8Impl *impl_from_IDirect3DSurface8(IDirect3DSurfac static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(IDirect3DSurface8 *iface, REFIID riid, void **ppobj) { - IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource8) - || IsEqualGUID(riid, &IID_IDirect3DSurface8)) { + if (IsEqualGUID(riid, &IID_IDirect3DSurface8) + || IsEqualGUID(riid, &IID_IDirect3DResource8) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *ppobj = NULL; return E_NOINTERFACE; }

1 0

Józef Kucia : dinput8/tests: Use CLSCTX_INPROC_SERVER instead of a magic number.
by Alexandre Julliard March 26, 2012

March 26, 2012

Module: wine Branch: master Commit: 42235c3cc9dc34bce5e54fbbef0a7a379baf8890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42235c3cc9dc34bce5e54fbbe… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:48:37 2012 +0200 dinput8/tests: Use CLSCTX_INPROC_SERVER instead of a magic number. --- dlls/dinput8/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 7fbdfaa..2deb348 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -271,7 +271,7 @@ static void test_action_mapping(void) DIACTIONFORMAT af; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; - hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); + hr = CoCreateInstance(&CLSID_DirectInput8, 0, CLSCTX_INPROC_SERVER, &IID_IDirectInput8A, (LPVOID*)&pDI); if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION || hr == REGDB_E_CLASSNOTREG)

1 0