wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Józef Kucia : d3dcompiler: Allow the alternative shader version format ( with dots instead of underscores).
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: 6a706d587a0c1fcd21b31d3518a43f80918c15a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a706d587a0c1fcd21b31d351… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sat Apr 7 10:28:08 2012 +0200 d3dcompiler: Allow the alternative shader version format (with dots instead of underscores). --- dlls/d3dcompiler_43/asmshader.l | 12 ++++++------ dlls/d3dcompiler_43/tests/asm.c | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.l b/dlls/d3dcompiler_43/asmshader.l index 5817344..af42e2f 100644 --- a/dlls/d3dcompiler_43/asmshader.l +++ b/dlls/d3dcompiler_43/asmshader.l @@ -259,9 +259,9 @@ phase {return INSTR_PHASE; } vs\.1\.0|vs_1_0 {return VER_VS10; } vs\.1\.1|vs_1_1 {return VER_VS11; } -vs_2_0 {return VER_VS20; } -vs_2_x {return VER_VS2X; } -vs_3_0 {return VER_VS30; } +vs\.2\.0|vs_2_0 {return VER_VS20; } +vs\.2\.x|vs_2_x {return VER_VS2X; } +vs\.3\.0|vs_3_0 {return VER_VS30; } ps\.1\.0|ps_1_0 {return VER_PS10; } ps\.1\.1|ps_1_1 {return VER_PS11; } @@ -269,9 +269,9 @@ ps\.1\.2|ps_1_2 {return VER_PS12; } ps\.1\.3|ps_1_3 {return VER_PS13; } ps\.1\.4|ps_1_4 {return VER_PS14; } -ps_2_0 {return VER_PS20; } -ps_2_x {return VER_PS2X; } -ps_3_0 {return VER_PS30; } +ps\.2\.0|ps_2_0 {return VER_PS20; } +ps\.2\.x|ps_2_x {return VER_PS2X; } +ps\.3\.0|ps_3_0 {return VER_PS30; } {DOT} {return yytext[0]; } {COMPONENT} { diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 1e986df..b5c45d6 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -129,7 +129,7 @@ static void ps_1_1_test(void) { {0xffff0101, 0x00000001, 0x8e0f0000, 0x80e40001, 0x0000ffff} }, { /* shader 2 */ - "ps.1.1\n" + "ps_1_1\n" "def c2, 0, 0., 0, 0.\n", {0xffff0101, 0x00000051, 0xa00f0002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff} @@ -273,7 +273,7 @@ static void vs_1_1_test(void) { {0xfffe0101, 0x00000006, 0x800f0000, 0x90000000, 0x0000ffff} }, { /* shader 25 */ - "vs_1_1\n" + "vs.1.1\n" "rsq r0, v0.x\n", {0xfffe0101, 0x00000007, 0x800f0000, 0x90000000, 0x0000ffff} }, @@ -511,7 +511,7 @@ static void ps_1_3_test(void) { 0x0000ffff} }, { /* shader 35 */ - "ps_1_3\n" + "ps.1.3\n" "tex t0\n" "texdp3tex_x8 t1, t0\n", {0xffff0103, 0x00000042, 0xb00f0000, 0x00000053, 0xb30f0001, 0xb0e40000, @@ -623,7 +623,7 @@ static void ps_1_4_test(void) { {0xffff0104, 0x00000057, 0x810f0005, 0x0000ffff} }, { /* shader 18 */ - "ps_1_4\n" + "ps.1.4\n" "bem_d2 r1, c0, r0\n", {0xffff0104, 0x00000059, 0x8f0f0001, 0xa0e40000, 0x80e40000, 0x0000ffff} }, @@ -814,7 +814,7 @@ static void vs_2_0_test(void) { {0xfffe0200, 0x01000019, 0xa0e41003, 0x0000001c, 0x0100001e, 0xa0e41003, 0x0000001c, 0x0000ffff} }, { /* shader 29: labels up to 2047 are accepted even in vs_2_0 */ - "vs_2_0\n" + "vs.2.0\n" "call l2047\n", {0xfffe0200, 0x01000019, 0xa0e417ff, 0x0000ffff} }, @@ -872,7 +872,7 @@ static void vs_2_x_test(void) { 0x0100001e, 0xa0e41000, 0x0000001c, 0x0000ffff} }, { /* shader 6 */ - "vs_2_x\n" + "vs.2.x\n" "rep i0\n" "breakp p0.w\n" "endrep\n", @@ -946,7 +946,7 @@ static void ps_2_0_test(void) { 0xb0e40001, 0xa0e40802, 0x0000ffff} }, { /* shader 10 */ - "ps_2_0\n" + "ps.2.0\n" "dcl_2d s2\n" "texldb r0, t1, s2\n", {0xffff0200, 0x0200001f, 0x90000000, 0xa00f0802, 0x03020042, 0x800f0000, @@ -1082,7 +1082,7 @@ static void ps_2_x_test(void) { 0x00000027, 0x0000ffff} }, { /* shader 16 */ - "ps_2_x\n" + "ps.2.x\n" "call l2047\n" "ret\n" "label l2047\n" @@ -1169,7 +1169,7 @@ static void vs_3_0_test(void) { 0x3f000000, 0x0000ffff} }, { /* shader 14: no register number checks with relative addressing */ - "vs_3_0\n" + "vs.3.0\n" "add r0, v20[aL], r2\n", {0xfffe0300, 0x04000002, 0x800f0000, 0x90e42014, 0xf0e40800, 0x80e40002, 0x0000ffff} @@ -1257,7 +1257,7 @@ static void ps_3_0_test(void) { {0xffff0300, 0x0200001f, 0x90000000, 0xa04f0800, 0x0000ffff} }, { /* shader 14 */ - "ps_3_0\n" + "ps.3.0\n" "dcl_2d_pp s0\n", {0xffff0300, 0x0200001f, 0x90000000, 0xa02f0800, 0x0000ffff} },

1 0

Józef Kucia : d3dcompiler: Fix parsing the tex instruction in ps_1_0 shaders.
by Alexandre Julliard 09 Apr '12

09 Apr '12

Module: wine Branch: master Commit: d2b164f0b4e8394d446c137fa11814875a8ec6f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b164f0b4e8394d446c137fa… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sat Apr 7 10:28:07 2012 +0200 d3dcompiler: Fix parsing the tex instruction in ps_1_0 shaders. --- dlls/d3dcompiler_43/asmparser.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/asmparser.c b/dlls/d3dcompiler_43/asmparser.c index 4d71237..6540a80 100644 --- a/dlls/d3dcompiler_43/asmparser.c +++ b/dlls/d3dcompiler_43/asmparser.c @@ -548,7 +548,8 @@ static void asmparser_instr(struct asm_parser *This, DWORD opcode, case BWRITERSIO_TEX: /* this encodes both the tex PS 1.x instruction and the texld 1.4/2.0+ instruction */ - if(This->shader->version == BWRITERPS_VERSION(1, 1) || + if(This->shader->version == BWRITERPS_VERSION(1, 0) || + This->shader->version == BWRITERPS_VERSION(1, 1) || This->shader->version == BWRITERPS_VERSION(1, 2) || This->shader->version == BWRITERPS_VERSION(1, 3)) { asmparser_tex(This, mod, shift, dst);

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

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

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

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: 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 + +@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

Robert van Herk : msi: Fixed MsiGetFileHashW for empty files.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: f87c4a36ddc1a32af392e45b0af1feff8c388852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87c4a36ddc1a32af392e45b0… Author: Robert van Herk <mijnspamboxje(a)hotmail.com> Date: Thu Apr 5 13:08:08 2012 +0200 msi: Fixed MsiGetFileHashW for empty files. --- dlls/msi/msi.c | 34 ++++++++++++++++++++++------------ dlls/msi/tests/msi.c | 6 ++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 53ae641..4d18265 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4014,24 +4014,34 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, } length = GetFileSize( handle, NULL ); - mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL ); - if (mapping) + if (length) { - p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); - if (p) + mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL ); + if (mapping) { - MD5_CTX ctx; + p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); + if (p) + { + MD5_CTX ctx; - MD5Init( &ctx ); - MD5Update( &ctx, p, length ); - MD5Final( &ctx ); - UnmapViewOfFile( p ); + MD5Init( &ctx ); + MD5Update( &ctx, p, length ); + MD5Final( &ctx ); + UnmapViewOfFile( p ); - memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData ); - r = ERROR_SUCCESS; + memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData ); + r = ERROR_SUCCESS; + } + CloseHandle( mapping ); } - CloseHandle( mapping ); } + else + { + /* Empty file -> set hash to 0 */ + memset( pHash->dwData, 0, sizeof pHash->dwData ); + r = ERROR_SUCCESS; + } + CloseHandle( handle ); return r; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index f12af78..8768d2a 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -417,6 +417,12 @@ static const struct MSIFILEHASHINFO hash; } hash_data[] = { + { "", 0, + { HASHSIZE, + { 0, 0, 0, 0 }, + }, + }, + { "abc", 0, { HASHSIZE, { 0x98500190, 0xb04fd23c, 0x7d3f96d6, 0x727fe128 },

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

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

← Newer
1
...
49
50
51
52
53
54
55
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012