January 2013 - Wine-Commits

André Hentschel : include: Add ARM64 context.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: a431f83ec1a253ede1f7382fa7467b46bce0d29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a431f83ec1a253ede1f7382fa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:41:25 2013 +0100 include: Add ARM64 context. --- include/winnt.h | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 467b427..f2bf990 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1672,6 +1672,75 @@ typedef struct _CONTEXT { #endif /* __arm__ */ +#ifdef __aarch64__ +/* + * FIXME: + * + * There is not yet an official CONTEXT structure defined for the AArch64 + * architecture, so I just made one up. + * + */ + +#define CONTEXT_ARM64 0x2000000 +#define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x00000001) +#define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x00000002) +#define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x00000004) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) + +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + +typedef struct _CONTEXT { + ULONG ContextFlags; + + /* This section is specified/returned if the ContextFlags word contains + the flag CONTEXT_INTEGER. */ + ULONGLONG X0; + ULONGLONG X1; + ULONGLONG X2; + ULONGLONG X3; + ULONGLONG X4; + ULONGLONG X5; + ULONGLONG X6; + ULONGLONG X7; + ULONGLONG X8; + ULONGLONG X9; + ULONGLONG X10; + ULONGLONG X11; + ULONGLONG X12; + ULONGLONG X13; + ULONGLONG X14; + ULONGLONG X15; + ULONGLONG X16; + ULONGLONG X17; + ULONGLONG X18; + ULONGLONG X19; + ULONGLONG X20; + ULONGLONG X21; + ULONGLONG X22; + ULONGLONG X23; + ULONGLONG X24; + ULONGLONG X25; + ULONGLONG X26; + ULONGLONG X27; + ULONGLONG X28; + ULONGLONG X29; + ULONGLONG X30; + + /* These are selected by CONTEXT_CONTROL */ + ULONGLONG Sp; + ULONGLONG Pc; + ULONGLONG PState; + + /* These are selected by CONTEXT_FLOATING_POINT */ + /* FIXME */ +} CONTEXT; + +#endif /* __aarch64__ */ + /* Mips context definitions */ #if defined(_MIPS_) || defined(__MIPS__) || defined(__mips__) @@ -2449,6 +2518,7 @@ typedef struct _IMAGE_VXD_HEADER { /* Wine extension */ #define IMAGE_FILE_MACHINE_SPARC 0x2000 +#define IMAGE_FILE_MACHINE_ARM64 0x01c5 #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56

1 0

André Hentschel : widl: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 3ea316638dc79ba031aadeb7a3c992c1c3235cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea316638dc79ba031aadeb7a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:44:33 2013 +0100 widl: Add ARM64 support. --- tools/widl/widl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1718247..5626d13 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -266,7 +266,8 @@ static void set_target( const char *target ) { "sparc", SYS_WIN32 }, { "alpha", SYS_WIN32 }, { "powerpc", SYS_WIN32 }, - { "arm", SYS_WIN32 } + { "arm", SYS_WIN32 }, + { "aarch64", SYS_WIN64 } }; unsigned int i;

1 0

André Hentschel : wrc: Add ARM64 support.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 198b70cb9d6f144be83d96a1912dc3b5799988c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=198b70cb9d6f144be83d96a19… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:45:06 2013 +0100 wrc: Add ARM64 support. --- tools/wrc/wrc.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 7d5ad89..ac1fdcc 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -318,7 +318,8 @@ static void set_target( const char *target ) /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ if (!(p = strchr( cpu, '-' ))) error( "Invalid target specification '%s'\n", target ); *p = 0; - if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || !strcmp( cpu, "ia64" )) + if (!strcmp( cpu, "amd64" ) || !strcmp( cpu, "x86_64" ) || + !strcmp( cpu, "ia64" ) || !strcmp( cpu, "aarch64" )) pointer_size = 8; else pointer_size = 4;

1 0

André Hentschel : libport: Implemented the interlocked_cmpxchg128 function for ARM64.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: c2ef2edf850a4cf27cae53b1664d1a40e80eb8e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ef2edf850a4cf27cae53b16… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 16 00:42:12 2013 +0100 libport: Implemented the interlocked_cmpxchg128 function for ARM64. --- libs/port/interlocked.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/libs/port/interlocked.c b/libs/port/interlocked.c index eb14daa..143d226 100644 --- a/libs/port/interlocked.c +++ b/libs/port/interlocked.c @@ -313,6 +313,28 @@ __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compare ) return compare; } +#ifdef __aarch64__ +int interlocked_cmpxchg128( __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + int retv; + pthread_mutex_lock( &interlocked_mutex ); + if (dest[0] == compare[0] && dest[1] == compare[1]) + { + dest[0] = xchg_low; + dest[1] = xchg_high; + retv = 1; + } + else + { + compare[0] = dest[0]; + compare[1] = dest[1]; + retv = 0; + } + pthread_mutex_unlock( &interlocked_mutex ); + return retv; +} +#endif + int interlocked_xchg( int *dest, int val ) { int retv;

1 0

Rico Schüller : d3dx9: Add support for D3DFMT_A32B32G32R32F.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 25ce3a42204ab43850ee92fab133ea42f288f1b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ce3a42204ab43850ee92fab… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 15 19:25:26 2013 +0100 d3dx9: Add support for D3DFMT_A32B32G32R32F. --- dlls/d3dx9_36/d3dx9_36_private.h | 1 + dlls/d3dx9_36/tests/texture.c | 4 ++-- dlls/d3dx9_36/texture.c | 8 +++++--- dlls/d3dx9_36/util.c | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 01bfbbe..85f0871 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -48,6 +48,7 @@ struct volume enum format_type { FORMAT_ARGB, /* unsigned */ FORMAT_ARGBF16,/* float 16 */ + FORMAT_ARGBF, /* float */ FORMAT_DXT, FORMAT_UNKNOWN }; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 968a8db..28fb47e 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1101,7 +1101,7 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) { hr = D3DXFillTexture(tex, fillfunc, NULL); - todo_wine ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "D3DXFillTexture returned %#x, expected %#x\n", hr, D3D_OK); hr = IDirect3DTexture9_LockRect(tex, 0, &lock_rect, NULL, D3DLOCK_READONLY); if (SUCCEEDED(hr)) @@ -1124,7 +1124,7 @@ static void test_D3DXFillTexture(IDirect3DDevice9 *device) expected.z = 1.0f / 4.0f; expected.w = 1.0f; - todo_wine expect_vec4(&expected, &got); + expect_vec4(&expected, &got); } } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 7323852..9e45506 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1236,6 +1236,8 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po if (format->type == FORMAT_ARGBF16) v = float_32_to_16(comp_value); + else if (format->type == FORMAT_ARGBF) + v = *(DWORD *)&comp_value; else if (format->type == FORMAT_ARGB) v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; else @@ -1282,7 +1284,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1649,7 +1651,7 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; @@ -1708,7 +1710,7 @@ HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LP return D3DERR_INVALIDCALL; format = get_format_info(desc.Format); - if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16) + if (format->type != FORMAT_ARGB && format->type != FORMAT_ARGBF16 && format->type != FORMAT_ARGBF) { FIXME("Unsupported texture format %#x\n", desc.Format); return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 264581c..6d8d152 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -71,6 +71,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_DXT4, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_DXT5, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_DXT, NULL, NULL }, {D3DFMT_A16B16G16R16F, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGBF16, NULL, NULL }, + {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96, 0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF, NULL, NULL }, /* marks last element */ {D3DFMT_UNKNOWN, { 0, 0, 0, 0}, { 0, 0, 0, 0}, 0, 1, 1, 0, FORMAT_UNKNOWN, NULL, NULL }, };

1 0

Rico Schüller : d3dx9: Add support for D3DFMT_A16B16G16R16.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 7c5517da6f8cc4a81b6760c5bce91eeed20e6ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5517da6f8cc4a81b6760c5b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jan 15 19:25:45 2013 +0100 d3dx9: Add support for D3DFMT_A16B16G16R16. --- dlls/d3dx9_36/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 6d8d152..9ba54e2 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -59,6 +59,7 @@ static const struct pixel_format_desc formats[] = {D3DFMT_X4R4G4B4, { 0, 4, 4, 4}, { 0, 8, 4, 0}, 2, 1, 1, 2, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A2R10G10B10, { 2, 10, 10, 10}, {30, 20, 10, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A2B10G10R10, { 2, 10, 10, 10}, {30, 0, 10, 20}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, + {D3DFMT_A16B16G16R16, {16, 16, 16, 16}, {48, 0, 16, 32}, 8, 1, 1, 8, FORMAT_ARGB, NULL, NULL }, {D3DFMT_G16R16, { 0, 16, 16, 0}, { 0, 0, 16, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8, { 8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8L8, { 8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba},

1 0

Andrew Talbot : dsound: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 7805ff3291d19e1b4edd27ed113f913b6cb07c56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7805ff3291d19e1b4edd27ed1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 22:27:02 2013 +0000 dsound: Avoid signed-unsigned integer comparisons. --- dlls/dsound/primary.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index dd810fd..0bfd5667 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -262,7 +262,7 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) { IDirectSoundBufferImpl** dsb = device->buffers; LPBYTE newbuf; - DWORD i; + int i; TRACE("(%p)\n", device);

1 0

Henri Verbeet : ddraw: Update DefaultSurfaceType if we had to fallback to a wined3d object without 3D support .
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 56b256cb774efb3842cc15e945f878b63da5288e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b256cb774efb3842cc15e94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 16 08:51:48 2013 +0100 ddraw: Update DefaultSurfaceType if we had to fallback to a wined3d object without 3D support. --- dlls/ddraw/ddraw.c | 10 ++++++++-- dlls/ddraw/main.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a04de34..32f9c5a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5243,6 +5243,7 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) { + DWORD flags; HRESULT hr; ddraw->IDirectDraw7_iface.lpVtbl = &ddraw7_vtbl; @@ -5257,15 +5258,20 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) + flags = WINED3D_LEGACY_DEPTH_BIAS; + if (DefaultSurfaceType != WINED3D_SURFACE_TYPE_OPENGL) + flags |= WINED3D_NO3D; + + if (!(ddraw->wined3d = wined3d_create(7, flags))) { - if (!(ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + if ((flags & WINED3D_NO3D) || !(ddraw->wined3d = wined3d_create(7, flags | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; } WARN("Created a wined3d object without 3D support.\n"); + DefaultSurfaceType = WINED3D_SURFACE_TYPE_GDI; } hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e79b471..819dc7f 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -371,6 +371,7 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA callback, void *context) HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags) { struct wined3d *wined3d; + DWORD wined3d_flags; TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags); @@ -382,16 +383,21 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex if (flags) FIXME("flags 0x%08x not handled\n", flags); + wined3d_flags = WINED3D_LEGACY_DEPTH_BIAS; + if (DefaultSurfaceType != WINED3D_SURFACE_TYPE_OPENGL) + wined3d_flags |= WINED3D_NO3D; + TRACE("Enumerating ddraw interfaces\n"); - if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS))) + if (!(wined3d = wined3d_create(7, wined3d_flags))) { - if (!(wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS | WINED3D_NO3D))) + if ((wined3d_flags & WINED3D_NO3D) || !(wined3d = wined3d_create(7, wined3d_flags | WINED3D_NO3D))) { WARN("Failed to create a wined3d object.\n"); return E_FAIL; } WARN("Created a wined3d object without 3D support.\n"); + DefaultSurfaceType = WINED3D_SURFACE_TYPE_GDI; } __TRY

1 0

Nikolay Sivov : xmllite: Added IXmlResolver definition.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 6d2caffd194dbe46baa69b1ed8216d44bd58cee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2caffd194dbe46baa69b1ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 16 11:33:00 2013 +0400 xmllite: Added IXmlResolver definition. --- include/xmllite.idl | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/xmllite.idl b/include/xmllite.idl index c1c0b88..7547d1a 100644 --- a/include/xmllite.idl +++ b/include/xmllite.idl @@ -78,6 +78,21 @@ interface IXmlReader : IUnknown BOOL IsEOF(void); } +/* IXmlResolver */ +[ + local, + object, + uuid(7279fc82-709d-4095-b63d-69fe4b0d9030), + pointer_default(unique) +] +interface IXmlResolver : IUnknown +{ + HRESULT ResolveUri([in] LPCWSTR base_uri, + [in] LPCWSTR public_id, + [in] LPCWSTR system_id, + [out] IUnknown **input); +} + /* IXmlReader state */ typedef enum XmlReadState {

1 0

Andrew Talbot : dmusic: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 16, 2013

Jan. 16, 2013

Module: wine Branch: master Commit: 00f85d7fc335a748360299f585b412164ac69bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f85d7fc335a748360299f58… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 15 22:26:59 2013 +0000 dmusic: Avoid signed-unsigned integer comparisons. --- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/port.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index bdefe3a..0c2584f 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -316,7 +316,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) MIDIINCAPSW caps_in; IDirectMusicSynth8* synth; HRESULT hr; - int i; + ULONG i; TRACE("(%p)\n", object); diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 55d0dad..459fdb8 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -251,7 +251,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT ULONG offset; ULONG nb_regions; ULONG size; - int i; + ULONG i; TRACE("(%p/%p)->(%p, %p, %p, %d)\n", iface, This, instrument, downloaded_instrument, note_ranges, num_note_ranges); @@ -684,7 +684,7 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou { SynthPortImpl *obj; HRESULT hr = E_FAIL; - UINT i; + int i; TRACE("(%p,%p,%p,%p,%p%d)\n", guid, object, unkouter, port_params, port_caps, device);

1 0