April 2012 - Wine-commits - list.winehq.org

Jacek Caban : jscript: Replace only the first match for non-regexp pattern in String.replace.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 78fc648dec5218dbb1290ee99907e78a08af7cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fc648dec5218dbb1290ee99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 9 14:02:35 2012 +0200 jscript: Replace only the first match for non-regexp pattern in String.replace. --- dlls/jscript/string.c | 3 +++ dlls/jscript/tests/api.js | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index df44db9..17f6c2f 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -961,6 +961,9 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(FAILED(hres)) break; } + + if(!regexp) + break; } if(SUCCEEDED(hres)) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index be49179..ffc1c48 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -414,6 +414,15 @@ ok(r === "-ret-", "r = " + r + " expected '-ret-'"); r = "-[test]-".replace("[test]", replaceFunc3, "test"); ok(r === "-ret-", "r = " + r + " expected '-ret-'"); +r = "x,x,x".replace("x", "y"); +ok(r === "y,x,x", "r = " + r + " expected 'y,x,x'"); + +r = "x,x,x".replace("", "y"); +ok(r === "yx,x,x", "r = " + r + " expected 'yx,x,x'"); + +r = "x,x,x".replace("", ""); +ok(r === "x,x,x", "r = " + r + " expected 'x,x,x'"); + r = "1,2,3".split(","); ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); ok(r.length === 3, "r.length = " + r.length);

1 0

Andrew Eikum : winealsa.drv: Enumerate ALSA devices in a single pass.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: f461e8496d4e2861dab6183465a89e2d286a73eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f461e8496d4e2861dab618346… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 9 09:20:31 2012 -0500 winealsa.drv: Enumerate ALSA devices in a single pass. --- dlls/winealsa.drv/mmdevdrv.c | 88 +++++++++++++++++++++++------------------- 1 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c99186b..66e8baf 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -329,6 +329,8 @@ static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) snd_pcm_t *handle; int err; + TRACE("devnode: %s, stream: %d\n", devnode, stream); + if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ WARN("The device \"%s\" failed to open: %d (%s).\n", devnode, err, snd_strerror(err)); @@ -386,11 +388,13 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const cha }else ret[copied] = 0; + TRACE("Enumerated device: %s\n", wine_dbgstr_w(ret)); + return ret; } static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, - WCHAR **ids, GUID *guids, UINT *num, snd_ctl_t *ctl, int card, + WCHAR ***ids, GUID **guids, UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) { int err, device; @@ -425,18 +429,24 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, if(!alsa_try_open(devnode, stream)) continue; - if(ids && guids){ - devname = snd_pcm_info_get_name(info); - if(!devname){ - WARN("Unable to get device name for card %d, device %d\n", card, - device); - continue; - } + if(*num){ + *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); + *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); + }else{ + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); + *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); + } - ids[*num] = construct_device_id(flow, cardnameW, devname); - get_device_guid(flow, devnode, &guids[*num]); + devname = snd_pcm_info_get_name(info); + if(!devname){ + WARN("Unable to get device name for card %d, device %d\n", card, + device); + continue; } + (*ids)[*num] = construct_device_id(flow, cardnameW, devname); + get_device_guid(flow, devnode, &(*guids)[*num]); + ++(*num); } @@ -449,8 +459,8 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, snd_pcm_stream_t stream, return S_OK; } -static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids, - GUID *guids, UINT *num) +static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***ids, + GUID **guids, UINT *num) { static const WCHAR ALSAOutputDevices[] = {'A','L','S','A','O','u','t','p','u','t','D','e','v','i','c','e','s',0}; static const WCHAR ALSAInputDevices[] = {'A','L','S','A','I','n','p','u','t','D','e','v','i','c','e','s',0}; @@ -477,10 +487,15 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids WideCharToMultiByte(CP_UNIXCP, 0, p, -1, devname, sizeof(devname), NULL, NULL); if(alsa_try_open(devname, stream)){ - if(ids && guids){ - ids[*num] = construct_device_id(flow, p, NULL); - get_device_guid(flow, devname, &guids[*num]); + if(*num){ + *ids = HeapReAlloc(GetProcessHeap(), 0, *ids, sizeof(WCHAR *) * (*num + 1)); + *guids = HeapReAlloc(GetProcessHeap(), 0, *guids, sizeof(GUID) * (*num + 1)); + }else{ + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); + *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); } + (*ids)[*num] = construct_device_id(flow, p, NULL); + get_device_guid(flow, devname, &(*guids)[*num]); ++*num; } @@ -492,7 +507,7 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR **ids } } -static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, GUID *guids, +static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : @@ -503,10 +518,10 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, GUID *guids, *num = 0; if(alsa_try_open(defname, stream)){ - if(ids && guids){ - *ids = construct_device_id(flow, defaultW, NULL); - get_device_guid(flow, defname, guids); - } + *ids = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *)); + (*ids)[0] = construct_device_id(flow, defaultW, NULL); + *guids = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); + get_device_guid(flow, defname, &(*guids)[0]); ++*num; } @@ -568,37 +583,30 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index); - hr = alsa_enum_devices(flow, NULL, NULL, num); - if(FAILED(hr)) - return hr; - - if(*num == 0) - { - *ids = NULL; - *guids = NULL; - return S_OK; - } + *ids = NULL; + *guids = NULL; - *ids = HeapAlloc(GetProcessHeap(), 0, *num * sizeof(WCHAR *)); - *guids = HeapAlloc(GetProcessHeap(), 0, *num * sizeof(GUID)); - if(!*ids || !*guids){ + hr = alsa_enum_devices(flow, ids, guids, num); + if(FAILED(hr)){ + UINT i; + for(i = 0; i < *num; ++i) + HeapFree(GetProcessHeap(), 0, (*ids)[i]); HeapFree(GetProcessHeap(), 0, *ids); HeapFree(GetProcessHeap(), 0, *guids); return E_OUTOFMEMORY; } - *def_index = 0; + TRACE("Enumerated %u devices\n", *num); - hr = alsa_enum_devices(flow, *ids, *guids, num); - if(FAILED(hr)){ - int i; - for(i = 0; i < *num; ++i) - HeapFree(GetProcessHeap(), 0, (*ids)[i]); + if(*num == 0){ HeapFree(GetProcessHeap(), 0, *ids); + *ids = NULL; HeapFree(GetProcessHeap(), 0, *guids); - return E_OUTOFMEMORY; + *guids = NULL; } + *def_index = 0; + return S_OK; }

1 0

Vincent Povirk : winedump: Add basic support for dumping the property store in lnk files.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 73e7346dd5b1d34ea1ae698e4d9c5f16bdf7f7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=73e7346dd5b1d34ea1ae698e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 5 16:46:54 2012 -0500 winedump: Add basic support for dumping the property store in lnk files. --- tools/winedump/lnk.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index 680e2de..e0a2282 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -67,6 +67,7 @@ typedef enum { #define EXP_SPECIAL_FOLDER_SIG 0xa0000005 #define EXP_DARWIN_ID_SIG 0xa0000006 #define EXP_SZ_ICON_SIG 0xa0000007 +#define EXP_PROPERTYSTORAGE_SIG 0xa0000009 typedef struct tagDATABLOCKHEADER { @@ -99,6 +100,22 @@ typedef struct tagLINK_SZ_BLOCK WCHAR bufW[MAX_PATH]; } LINK_SZ_BLOCK; +typedef struct tagLINK_PROPERTYSTORAGE_GUID +{ + DWORD size; + DWORD magic; + GUID fmtid; +} LINK_PROPERTYSTORAGE_GUID; + +typedef struct tagLINK_PROPERTYSTORAGE_VALUE +{ + DWORD size; + DWORD pid; + BYTE unknown8; + DWORD vt; + DWORD unknown25; +} LINK_PROPERTYSTORAGE_VALUE; + typedef struct _LOCATION_INFO { DWORD dwTotalSize; @@ -386,6 +403,94 @@ static int dump_darwin_id(const DATABLOCK_HEADER* bhdr) return 0; } +static void dump_property_storage_value(const LINK_PROPERTYSTORAGE_VALUE *lnk_value_hdr, + DWORD data_size) +{ + int got_terminator = 0, i, value_size; + const unsigned char *value; + + while (data_size >= sizeof(DWORD)) + { + if (!lnk_value_hdr->size) + { + got_terminator = 1; + break; + } + + if (lnk_value_hdr->size > data_size || lnk_value_hdr->size < sizeof(*lnk_value_hdr)) + { + printf(" size: %d (invald)\n", lnk_value_hdr->size); + return; + } + + printf(" pid: %d\n", lnk_value_hdr->pid); + printf(" unknown8: %d\n", lnk_value_hdr->unknown8); + printf(" vartype: %d\n", lnk_value_hdr->vt); + printf(" unknown25: %d\n", lnk_value_hdr->unknown25); + + value_size = lnk_value_hdr->size - sizeof(*lnk_value_hdr); + value = (const unsigned char*)(lnk_value_hdr+1); + + printf(" value (%2d bytes) : ",value_size); + for(i=0; i<value_size; i++) + printf("%02x ",value[i]); + printf("\n\n"); + + data_size -= lnk_value_hdr->size; + lnk_value_hdr = (void*)((char*)lnk_value_hdr + lnk_value_hdr->size); + } + + if (!got_terminator) + printf(" missing terminator!\n"); +} + +static int dump_property_storage(const DATABLOCK_HEADER* bhdr) +{ + int data_size; + const LINK_PROPERTYSTORAGE_GUID *lnk_guid_hdr; + int got_terminator = 0; + + printf("Property Storage\n"); + printf("--------------\n\n"); + + data_size=bhdr->cbSize-sizeof(*bhdr); + + lnk_guid_hdr=(void*)((const char*)bhdr+sizeof(*bhdr)); + + while (data_size >= sizeof(DWORD)) + { + if (!lnk_guid_hdr->size) + { + got_terminator = 1; + break; + } + + if (lnk_guid_hdr->size > data_size || lnk_guid_hdr->size < sizeof(*lnk_guid_hdr)) + { + printf("size: %d (invald)\n", lnk_guid_hdr->size); + return 1; + } + + if (lnk_guid_hdr->magic != 0x53505331) + printf("magic: %x\n", lnk_guid_hdr->magic); + + printf("fmtid: %s\n", get_guid_str(&lnk_guid_hdr->fmtid)); + + dump_property_storage_value((void*)(lnk_guid_hdr + 1), lnk_guid_hdr->size - sizeof(*lnk_guid_hdr)); + + data_size -= lnk_guid_hdr->size; + + lnk_guid_hdr = (void*)((char*)lnk_guid_hdr + lnk_guid_hdr->size); + } + + if (!got_terminator) + printf("missing terminator!\n"); + + printf("\n"); + + return 0; +} + static int dump_raw_block(const DATABLOCK_HEADER* bhdr) { int data_size; @@ -539,6 +644,9 @@ void lnk_dump(void) case EXP_DARWIN_ID_SIG: dump_darwin_id(bhdr); break; + case EXP_PROPERTYSTORAGE_SIG: + dump_property_storage(bhdr); + break; default: dump_raw_block(bhdr); }

1 0

Christian Costa : dmsynth: Add basic tests.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: d2d5d0e0d75b1b6b0ebc16aad410e120a8e99527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d5d0e0d75b1b6b0ebc16aad… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 6 13:39:02 2012 +0200 dmsynth: Add basic tests. --- configure | 1 + configure.ac | 1 + dlls/dmsynth/tests/Makefile.in | 7 ++++ dlls/dmsynth/tests/dmsynth.c | 60 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f40e012..3e6e777 100755 --- a/configure +++ b/configure @@ -15024,6 +15024,7 @@ wine_fn_config_test dlls/dmloader/tests dmloader_test wine_fn_config_dll dmscript enable_dmscript wine_fn_config_dll dmstyle enable_dmstyle wine_fn_config_dll dmsynth enable_dmsynth +wine_fn_config_test dlls/dmsynth/tests dmsynth_test wine_fn_config_dll dmusic enable_dmusic wine_fn_config_test dlls/dmusic/tests dmusic_test wine_fn_config_dll dmusic32 enable_dmusic32 implib diff --git a/configure.ac b/configure.ac index 7540676..667d725 100644 --- a/configure.ac +++ b/configure.ac @@ -2530,6 +2530,7 @@ WINE_CONFIG_TEST(dlls/dmloader/tests) WINE_CONFIG_DLL(dmscript) WINE_CONFIG_DLL(dmstyle) WINE_CONFIG_DLL(dmsynth) +WINE_CONFIG_TEST(dlls/dmsynth/tests) WINE_CONFIG_DLL(dmusic) WINE_CONFIG_TEST(dlls/dmusic/tests) WINE_CONFIG_DLL(dmusic32,,[implib]) diff --git a/dlls/dmsynth/tests/Makefile.in b/dlls/dmsynth/tests/Makefile.in new file mode 100644 index 0000000..a319918 --- /dev/null +++ b/dlls/dmsynth/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dmsynth.dll +IMPORTS = oleaut32 ole32 uuid + +C_SRCS = \ + dmsynth.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c new file mode 100644 index 0000000..af2b7cb --- /dev/null +++ b/dlls/dmsynth/tests/dmsynth.c @@ -0,0 +1,60 @@ +/* + * Unit tests for dmsynth functions + * + * Copyright (C) 2012 Christian Costa + * + * 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 <stdio.h> + +#include "wine/test.h" +#include "uuids.h" +#include "ole2.h" +#include "initguid.h" +#include "dmusics.h" +#include "dmusici.h" + +static void test_dmsynth(void) +{ + IDirectMusicSynth *dmsynth = NULL; + IDirectMusicSynthSink *dmsynth_sink = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); + if (hr != S_OK) + { + skip("Cannot create DirectMusicSync object (%x)\n", hr); + return; + } + + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); + todo_wine ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + + if (dmsynth_sink) + IDirectMusicSynthSink_Release(dmsynth_sink); + IDirectMusicSynth_Release(dmsynth); +} + +START_TEST(dmsynth) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + test_dmsynth(); + + CoUninitialize(); +}

1 0

Christian Costa : dmsynth: Check the rigth CLSID to create the DirectMusicSynthSink object.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 3e48fe9d616b4019dc2c78f80121fec69e1d7ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e48fe9d616b4019dc2c78f80… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 6 13:39:10 2012 +0200 dmsynth: Check the rigth CLSID to create the DirectMusicSynthSink object. --- dlls/dmsynth/dmsynth_main.c | 19 ++++++++++--------- dlls/dmsynth/tests/dmsynth.c | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 966fafc..4afa7b4 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -148,15 +148,16 @@ HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); - if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSynth) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = &Synth_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicSynth) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = &SynthSink_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } + + if (IsEqualCLSID(rclsid, &CLSID_DirectMusicSynth) && IsEqualIID(riid, &IID_IClassFactory)) { + *ppv = &Synth_CF; + IClassFactory_AddRef((IClassFactory*)*ppv); + return S_OK; + } else if (IsEqualCLSID(rclsid, &CLSID_DirectMusicSynthSink) && IsEqualIID(riid, &IID_IClassFactory)) { + *ppv = &SynthSink_CF; + IClassFactory_AddRef((IClassFactory*)*ppv); + return S_OK; + } WARN("(%s,%s,%p): no interface found.\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index af2b7cb..b341935 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -43,7 +43,7 @@ static void test_dmsynth(void) } hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); - todo_wine ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); if (dmsynth_sink) IDirectMusicSynthSink_Release(dmsynth_sink);

1 0

Christian Costa : dmsynth: Put port caps that match native ones.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: b751d9ad9c2c52553f995d92723f4b574a457294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b751d9ad9c2c52553f995d927… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Apr 6 13:39:18 2012 +0200 dmsynth: Put port caps that match native ones. --- dlls/dmsynth/synth.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index e14ae81..dda2c09 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -233,7 +233,8 @@ static const IDirectMusicSynth8Vtbl DirectMusicSynth8_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) +{ IDirectMusicSynth8Impl *obj; TRACE("(%p,%p,%p)\n", lpcGUID, ppobj, pUnkOuter); @@ -249,12 +250,12 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl (LPCGUID lpcGUID, LPVOID* ppobj obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; obj->pCaps.guidPort = CLSID_DirectMusicSynth; obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; - obj->pCaps.dwType = DMUS_PORT_WINMM_DRIVER; + obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; obj->pCaps.dwMaxChannelGroups = 1000; obj->pCaps.dwMaxVoices = 1000; - obj->pCaps.dwMaxAudioChannels = -1; - obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB | DMUS_EFFECT_CHORUS | DMUS_EFFECT_DELAY; + obj->pCaps.dwMaxAudioChannels = 2; + obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; MultiByteToWideChar (CP_ACP, 0, "Microsoft Synthesizer", -1, obj->pCaps.wszDescription, sizeof(obj->pCaps.wszDescription)/sizeof(WCHAR)); /* assign latency clock */ /*DMUSIC_CreateReferenceClockImpl (&IID_IReferenceClock, (LPVOID*)&This->pLatencyClock, NULL); */

1 0

Aric Stewart : quartz: COM cleanup for PullPin.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 018161e7604fc976d8ce6a97825a29f5d8fdeeab URL: http://source.winehq.org/git/wine.git/?a=commit;h=018161e7604fc976d8ce6a978… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 4 08:27:25 2012 -0500 quartz: COM cleanup for PullPin. --- dlls/quartz/avisplit.c | 8 ++++---- dlls/quartz/mpegsplit.c | 6 +++--- dlls/quartz/parser.c | 24 ++++++++++++------------ dlls/quartz/pin.c | 18 +++++++++--------- dlls/quartz/pin.h | 6 ++++++ dlls/quartz/waveparser.c | 6 +++--- 6 files changed, 37 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=018161e7604fc976d8ce6…

1 0

Jacek Caban : mshtml: Added IHTMLFormElement::submit implementation.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 0067b9505e40b0943fc5f757b77d18802176eeb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0067b9505e40b0943fc5f757b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 6 14:58:53 2012 +0200 mshtml: Added IHTMLFormElement::submit implementation. --- dlls/mshtml/htmlform.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5041345..c9f847a 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -361,8 +361,17 @@ static HRESULT WINAPI HTMLFormElement_get_onreset(IHTMLFormElement *iface, VARIA static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->()\n", This); + + nsres = nsIDOMHTMLFormElement_Submit(This->nsform); + if(NS_FAILED(nsres)) { + ERR("Submit failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFormElement_reset(IHTMLFormElement *iface)

1 0

André Hentschel : winedbg: Implement be_arm_store_integer on ARM.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 5a1276bf39f1e35a1fd94cae4fa7f90e80252f8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a1276bf39f1e35a1fd94cae4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 6 18:22:19 2012 +0200 winedbg: Implement be_arm_store_integer on ARM. --- programs/winedbg/be_arm.c | 6 +++--- programs/winedbg/winedbg.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 9db785f..e36c969 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -22,7 +22,7 @@ #include "debugger.h" -#if defined(__arm__) +#if defined(__arm__) && !defined(__ARMEB__) static unsigned be_arm_get_addr(HANDLE hThread, const CONTEXT* ctx, enum be_cpu_addr bca, ADDRESS64* addr) @@ -258,8 +258,8 @@ static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, static int be_arm_store_integer(const struct dbg_lvalue* lvalue, unsigned size, unsigned is_signed, LONGLONG val) { - dbg_printf("be_arm_store_integer: not done\n"); - return FALSE; + /* this is simple if we're on a little endian CPU */ + return memory_write_value(lvalue, size, &val); } struct backend_cpu be_arm = diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index c5f4448..7e63727 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -618,7 +618,7 @@ extern struct backend_cpu be_ppc; extern struct backend_cpu be_x86_64; #elif defined(__sparc__) extern struct backend_cpu be_sparc; -#elif defined(__arm__) +#elif defined(__arm__) && !defined(__ARMEB__) extern struct backend_cpu be_arm; #else # error CPU unknown @@ -638,7 +638,7 @@ int main(int argc, char** argv) be_cpu = &be_x86_64; #elif defined(__sparc__) be_cpu = &be_sparc; -#elif defined(__arm__) +#elif defined(__arm__) && !defined(__ARMEB__) be_cpu = &be_arm; #else # error CPU unknown

1 0

André Hentschel : make_specfiles: Add atl group.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: b08f2237ee81fcfef7ed24b202c3173fe9db7e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08f2237ee81fcfef7ed24b20… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 5 19:41:01 2012 +0200 make_specfiles: Add atl group. --- tools/make_specfiles | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 619c8ad..a39889f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -110,6 +110,10 @@ my @dll_groups = "vcomp", "vcomp100", ], + [ + "atl", + "atl80", + ], ); my $update_flags = 0;

1 0