January 2014 - Wine-Commits

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 16ecf3c84aa548c80069a0666293855bc3b9c72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ecf3c84aa548c80069a0666… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 16 11:14:39 2014 +0400 po: Update Russian translation. --- po/ru.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2103b9b..d5843b6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10084,7 +10084,7 @@ msgstr "Приглашение командной строки Wine" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10153,10 +10153,8 @@ msgid "Wine Explorer" msgstr "Проводник Wine" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Автозагрузка" +msgstr "Пуск" #: explorer.rc:34 winefile.rc:36 msgid "&Run..." @@ -12742,10 +12740,8 @@ msgid "Select Drive Letter" msgstr "Выберите букву диска" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Настройка Wine" +msgstr "Настройка дисков" #: winecfg.rc:227 msgid "" @@ -13024,10 +13020,8 @@ msgid "Letter" msgstr "Диск" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Новая папка" +msgstr "Путь" #: winecfg.rc:79 msgid ""

1 0

Ken Thomases : winemac: Eliminate unused "hdc" field of OpenGL context structure.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: f4b41eeb17e99d52d7dacca468c915069983c8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b41eeb17e99d52d7dacca46… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:16 2014 -0600 winemac: Eliminate unused "hdc" field of OpenGL context structure. --- dlls/winemac.drv/opengl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ad520fa..48fe4b7 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -56,7 +56,6 @@ static struct gl_info gl_info; struct wgl_context { - HDC hdc; int format; macdrv_opengl_context context; CGLContextObj cglcontext;

1 0

Frédéric Delanoy : comctl32: Avoid TRUE: FALSE conditional expressions.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 3684578a9f64b497b49d8b44151e8a3bf5b1278c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3684578a9f64b497b49d8b441… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 15 23:58:17 2014 +0100 comctl32: Avoid TRUE:FALSE conditional expressions. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/rebar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index f1acc7d..31762b1 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1590,7 +1590,7 @@ static LRESULT COMBOEX_NotifyFormat (COMBOEX_INFO *infoPtr, LPARAM lParam) if (lParam == NF_REQUERY) { INT i = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); - infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0; + infoPtr->NtfUnicode = (i == NFR_UNICODE); } return infoPtr->NtfUnicode ? NFR_UNICODE : NFR_ANSI; } diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4a3b7d4..becfe20 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3385,7 +3385,7 @@ REBAR_NotifyFormat (REBAR_INFO *infoPtr, LPARAM cmd) ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n", i); i = NFR_ANSI; } - infoPtr->bUnicode = (i == NFR_UNICODE) ? 1 : 0; + infoPtr->bUnicode = (i == NFR_UNICODE); return (LRESULT)i; } return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI);

1 0

Stefan Dösinger : wined3d: Remove resource-> allocatedMemory.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 10a8b2cd7f6b285abb4730f3f3d45fb50616871d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a8b2cd7f6b285abb4730f3f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:15 2014 +0100 wined3d: Remove resource->allocatedMemory. --- dlls/wined3d/buffer.c | 49 +++++++++++++++++++--------------------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/resource.c | 2 -- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 25 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10a8b2cd7f6b285abb473…

1 0

Michael Stefaniuc : dmcompos/tests: Add COM tests for IDirectMusicComposer.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 6c22a6ad5632e7d53989933c9daea5c3b7625703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c22a6ad5632e7d53989933c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:47:38 2014 +0100 dmcompos/tests: Add COM tests for IDirectMusicComposer. --- configure | 1 + configure.ac | 1 + dlls/dmcompos/tests/Makefile.in | 5 +++ dlls/dmcompos/tests/dmcompos.c | 91 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) diff --git a/configure b/configure index 48f12f1..c59d934 100755 --- a/configure +++ b/configure @@ -16665,6 +16665,7 @@ wine_fn_config_dll display.drv16 enable_win16 wine_fn_config_dll dmband enable_dmband clean wine_fn_config_test dlls/dmband/tests dmband_test wine_fn_config_dll dmcompos enable_dmcompos clean +wine_fn_config_test dlls/dmcompos/tests dmcompos_test wine_fn_config_dll dmime enable_dmime clean wine_fn_config_test dlls/dmime/tests dmime_test wine_fn_config_dll dmloader enable_dmloader clean diff --git a/configure.ac b/configure.ac index 75faadf..4f51909 100644 --- a/configure.ac +++ b/configure.ac @@ -2789,6 +2789,7 @@ WINE_CONFIG_DLL(display.drv16,enable_win16) WINE_CONFIG_DLL(dmband,,[clean]) WINE_CONFIG_TEST(dlls/dmband/tests) WINE_CONFIG_DLL(dmcompos,,[clean]) +WINE_CONFIG_TEST(dlls/dmcompos/tests) WINE_CONFIG_DLL(dmime,,[clean]) WINE_CONFIG_TEST(dlls/dmime/tests) WINE_CONFIG_DLL(dmloader,,[clean]) diff --git a/dlls/dmcompos/tests/Makefile.in b/dlls/dmcompos/tests/Makefile.in new file mode 100644 index 0000000..b794d4d --- /dev/null +++ b/dlls/dmcompos/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dmcompos.dll +IMPORTS = ole32 + +C_SRCS = \ + dmcompos.c diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c new file mode 100644 index 0000000..329d65e --- /dev/null +++ b/dlls/dmcompos/tests/dmcompos.c @@ -0,0 +1,91 @@ +/* + * Copyright 2014 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <windef.h> +#include <initguid.h> +#include <wine/test.h> +#include <dmusici.h> + + +static BOOL missing_dmcompos(void) +{ + IDirectMusicComposer *dmc; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicComposer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicComposer, (void**)&dmc); + + if (hr == S_OK && dmc) + { + IDirectMusicComposer_Release(dmc); + return FALSE; + } + return TRUE; +} + +static void test_COM(void) +{ + IDirectMusicComposer *dmc = (IDirectMusicComposer*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicComposer, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmc); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicComposer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmc, "dmc = %p\n", dmc); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicComposer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmc); + ok(hr == E_NOINTERFACE, + "DirectMusicComposer create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicComposer interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicComposer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicComposer, (void**)&dmc); + ok(hr == S_OK, "DirectMusicComposer create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicComposer_AddRef(dmc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicComposer_QueryInterface(dmc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicComposer_Release(dmc)); +} + +START_TEST(dmcompos) +{ + CoInitialize(NULL); + + if (missing_dmcompos()) + { + skip("dmcompos not available\n"); + CoUninitialize(); + return; + } + test_COM(); + + CoUninitialize(); +}

1 0

Michael Stefaniuc : dmcompos: None of the COM classes support aggregation.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 434842e13d716debf712a6f97bfc1aef8bf3fdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=434842e13d716debf712a6f97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:45:17 2014 +0100 dmcompos: None of the COM classes support aggregation. --- dlls/dmcompos/chordmap.c | 3 ++- dlls/dmcompos/chordmaptrack.c | 3 ++- dlls/dmcompos/composer.c | 3 ++- dlls/dmcompos/dmcompos_main.c | 23 +++++++++++++---------- dlls/dmcompos/dmcompos_private.h | 8 ++++---- dlls/dmcompos/signposttrack.c | 3 ++- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index ea751af..21849b8 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -524,7 +524,8 @@ static const IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmchordmap(REFIID lpcGUID, void **ppobj) +{ IDirectMusicChordMapImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapImpl)); diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 6d8f326..cac652c 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -269,7 +269,8 @@ static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicChordMapTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapTrack)); diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index d122e97..2d91f5e 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -112,7 +112,8 @@ static const IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicComposerImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmcomposer(REFIID lpcGUID, void **ppobj) +{ IDirectMusicComposerImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicComposerImpl)); diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index e40c6ea..240cc9d 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -30,12 +30,12 @@ LONG DMCOMPOS_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; -static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ppv, IUnknown *pUnkOuter) +static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ret_iface) { - FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); + FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface); return CLASS_E_CLASSNOTAVAILABLE; } @@ -89,7 +89,12 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + return This->fnCreateInstance(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -112,13 +117,11 @@ static const IClassFactoryVtbl classfactory_vtbl = { ClassFactory_LockServer }; -static IClassFactoryImpl ChordMap_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicChordMapImpl}; -static IClassFactoryImpl Composer_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicComposerImpl}; -static IClassFactoryImpl ChordMapTrack_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicChordMapTrack}; +static IClassFactoryImpl ChordMap_CF = {{&classfactory_vtbl}, create_dmchordmap}; +static IClassFactoryImpl Composer_CF = {{&classfactory_vtbl}, create_dmcomposer}; +static IClassFactoryImpl ChordMapTrack_CF = {{&classfactory_vtbl}, create_dmchordmaptrack}; static IClassFactoryImpl Template_CF = {{&classfactory_vtbl}, create_direct_music_template}; -static IClassFactoryImpl SignPostTrack_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicSignPostTrack}; +static IClassFactoryImpl SignPostTrack_CF = {{&classfactory_vtbl}, create_dmsignposttrack}; /****************************************************************** * DllMain diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 5e9a9f1..d6d252c 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -53,10 +53,10 @@ typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicComposerImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordMapTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmchordmap(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmcomposer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmchordmaptrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmsignposttrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicChordMapImpl implementation structure diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 15ff599..586c085 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -267,7 +267,8 @@ static const IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl = }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicSignPostTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSignPostTrack));

1 0

Ken Thomases : winecoreaudio: Remove some no-longer-used code.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: d3488325aec9ca6b2ef0a7212a194711cf4c96f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3488325aec9ca6b2ef0a7212… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:25 2014 -0600 winecoreaudio: Remove some no-longer-used code. --- dlls/winecoreaudio.drv/audiounit.c | 95 +----------------------------------- 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 6968719..b49d214 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -36,25 +36,8 @@ #include "wine/debug.h" #ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for compatibility's sake */ -typedef Component AudioComponent; +/* Define new AudioComponent Manager types for compatibility's sake */ typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} #endif #ifndef HAVE_AUGRAPHADDNODE @@ -72,49 +55,6 @@ static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponen WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); -static const char *streamDescription(const AudioStreamBasicDescription* stream) -{ - return wine_dbg_sprintf("\n mSampleRate : %f\n mFormatID : %s\n mFormatFlags : %lX\n mBytesPerPacket : %lu\n mFramesPerPacket : %lu\n mBytesPerFrame : %lu\n mChannelsPerFrame : %lu\n mBitsPerChannel : %lu\n", - stream->mSampleRate, - wine_dbgstr_fourcc(stream->mFormatID), - stream->mFormatFlags, - stream->mBytesPerPacket, - stream->mFramesPerPacket, - stream->mBytesPerFrame, - stream->mChannelsPerFrame, - stream->mBitsPerChannel); -} - -int AudioUnit_CloseAudioUnit(AudioUnit au) -{ - OSStatus err = AudioComponentInstanceDispose(au); - return (err == noErr); -} - -int AudioUnit_InitializeWithStreamDescription(AudioUnit au, AudioStreamBasicDescription *stream) -{ - OSStatus err = noErr; - - TRACE("input format: %s\n", streamDescription(stream)); - - err = AudioUnitSetProperty(au, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, - 0, stream, sizeof(*stream)); - - if (err != noErr) - { - ERR("AudioUnitSetProperty return an error %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - err = AudioUnitInitialize(au); - if (err != noErr) - { - ERR("AudioUnitInitialize return an error %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - return 1; -} - int AudioUnit_SetVolume(AudioUnit au, float left, float right) { OSStatus err = noErr; @@ -150,39 +90,6 @@ int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) } -/* FIXME: implement sample rate conversion on input */ -int AudioUnit_GetInputDeviceSampleRate(void) -{ - AudioDeviceID defaultInputDevice; - UInt32 param; - AudioObjectPropertyAddress propertyAddress; - Float64 sampleRate; - OSStatus err; - - param = sizeof(defaultInputDevice); - propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice; - propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; - propertyAddress.mElement = kAudioObjectPropertyElementMaster; - err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &param, &defaultInputDevice); - if (err != noErr || defaultInputDevice == kAudioDeviceUnknown) - { - ERR("Couldn't get the default audio input device ID: %08lx\n", err); - return 0; - } - - param = sizeof(sampleRate); - propertyAddress.mSelector = kAudioDevicePropertyNominalSampleRate; - propertyAddress.mScope = kAudioDevicePropertyScopeInput; - err = AudioObjectGetPropertyData(defaultInputDevice, &propertyAddress, 0, NULL, &param, &sampleRate); - if (err != noErr) - { - ERR("Couldn't get the device sample rate: %08lx\n", err); - return 0; - } - - return sampleRate; -} - /* * MIDI Synth Unit */

1 0

Michael Stefaniuc : dmcompos: Use a better error for an unimplemented COM class.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 4f3931eb1537f315112386732ce42e61ac11a688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3931eb1537f315112386732… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:42:52 2014 +0100 dmcompos: Use a better error for an unimplemented COM class. --- dlls/dmcompos/dmcompos_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index b9f1444..e40c6ea 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -37,7 +37,7 @@ static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ppv, IUnk { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Michael Stefaniuc : dmcompos/tests: COM tests for the different DirectMusic*Tracks.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 7c7c427c423104e630986d04d672a2b4cd6a90f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7c427c423104e630986d04d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:52:57 2014 +0100 dmcompos/tests: COM tests for the different DirectMusic*Tracks. --- dlls/dmcompos/tests/dmcompos.c | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 6ff663a..ba07305 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -24,6 +24,7 @@ #include <wine/test.h> #include <dmusici.h> +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) static BOOL missing_dmcompos(void) { @@ -125,6 +126,70 @@ static void test_COM_chordmap(void) while (IDirectMusicChordMap_Release(dmcm)); } +static void test_COM_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + } class[] = { + { X(DirectMusicChordMapTrack) }, + { X(DirectMusicSignPostTrack) }, + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + /* COM aggregation */ + dmt8 = (IDirectMusicTrack8*)0xdeadbeef; + hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dmt8); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("%s not registered\n", class[i].name); + continue; + } + ok(hr == CLASS_E_NOAGGREGATION, + "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + ok(!dmt8, "dmt8 = %p\n", dmt8); + + /* Invalid RIID */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dmt8); + ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", + class[i].name, hr); + + /* Same refcount for all DirectMusicTrack interfaces */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + refcount = IDirectMusicTrack8_AddRef(dmt8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -137,6 +202,7 @@ START_TEST(dmcompos) } test_COM(); test_COM_chordmap(); + test_COM_track(); CoUninitialize(); }

1 0

Dmitry Timoshkov : taskschd: Treat VT_BSTR/NULL or empty variant as NULL.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 006aadd3d2185c5d0d888fa623bf42999f424995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006aadd3d2185c5d0d888fa62… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 16 18:01:59 2014 +0900 taskschd: Treat VT_BSTR/NULL or empty variant as NULL. --- dlls/taskschd/task.c | 3 ++- dlls/taskschd/tests/scheduler.c | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 5ff3761..c8f8fdf 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -131,7 +131,8 @@ static HRESULT WINAPI TaskService_NewTask(ITaskService *iface, DWORD flags, ITas static inline BOOL is_variant_null(const VARIANT *var) { - return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL; + return V_VT(var) == VT_EMPTY || V_VT(var) == VT_NULL || + (V_VT(var) == VT_BSTR && (V_BSTR(var) == NULL || !*V_BSTR(var))); } static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, VARIANT user, VARIANT domain, VARIANT password) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 12c89b6..152dd69 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -30,6 +30,7 @@ static void test_Connect(void) { + static WCHAR empty[] = { 0 }; static const WCHAR deadbeefW[] = { '0','.','0','.','0','.','0',0 }; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len; @@ -75,13 +76,13 @@ static void test_Connect(void) hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); ok(hr == S_OK || hr == E_ACCESSDENIED /* not an administrator */, "Connect error %#x\n", hr); was_connected = hr == S_OK; - SysFreeString(V_BSTR(&v_comp)); - V_BSTR(&v_comp) = SysAllocString(deadbeefW); + V_BSTR(&v_comp) = SysAllocString(deadbeefW); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); todo_wine ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR), "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); + SysFreeString(V_BSTR(&v_comp)); vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); @@ -89,6 +90,15 @@ todo_wine ok(vbool == VARIANT_FALSE || (was_connected && vbool == VARIANT_TRUE), "Connect shouldn't trash an existing connection, got %d (was connected %d)\n", vbool, was_connected); + V_BSTR(&v_comp) = SysAllocString(empty); + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + SysFreeString(V_BSTR(&v_comp)); + + V_BSTR(&v_comp) = NULL; + hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); ok(hr == S_OK, "Connect error %#x\n", hr); @@ -102,8 +112,6 @@ todo_wine ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); SysFreeString(bstr); - SysFreeString(V_BSTR(&v_comp)); - ITaskService_Release(service); }

1 0

Dmitry Timoshkov : taskschd/tests: Add more task folder tests.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 7341996f5d6ce20b8914dba79e2901aef900ac57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7341996f5d6ce20b8914dba79… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 16 18:02:25 2014 +0900 taskschd/tests: Add more task folder tests. --- dlls/taskschd/tests/scheduler.c | 83 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 152dd69..63b5730 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -118,19 +118,21 @@ todo_wine static void test_GetFolder(void) { static WCHAR dot[] = { '.',0 }; + static WCHAR empty[] = { 0 }; static WCHAR slash[] = { '/',0 }; static WCHAR bslash[] = { '\\',0 }; static WCHAR Wine[] = { '\\','W','i','n','e',0 }; static WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; static WCHAR Wine_Folder1_[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\',0 }; static WCHAR Wine_Folder1_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\','F','o','l','d','e','r','2',0 }; + static WCHAR Folder1_Folder2[] = { '\\','F','o','l','d','e','r','1','\\','F','o','l','d','e','r','2',0 }; static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; HRESULT hr; BSTR bstr; VARIANT v_null; ITaskService *service; - ITaskFolder *folder, *subfolder; + ITaskFolder *folder, *subfolder, *subfolder2; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -162,6 +164,12 @@ todo_wine todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = ITaskService_GetFolder(service, empty, &folder); +todo_wine + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr == S_OK) + ITaskFolder_Release(folder); + hr = ITaskService_GetFolder(service, NULL, &folder); todo_wine ok(hr == S_OK, "GetFolder error %#x\n", hr); @@ -198,6 +206,9 @@ todo_wine hr = ITaskFolder_CreateFolder(folder, slash, v_null, &subfolder); ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); @@ -266,8 +277,76 @@ todo_wine SysFreeString(bstr); hr = ITaskFolder_get_Path(subfolder, &bstr); ok(hr == S_OK, "get_Path error %#x\n", hr); - ok(!lstrcmpW(bstr, Wine_Folder1), "expected Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + ok(!lstrcmpW(bstr, Wine_Folder1), "expected \\Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine), "expected \\Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine+1, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = ITaskFolder_GetFolder(subfolder, empty, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder2, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine+1), "expected Wine, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder2); + + hr = ITaskFolder_GetFolder(subfolder, Folder1_Folder2, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder2, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1_Folder2+1), "expected Wine\\Folder1\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder2); + + hr = ITaskFolder_GetFolder(subfolder, Folder1_Folder2+1, &subfolder2); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + + hr = ITaskFolder_get_Name(subfolder2, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder2, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1_Folder2+1), "expected Wine\\Folder1\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder2); + ITaskFolder_Release(subfolder); hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0);

1 0

Stefan Dösinger : wined3d: Sysmem can be freed when user memory is used.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: abb620ed2e89e5a9390b7860d604ec3f3e5a1e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb620ed2e89e5a9390b7860d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 22:02:14 2014 +0100 wined3d: Sysmem can be freed when user memory is used. --- dlls/wined3d/surface.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3a0d327..586358a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -614,8 +614,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) - || surface->user_memory) + if (surface->resource.map_count || surface->flags & SFLAG_DONOTFREE) return; wined3d_resource_free_sysmem(&surface->resource);

1 0

Piotr Caban : msvcrt: Don't overwrite unmatched string in scanf.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 638c8e3847212f1d5399643c30fddcf7afc8c6ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=638c8e3847212f1d5399643c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 16 11:39:44 2014 +0100 msvcrt: Don't overwrite unmatched string in scanf. --- dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/tests/scanf.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 7f618f4..e85f343 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -478,7 +478,7 @@ _FUNCTION_ { if (width>0) width--; } /* terminate */ - if (!suppress) *sptr = 0; + if (st && !suppress) *sptr = 0; } break; widecharstring: { /* read a word into a wchar_t* */ @@ -508,7 +508,7 @@ _FUNCTION_ { if (width>0) width--; } /* terminate */ - if (!suppress) *sptr = 0; + if (st && !suppress) *sptr = 0; } break; /* 'c' and 'C work analogously to 's' and 'S' as described diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index b09e7df..97b8074 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -131,6 +131,13 @@ static void test_sscanf( void ) ok( ret == 1, "Error with format \"%s\"\n","%*[a-cd-dg-e]%c"); ok( buffer[0] == 'h', "Error with \"abcefgdh\" \"%c\"\n", buffer[0]); + buffer1[0] = 'b'; + ret = sscanf("a","%s%s", buffer, buffer1); + ok( ret == 1, "expected 1, got %u\n", ret); + ok( buffer[0] == 'a', "buffer[0] = '%c'\n", buffer[0]); + ok( buffer[1] == '\0', "buffer[1] = '%c'\n", buffer[1]); + ok( buffer1[0] == 'b', "buffer1[0] = '%c'\n", buffer1[0]); + /* check digits */ ret = sprintf(buffer,"%d:%d:%d",hour,min,sec); ok( ret == 8, "expected 8, got %u\n", ret);

1 0

Michael Stefaniuc : dmcompos/tests: Add COM tests for IDirectMusicChordMap.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: ad52929b178981427ff56103fc6dc1a268102d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad52929b178981427ff56103f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:49:19 2014 +0100 dmcompos/tests: Add COM tests for IDirectMusicChordMap. --- dlls/dmcompos/tests/dmcompos.c | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 329d65e..6ff663a 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -75,6 +75,56 @@ static void test_COM(void) while (IDirectMusicComposer_Release(dmc)); } +static void test_COM_chordmap(void) +{ + IDirectMusicChordMap *dmcm = (IDirectMusicChordMap*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, (IUnknown*)&dmcm, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmcm); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicChordMap create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmcm, "dmcm = %p\n", dmcm); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IClassFactory, (void**)&dmcm); + ok(hr == E_NOINTERFACE, + "DirectMusicChordMap create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicChordMap interfaces */ + 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); + refcount = IDirectMusicChordMap_AddRef(dmcm); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicChordMap_QueryInterface(dmcm, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicChordMap_Release(dmcm)); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -86,6 +136,7 @@ START_TEST(dmcompos) return; } test_COM(); + test_COM_chordmap(); CoUninitialize(); }

1 0

Ken Thomases : opengl32: Download OpenGL registry files even if server certificate can' t be verified.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: fbf2e243fe62fa1fb483b85f53a0789071fade37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf2e243fe62fa1fb483b85f5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:46:52 2014 -0600 opengl32: Download OpenGL registry files even if server certificate can't be verified. --- dlls/opengl32/make_opengl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fa6d514..b0b9c00 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -389,8 +389,8 @@ if ($version eq "1.0") { # # Fetch the registry files # --f "gl.xml" || system "wget https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml" || die "cannot download gl.xml"; --f "wgl.xml" || system "wget https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml" || die "cannot download wgl.xml"; +-f "gl.xml" || system "wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml" || die "cannot download gl.xml"; +-f "wgl.xml" || system "wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml" || die "cannot download wgl.xml"; #

1 0

Ken Thomases : opengl32: Fix Perl compilation errors in make_opengl script.
by Alexandre Julliard Jan. 16, 2014

Jan. 16, 2014

Module: wine Branch: master Commit: 46c7acadd76053ab886924a6603c05d68829439b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c7acadd76053ab886924a66… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:04 2014 -0600 opengl32: Fix Perl compilation errors in make_opengl script. --- dlls/opengl32/make_opengl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 569c294..fa6d514 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -609,7 +609,7 @@ sub parse_variable($) my $pnamebefore = ''; my $pnameafter = ''; - while (my ($k, $v) = each($p)){ + while (my ($k, $v) = each(%$p)){ if ($k eq 'ptype') { $ptype = ${$v}[0]; } elsif ($k eq 'name') { @@ -643,7 +643,7 @@ sub parse_file($$) my $ret = ''; my $params = []; my @alias = ''; - while (my ($k, $v) = each($command)){ + while (my ($k, $v) = each(%$command)){ if ($k eq 'param') { push(@$params, parse_variable($_)) for (@{$v}); } elsif ($k eq 'proto') { @@ -657,7 +657,7 @@ sub parse_file($$) if ($generate_enums) { for my $enum ( @{$data->{'enums'}} ) { if (ref($enum->{'enum'}) eq "HASH") { - while (my ($k, $v) = each($enum->{'enum'})){ + while (my ($k, $v) = each(%{$enum->{'enum'}})){ $enums{$k} = $v->{'value'}; } } @@ -665,7 +665,7 @@ sub parse_file($$) } # generate norm functions - while (my ($k, $v) = each($data->{feature})) { + while (my ($k, $v) = each(%{$data->{feature}})) { if ($norm_categories{$k}) { for my $req (@{$v->{require}}) { for(keys %{$req->{command}}) { @@ -676,7 +676,7 @@ sub parse_file($$) } # generate extension functions from norm functions, if they are newer than the category - while (my ($k, $v) = each($data->{feature})) { + while (my ($k, $v) = each(%{$data->{feature}})) { if (!$norm_categories{$k} && $v->{api} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { @@ -690,7 +690,7 @@ sub parse_file($$) } # generate extension functions - while (my ($k, $v) = each(${$data->{extensions}}[0]->{extension})) { + while (my ($k, $v) = each(%{${$data->{extensions}}[0]->{extension}})) { if ($v->{supported} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { if (!defined $req->{api} || $req->{api} =~ /^gl(\||$)/) {

1 0

Stefan Dösinger : wined3d: Add INDIB and INUSERMEM to resource_access_from_location.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 42927d0e9d60db7139eb55dde1ffa47092623637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42927d0e9d60db7139eb55dde… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:08 2014 +0100 wined3d: Add INDIB and INUSERMEM to resource_access_from_location. --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d70f605..92750cb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4885,6 +4885,8 @@ static DWORD resource_access_from_location(DWORD location) switch (location) { case SFLAG_INSYSMEM: + case SFLAG_INUSERMEM: + case SFLAG_INDIB: return WINED3D_RESOURCE_ACCESS_CPU; case SFLAG_INDRAWABLE:

1 0

Dmitry Timoshkov : taskschd/tests: Use IP 0.0.0.0 as a bad server name and test that unsuccessful connection attempt shouldn 't trash an existing connection.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 3826fc844a5b5b1bbec1fd9cc3443b0053192c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3826fc844a5b5b1bbec1fd9cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 15 17:17:09 2014 +0900 taskschd/tests: Use IP 0.0.0.0 as a bad server name and test that unsuccessful connection attempt shouldn't trash an existing connection. --- dlls/taskschd/tests/scheduler.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 1953199..f631c52 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -30,13 +30,14 @@ static void test_Connect(void) { - static const WCHAR deadbeefW[] = { 'd','e','a','d','b','e','e','f',0 }; + static const WCHAR deadbeefW[] = { '0','.','0','.','0','.','0',0 }; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len; HRESULT hr; BSTR bstr; VARIANT v_null, v_comp; VARIANT_BOOL vbool; + BOOL was_connected; ITaskService *service; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); @@ -73,17 +74,20 @@ static void test_Connect(void) hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); ok(hr == S_OK || hr == E_ACCESSDENIED /* not an administrator */, "Connect error %#x\n", hr); + was_connected = hr == S_OK; SysFreeString(V_BSTR(&v_comp)); V_BSTR(&v_comp) = SysAllocString(deadbeefW); hr = ITaskService_Connect(service, v_comp, v_null, v_null, v_null); - ok(hr == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "expected ERROR_BAD_NETPATH, got %#x\n", hr); +todo_wine + ok(hr == HRESULT_FROM_WIN32(RPC_S_INVALID_NET_ADDR), "expected RPC_S_INVALID_NET_ADDR, got %#x\n", hr); vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); ok(hr == S_OK, "get_Connected error %#x\n", hr); - ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + ok(vbool == VARIANT_FALSE || (was_connected && vbool == VARIANT_TRUE), + "Connect shouldn't trash an existing connection, got %d (was connected %d)\n", vbool, was_connected); hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); ok(hr == S_OK, "Connect error %#x\n", hr); @@ -95,12 +99,12 @@ static void test_Connect(void) hr = ITaskService_get_TargetServer(service, &bstr); ok(hr == S_OK, "get_TargetServer error %#x\n", hr); - if (hr == S_OK) - { - ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); - SysFreeString(bstr); - } + ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + SysFreeString(V_BSTR(&v_comp)); + + ITaskService_Release(service); } START_TEST(scheduler)

1 0

Michael Stefaniuc : dmstyle/tests: COM tests for DirectMusicSection.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 134697b69fb4945cb122077c305c3b6ce78832bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=134697b69fb4945cb122077c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:13:32 2014 +0100 dmstyle/tests: COM tests for DirectMusicSection. --- dlls/dmstyle/tests/dmstyle.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 18f2a6b..a1565c0 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -89,6 +89,53 @@ static void test_COM(void) while (IDirectMusicStyle8_Release(dms8)); } +static void test_COM_section(void) +{ + IDirectMusicObject *dmo = (IDirectMusicObject*)0xdeadbeef; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicSection, (IUnknown*)&dmo, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmo); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicSection create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmo, "dmo = %p\n", dmo); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicSection, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&dmo); + todo_wine ok(hr == E_NOINTERFACE, + "DirectMusicSection create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicObject interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicSection, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmo); + todo_wine ok(hr == S_OK, "DirectMusicSection create failed: %08x, expected S_OK\n", hr); + if (hr != S_OK) { + skip("DirectMusicSection not implemented\n"); + return; + } + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicObject_QueryInterface(dmo, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicObject_Release(dmo)); +} + static void test_COM_track(void) { IDirectMusicTrack8 *dmt8; @@ -168,6 +215,7 @@ START_TEST(dmstyle) return; } test_COM(); + test_COM_section(); test_COM_track(); CoUninitialize();

1 0

Stefan Dösinger : wined3d: Decide about PBO use at surface creation time.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 321cd8e825c4382cdb4b0c4b4371c7362b237eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=321cd8e825c4382cdb4b0c4b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:11 2014 +0100 wined3d: Decide about PBO use at surface creation time. --- dlls/wined3d/surface.c | 41 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0d8de0f..ab7bbd6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -538,20 +538,6 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; } -static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) -{ - if (surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) - return FALSE; - if (!(surface->flags & SFLAG_DYNLOCK)) - return FALSE; - if (surface->flags & (SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) - return FALSE; - if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) - return FALSE; - - return TRUE; -} - static void surface_create_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_context *context; @@ -591,7 +577,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (!surface->pbo && surface_need_pbo(surface, gl_info)) + if (!surface->pbo && surface->flags & SFLAG_PBO) surface_create_pbo(surface, gl_info); else if (!(surface->resource.heap_memory || surface->pbo)) { @@ -666,6 +652,17 @@ static void surface_release_client_storage(struct wined3d_surface *surface) surface_force_reload(surface); } +static BOOL surface_use_pbo(const struct wined3d_surface *surface) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + + return surface->resource.pool == WINED3D_POOL_DEFAULT + && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !surface->resource.format->convert + && !(surface->flags & (SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)); +} + static HRESULT surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ @@ -753,6 +750,9 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->flags |= SFLAG_DISCARDED; + if (surface_use_pbo(surface)) + surface->flags |= SFLAG_PBO; + return WINED3D_OK; } @@ -2791,6 +2791,13 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->resource.size = resource_size; + /* The format might be changed to a format that needs conversion. + * If the surface didn't use PBOs previously but could now, don't + * change it - whatever made us not use PBOs might come back, e.g. + * color keys. */ + if (!surface_use_pbo(surface)) + surface->flags &= ~SFLAG_PBO; + if (create_dib) { if (FAILED(hr = surface_create_dib_section(surface))) @@ -5109,6 +5116,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { TRACE("Removing the pbo attached to surface %p.\n", surface); surface_remove_pbo(surface, gl_info); + surface->flags &= ~SFLAG_PBO; } surface_get_memory(surface, &data, surface->flags); @@ -5209,8 +5217,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { TRACE("Location already up to date.\n"); - if (location == SFLAG_INSYSMEM && !surface->pbo - && surface_need_pbo(surface, gl_info)) + if (location == SFLAG_INSYSMEM && !surface->pbo && surface->flags & SFLAG_PBO) surface_create_pbo(surface, gl_info); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8bdc9c..9d4c39c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2305,6 +2305,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ #define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ #define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_PBO 0x00400000 /* Use a PBO for mapping. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0

Stefan Dösinger : wined3d: Give buffers their own location.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 2b8e900ac4f1cfce6b3234967b4931a524114ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8e900ac4f1cfce6b3234967… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:12 2014 +0100 wined3d: Give buffers their own location. --- dlls/wined3d/surface.c | 192 ++++++++++++++++------------------------ dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 15 ++-- 3 files changed, 87 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b8e900ac4f1cfce6b323…

1 0

Huw Davies : riched20: Add uniscribe support.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 7a0a4ce7abaa36a10ac97b74b39b582c2fc7665c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0a4ce7abaa36a10ac97b74b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 15 13:06:43 2014 +0000 riched20: Add uniscribe support. --- dlls/riched20/Makefile.in | 2 +- dlls/riched20/editstr.h | 12 +++ dlls/riched20/list.c | 2 + dlls/riched20/paint.c | 7 +- dlls/riched20/run.c | 36 ++++++- dlls/riched20/style.c | 2 + dlls/riched20/wrap.c | 239 +++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 296 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a0a4ce7abaa36a10ac97…

1 0

Michael Stefaniuc : dmstyle: Use a better error for an unimplemented COM class.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 6dfae45b3a9e7eef68a4bc800816703a2c08017d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dfae45b3a9e7eef68a4bc800… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:12:35 2014 +0100 dmstyle: Use a better error for an unimplemented COM class. --- dlls/dmstyle/dmstyle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 996fc9b..b76fa73 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -34,7 +34,7 @@ static HRESULT WINAPI create_direct_music_section(REFIID riid, void **ret_iface) { FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Stefan Dösinger : wined3d: Remove SFLAG_PBO.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 7c052171d638f9d43911981e75da367350831b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c052171d638f9d43911981e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:10 2014 +0100 wined3d: Remove SFLAG_PBO. --- dlls/wined3d/surface.c | 29 ++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 21 +++++++++------------ 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 74cab37..0d8de0f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -45,7 +45,7 @@ static void surface_cleanup(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if ((surface->flags & SFLAG_PBO) || surface->rb_multisample + if (surface->pbo || surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { struct wined3d_renderbuffer_entry *entry, *entry2; @@ -55,7 +55,7 @@ static void surface_cleanup(struct wined3d_surface *surface) context = context_acquire(surface->resource.device, NULL); gl_info = context->gl_info; - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { TRACE("Deleting PBO %u.\n", surface->pbo); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); @@ -522,7 +522,7 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win } if (location & SFLAG_INSYSMEM) { - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { data->addr = NULL; data->buffer_object = surface->pbo; @@ -581,7 +581,6 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win /* We don't need the system memory anymore and we can't even use it for PBOs. */ if (!(surface->flags & SFLAG_CLIENT)) wined3d_resource_free_sysmem(&surface->resource); - surface->flags |= SFLAG_PBO; surface->map_binding = SFLAG_INSYSMEM; context_release(context); } @@ -592,9 +591,9 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) + if (!surface->pbo && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.heap_memory || surface->flags & SFLAG_PBO)) + else if (!(surface->resource.heap_memory || surface->pbo)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ @@ -631,7 +630,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) - || surface->user_memory) + || surface->user_memory || surface->pbo) return; wined3d_resource_free_sysmem(&surface->resource); @@ -828,7 +827,7 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR return surface->dib.bitmap_data; case SFLAG_INSYSMEM: - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { BYTE *ret; const struct wined3d_gl_info *gl_info; @@ -877,7 +876,7 @@ static void surface_unmap(struct wined3d_surface *surface) break; case SFLAG_INSYSMEM: - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -1339,7 +1338,6 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win checkGLcall("glDeleteBuffersARB"); surface->pbo = 0; - surface->flags &= ~SFLAG_PBO; } static BOOL surface_init_sysmem(struct wined3d_surface *surface) @@ -1382,7 +1380,7 @@ static void surface_unload(struct wined3d_resource *resource) * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - if (!(surface->flags & SFLAG_PBO)) + if (!surface->pbo) { surface_init_sysmem(surface); surface_validate_location(surface, surface->map_binding); @@ -1405,7 +1403,7 @@ static void surface_unload(struct wined3d_resource *resource) gl_info = context->gl_info; /* Destroy PBOs, but load them into real sysmem before */ - if (surface->flags & SFLAG_PBO) + if (surface->pbo) surface_remove_pbo(surface, gl_info); /* Destroy fbo render buffers. This is needed for implicit render targets, for @@ -3274,7 +3272,8 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (FAILED(hr)) return WINED3DERR_INVALIDCALL; if (!(surface->map_binding == SFLAG_INUSERMEM - || surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + || surface->flags & SFLAG_PIN_SYSMEM + || surface->pbo)) surface->map_binding = SFLAG_INDIB; } @@ -5106,7 +5105,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* Don't use PBOs for converted surfaces. During PBO conversion we look at * SFLAG_CONVERTED but it isn't set (yet) in all cases it is getting * called. */ - if ((convert != WINED3D_CT_NONE || format.convert) && (surface->flags & SFLAG_PBO)) + if ((convert != WINED3D_CT_NONE || format.convert) && surface->pbo) { TRACE("Removing the pbo attached to surface %p.\n", surface); surface_remove_pbo(surface, gl_info); @@ -5210,7 +5209,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { TRACE("Location already up to date.\n"); - if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) + if (location == SFLAG_INSYSMEM && !surface->pbo && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e795623..d8bdc9c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2296,27 +2296,24 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ #define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ #define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00002000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00004000 /* The system memory copy is current. */ -#define SFLAG_INUSERMEM 0x00008000 /* The user memory copy is current. */ -#define SFLAG_INDIB 0x00010000 /* The DIB copy is current. */ -#define SFLAG_INTEXTURE 0x00020000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00040000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00080000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00100000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00200000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00400000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_INSYSMEM 0x00002000 /* The system memory copy is current. */ +#define SFLAG_INUSERMEM 0x00004000 /* The user memory copy is current. */ +#define SFLAG_INDIB 0x00008000 /* The DIB copy is current. */ +#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long * SFLAG_DYNLOCK: Avoid freeing the data for performance - * SFLAG_PBO: PBOs don't use 'normal' memory. It is either allocated by the driver or must be NULL. * SFLAG_CLIENT: OpenGL uses our memory as backup */ #define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ - SFLAG_PBO | \ SFLAG_PIN_SYSMEM) #define SFLAG_LOCATIONS (SFLAG_INSYSMEM | \

1 0

Dmitry Timoshkov : taskschd/tests: Add some ITaskFolder tests.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 57d5b6fcdd868baa4634fb7d00b9969d07199908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d5b6fcdd868baa4634fb7d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 15 17:17:57 2014 +0900 taskschd/tests: Add some ITaskFolder tests. --- dlls/taskschd/tests/scheduler.c | 170 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 170 insertions(+) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f631c52..12c89b6 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -107,11 +107,181 @@ todo_wine ITaskService_Release(service); } +static void test_GetFolder(void) +{ + static WCHAR dot[] = { '.',0 }; + static WCHAR slash[] = { '/',0 }; + static WCHAR bslash[] = { '\\',0 }; + static WCHAR Wine[] = { '\\','W','i','n','e',0 }; + static WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; + static WCHAR Wine_Folder1_[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\',0 }; + static WCHAR Wine_Folder1_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\','F','o','l','d','e','r','2',0 }; + static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; + static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; + HRESULT hr; + BSTR bstr; + VARIANT v_null; + ITaskService *service; + ITaskFolder *folder, *subfolder; + + hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); + if (hr != S_OK) + { + win_skip("CoCreateInstance(CLSID_TaskScheduler) error %#x\n", hr); + return; + } + + V_VT(&v_null) = VT_NULL; + + hr = ITaskService_Connect(service, v_null, v_null, v_null, v_null); + ok(hr == S_OK, "Connect error %#x\n", hr); + + hr = ITaskService_GetFolder(service, slash, &folder); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, dot, &folder); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, bslash, &folder); +todo_wine + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr == S_OK) + ITaskFolder_Release(folder); + + hr = ITaskService_GetFolder(service, NULL, NULL); +todo_wine + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, NULL, &folder); +todo_wine + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr != S_OK) + { + ITaskService_Release(service); + return; + } + + hr = ITaskFolder_get_Name(folder, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskFolder_get_Name(folder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, bslash), "expected '\\', got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_get_Path(folder, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskFolder_get_Path(folder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, bslash), "expected '\\', got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = ITaskFolder_CreateFolder(folder, NULL, v_null, &subfolder); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + /* Just in case something was left from previous runs */ + ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0); + ITaskFolder_DeleteFolder(folder, Wine_Folder1, 0); + ITaskFolder_DeleteFolder(folder, Wine, 0); + + hr = ITaskFolder_CreateFolder(folder, slash, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskFolder_CreateFolder(folder, bslash, v_null, &subfolder); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); + ok(hr == S_OK, "CreateFolder error %#x\n", hr); + if (hr == S_OK) + ITaskFolder_Release(subfolder); + + hr = ITaskFolder_CreateFolder(folder, Wine, v_null, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + + hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine+1, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1+1, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_Folder2+1, v_null, &subfolder); + ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + + hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + if (hr != S_OK) + { + ITaskService_Release(service); + return; + } + + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1_Folder2), "expected \\Wine\\Folder1\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine_Folder1_Folder2+1, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder2), "expected Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1_Folder2+1), "expected Wine\\Folder1\\Folder2, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskService_GetFolder(service, Wine_Folder1, &subfolder); + ok(hr == S_OK, "GetFolder error %#x\n", hr); + hr = ITaskFolder_get_Name(subfolder, &bstr); + ok (hr == S_OK, "get_Name error %#x\n", hr); + ok(!lstrcmpW(bstr, Folder1), "expected Folder1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = ITaskFolder_get_Path(subfolder, &bstr); + ok(hr == S_OK, "get_Path error %#x\n", hr); + ok(!lstrcmpW(bstr, Wine_Folder1), "expected Wine\\Folder1, got %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskFolder_Release(subfolder); + + hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + ITaskFolder_DeleteFolder(folder, Wine_Folder1+1, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + hr = ITaskFolder_DeleteFolder(folder, Wine+1, 0); + ok(hr == S_OK, "DeleteFolder error %#x\n", hr); + + hr = ITaskFolder_DeleteFolder(folder, Wine, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); + + ITaskFolder_Release(folder); + ITaskService_Release(service); +} + START_TEST(scheduler) { OleInitialize(NULL); test_Connect(); + test_GetFolder(); OleUninitialize(); }

1 0

Stefan Dösinger : wined3d: Load textures from dib without copying to sysmem first.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 035012d5aac797077edd62b1a87ce903aa6bbc36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035012d5aac797077edd62b1a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:09 2014 +0100 wined3d: Load textures from dib without copying to sysmem first. --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 92750cb..74cab37 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,6 +36,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */ +static const DWORD surface_simple_locations = + SFLAG_INDIB | SFLAG_INUSERMEM | SFLAG_INSYSMEM; + static void surface_cleanup(struct wined3d_surface *surface) { struct wined3d_surface *overlay, *cur; @@ -4941,10 +4944,7 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD static void surface_load_sysmem(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { - static const DWORD simple_locations = - SFLAG_INDIB | SFLAG_INUSERMEM | SFLAG_INSYSMEM; - - if (surface->flags & simple_locations) + if (surface->flags & surface_simple_locations) { surface_copy_simple_location(surface, dst_location); return; @@ -5079,9 +5079,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } } - if (!(surface->flags & SFLAG_INSYSMEM)) + if (!(surface->flags & surface_simple_locations)) { - WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); + WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); /* Lets hope we get it from somewhere... */ surface_prepare_system_memory(surface); surface_load_location(surface, SFLAG_INSYSMEM);

1 0

Michael Stefaniuc : dmstyle/tests: COM tests for the different DirectMusic*Tracks.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 31c9881f603ba7cad8adb6d08aec08977c0e8389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c9881f603ba7cad8adb6d08… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:11:24 2014 +0100 dmstyle/tests: COM tests for the different DirectMusic*Tracks. --- dlls/dmstyle/tests/dmstyle.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index bbc04bd..18f2a6b 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -24,6 +24,7 @@ #include <wine/test.h> #include <dmusici.h> +#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) static BOOL missing_dmstyle(void) { @@ -88,6 +89,74 @@ static void test_COM(void) while (IDirectMusicStyle8_Release(dms8)); } +static void test_COM_track(void) +{ + IDirectMusicTrack8 *dmt8; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; +#define X(class) &CLSID_ ## class, #class + const struct { + REFCLSID clsid; + const char *name; + } class[] = { + { X(DirectMusicAuditionTrack) }, + { X(DirectMusicChordTrack) }, + { X(DirectMusicCommandTrack) }, + { X(DirectMusicMotifTrack) }, + { X(DirectMusicMuteTrack) }, + { X(DirectMusicStyleTrack) }, + }; +#undef X + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(class); i++) { + /* COM aggregation */ + dmt8 = (IDirectMusicTrack8*)0xdeadbeef; + hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, + (void**)&dmt8); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("%s not registered\n", class[i].name); + continue; + } + ok(hr == CLASS_E_NOAGGREGATION, + "%s create failed: %08x, expected CLASS_E_NOAGGREGATION\n", class[i].name, hr); + ok(!dmt8, "dmt8 = %p\n", dmt8); + + /* Invalid RIID */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, + (void**)&dmt8); + ok(hr == E_NOINTERFACE, "%s create failed: %08x, expected E_NOINTERFACE\n", + class[i].name, hr); + + /* Same refcount for all DirectMusicTrack interfaces */ + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, + (void**)&dmt8); + if (hr == E_NOINTERFACE && !dmt8) { + skip("%s not created with CoCreateInstance()\n", class[i].name); + continue; + } + ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + refcount = IDirectMusicTrack8_AddRef(dmt8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicTrack8_Release(dmt8)); + } +} + START_TEST(dmstyle) { CoInitialize(NULL); @@ -99,6 +168,7 @@ START_TEST(dmstyle) return; } test_COM(); + test_COM_track(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmstyle/tests: Add COM tests for IDirectMusicStyle8.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: e5b4b69352aecbf29bbce0dbfc65148e2d40e7de URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b4b69352aecbf29bbce0dbf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:10:15 2014 +0100 dmstyle/tests: Add COM tests for IDirectMusicStyle8. --- configure | 1 + configure.ac | 1 + dlls/dmstyle/tests/Makefile.in | 5 ++ dlls/dmstyle/tests/dmstyle.c | 104 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+) diff --git a/configure b/configure index 1ee19b2..48f12f1 100755 --- a/configure +++ b/configure @@ -16672,6 +16672,7 @@ wine_fn_config_test dlls/dmloader/tests dmloader_test wine_fn_config_dll dmscript enable_dmscript clean wine_fn_config_test dlls/dmscript/tests dmscript_test wine_fn_config_dll dmstyle enable_dmstyle clean +wine_fn_config_test dlls/dmstyle/tests dmstyle_test wine_fn_config_dll dmsynth enable_dmsynth clean wine_fn_config_test dlls/dmsynth/tests dmsynth_test wine_fn_config_dll dmusic enable_dmusic clean diff --git a/configure.ac b/configure.ac index da240bd..75faadf 100644 --- a/configure.ac +++ b/configure.ac @@ -2796,6 +2796,7 @@ WINE_CONFIG_TEST(dlls/dmloader/tests) WINE_CONFIG_DLL(dmscript,,[clean]) WINE_CONFIG_TEST(dlls/dmscript/tests) WINE_CONFIG_DLL(dmstyle,,[clean]) +WINE_CONFIG_TEST(dlls/dmstyle/tests) WINE_CONFIG_DLL(dmsynth,,[clean]) WINE_CONFIG_TEST(dlls/dmsynth/tests) WINE_CONFIG_DLL(dmusic,,[clean]) diff --git a/dlls/dmstyle/tests/Makefile.in b/dlls/dmstyle/tests/Makefile.in new file mode 100644 index 0000000..ec8b063 --- /dev/null +++ b/dlls/dmstyle/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = dmstyle.dll +IMPORTS = ole32 + +C_SRCS = \ + dmstyle.c diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c new file mode 100644 index 0000000..bbc04bd --- /dev/null +++ b/dlls/dmstyle/tests/dmstyle.c @@ -0,0 +1,104 @@ +/* + * Copyright 2014 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <windef.h> +#include <initguid.h> +#include <wine/test.h> +#include <dmusici.h> + + +static BOOL missing_dmstyle(void) +{ + IDirectMusicStyle *dms; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicStyle, (void**)&dms); + + if (hr == S_OK && dms) + { + IDirectMusicStyle_Release(dms); + return FALSE; + } + return TRUE; +} + +static void test_COM(void) +{ + IDirectMusicStyle8 *dms8 = (IDirectMusicStyle8*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicStyle, (IUnknown*)&dms8, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dms8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicStyle8 create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dms8, "dms8 = %p\n", dms8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&dms8); + ok(hr == E_NOINTERFACE, "DirectMusicStyle8 create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicStyle8 interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicStyle, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicStyle8, (void**)&dms8); + ok(hr == S_OK, "DirectMusicStyle8 create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicStyle8_AddRef(dms8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicStyle8_QueryInterface(dms8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicStyle8_Release(dms8)); +} + +START_TEST(dmstyle) +{ + CoInitialize(NULL); + + if (missing_dmstyle()) + { + skip("dmstyle not available\n"); + CoUninitialize(); + return; + } + test_COM(); + + CoUninitialize(); +}

1 0

Michael Stefaniuc : dmstyle: None of the COM classes support aggregation.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 65942c1786fe10609f1a6e22f33abebf85893ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65942c1786fe10609f1a6e22f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 15 01:08:41 2014 +0100 dmstyle: None of the COM classes support aggregation. --- dlls/dmstyle/auditiontrack.c | 3 ++- dlls/dmstyle/chordtrack.c | 3 ++- dlls/dmstyle/commandtrack.c | 3 ++- dlls/dmstyle/dmstyle_main.c | 29 ++++++++++++++++------------- dlls/dmstyle/dmstyle_private.h | 14 +++++++------- dlls/dmstyle/motiftrack.c | 3 ++- dlls/dmstyle/mutetrack.c | 3 ++- dlls/dmstyle/style.c | 3 ++- dlls/dmstyle/styletrack.c | 3 ++- 9 files changed, 37 insertions(+), 27 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 3d6afc1..4e14db0 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -270,7 +270,8 @@ static const IPersistStreamVtbl DirectMusicAuditionTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmauditiontrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicAuditionTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicAuditionTrack)); diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index d85fbdb..5ce3eb1 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -399,7 +399,8 @@ static const IPersistStreamVtbl DirectMusicChordTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmchordtrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicChordTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordTrack)); diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 9fe0057..4cf208b 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -333,7 +333,8 @@ static const IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmcommandtrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicCommandTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicCommandTrack)); diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index 677fc1c..996fc9b 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -27,12 +27,12 @@ LONG DMSTYLE_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; -static HRESULT WINAPI create_direct_music_section(REFIID riid, void **ppv, IUnknown *pUnkOuter) +static HRESULT WINAPI create_direct_music_section(REFIID riid, void **ret_iface) { - FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); + FIXME("(%s, %p) stub\n", debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; } @@ -86,7 +86,12 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + return This->fnCreateInstance(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -110,15 +115,13 @@ static const IClassFactoryVtbl classfactory_vtbl = { }; static IClassFactoryImpl Section_CF = {{&classfactory_vtbl}, create_direct_music_section}; -static IClassFactoryImpl Style_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicStyleImpl}; -static IClassFactoryImpl ChordTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicChordTrack}; -static IClassFactoryImpl CommandTrack_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicCommandTrack}; -static IClassFactoryImpl StyleTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicStyleTrack}; -static IClassFactoryImpl MotifTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicMotifTrack}; -static IClassFactoryImpl AuditionTrack_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicAuditionTrack}; -static IClassFactoryImpl MuteTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicMuteTrack}; +static IClassFactoryImpl Style_CF = {{&classfactory_vtbl}, create_dmstyle}; +static IClassFactoryImpl ChordTrack_CF = {{&classfactory_vtbl}, create_dmchordtrack}; +static IClassFactoryImpl CommandTrack_CF = {{&classfactory_vtbl}, create_dmcommandtrack}; +static IClassFactoryImpl StyleTrack_CF = {{&classfactory_vtbl}, create_dmstyletrack}; +static IClassFactoryImpl MotifTrack_CF = {{&classfactory_vtbl}, create_dmmotiftrack}; +static IClassFactoryImpl AuditionTrack_CF = {{&classfactory_vtbl}, create_dmauditiontrack}; +static IClassFactoryImpl MuteTrack_CF = {{&classfactory_vtbl}, create_dmmutetrack}; /****************************************************************** * DllMain diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index e1c8e9a..7ac9fac 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -58,7 +58,13 @@ typedef struct IDirectMusicStyleTrack IDirectMusicStyleTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmstyle(REFIID lpcGUID, LPVOID* ppobj) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmauditiontrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmchordtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmcommandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmmotiftrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmmutetrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmstyletrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /***************************************************************************** * Auxiliary definitions @@ -92,12 +98,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { IDirectMusicStyle8* pObject; } DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicAuditionTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicChordTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicCommandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectMusicStyle8Impl implementation structure diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 06fdb63..9a25a05 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -276,7 +276,8 @@ static const IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicMotifTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmmotiftrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicMotifTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMotifTrack)); diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index a4d92fa..64390f1 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -273,7 +273,8 @@ static const IPersistStreamVtbl DirectMusicMuteTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicMuteTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmmutetrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicMuteTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMuteTrack)); diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 36ce9bf..077ed06 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -1086,7 +1086,8 @@ static const IPersistStreamVtbl DirectMusicStyle8_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicStyleImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmstyle(REFIID lpcGUID, void **ppobj) +{ IDirectMusicStyle8Impl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyle8Impl)); diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index fd100e4..39e5a70 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -462,7 +462,8 @@ static const IPersistStreamVtbl DirectMusicStyleTrack_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmstyletrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicStyleTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyleTrack));

1 0

Alexandre Julliard : makedep: Make the makefile mode the default behavior and remove obsolete options.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 2da6fc368f29071f7fb7f1eb2b9ffbe38be1a0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da6fc368f29071f7fb7f1eb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 21:16:40 2014 +0100 makedep: Make the makefile mode the default behavior and remove obsolete options. --- aclocal.m4 | 4 +-- configure | 4 +-- tools/makedep.c | 89 ++++++++++--------------------------------------------- 3 files changed, 20 insertions(+), 77 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index bb48320..c582890 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -227,11 +227,11 @@ wine_fn_depend_rules () { wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir" + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir" } wine_fn_pot_rules () diff --git a/configure b/configure index 27251d0..2612bdc 100755 --- a/configure +++ b/configure @@ -7075,11 +7075,11 @@ wine_fn_depend_rules () { wine_fn_append_rule \ "$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP) - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir depend: $ac_dir/depend .PHONY: $ac_dir/depend $ac_dir/depend: \$(MAKEDEP) dummy - @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir" + @./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir" } wine_fn_pot_rules () diff --git a/tools/makedep.c b/tools/makedep.c index 108cdb0..3a656e5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -111,24 +111,17 @@ static const char *Separator = "### Dependencies"; static const char *input_file_name; static const char *output_file_name; static const char *temp_file_name; -static int parse_makefile_mode; static int relative_dir_mode; static int input_line; static int output_column; static FILE *output_file; static const char Usage[] = - "Usage: makedep [options] [files]\n" + "Usage: makedep [options] directories\n" "Options:\n" - " -Idir Search for include files in directory 'dir'\n" - " -Cdir Search for source files in directory 'dir'\n" - " -Sdir Set the top source directory\n" - " -Tdir Set the top object directory\n" - " -Pdir Set the parent source directory\n" - " -M dirs Parse the makefiles from the specified directories\n" - " -R from to Compute the relative path between two directories\n" - " -fxxx Store output in file 'xxx' (default: Makefile)\n" - " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; + " -R from to Compute the relative path between two directories\n" + " -fxxx Store output in file 'xxx' (default: Makefile)\n" + " -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n"; #ifndef __GNUC__ @@ -314,19 +307,6 @@ static void strarray_addall( struct strarray *array, struct strarray added ) /******************************************************************* - * strarray_insert - */ -static void strarray_insert( struct strarray *array, unsigned int pos, const char *str ) -{ - unsigned int i; - - strarray_add( array, NULL ); - for (i = array->count - 1; i > pos; i--) array->str[i] = array->str[i - 1]; - array->str[pos] = str; -} - - -/******************************************************************* * strarray_add_uniq */ static void strarray_add_uniq( struct strarray *array, const char *str ) @@ -521,20 +501,6 @@ static char *tools_path( const char *name ) /******************************************************************* - * init_paths - */ -static void init_paths(void) -{ - /* ignore redundant source paths */ - if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; - if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; - if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; - - strarray_insert( &include_args, 0, strmake( "-I%s", top_dir_path( "include" ))); -} - - -/******************************************************************* * get_line */ static char *get_line( FILE *file ) @@ -2156,6 +2122,11 @@ static void update_makefile( const char *path ) tools_dir = get_expanded_make_variable( "TOOLSDIR" ); tools_ext = get_expanded_make_variable( "TOOLSEXT" ); + /* ignore redundant source paths */ + if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; + if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; + if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; + appmode = get_expanded_make_var_array( "APPMODE" ); dllflags = get_expanded_make_var_array( "DLLFLAGS" ); imports = get_expanded_make_var_array( "IMPORTS" ); @@ -2168,6 +2139,7 @@ static void update_makefile( const char *path ) include_args = empty_strarray; define_args = empty_strarray; strarray_add( &define_args, "-D__WINESRC__" ); + strarray_add( &include_args, strmake( "-I%s", top_dir_path( "include" ))); if (!tools_ext) tools_ext = ""; @@ -2179,8 +2151,6 @@ static void update_makefile( const char *path ) strarray_add_uniq( &define_args, value.str[i] ); strarray_addall( &define_args, get_expanded_make_var_array( "EXTRADEFS" )); - init_paths(); - if (use_msvcrt) { strarray_add( &dllflags, get_expanded_make_variable( "MSVCRTFLAGS" )); @@ -2249,27 +2219,9 @@ static int parse_option( const char *opt ) } switch(opt[1]) { - case 'I': - if (opt[2]) strarray_add_uniq( &include_args, opt ); - break; - case 'C': - src_dir = opt + 2; - break; - case 'S': - top_src_dir = opt + 2; - break; - case 'T': - top_obj_dir = opt + 2; - break; - case 'P': - parent_dir = opt + 2; - break; case 'f': if (opt[2]) makefile_name = opt + 2; break; - case 'M': - parse_makefile_mode = 1; - break; case 'R': relative_dir_mode = 1; break; @@ -2277,8 +2229,6 @@ static int parse_option( const char *opt ) if (opt[2]) Separator = opt + 2; else Separator = NULL; break; - case 'x': - break; /* ignored */ default: fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage ); exit(1); @@ -2293,7 +2243,6 @@ static int parse_option( const char *opt ) int main( int argc, char *argv[] ) { const char *makeflags = getenv( "MAKEFLAGS" ); - struct incl_file *pFile; int i, j; if (makeflags) parse_makeflags( makeflags ); @@ -2323,6 +2272,11 @@ int main( int argc, char *argv[] ) exit( 0 ); } + if (argc <= 1) + { + fprintf( stderr, "%s", Usage ); + exit( 1 ); + } atexit( cleanup_files ); signal( SIGTERM, exit_on_signal ); signal( SIGINT, exit_on_signal ); @@ -2330,17 +2284,6 @@ int main( int argc, char *argv[] ) signal( SIGHUP, exit_on_signal ); #endif - if (parse_makefile_mode) - { - for (i = 1; i < argc; i++) update_makefile( argv[i] ); - exit( 0 ); - } - - init_paths(); - for (i = 1; i < argc; i++) add_src_file( argv[i] ); - add_generated_sources(); - - LIST_FOR_EACH_ENTRY( pFile, &includes, struct incl_file, entry ) parse_file( pFile, 0 ); - output_dependencies( makefile_name ); + for (i = 1; i < argc; i++) update_makefile( argv[i] ); return 0; }

1 0

Frédéric Delanoy : odbc32: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: bb356e23fab7b536b2b5eef431108939553ba955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb356e23fab7b536b2b5eef43… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jan 14 23:32:55 2014 +0100 odbc32: Use BOOL type where appropriate. --- dlls/odbc32/proxyodbc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 58d76aa..89cf154 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -322,7 +322,7 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) * that this will add a requirement that this function be called after * ODBC_ReplicateODBCInstToRegistry) */ -static void ODBC_ReplicateODBCToRegistry (int is_user, SQLHENV hEnv) +static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) { HKEY hODBC; LONG reg_ret; @@ -447,8 +447,8 @@ static void ODBC_ReplicateToRegistry (void) if ((sql_ret = SQLAllocEnv (&hEnv)) == SQL_SUCCESS) { ODBC_ReplicateODBCInstToRegistry (hEnv); - ODBC_ReplicateODBCToRegistry (0 /* system dsns */, hEnv); - ODBC_ReplicateODBCToRegistry (1 /* user dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (FALSE /* system dsns */, hEnv); + ODBC_ReplicateODBCToRegistry (TRUE /* user dsns */, hEnv); if ((sql_ret = SQLFreeEnv (hEnv)) != SQL_SUCCESS) {

1 0

Alexandre Julliard : makedep: Create target subdirectories at make depend time.
by Alexandre Julliard Jan. 15, 2014

Jan. 15, 2014

Module: wine Branch: master Commit: 16286e45c4447d23067cd22840c51146e39f6bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=16286e45c4447d23067cd2284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 21:20:25 2014 +0100 makedep: Create target subdirectories at make depend time. --- Make.vars.in | 1 - configure | 50 -------------------------------------------------- configure.ac | 1 - tools/makedep.c | 37 +++++++++++++++++++++++++------------ 4 files changed, 25 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16286e45c4447d23067cd…

1 0

Łukasz Wojniłowicz : Polish translation for release 1.6.2
by Jeremy Newman Jan. 15, 2014

Jan. 15, 2014

Module: website Branch: master Commit: e499ab6a15a8ae59e9af88f129d2da7f5ea916a1 URL: http://source.winehq.org/git/website.git/?a=commit;h=e499ab6a15a8ae59e9af88… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Jan 14 17:37:05 2014 +0100 Polish translation for release 1.6.2 --- news/pl/2014011001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/pl/2014011001.xml b/news/pl/2014011001.xml new file mode 100644 index 0000000..9f4b281 --- /dev/null +++ b/news/pl/2014011001.xml @@ -0,0 +1,13 @@ +<news> +<date>Styczeń 10, 2014</date> +<title>Wydano Wine 1.6.2</title> +<body> + Poprawione wydanie Wine 1.6.2 jest już dostępne. + <a href="{$root}/announce/1.6.2">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa zarządzania barwą uaktualniona do liblcms w wersji 2-giej.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.2.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Stefan Dösinger : wined3d: Don' t map the surface in getdc.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 96658847664ba76789ae811c24ca31b883b1d5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=96658847664ba76789ae811c2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:24 2014 +0100 wined3d: Don't map the surface in getdc. This avoids bouncing the content between the map binding and DIB. --- dlls/wined3d/surface.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ef91ebc..f59efb2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3219,7 +3219,6 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) { - struct wined3d_map_desc map; HRESULT hr; TRACE("surface %p, dc %p.\n", surface, dc); @@ -3245,14 +3244,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINED3DERR_INVALIDCALL; } - /* Map the surface. */ - hr = wined3d_surface_map(surface, &map, NULL, 0); - if (FAILED(hr)) - { - ERR("Map failed, hr %#x.\n", hr); - return hr; - } - surface_load_location(surface, SFLAG_INDIB); surface_invalidate_location(surface, ~SFLAG_INDIB); @@ -3294,6 +3285,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) } surface->flags |= SFLAG_DCINUSE; + surface->resource.map_count++; *dc = surface->hDC; TRACE("Returning dc %p.\n", *dc); @@ -3315,8 +3307,7 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - wined3d_surface_unmap(surface); - + surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; if (surface->map_binding == SFLAG_INUSERMEM)

1 0

Sebastian Lackner : kernel32/tests: Add a SRWLock test to simulate a typical use case.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 0c77f89f61bda08e70ba9bd87beba6f7f9c990dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c77f89f61bda08e70ba9bd87… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 11 02:23:12 2014 +0100 kernel32/tests: Add a SRWLock test to simulate a typical use case. --- dlls/kernel32/tests/sync.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 94ee200..6431df0 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1919,6 +1919,90 @@ static void test_srwlock_base(void) } } +static SRWLOCK srwlock_example; +static LONG srwlock_protected_value = 0; +static LONG srwlock_example_errors = 0, srwlock_inside = 0, srwlock_cnt = 0; +static BOOL srwlock_stop = FALSE; + +static DWORD WINAPI srwlock_example_thread(LPVOID x) { + DWORD *cnt = x; + LONG old; + + while (!srwlock_stop) + { + + /* periodically request exclusive access */ + if (InterlockedIncrement(&srwlock_cnt) % 13 == 0) + { + pAcquireSRWLockExclusive(&srwlock_example); + if (InterlockedIncrement(&srwlock_inside) != 1) + InterlockedIncrement(&srwlock_example_errors); + + InterlockedIncrement(&srwlock_protected_value); + Sleep(1); + + if (InterlockedDecrement(&srwlock_inside) != 0) + InterlockedIncrement(&srwlock_example_errors); + pReleaseSRWLockExclusive(&srwlock_example); + } + + /* request shared access */ + pAcquireSRWLockShared(&srwlock_example); + InterlockedIncrement(&srwlock_inside); + old = srwlock_protected_value; + + (*cnt)++; + Sleep(1); + + if (old != srwlock_protected_value) + InterlockedIncrement(&srwlock_example_errors); + InterlockedDecrement(&srwlock_inside); + pReleaseSRWLockShared(&srwlock_example); + } + + return 0; +} + +static void test_srwlock_example(void) +{ + HANDLE h1, h2, h3; + DWORD dummy; + DWORD cnt1, cnt2, cnt3; + + if (!pInitializeSRWLock) { + /* function is not yet in XP, only in newer Windows */ + win_skip("no srw lock support.\n"); + return; + } + + pInitializeSRWLock(&srwlock_example); + + cnt1 = cnt2 = cnt3 = 0; + + h1 = CreateThread(NULL, 0, srwlock_example_thread, &cnt1, 0, &dummy); + h2 = CreateThread(NULL, 0, srwlock_example_thread, &cnt2, 0, &dummy); + h3 = CreateThread(NULL, 0, srwlock_example_thread, &cnt3, 0, &dummy); + + /* limit run to 1 second. */ + Sleep(1000); + + /* tear down start */ + srwlock_stop = TRUE; + + WaitForSingleObject(h1, 1000); + WaitForSingleObject(h2, 1000); + WaitForSingleObject(h3, 1000); + + ok(!srwlock_inside, "threads didn't terminate properly, srwlock_inside is %d.\n", srwlock_inside); + + todo_wine + ok(!srwlock_example_errors, "errors occured while running SRWLock example test (number of errors: %d)\n", + srwlock_example_errors); + + trace("number of shared accesses per thread are c1 %d, c2 %d, c3 %d\n", cnt1, cnt2, cnt3); + trace("number of total exclusive accesses is %d\n", srwlock_protected_value); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandleA("kernel32.dll"); @@ -1959,4 +2043,5 @@ START_TEST(sync) test_condvars_base(); test_condvars_consumer_producer(); test_srwlock_base(); + test_srwlock_example(); }

1 0

Stefan Dösinger : wined3d: Re-enable mapping into the DIB.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d0823eb4f0a2dca9cc54843dd9d5e0ba128f5899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0823eb4f0a2dca9cc54843dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:25 2014 +0100 wined3d: Re-enable mapping into the DIB. --- dlls/wined3d/surface.c | 59 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f59efb2..d70f605 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -579,6 +579,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win if (!(surface->flags & SFLAG_CLIENT)) wined3d_resource_free_sysmem(&surface->resource); surface->flags |= SFLAG_PBO; + surface->map_binding = SFLAG_INSYSMEM; context_release(context); } @@ -820,6 +821,9 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR case SFLAG_INUSERMEM: return surface->user_memory; + case SFLAG_INDIB: + return surface->dib.bitmap_data; + case SFLAG_INSYSMEM: if (surface->flags & SFLAG_PBO) { @@ -866,6 +870,9 @@ static void surface_unmap(struct wined3d_surface *surface) case SFLAG_INUSERMEM: break; + case SFLAG_INDIB: + break; + case SFLAG_INSYSMEM: if (surface->flags & SFLAG_PBO) { @@ -1297,16 +1304,33 @@ HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *sur /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { - if (!surface->resource.heap_memory) - wined3d_resource_allocate_sysmem(&surface->resource); - else if (!(surface->flags & SFLAG_CLIENT)) - ERR("Surface %p has heap_memory %p and flags %#x.\n", - surface, surface->resource.heap_memory, surface->flags); + void *dst; + + if (surface->flags & SFLAG_DIBSECTION) + { + surface->map_binding = SFLAG_INDIB; + dst = surface->dib.bitmap_data; + if (surface->flags & SFLAG_INSYSMEM) + { + surface_invalidate_location(surface, SFLAG_INSYSMEM); + surface_validate_location(surface, SFLAG_INDIB); + } + } + else + { + if (!surface->resource.heap_memory) + wined3d_resource_allocate_sysmem(&surface->resource); + else if (!(surface->flags & SFLAG_CLIENT)) + ERR("Surface %p has heap_memory %p and flags %#x.\n", + surface, surface->resource.heap_memory, surface->flags); + + dst = surface->resource.heap_memory; + } GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB(GL_PIXEL_UNPACK_BUFFER, surface->pbo)"); GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, - surface->resource.size, surface->resource.heap_memory)); + surface->resource.size, dst)); checkGLcall("glGetBufferSubDataARB"); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); checkGLcall("glDeleteBuffersARB"); @@ -1455,6 +1479,7 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) hr = surface_create_dib_section(surface); if (FAILED(hr)) return hr; + surface->map_binding = SFLAG_INDIB; /* We don't mind the nonpow2 stuff in GDI. */ surface->pow2Width = surface->resource.width; @@ -1505,6 +1530,9 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, case SFLAG_INUSERMEM: return surface->user_memory; + case SFLAG_INDIB: + return surface->dib.bitmap_data; + case SFLAG_INSYSMEM: return surface->resource.heap_memory; @@ -3242,6 +3270,9 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) hr = surface_create_dib_section(surface); if (FAILED(hr)) return WINED3DERR_INVALIDCALL; + if (!(surface->map_binding == SFLAG_INUSERMEM + || surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + surface->map_binding = SFLAG_INDIB; } surface_load_location(surface, SFLAG_INDIB); @@ -6427,6 +6458,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text if (lockable && (desc->usage & WINED3DUSAGE_RENDERTARGET)) surface->flags |= SFLAG_DYNLOCK; + surface->map_binding = SFLAG_INSYSMEM; + /* Call the private setup routine */ hr = surface->surface_ops->surface_private_setup(surface); if (FAILED(hr)) @@ -6437,7 +6470,19 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text return hr; } - surface->map_binding = SFLAG_INSYSMEM; + /* Similar to lockable rendertargets above, creating the DIB section + * during surface initialization prevents the sysmem pointer from changing + * after a wined3d_surface_getdc() call. */ + if ((desc->usage & WINED3DUSAGE_OWNDC) && !surface->hDC + && SUCCEEDED(surface_create_dib_section(surface))) + surface->map_binding = SFLAG_INDIB; + + if (surface->map_binding == SFLAG_INDIB) + { + wined3d_resource_free_sysmem(&surface->resource); + surface_validate_location(surface, SFLAG_INDIB); + surface_invalidate_location(surface, SFLAG_INSYSMEM); + } return hr; }

1 0

Piotr Caban : msvcp110: Fix _Ctypevec structure layout.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d5b72bbcdc1484f16c73d489fabb32ddfa95beac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b72bbcdc1484f16c73d489f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:56:17 2014 +0100 msvcp110: Fix _Ctypevec structure layout. --- dlls/msvcp90/locale.c | 11 +++++++++++ dlls/msvcp90/msvcp90.h | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1b0c891..02ccb0e 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -631,7 +631,12 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) TRACE("\n"); ret->page = ___lc_codepage_func(); +#if _MSVCP_VER < 110 ret->handle = ___lc_handle_func()[LC_COLLATE]; +#else + /* FIXME: use ___lc_locale_name_func() */ + ret->name = NULL; +#endif ret->delfl = TRUE; table = malloc(sizeof(short[256])); if(!table) throw_exception(EXCEPTION_BAD_ALLOC, NULL); @@ -1446,6 +1451,9 @@ void __thiscall ctype_char__Tidy(ctype_char *this) if(this->ctype.delfl) free((short*)this->ctype.table); +#if _MSVCP_VER >= 110 + free(this->ctype.name); +#endif } /* ?classic_table@?$ctype(a)D@std@@KAPBFXZ */ @@ -2142,6 +2150,9 @@ void __thiscall ctype_wchar_dtor(ctype_wchar *this) TRACE("(%p)\n", this); if(this->ctype.delfl) free((void*)this->ctype.table); +#if _MSVCP_VER >= 110 + free(this->ctype.name); +#endif } DEFINE_THISCALL_WRAPPER(ctype_wchar_vector_dtor, 8) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 67ea924..f5e79f5 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -123,10 +123,15 @@ typedef enum { } codecvt_base_result; typedef struct { +#if _MSVCP_VER < 110 LCID handle; +#endif unsigned page; const short *table; int delfl; +#if _MSVCP_VER >= 110 + wchar_t *name; +#endif } _Ctypevec; /* class codecvt_base */

1 0

Stefan Dösinger : wined3d: Give the DIB section its own location.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: adf0ab2ad889c7c6bcda484edfde9a431f829b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf0ab2ad889c7c6bcda484ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:23 2014 +0100 wined3d: Give the DIB section its own location. --- dlls/wined3d/surface.c | 67 ++++++++++++++++++++++++++++++++++++---- dlls/wined3d/swapchain.c | 4 +-- dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 15 ++++----- 4 files changed, 73 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 61f322e..ef91ebc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -511,6 +511,12 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; return; } + if (location & SFLAG_INDIB) + { + data->addr = surface->dib.bitmap_data; + data->buffer_object = 0; + return; + } if (location & SFLAG_INSYSMEM) { if (surface->flags & SFLAG_PBO) @@ -605,6 +611,10 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) ERR("Map binding is set to SFLAG_INUSERMEM but surface->user_memory is NULL.\n"); break; + case SFLAG_INDIB: + if (!surface->dib.bitmap_data) + ERR("Map binding is set to SFLAG_INDIB but surface->dib.bitmap_data is NULL.\n"); + case SFLAG_INSYSMEM: surface_prepare_system_memory(surface); break; @@ -3242,9 +3252,9 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) ERR("Map failed, hr %#x.\n", hr); return hr; } - surface->getdc_map_mem = map.data; - memcpy(surface->dib.bitmap_data, surface->getdc_map_mem, surface->resource.size); + surface_load_location(surface, SFLAG_INDIB); + surface_invalidate_location(surface, ~SFLAG_INDIB); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) @@ -3305,14 +3315,13 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - memcpy(surface->getdc_map_mem, surface->dib.bitmap_data, surface->resource.size); - - /* We locked first, so unlock now. */ - surface->getdc_map_mem = NULL; wined3d_surface_unmap(surface); surface->flags &= ~SFLAG_DCINUSE; + if (surface->map_binding == SFLAG_INUSERMEM) + surface_load_location(surface, SFLAG_INUSERMEM); + return WINED3D_OK; } @@ -4869,9 +4878,54 @@ static DWORD resource_access_from_location(DWORD location) } } +static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) +{ + struct wined3d_device *device = surface->resource.device; + struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; + struct wined3d_bo_address dst, src; + UINT size = surface->resource.size; + + surface_get_memory(surface, &dst, location); + surface_get_memory(surface, &src, surface->flags); + + if (dst.buffer_object) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, dst.buffer_object)); + GL_EXTCALL(glBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, size, src.addr)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("Upload PBO"); + context_release(context); + return; + } + if (src.buffer_object) + { + context = context_acquire(device, NULL); + gl_info = context->gl_info; + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, src.buffer_object)); + GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_PACK_BUFFER_ARB, 0, size, dst.addr)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("Download PBO"); + context_release(context); + return; + } + memcpy(dst.addr, src.addr, size); +} + static void surface_load_sysmem(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { + static const DWORD simple_locations = + SFLAG_INDIB | SFLAG_INUSERMEM | SFLAG_INSYSMEM; + + if (surface->flags & simple_locations) + { + surface_copy_simple_location(surface, dst_location); + return; + } + if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED)) surface_load_location(surface, SFLAG_INTEXTURE); @@ -5156,6 +5210,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) switch (location) { + case SFLAG_INDIB: case SFLAG_INUSERMEM: case SFLAG_INSYSMEM: surface_load_sysmem(surface, gl_info, location); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 045ead6..d65de1f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -609,7 +609,7 @@ static const struct wined3d_swapchain_ops swapchain_gl_ops = /* Helper function that blits the front buffer contents to the target window. */ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) { - const struct wined3d_surface *front; + struct wined3d_surface *front; POINT offset = {0, 0}; HDC src_dc, dst_dc; RECT draw_rect; @@ -623,7 +623,7 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r TRACE("Copying surface %p to screen.\n", front); - memcpy(front->dib.bitmap_data, front->resource.heap_memory, front->resource.size); + surface_load_location(front, SFLAG_INDIB); src_dc = front->hDC; window = swapchain->win_handle; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index fa72a07..eb62455 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2795,7 +2795,7 @@ void dump_color_fixup_desc(struct color_fixup_desc fixup) } const char *debug_surflocation(DWORD flag) { - char buf[140]; + char buf[152]; buf[0] = 0; if (flag & SFLAG_INSYSMEM) strcat(buf, " | SFLAG_INSYSMEM"); /* 17 */ @@ -2805,6 +2805,7 @@ const char *debug_surflocation(DWORD flag) { if (flag & SFLAG_INRB_MULTISAMPLE) strcat(buf, " | SFLAG_INRB_MULTISAMPLE"); /* 25 */ if (flag & SFLAG_INRB_RESOLVED) strcat(buf, " | SFLAG_INRB_RESOLVED"); /* 22 */ if (flag & SFLAG_INUSERMEM) strcat(buf, " | SFLAG_INUSERMEM"); /* 18 */ + if (flag & SFLAG_INDIB) strcat(buf, " | SFLAG_INDIB"); /* 14 */ return wine_dbg_sprintf("%s", buf[0] ? buf + 3 : "0"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d4f0739..e795623 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2217,7 +2217,6 @@ struct wined3d_surface /* For GetDC */ struct wined3d_surface_dib dib; HDC hDC; - void *getdc_map_mem; struct wined3d_color_key gl_color_key; @@ -2300,12 +2299,13 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_PBO 0x00002000 /* The surface has a PBO. */ #define SFLAG_INSYSMEM 0x00004000 /* The system memory copy is current. */ #define SFLAG_INUSERMEM 0x00008000 /* The user memory copy is current. */ -#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_INDIB 0x00010000 /* The DIB copy is current. */ +#define SFLAG_INTEXTURE 0x00020000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00040000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00080000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00100000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00200000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00400000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long @@ -2321,6 +2321,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_LOCATIONS (SFLAG_INSYSMEM | \ SFLAG_INUSERMEM | \ + SFLAG_INDIB | \ SFLAG_INTEXTURE | \ SFLAG_INSRGBTEX | \ SFLAG_INDRAWABLE | \

1 0

Stefan Dösinger : wined3d: Do not use surface-> resource.allocatedMemory.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: f6403b4ac0ad822b3c1b4e9134b4d5cd2dfce6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6403b4ac0ad822b3c1b4e913… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:22 2014 +0100 wined3d: Do not use surface->resource.allocatedMemory. --- dlls/wined3d/surface.c | 59 +++++++++++++--------------------------------- dlls/wined3d/swapchain.c | 4 ---- 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a434bda..61f322e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -519,7 +519,7 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = surface->pbo; return; } - data->addr = surface->resource.allocatedMemory; + data->addr = surface->resource.heap_memory; data->buffer_object = 0; return; } @@ -572,7 +572,6 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win /* We don't need the system memory anymore and we can't even use it for PBOs. */ if (!(surface->flags & SFLAG_CLIENT)) wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = NULL; surface->flags |= SFLAG_PBO; context_release(context); } @@ -585,13 +584,12 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) + else if (!(surface->resource.heap_memory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ - if (!surface->resource.heap_memory && !wined3d_resource_allocate_sysmem(&surface->resource)) + if (!wined3d_resource_allocate_sysmem(&surface->resource)) ERR("Failed to allocate system memory.\n"); - surface->resource.allocatedMemory = surface->resource.heap_memory; if (surface->flags & SFLAG_INSYSMEM) ERR("Surface without memory or PBO has SFLAG_INSYSMEM set.\n"); @@ -623,7 +621,6 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) return; wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = NULL; surface_invalidate_location(surface, SFLAG_INSYSMEM); } @@ -838,7 +835,7 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR return ret; } - return surface->resource.allocatedMemory; + return surface->resource.heap_memory; default: ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); @@ -1296,12 +1293,10 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win ERR("Surface %p has heap_memory %p and flags %#x.\n", surface, surface->resource.heap_memory, surface->flags); - surface->resource.allocatedMemory = surface->resource.heap_memory; - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB(GL_PIXEL_UNPACK_BUFFER, surface->pbo)"); GL_EXTCALL(glGetBufferSubDataARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0, - surface->resource.size, surface->resource.allocatedMemory)); + surface->resource.size, surface->resource.heap_memory)); checkGLcall("glGetBufferSubDataARB"); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); checkGLcall("glDeleteBuffersARB"); @@ -1312,27 +1307,17 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win static BOOL surface_init_sysmem(struct wined3d_surface *surface) { - if (surface->resource.allocatedMemory) + if (surface->user_memory) + return TRUE; + + if (surface->resource.heap_memory) { - memset(surface->resource.allocatedMemory, 0, surface->resource.size); + memset(surface->resource.heap_memory, 0, surface->resource.size); } - else if (!surface->user_memory) + else if (!wined3d_resource_allocate_sysmem(&surface->resource)) { - if (!surface->resource.heap_memory) - { - if (!wined3d_resource_allocate_sysmem(&surface->resource)) - { - ERR("Failed to allocate system memory.\n"); - return FALSE; - } - } - else if (!(surface->flags & SFLAG_CLIENT)) - { - ERR("Surface %p has heap_memory %p and flags %#x.\n", - surface, surface->resource.heap_memory, surface->flags); - } - - surface->resource.allocatedMemory = surface->resource.heap_memory; + ERR("Failed to allocate system memory.\n"); + return FALSE; } return TRUE; @@ -1511,7 +1496,7 @@ static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, return surface->user_memory; case SFLAG_INSYSMEM: - return surface->resource.allocatedMemory; + return surface->resource.heap_memory; default: ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); @@ -2133,23 +2118,19 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru if (gl_info->supported[APPLE_CLIENT_STORAGE]) { if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION | SFLAG_CONVERTED) - || !surface->resource.allocatedMemory) + || !surface->resource.heap_memory) { /* In some cases we want to disable client storage. * SFLAG_NONPOW2 has a bigger opengl texture than the client memory, and different pitches * SFLAG_DIBSECTION: Dibsections may have read / write protections on the memory. Avoid issues... * SFLAG_CONVERTED: The conversion destination memory is freed after loading the surface - * allocatedMemory == NULL: Not defined in the extension. Seems to disable client storage effectively + * heap_memory == NULL: Not defined in the extension. Seems to disable client storage effectively */ surface->flags &= ~SFLAG_CLIENT; } else { surface->flags |= SFLAG_CLIENT; - - /* Point OpenGL to our allocated texture memory. Do not use - * resource.allocatedMemory here because it might point into a - * PBO. Instead use heap_memory. */ mem = surface->resource.heap_memory; gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); @@ -2735,7 +2716,6 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, } surface->flags &= ~SFLAG_LOCATIONS; - surface->resource.allocatedMemory = NULL; wined3d_resource_free_sysmem(&surface->resource); surface->resource.width = width; @@ -3891,10 +3871,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) front->dib.bitmap_data = back->dib.bitmap_data; back->dib.bitmap_data = tmp; - tmp = front->resource.allocatedMemory; - front->resource.allocatedMemory = back->resource.allocatedMemory; - back->resource.allocatedMemory = tmp; - tmp = front->resource.heap_memory; front->resource.heap_memory = back->resource.heap_memory; back->resource.heap_memory = tmp; @@ -6405,9 +6381,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text if (lockable && (desc->usage & WINED3DUSAGE_RENDERTARGET)) surface->flags |= SFLAG_DYNLOCK; - TRACE("surface %p, memory %p, size %u\n", - surface, surface->resource.allocatedMemory, surface->resource.size); - /* Call the private setup routine */ hr = surface->surface_ops->surface_private_setup(surface); if (FAILED(hr)) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 74acb6c..045ead6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -682,10 +682,6 @@ static void swapchain_gdi_present(struct wined3d_swapchain *swapchain, const REC front->dib.bitmap_data = back->dib.bitmap_data; back->dib.bitmap_data = tmp; - tmp = front->resource.allocatedMemory; - front->resource.allocatedMemory = back->resource.allocatedMemory; - back->resource.allocatedMemory = tmp; - if (front->resource.heap_memory) ERR("GDI Surface %p has heap memory allocated.\n", front);

1 0

Piotr Caban : msvcp110: Add _New_Locimp implementation.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 1d1ea6ebf466c653eaaf72bb3aa35d3daf63a988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1ea6ebf466c653eaaf72bb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:55:15 2014 +0100 msvcp110: Add _New_Locimp implementation. --- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp90/locale.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index a12b20e..b9d520d 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1637,10 +1637,10 @@ @ stub -arch=win64 ?_Mtx_new(a)threads@stdext@@YAXAEAPEAX(a)Z @ stub -arch=win32 ?_Mtx_unlock(a)threads@stdext@@YAXPAX(a)Z @ stub -arch=win64 ?_Mtx_unlock(a)threads@stdext@@YAXPEAX(a)Z -@ stub -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)ABV123@@Z -@ stub -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z -@ stub -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z -@ stub -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z +@ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)ABV123@@Z(ptr) locale__Locimp__New_Locimp +@ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z(ptr) locale__Locimp__New_Locimp +@ cdecl -arch=win32 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent +@ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPADPBDAAHAAW4file_type(a)123@@Z @ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEADPEBDAEAHAEAW4file_type(a)123@@Z @ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b35eaf5..1b0c891 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9357,6 +9357,40 @@ locale__Locimp* __thiscall locale__Locimp_vector_dtor(locale__Locimp *this, unsi return this; } +/* ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)ABV123@@Z */ +/* ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)AEBV123@@Z */ +locale__Locimp* __cdecl locale__Locimp__New_Locimp(const locale__Locimp *copy) +{ + locale__Locimp *ret; + + TRACE("(%p)\n", copy); + + ret = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!ret) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + return locale__Locimp_copy_ctor(ret, copy); +} + +/* ?_New_Locimp(a)_Locimp@locale(a)std@@CAPAV123(a)_N@Z */ +/* ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z */ +locale__Locimp* __cdecl locale__Locimp__New_Locimp_transparent(MSVCP_bool transparent) +{ + locale__Locimp *ret; + + TRACE("(%x)\n", transparent); + + ret = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!ret) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + return locale__Locimp_ctor_transparent(ret, transparent); +} + /* ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z */ /* ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z */ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet *facet, MSVCP_size_t id)

1 0

Nikolay Sivov : oleaut32/tests: Test Invoke() arguments in *FromDisp() tests.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: bb711b6133a46839e5ee94af4a2a4d119ae87e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb711b6133a46839e5ee94af4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 14 13:25:06 2014 +0400 oleaut32/tests: Test Invoke() arguments in *FromDisp() tests. --- dlls/oleaut32/tests/vartype.c | 161 ++++++++++++++++++++++++++++++----------- 1 file changed, 119 insertions(+), 42 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index d100ad1..bc74e2e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -19,10 +19,12 @@ */ #define CONST_VTABLE +#define COBJMACROS #include "wine/test.h" #include "oleauto.h" #include <math.h> +#include <stdio.h> /* Some Visual C++ versions choke on __uint64 to float conversions. * To fix this you need either VC++ 6.0 plus the processor pack @@ -245,6 +247,32 @@ static BOOL has_locales; BADVAR(VT_CLSID); \ BADVAR(VT_BSTR_BLOB) +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(dispatch_invoke); + /* Early versions of oleaut32 are missing many functions */ static HRESULT (WINAPI *pVarI1FromUI1)(BYTE,signed char*); static HRESULT (WINAPI *pVarI1FromI2)(SHORT,signed char*); @@ -482,6 +510,18 @@ static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); +static const char *debugstr_guid(REFIID riid) +{ + static char buf[50]; + + 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]); + + return buf; +} + /* Internal representation of a BSTR */ typedef struct tagINTERNAL_BSTR { @@ -504,66 +544,85 @@ static inline DummyDispatch *impl_from_IDispatch(IDispatch *iface) return CONTAINING_RECORD(iface, DummyDispatch, IDispatch_iface); } -static ULONG WINAPI DummyDispatch_AddRef(LPDISPATCH iface) +static ULONG WINAPI DummyDispatch_AddRef(IDispatch *iface) { DummyDispatch *This = impl_from_IDispatch(iface); - - trace("AddRef(%p)\n", iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DummyDispatch_Release(LPDISPATCH iface) +static ULONG WINAPI DummyDispatch_Release(IDispatch *iface) { DummyDispatch *This = impl_from_IDispatch(iface); - - trace("Release(%p)\n", iface); return InterlockedDecrement(&This->ref); } -static HRESULT WINAPI DummyDispatch_QueryInterface(LPDISPATCH iface, +static HRESULT WINAPI DummyDispatch_QueryInterface(IDispatch *iface, REFIID riid, void** ppvObject) { - trace("QueryInterface(%p)\n", iface); - if (ppvObject) + *ppvObject = NULL; + + if (IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_IUnknown)) { - *ppvObject = NULL; - if (IsEqualIID(riid, &IID_IDispatch)) - { - trace("Asked for IID_IDispatch\n"); *ppvObject = iface; - } - else if (IsEqualIID(riid, &IID_IUnknown)) - { - trace("Asked for IID_IUnknown\n"); - *ppvObject = iface; - } - if (*ppvObject) - { - DummyDispatch_AddRef(*ppvObject); - return S_OK; - } + IDispatch_AddRef(iface); } - return E_NOINTERFACE; + + return *ppvObject ? S_OK : E_NOINTERFACE; +} + +static HRESULT WINAPI DummyDispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; } -static HRESULT WINAPI DummyDispatch_Invoke(LPDISPATCH iface, - DISPID dispIdMember, REFIID riid, +static HRESULT WINAPI DummyDispatch_GetTypeInfo(IDispatch *iface, UINT tinfo, LCID lcid, ITypeInfo **ti) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, LPOLESTR *names, + UINT cnames, LCID lcid, DISPID *dispid) +{ + ok(0, "Unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, + DISPID dispid, REFIID riid, LCID lcid, WORD wFlags, - DISPPARAMS *pDispParams, - VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, - UINT *puArgErr) + DISPPARAMS *params, + VARIANT *res, + EXCEPINFO *ei, + UINT *arg_err) { - trace("Invoke(%p)\n", iface); + CHECK_EXPECT(dispatch_invoke); + + ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", debugstr_guid(riid)); ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); - ok(pDispParams->cArgs == 0, "Property get has args\n"); + + ok(params->rgvarg == NULL, "got %p\n", params->rgvarg); + ok(params->rgdispidNamedArgs == NULL, "got %p\n", params->rgdispidNamedArgs); + ok(params->cArgs == 0, "got %d\n", params->cArgs); + ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); + + ok(res != NULL, "got %p\n", res); + ok(ei == NULL, "got %p\n", ei); + ok(arg_err == NULL, "got %p\n", arg_err); if (dispatch.bFailInvoke) return E_OUTOFMEMORY; - memset(pVarResult, 0, sizeof(*pVarResult)); - V_VT(pVarResult) = dispatch.vt; + V_VT(res) = dispatch.vt; + if (dispatch.vt == VT_UI1) + V_UI1(res) = 1; + else + memset(res, 0, sizeof(*res)); + return S_OK; } @@ -572,9 +631,9 @@ static const IDispatchVtbl DummyDispatch_VTable = DummyDispatch_QueryInterface, DummyDispatch_AddRef, DummyDispatch_Release, - NULL, - NULL, - NULL, + DummyDispatch_GetTypeInfoCount, + DummyDispatch_GetTypeInfo, + DummyDispatch_GetIDsOfNames, DummyDispatch_Invoke }; @@ -1079,19 +1138,37 @@ static void test_VarUI1FromDisp(void) dispatch.vt = VT_UI1; dispatch.bFailInvoke = FALSE; + SET_EXPECT(dispatch_invoke); + out = 10; hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); - trace("0x%08x\n", hres); + ok(broken(hres == DISP_E_BADVARTYPE) || hres == S_OK, "got 0x%08x\n", hres); + ok(broken(out == 10) || out == 1, "got %d\n", out); + CHECK_CALLED(dispatch_invoke); + SET_EXPECT(dispatch_invoke); + V_VT(&vDst) = VT_EMPTY; + V_UI1(&vDst) = 0; hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); - trace("0x%08x\n", hres); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(V_VT(&vDst) == VT_UI1, "got %d\n", V_VT(&vDst)); + ok(V_UI1(&vDst) == 1, "got %d\n", V_UI1(&vDst)); + CHECK_CALLED(dispatch_invoke); dispatch.bFailInvoke = TRUE; + SET_EXPECT(dispatch_invoke); + out = 10; hres = pVarUI1FromDisp(&dispatch.IDispatch_iface, in, &out); - trace("0x%08x\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); + ok(out == 10, "got %d\n", out); + CHECK_CALLED(dispatch_invoke); + SET_EXPECT(dispatch_invoke); + V_VT(&vDst) = VT_EMPTY; hres = VariantChangeTypeEx(&vDst, &vSrc, in, 0, VT_UI1); - trace("0x%08x\n", hres); + ok(hres == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hres); + ok(V_VT(&vDst) == VT_EMPTY, "got %d\n", V_VT(&vDst)); + CHECK_CALLED(dispatch_invoke); } static void test_VarUI1Copy(void)

1 0

Sebastian Lackner : kernel32/tests: Add basic tests for SRWLock commands.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: d7ff42a09199fa9e752b0573e3e8e30d44783371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ff42a09199fa9e752b0573e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jan 10 23:02:52 2014 +0100 kernel32/tests: Add basic tests for SRWLock commands. --- dlls/kernel32/tests/sync.c | 260 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 260 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7ff42a09199fa9e752b0…

1 0

Piotr Caban : msvcp110: Fix basic_streambuf structure layout.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 08e851f3c63190c62e94c49b8f87e0de7a6434ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=08e851f3c63190c62e94c49b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:55:56 2014 +0100 msvcp110: Fix basic_streambuf structure layout. --- dlls/msvcp90/ios.c | 20 ++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index c44a7a5..a89352e 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1003,7 +1003,9 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor_uninitialized(basic_s { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_char_vtable; +#if _MSVCP_VER <= 100 mutex_ctor(&this->lock); +#endif return this; } @@ -1015,7 +1017,9 @@ basic_streambuf_char* __thiscall basic_streambuf_char_ctor(basic_streambuf_char TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_char_vtable; +#if _MSVCP_VER <= 100 mutex_ctor(&this->lock); +#endif this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_char__Init_empty(this); @@ -1030,7 +1034,9 @@ void __thiscall basic_streambuf_char_dtor(basic_streambuf_char *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_dtor(&this->lock); +#endif locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -1122,7 +1128,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Lock, 4) void __thiscall basic_streambuf_char__Lock(basic_streambuf_char *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_lock(&this->lock); +#endif } /* ?_Pnavail@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEHXZ */ @@ -1248,7 +1256,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_char__Unlock, 4) void __thiscall basic_streambuf_char__Unlock(basic_streambuf_char *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_unlock(&this->lock); +#endif } /* ?eback@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEPADXZ */ @@ -1801,7 +1811,9 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor_uninitialized(basic { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_wchar_vtable; +#if _MSVCP_VER <= 100 mutex_ctor(&this->lock); +#endif return this; } @@ -1824,7 +1836,9 @@ basic_streambuf_wchar* __thiscall basic_streambuf_wchar_ctor(basic_streambuf_wch TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_wchar_vtable; +#if _MSVCP_VER <= 100 mutex_ctor(&this->lock); +#endif this->loc = MSVCRT_operator_new(sizeof(locale)); locale_ctor(this->loc); basic_streambuf_wchar__Init_empty(this); @@ -1852,7 +1866,9 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_dtor(&this->lock); +#endif locale_dtor(this->loc); MSVCRT_operator_delete(this->loc); } @@ -1951,7 +1967,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Lock, 4) void __thiscall basic_streambuf_wchar__Lock(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_lock(&this->lock); +#endif } /* ?_Pnavail@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBEHXZ */ @@ -2086,7 +2104,9 @@ DEFINE_THISCALL_WRAPPER(basic_streambuf_wchar__Unlock, 4) void __thiscall basic_streambuf_wchar__Unlock(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); +#if _MSVCP_VER <= 100 mutex_unlock(&this->lock); +#endif } /* ?eback@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@IBEPA_WXZ */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 026a04d..67ea924 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -328,7 +328,9 @@ typedef struct _ios_base { /* class basic_streambuf<char> */ typedef struct { const vtable_ptr *vtable; +#if _MSVCP_VER <= 100 mutex lock; +#endif char *rbuf; char *wbuf; char **prbuf; @@ -365,7 +367,9 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char*, char); /* class basic_streambuf<wchar> */ typedef struct { const vtable_ptr *vtable; +#if _MSVCP_VER <= 100 mutex lock; +#endif wchar_t *rbuf; wchar_t *wbuf; wchar_t **prbuf;

1 0

Stefan Dösinger : wined3d: Don' t lock directly into the DIB.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 353b3ba6d352f80ee18bd7de26fb9462ce876210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353b3ba6d352f80ee18bd7de2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 14 13:59:21 2014 +0100 wined3d: Don't lock directly into the DIB. --- dlls/wined3d/surface.c | 64 +++++++--------------------------------- dlls/wined3d/swapchain.c | 2 ++ dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 13 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0c83a0e..a434bda 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -85,7 +85,6 @@ static void surface_cleanup(struct wined3d_surface *surface) DeleteDC(surface->hDC); DeleteObject(surface->dib.DIBsection); surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; } if (surface->overlay_dest) @@ -488,17 +487,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) } TRACE("DIBSection at %p.\n", surface->dib.bitmap_data); - /* Copy the existing surface to the dib section. */ - if (surface->resource.allocatedMemory) - { - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, - surface->resource.height * wined3d_surface_get_pitch(surface)); - } - else if (!surface->user_memory) - { - /* This is to make maps read the GL texture although memory is allocated. */ - surface->flags &= ~SFLAG_INSYSMEM; - } surface->dib.bitmap_size = b_info->bmiHeader.biSizeImage; HeapFree(GetProcessHeap(), 0, b_info); @@ -1302,20 +1290,13 @@ HRESULT CDECL wined3d_surface_get_render_target_data(struct wined3d_surface *sur /* Context activation is done by the caller. */ static void surface_remove_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { - if (surface->flags & SFLAG_DIBSECTION) - { - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } - else - { - if (!surface->resource.heap_memory) - wined3d_resource_allocate_sysmem(&surface->resource); - else if (!(surface->flags & SFLAG_CLIENT)) - ERR("Surface %p has heap_memory %p and flags %#x.\n", - surface, surface->resource.heap_memory, surface->flags); + if (!surface->resource.heap_memory) + wined3d_resource_allocate_sysmem(&surface->resource); + else if (!(surface->flags & SFLAG_CLIENT)) + ERR("Surface %p has heap_memory %p and flags %#x.\n", + surface, surface->resource.heap_memory, surface->flags); - surface->resource.allocatedMemory = surface->resource.heap_memory; - } + surface->resource.allocatedMemory = surface->resource.heap_memory; GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); checkGLcall("glBindBufferARB(GL_PIXEL_UNPACK_BUFFER, surface->pbo)"); @@ -1477,11 +1458,8 @@ static HRESULT gdi_surface_private_setup(struct wined3d_surface *surface) /* Sysmem textures have memory already allocated - release it, * this avoids an unnecessary memcpy. */ hr = surface_create_dib_section(surface); - if (SUCCEEDED(hr)) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } + if (FAILED(hr)) + return hr; /* We don't mind the nonpow2 stuff in GDI. */ surface->pow2Width = surface->resource.width; @@ -2801,9 +2779,8 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, ERR("Failed to create dib section, hr %#x.\n", hr); return hr; } - surface->resource.allocatedMemory = surface->dib.bitmap_data; } - else if (!surface_init_sysmem(surface)) + if (!surface_init_sysmem(surface)) return E_OUTOFMEMORY; surface_validate_location(surface, surface->map_binding); @@ -3276,13 +3253,6 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) hr = surface_create_dib_section(surface); if (FAILED(hr)) return WINED3DERR_INVALIDCALL; - - /* Use the DIB section from now on if we are not using a PBO or user memory. */ - if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM) || surface->user_memory)) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } } /* Map the surface. */ @@ -3294,8 +3264,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) } surface->getdc_map_mem = map.data; - if (surface->dib.bitmap_data != surface->getdc_map_mem) - memcpy(surface->dib.bitmap_data, surface->getdc_map_mem, surface->resource.size); + memcpy(surface->dib.bitmap_data, surface->getdc_map_mem, surface->resource.size); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) @@ -3356,8 +3325,7 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - if (surface->dib.bitmap_data != surface->getdc_map_mem) - memcpy(surface->getdc_map_mem, surface->dib.bitmap_data, surface->resource.size); + memcpy(surface->getdc_map_mem, surface->dib.bitmap_data, surface->resource.size); /* We locked first, so unlock now. */ surface->getdc_map_mem = NULL; @@ -6450,16 +6418,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text return hr; } - /* Similar to lockable rendertargets above, creating the DIB section - * during surface initialization prevents the sysmem pointer from changing - * after a wined3d_surface_getdc() call. */ - if ((desc->usage & WINED3DUSAGE_OWNDC) && !surface->hDC - && SUCCEEDED(surface_create_dib_section(surface))) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = surface->dib.bitmap_data; - } - surface->map_binding = SFLAG_INSYSMEM; return hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0e7d79f..74acb6c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -623,6 +623,8 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r TRACE("Copying surface %p to screen.\n", front); + memcpy(front->dib.bitmap_data, front->resource.heap_memory, front->resource.size); + src_dc = front->hDC; window = swapchain->win_handle; dst_dc = GetDCEx(window, 0, DCX_CLIPSIBLINGS | DCX_CACHE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 985f86f..d4f0739 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2309,7 +2309,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long - * SFLAG_DIBSECTION: The dib code manages the memory * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_PBO: PBOs don't use 'normal' memory. It is either allocated by the driver or must be NULL. * SFLAG_CLIENT: OpenGL uses our memory as backup @@ -2317,7 +2316,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ - SFLAG_DIBSECTION | \ SFLAG_PBO | \ SFLAG_PIN_SYSMEM)

1 0

Alexandre Julliard : shell32: Avoid a duplicate const.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 26f8ac8fae3ad60afd979e18ae71315209108ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=26f8ac8fae3ad60afd979e18a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 14 13:49:42 2014 +0100 shell32: Avoid a duplicate const. --- dlls/shell32/shelldispatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 52a365b..7b5de8b 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -49,7 +49,7 @@ enum tid_t { }; static ITypeLib *typelib; -static const REFIID tid_ids[] = +static const IID * const tid_ids[] = { &IID_NULL, &IID_IShellDispatch5,

1 0

Piotr Caban : msvcp110: Add locale::_Init implementation.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: f3abe0bd7f70ade54fc63a206327180878078308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3abe0bd7f70ade54fc63a206… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 14 13:54:52 2014 +0100 msvcp110: Add locale::_Init implementation. --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp90/locale.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0fbb08e..a12b20e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1467,8 +1467,8 @@ @ cdecl -arch=arm ?_Init(a)ios_base@std@@IAAXXZ(ptr) ios_base__Init @ thiscall -arch=i386 ?_Init(a)ios_base@std@@IAEXXZ(ptr) ios_base__Init @ cdecl -arch=win64 ?_Init(a)ios_base@std@@IEAAXXZ(ptr) ios_base__Init -@ stub -arch=win32 ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z -@ stub -arch=win64 ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z +@ cdecl -arch=win32 ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z(long) locale__Init_ref +@ cdecl -arch=win64 ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z(long) locale__Init_ref @ extern ?_Init_cnt(a)Init@ios_base(a)std@@0HA ios_base_Init__Init_cnt # extern ?_Init_cnt(a)_UShinit@std@@0HA @ extern ?_Init_cnt(a)_Winit@std@@0HA _Winit__Init_cnt diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c58862f..b35eaf5 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9845,6 +9845,27 @@ locale__Locimp* __cdecl locale__Init(void) return global_locale; } +/* ?_Init(a)locale@std@@CAPAV_Locimp(a)12@_N(a)Z */ +/* ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@_N(a)Z */ +locale__Locimp* __cdecl locale__Init_ref(MSVCP_bool inc_ref) +{ + locale__Locimp *ret; + _Lockit lock; + + TRACE("(%x)\n", inc_ref); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + if(inc_ref && global_locale) { + call_locale_facet__Incref(&global_locale->facet); + _Lockit_dtor(&lock); + return global_locale; + } + + ret = locale__Init(); + _Lockit_dtor(&lock); + return ret; +} + /* ??0locale(a)std@@QAE(a)ABV01@0H(a)Z */ /* ??0locale(a)std@@QEAA(a)AEBV01@0H(a)Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16)

1 0

Dmitry Timoshkov : taskschd: Implement ITaskService::get_Connected.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 189bfa96436774fc97c716c8b08999da04bb52cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=189bfa96436774fc97c716c8b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 14 17:18:03 2014 +0900 taskschd: Implement ITaskService::get_Connected. --- dlls/taskschd/task.c | 13 +++++++++++-- dlls/taskschd/tests/scheduler.c | 4 ---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 87d9273..76c0e9b 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -35,6 +35,7 @@ typedef struct { ITaskService ITaskService_iface; LONG ref; + BOOL connected; } TaskService; static inline TaskService *impl_from_ITaskService(ITaskService *iface) @@ -135,8 +136,15 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V static HRESULT WINAPI TaskService_get_Connected(ITaskService *iface, VARIANT_BOOL *connected) { - FIXME("%p,%p: stub\n", iface, connected); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, connected); + + if (!connected) return E_POINTER; + + *connected = task_svc->connected ? VARIANT_TRUE : VARIANT_FALSE; + + return S_OK; } static HRESULT WINAPI TaskService_get_TargetServer(ITaskService *iface, BSTR *server) @@ -192,6 +200,7 @@ HRESULT TaskService_create(void **obj) task_svc->ITaskService_iface.lpVtbl = &TaskService_vtbl; task_svc->ref = 1; + task_svc->connected = FALSE; *obj = &task_svc->ITaskService_iface; TRACE("created %p\n", *obj); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9b99258..adb7487 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -48,9 +48,7 @@ static void test_Connect(void) vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); -todo_wine ok(vbool == VARIANT_FALSE, "expected VARIANT_FALSE, got %d\n", vbool); hr = ITaskService_get_TargetServer(service, &bstr); @@ -81,7 +79,6 @@ todo_wine vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); @@ -92,7 +89,6 @@ todo_wine vbool = 0xdead; hr = ITaskService_get_Connected(service, &vbool); -todo_wine ok(hr == S_OK, "get_Connected error %#x\n", hr); todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool);

1 0

Ken Thomases : winemac: Make WineOpenGLContext hold a strong reference to its view.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: e21192469dbd3c234e1051504b6429bd9cfb0dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21192469dbd3c234e1051504… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:08 2014 -0600 winemac: Make WineOpenGLContext hold a strong reference to its view. Its superclass, NSOpenGLContext, only holds a weak reference. The view was sometimes being deallocated before the context was disposed of, resulting in crashes. --- dlls/winemac.drv/cocoa_opengl.m | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 5ec5688..32d182f 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -35,10 +35,26 @@ - (void) dealloc { + [[self view] release]; [latentView release]; [super dealloc]; } + - (void) setView:(NSView*)newView + { + NSView* oldView = [self view]; + [super setView:newView]; + [newView retain]; + [oldView release]; + } + + - (void) clearDrawable + { + NSView* oldView = [self view]; + [super clearDrawable]; + [oldView release]; + } + /* On at least some versions of Mac OS X, -[NSOpenGLContext clearDrawable] has the undesirable side effect of ordering the view's GL surface off-screen. This isn't done when just changing the context's view to a different view (which I would

1 0

Ken Thomases : winemac: Consolidate code paths for clearing the OpenGL context.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 2cc53379404bfb499461add373ddb42c77d224b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc53379404bfb499461add37… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:03 2014 -0600 winemac: Consolidate code paths for clearing the OpenGL context. We clear it if the context or the view is NULL. If the context is non-NULL, we want to disassociate the views of both the current and passed-in contexts, if they differ. --- dlls/winemac.drv/cocoa_opengl.m | 44 ++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 752fb77..196da46 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -154,36 +154,28 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) WineOpenGLContext *context = (WineOpenGLContext*)c; NSView* view = (NSView*)v; - if (context) + if (context && view) { [context removeFromViews:NO]; - if (view) - { - macdrv_add_view_opengl_context(v, c); - - if (context.needsUpdate) - { - context.needsUpdate = FALSE; - [context setView:view]; - [context setLatentView:nil]; - } - else - { - if ([context view]) - [context clearDrawableLeavingSurfaceOnScreen]; - [context setLatentView:view]; - } + macdrv_add_view_opengl_context(v, c); - [context makeCurrentContext]; - - if ([context view]) - [context clearToBlackIfNeeded]; + if (context.needsUpdate) + { + context.needsUpdate = FALSE; + [context setView:view]; + [context setLatentView:nil]; } else { - [WineOpenGLContext clearCurrentContext]; - [context removeFromViews:YES]; + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; + [context setLatentView:view]; } + + [context makeCurrentContext]; + + if ([context view]) + [context clearToBlackIfNeeded]; } else { @@ -192,8 +184,12 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) if ([currentContext isKindOfClass:[WineOpenGLContext class]]) { [WineOpenGLContext clearCurrentContext]; - [currentContext removeFromViews:YES]; + if (currentContext != context) + [currentContext removeFromViews:YES]; } + + if (context) + [context removeFromViews:YES]; } [pool release];

1 0

Frédéric Delanoy : winedump: Use BOOL type where appropriate.
by Alexandre Julliard Jan. 14, 2014

Jan. 14, 2014

Module: wine Branch: master Commit: 1bd7405193ca841a940cbf80386cd4fbe74f0b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd7405193ca841a940cbf803… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jan 13 21:44:00 2014 +0100 winedump: Use BOOL type where appropriate. --- tools/winedump/dump.c | 2 +- tools/winedump/main.c | 9 +++------ tools/winedump/msmangle.c | 34 +++++++++++++++++----------------- tools/winedump/winedump.h | 2 +- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f263390..7ca4dc0 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -154,7 +154,7 @@ const char* get_symbol_str(const char* symname) parsed_symbol symbol; symbol_init(&symbol, symname); - if (symbol_demangle(&symbol) == -1) + if (!symbol_demangle(&symbol)) ret = symname; else if (symbol.flags & SYM_DATA) { diff --git a/tools/winedump/main.c b/tools/winedump/main.c index ca2047b..dfd15b0 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -444,17 +444,14 @@ int main (int argc, char *argv[]) if (globals.do_code && symbol_searched(count, symbol.symbol)) { /* Attempt to get information about the symbol */ - int result = symbol_demangle (&symbol); + BOOL result = symbol_demangle (&symbol) || symbol_search(&symbol); - if (result) - result = !symbol_search (&symbol); - - if (!result && symbol.function_name) + if (result && symbol.function_name) /* Clean up the prototype */ symbol_clean_string (symbol.function_name); if (NORMAL) - puts (result ? "[Not Found]" : "[OK]"); + puts (result ? "[OK]" : "[Not Found]"); } else if (NORMAL) puts ("[Ignoring]"); diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index a0d9f92..39e4f3a 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -63,7 +63,7 @@ static char *get_pointer_type_string (compound_type *ct, * * Demangle a C++ linker symbol into a C prototype */ -int symbol_demangle (parsed_symbol *sym) +BOOL symbol_demangle (parsed_symbol *sym) { compound_type ct; BOOL is_static = FALSE; @@ -83,7 +83,7 @@ int symbol_demangle (parsed_symbol *sym) /* MS mangled names always begin with '?' */ name = sym->symbol; if (*name++ != '?') - return -1; + return FALSE; if (VERBOSE) puts ("Attempting to demangle symbol"); @@ -162,12 +162,12 @@ int symbol_demangle (parsed_symbol *sym) case 'X': function_name = strdup ("placement_new_closure"); break; case 'Y': function_name = strdup ("placement_delete_closure"); break; default: - return -1; + return FALSE; } break; default: /* FIXME: Other operators */ - return -1; + return FALSE; } name++; } @@ -177,7 +177,7 @@ int symbol_demangle (parsed_symbol *sym) function_name = name; while (*name && *name++ != '@') ; if (!*name) - return -1; + return FALSE; function_name = str_substring (function_name, name - 1); } @@ -194,7 +194,7 @@ int symbol_demangle (parsed_symbol *sym) while (*name && *name++ != '@') ; if (*name++ != '@') { free (function_name); - return -1; + return FALSE; } class_name = str_substring (class_name, name - 2); /* Allocates a new string */ } @@ -220,7 +220,7 @@ int symbol_demangle (parsed_symbol *sym) printf ("/*FIXME: %s: unknown data*/\n", sym->symbol); free (function_name); free (class_name); - return -1; + return FALSE; } sym->flags |= SYM_DATA; sym->argc = 1; @@ -230,7 +230,7 @@ int symbol_demangle (parsed_symbol *sym) FREE_CT (ct); free (function_name); free (class_name); - return 0; + return TRUE; case '6' : /* compiler generated static */ case '7' : /* compiler generated static */ @@ -246,11 +246,11 @@ int symbol_demangle (parsed_symbol *sym) puts ("Demangled symbol OK [vtable]"); free (function_name); free (class_name); - return 0; + return TRUE; } free (function_name); free (class_name); - return -1; + return FALSE; /* Functions */ @@ -295,7 +295,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } /* If there is an implicit this pointer, const status follows */ @@ -310,7 +310,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } } @@ -342,7 +342,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } /* Return type, or @ if 'void' */ @@ -358,7 +358,7 @@ int symbol_demangle (parsed_symbol *sym) if (!demangle_datatype (&name, &ct, sym)) { free (function_name); free (class_name); - return -1; + return FALSE; } sym->return_text = ct.expression; sym->return_type = get_type_constant(ct.dest_type, ct.flags); @@ -376,7 +376,7 @@ int symbol_demangle (parsed_symbol *sym) if (!demangle_datatype(&name, &ct, sym)) { free (function_name); free (class_name); - return -1; + return FALSE; } if (strcmp (ct.expression, "void")) @@ -405,7 +405,7 @@ int symbol_demangle (parsed_symbol *sym) if (*name != 'Z') { free (function_name); free (class_name); - return -1; + return FALSE; } /* Note: '()' after 'Z' means 'throws', but we don't care here */ @@ -433,7 +433,7 @@ int symbol_demangle (parsed_symbol *sym) if (VERBOSE) puts ("Demangled symbol OK"); - return 0; + return TRUE; } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 754a7d2..88fa0e7 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -164,7 +164,7 @@ BOOL dll_next_symbol (parsed_symbol * sym); /* Symbol functions */ void symbol_init(parsed_symbol* symbol, const char* name); -int symbol_demangle (parsed_symbol *symbol); +BOOL symbol_demangle (parsed_symbol *symbol); BOOL symbol_search (parsed_symbol *symbol);

1 0