June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : riched20: Implement Expand for tomStory case.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 3357fdd70a1cfcbbe8b3ad7b41476f88f395bc09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3357fdd70a1cfcbbe8b3ad7b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 16:15:09 2015 +0300 riched20: Implement Expand for tomStory case. --- dlls/riched20/richole.c | 41 +++++++++++++++++--- dlls/riched20/tests/richole.c | 87 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 66faa6d..257ce7f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -909,6 +909,35 @@ static void textfont_cache_range_props(ITextFontImpl *font) } } +static HRESULT textrange_expand(ITextRange *range, LONG unit, LONG *delta) +{ + LONG expand_start, expand_end; + + switch (unit) + { + case tomStory: + expand_start = 0; + ITextRange_GetStoryLength(range, &expand_end); + break; + default: + FIXME("unit %d is not supported\n", unit); + return E_NOTIMPL; + } + + if (delta) { + LONG start, end; + + ITextRange_GetStart(range, &start); + ITextRange_GetEnd(range, &end); + *delta = expand_end - expand_start - (end - start); + } + + ITextRange_SetStart(range, expand_start); + ITextRange_SetEnd(range, expand_end); + + return S_OK; +} + static HRESULT WINAPI IRichEditOleImpl_inner_fnQueryInterface(IUnknown *iface, REFIID riid, LPVOID *ppvObj) { IRichEditOleImpl *This = impl_from_IUnknown(iface); @@ -1970,12 +1999,12 @@ static HRESULT WINAPI ITextRange_fnExpand(ITextRange *me, LONG unit, LONG *delta { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d %p): stub\n", This, unit, delta); + TRACE("(%p)->(%d %p)\n", This, unit, delta); if (!This->child.reole) return CO_E_RELEASED; - return E_NOTIMPL; + return textrange_expand(me, unit, delta); } static HRESULT WINAPI ITextRange_fnGetIndex(ITextRange *me, LONG unit, LONG *index) @@ -4494,14 +4523,16 @@ static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) return hres; } -static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG Unit, LONG *pDelta) +static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG unit, LONG *delta) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + + TRACE("(%p)->(%d %p)\n", This, unit, delta); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + return textrange_expand((ITextRange*)me, unit, delta); } static HRESULT WINAPI ITextSelection_fnGetIndex(ITextSelection *me, LONG Unit, LONG *pIndex) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index fd4d9e8..dd1e8a5 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -3251,6 +3251,92 @@ static void test_ITextSelection_GetDuplicate(void) ITextRange_Release(range); } +static void test_Expand(void) +{ + static const char test_text1[] = "TestSomeText"; + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + ITextSelection *selection; + ITextRange *range; + LONG value; + HRESULT hr; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, &selection); + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); + SendMessageA(hwnd, EM_SETSEL, 1, 2); + + hr = ITextDocument_Range(doc, 0, 4, &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextRange_Expand(range, tomStory, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 13, "got %d\n", value); + + hr = ITextSelection_Expand(selection, tomStory, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextSelection_GetStart(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + hr = ITextSelection_GetEnd(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 13, "got %d\n", value); + + hr = ITextRange_SetStart(range, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextRange_SetEnd(range, 2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextSelection_SetStart(selection, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ITextSelection_SetEnd(selection, 2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = 0; + hr = ITextRange_Expand(range, tomStory, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 12, "got %d\n", value); + hr = ITextRange_GetStart(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + hr = ITextRange_GetEnd(range, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 13, "got %d\n", value); + + value = 0; + hr = ITextSelection_Expand(selection, tomStory, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 12, "got %d\n", value); + hr = ITextSelection_GetStart(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 0, "got %d\n", value); + hr = ITextSelection_GetEnd(selection, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == 13, "got %d\n", value); + + release_interfaces(&hwnd, &reole, &doc, NULL); + + hr = ITextRange_Expand(range, tomStory, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextRange_Expand(range, tomStory, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_Expand(selection, tomStory, NULL); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + hr = ITextSelection_Expand(selection, tomStory, &value); + ok(hr == CO_E_RELEASED, "got 0x%08x\n", hr); + + ITextSelection_Release(selection); + ITextRange_Release(range); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -3286,4 +3372,5 @@ START_TEST(richole) test_InsertObject(); test_GetStoryLength(); test_ITextSelection_GetDuplicate(); + test_Expand(); }

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sgetc.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: b08d0bc75de8224b95d299b83290fcbc0b00c18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08d0bc75de8224b95d299b83… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 16 11:32:19 2015 +0200 msvcirt: Add implementation of streambuf::sgetc. --- dlls/msvcirt/msvcirt.c | 19 ++++++++++++++++-- dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 46 +++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 5 files changed, 68 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 8c05fe3..03db71c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -36,7 +36,7 @@ typedef struct { const vtable_ptr *vtable; int allocated; int unbuffered; - int unknown; + int stored_char; char *base; char *ebuf; char *pbase; @@ -98,7 +98,7 @@ streambuf* __thiscall streambuf_reserve_ctor(streambuf *this, char *buffer, int TRACE("(%p %p %d)\n", this, buffer, length); this->vtable = &MSVCP_streambuf_vtable; this->allocated = 0; - this->unknown = -1; + this->stored_char = EOF; this->do_lock = -1; this->base = NULL; streambuf_setbuf(this, buffer, length); @@ -480,6 +480,7 @@ int __thiscall streambuf_unbuffered_get(const streambuf *this) /* Unexported */ DEFINE_THISCALL_WRAPPER(streambuf_underflow, 4) +#define call_streambuf_underflow(this) CALL_VTBL_FUNC(this, 32, int, (streambuf*), (this)) int __thiscall streambuf_underflow(streambuf *this) { return EOF; @@ -513,6 +514,20 @@ int __thiscall streambuf_xsputn(streambuf *this, const char *data, int length) return 0; } +/* ?sgetc(a)streambuf@@QAEHXZ */ +/* ?sgetc(a)streambuf@@QEAAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_sgetc, 4) +int __thiscall streambuf_sgetc(streambuf *this) +{ + TRACE("(%p)\n", this); + if (this->unbuffered) { + if (this->stored_char == EOF) + this->stored_char = call_streambuf_underflow(this); + return this->stored_char; + } else + return call_streambuf_underflow(this); +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index c9f5c06..e879a7f 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -693,8 +693,8 @@ @ cdecl -arch=win64 ?setp(a)streambuf@@IEAAXPEAD0(a)Z(ptr ptr ptr) streambuf_setp @ stub -arch=win32 ?setrwbuf(a)stdiobuf@@QAEHHH(a)Z # int __thiscall stdiobuf::setrwbuf(int,int) @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z -@ stub -arch=win32 ?sgetc(a)streambuf@@QAEHXZ # int __thiscall streambuf::sgetc(void) -@ stub -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sgetc(a)streambuf@@QAEHXZ(ptr) streambuf_sgetc +@ cdecl -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ(ptr) streambuf_sgetc @ stub -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z # int __thiscall streambuf::sgetn(char *,int) @ stub -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z # @ extern ?sh_none(a)filebuf@@2HB # static int const filebuf::sh_none diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 1a6ce5d..7155740 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -28,7 +28,7 @@ typedef struct { const vtable_ptr *vtable; int allocated; int unbuffered; - int unknown; + int stored_char; char *base; char *ebuf; char *pbase; @@ -61,6 +61,7 @@ static void (*__thiscall p_streambuf_pbump)(streambuf*, int); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static void (*__thiscall p_streambuf_setlock)(streambuf*); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); +static int (*__thiscall p_streambuf_sgetc)(streambuf*); static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); @@ -145,6 +146,7 @@ static BOOL init(void) SET(p_streambuf_setb, "?setb(a)streambuf@@IEAAXPEAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UEAAPEAV1(a)PEADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QEAAXXZ"); + SET(p_streambuf_sgetc, "?sgetc(a)streambuf@@QEAAHXZ"); SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); } else { @@ -160,6 +162,7 @@ static BOOL init(void) SET(p_streambuf_setb, "?setb(a)streambuf@@IAEXPAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UAEPAV1(a)PADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QAEXXZ"); + SET(p_streambuf_sgetc, "?sgetc(a)streambuf@@QAEHXZ"); SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); } @@ -168,6 +171,18 @@ static BOOL init(void) return TRUE; } +static int underflow_count; + +#ifdef __i386__ +static int __thiscall test_streambuf_underflow(void) +#else +static int __thiscall test_streambuf_underflow(streambuf *this) +#endif +{ + underflow_count++; + return 'u'; +} + struct streambuf_lock_arg { streambuf *sb; @@ -197,6 +212,7 @@ static DWORD WINAPI lock_streambuf(void *arg) static void test_streambuf(void) { streambuf sb, sb2, sb3, *psb; + vtable_ptr test_streambuf_vtbl[11]; struct streambuf_lock_arg lock_arg; HANDLE thread; char reserve[16]; @@ -226,6 +242,12 @@ static void test_streambuf(void) ok(sb3.base == NULL, "wrong base pointer, expected %p got %p\n", NULL, sb3.base); ok(sb3.ebuf == NULL, "wrong ebuf pointer, expected %p got %p\n", NULL, sb3.ebuf); + memcpy(test_streambuf_vtbl, sb.vtable, sizeof(test_streambuf_vtbl)); + test_streambuf_vtbl[8] = (vtable_ptr)&test_streambuf_underflow; + sb2.vtable = test_streambuf_vtbl; + sb3.vtable = test_streambuf_vtbl; + underflow_count = 0; + /* setlock */ ok(sb.do_lock == -1, "expected do_lock value -1, got %d\n", sb.do_lock); call_func1(p_streambuf_setlock, &sb); @@ -386,6 +408,28 @@ static void test_streambuf(void) ret = (int) call_func1(p_streambuf_sync, &sb3); ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + /* sgetc */ + ret = (int) call_func1(p_streambuf_sgetc, &sb2); + ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(underflow_count == 1, "expected call to underflow\n"); + ok(sb2.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb2.stored_char); + sb2.gptr = sb2.eback; + *sb2.gptr = 'a'; + ret = (int) call_func1(p_streambuf_sgetc, &sb2); + ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(underflow_count == 2, "expected call to underflow\n"); + ok(sb2.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb2.stored_char); + sb2.gptr = sb2.egptr; + ret = (int) call_func1(p_streambuf_sgetc, &sb3); + ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(underflow_count == 3, "expected call to underflow\n"); + ok(sb3.stored_char == 'u', "wrong stored character, expected 'u' got %c\n", sb3.stored_char); + sb3.stored_char = 'b'; + ret = (int) call_func1(p_streambuf_sgetc, &sb3); + ok(ret == 'b', "expected 'b' got '%c'\n", ret); + ok(underflow_count == 3, "no call to underflow expected\n"); + ok(sb3.stored_char == 'b', "wrong stored character, expected 'b' got %c\n", sb3.stored_char); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 9d212fe..14846f3 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -681,8 +681,8 @@ @ cdecl -arch=win64 ?setp(a)streambuf@@IEAAXPEAD0(a)Z(ptr ptr ptr) msvcirt.?setp(a)streambuf@@IEAAXPEAD0(a)Z @ stub -arch=win32 ?setrwbuf(a)stdiobuf@@QAEHHH(a)Z @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z -@ stub -arch=win32 ?sgetc(a)streambuf@@QAEHXZ -@ stub -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sgetc(a)streambuf@@QAEHXZ(ptr) msvcirt.?sgetc(a)streambuf@@QAEHXZ +@ cdecl -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z @ stub -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z # @ extern ?sh_none(a)filebuf@@2HB diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index a1cabf9..c794b6e 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -753,8 +753,8 @@ @ cdecl -arch=win64 ?setp(a)streambuf@@IEAAXPEAD0(a)Z(ptr ptr ptr) msvcirt.?setp(a)streambuf@@IEAAXPEAD0(a)Z @ stub -arch=win32 ?setrwbuf(a)stdiobuf@@QAEHHH(a)Z @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z -@ stub -arch=win32 ?sgetc(a)streambuf@@QAEHXZ -@ stub -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ +@ thiscall -arch=win32 ?sgetc(a)streambuf@@QAEHXZ(ptr) msvcirt.?sgetc(a)streambuf@@QAEHXZ +@ cdecl -arch=win64 ?sgetc(a)streambuf@@QEAAHXZ(ptr) msvcirt.?sgetc(a)streambuf@@QEAAHXZ @ stub -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z @ stub -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z # @ extern ?sh_none(a)filebuf@@2HB

1 0

Nikolay Sivov : ole32: Fix a typo in argument name.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 4cef7ad841fe17b8a9fa879a99a802eacb7dae89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cef7ad841fe17b8a9fa879a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 22:43:23 2015 +0300 ole32: Fix a typo in argument name. --- dlls/ole32/usrmarshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 957338a..fe8ff4f 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -308,7 +308,7 @@ static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffe return pBuffer + sizeof(RemotableHandle); } -static void handle_UserFree(ULONG *pFlags, HANDLE *phMenu) +static void handle_UserFree(ULONG *pFlags, HANDLE *handle) { /* nothing to do */ }

1 0

Andrew Eikum : xaudio2_7: Move object creation to avoid forward declaration.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 9a8faf23adec6dc30eb13f7c9b80c92130ef185f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8faf23adec6dc30eb13f7c9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 16 14:41:11 2015 -0500 xaudio2_7: Move object creation to avoid forward declaration. --- dlls/xaudio2_7/xaudio_dll.c | 216 ++++++++++++++++++++++---------------------- 1 file changed, 107 insertions(+), 109 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 2aab45c..ef55dfd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -71,119 +71,10 @@ HRESULT WINAPI DllUnregisterServer(void) } typedef struct { - IClassFactory IClassFactory_iface; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, IUnknown **ppObj); -} IClassFactoryImpl; - -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) -{ - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); -} - -static HRESULT WINAPI XAudio2CF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) -{ - if(IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IClassFactory)) - { - IClassFactory_AddRef(iface); - *ppobj = iface; - return S_OK; - } - - *ppobj = NULL; - WARN("(%p)->(%s, %p): interface not found\n", iface, debugstr_guid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI XAudio2CF_AddRef(IClassFactory *iface) -{ - return 2; -} - -static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface) -{ - return 1; -} - -static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, - REFIID riid, void **ppobj) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - HRESULT hr; - IUnknown *punk; - - TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); - - *ppobj = NULL; - hr = This->pfnCreateInstance(pOuter, &punk); - if (FAILED(hr)) - return hr; - - hr = IUnknown_QueryInterface(punk, riid, ppobj); - IUnknown_Release(punk); - return hr; -} - -static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) -{ - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d): stub!\n", This, dolock); - return S_OK; -} - -static const IClassFactoryVtbl XAudio2CF_Vtbl = -{ - XAudio2CF_QueryInterface, - XAudio2CF_AddRef, - XAudio2CF_Release, - XAudio2CF_CreateInstance, - XAudio2CF_LockServer -}; - -typedef struct { IXAudio2 IXAudio2Impl_iface; LONG ref; } IXAudio2Impl; -static const struct IXAudio2Vtbl XAudio2_Vtbl; - -HRESULT XAudio2_create(IUnknown *pUnkOuter, IUnknown **ppObj) -{ - IXAudio2Impl *object; - - TRACE("(%p, %p)\n", pUnkOuter, ppObj); - - if(pUnkOuter) - return CLASS_E_NOAGGREGATION; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IXAudio2Impl)); - if(!object) - return E_OUTOFMEMORY; - - object->IXAudio2Impl_iface.lpVtbl = &XAudio2_Vtbl; - object->ref = 1; - - *ppObj = (IUnknown *)&object->IXAudio2Impl_iface; - - return S_OK; -} - -static IClassFactoryImpl xaudio2_cf = { { &XAudio2CF_Vtbl }, XAudio2_create }; - -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) -{ - IClassFactory *factory = NULL; - - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - - if(IsEqualGUID(rclsid, &CLSID_XAudio2)) { - factory = &xaudio2_cf.IClassFactory_iface; - } - if(!factory) return CLASS_E_CLASSNOTAVAILABLE; - - return IClassFactory_QueryInterface(factory, riid, ppv); -} - /*** IUnknown methods ***/ static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) { @@ -362,3 +253,110 @@ static const IXAudio2Vtbl XAudio2_Vtbl = IXAudio2Impl_GetPerformanceData, IXAudio2Impl_SetDebugConfiguration }; + +typedef struct { + IClassFactory IClassFactory_iface; + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, IUnknown **ppObj); +} IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + +static HRESULT WINAPI XAudio2CF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ + if(IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IClassFactory)) + { + IClassFactory_AddRef(iface); + *ppobj = iface; + return S_OK; + } + + *ppobj = NULL; + WARN("(%p)->(%s, %p): interface not found\n", iface, debugstr_guid(riid), ppobj); + return E_NOINTERFACE; +} + +static ULONG WINAPI XAudio2CF_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + HRESULT hr; + IUnknown *punk; + + TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + hr = This->pfnCreateInstance(pOuter, &punk); + if (FAILED(hr)) + return hr; + + hr = IUnknown_QueryInterface(punk, riid, ppobj); + IUnknown_Release(punk); + return hr; +} + +static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); + return S_OK; +} + +static const IClassFactoryVtbl XAudio2CF_Vtbl = +{ + XAudio2CF_QueryInterface, + XAudio2CF_AddRef, + XAudio2CF_Release, + XAudio2CF_CreateInstance, + XAudio2CF_LockServer +}; + +HRESULT XAudio2_create(IUnknown *pUnkOuter, IUnknown **ppObj) +{ + IXAudio2Impl *object; + + TRACE("(%p, %p)\n", pUnkOuter, ppObj); + + if(pUnkOuter) + return CLASS_E_NOAGGREGATION; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IXAudio2Impl)); + if(!object) + return E_OUTOFMEMORY; + + object->IXAudio2Impl_iface.lpVtbl = &XAudio2_Vtbl; + object->ref = 1; + + *ppObj = (IUnknown *)&object->IXAudio2Impl_iface; + + return S_OK; +} + +static IClassFactoryImpl xaudio2_cf = { { &XAudio2CF_Vtbl }, XAudio2_create }; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + IClassFactory *factory = NULL; + + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if(IsEqualGUID(rclsid, &CLSID_XAudio2)) { + factory = &xaudio2_cf.IClassFactory_iface; + } + if(!factory) return CLASS_E_CLASSNOTAVAILABLE; + + return IClassFactory_QueryInterface(factory, riid, ppv); +}

1 0

Qian Hong : winemenubuilder: Fix copy and paste error.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 2b6573ac3fb33b927cb4f6bfc196cbd2b43f0f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6573ac3fb33b927cb4f6bfc… Author: Qian Hong <qhong(a)codeweavers.com> Date: Wed Jun 17 02:13:07 2015 +0800 winemenubuilder: Fix copy and paste error. --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index bc1540b..76d8f3a 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1423,11 +1423,11 @@ end: static HKEY open_menus_reg_key(void) { - static const WCHAR Software_Wine_FileOpenAssociationsW[] = { + static const WCHAR Software_Wine_FileOpenMenuFilesW[] = { 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','M','e','n','u','F','i','l','e','s',0}; HKEY assocKey; DWORD ret; - ret = RegCreateKeyW(HKEY_CURRENT_USER, Software_Wine_FileOpenAssociationsW, &assocKey); + ret = RegCreateKeyW(HKEY_CURRENT_USER, Software_Wine_FileOpenMenuFilesW, &assocKey); if (ret == ERROR_SUCCESS) return assocKey; SetLastError(ret);

1 0

Nikolay Sivov : riched20/tests: Remove explicit todo flag values from static test data.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: bb82d669d1971aaac224e76e8e688a945ab44501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb82d669d1971aaac224e76e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 17:43:34 2015 +0300 riched20/tests: Remove explicit todo flag values from static test data. --- dlls/riched20/tests/editor.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9adc507..9528630 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4425,33 +4425,33 @@ struct exsetsel_s { LRESULT expected_retval; int expected_getsel_start; int expected_getsel_end; - int _getsel_todo_wine; + BOOL todo; }; static const struct exsetsel_s exsetsel_tests[] = { /* sanity tests */ - {5, 10, 10, 5, 10, 0}, - {15, 17, 17, 15, 17, 0}, + {5, 10, 10, 5, 10 }, + {15, 17, 17, 15, 17 }, /* test cpMax > strlen() */ - {0, 100, 18, 0, 18, 0}, + {0, 100, 18, 0, 18 }, /* test cpMin < 0 && cpMax >= 0 after cpMax > strlen() */ - {-1, 1, 17, 17, 17, 0}, + {-1, 1, 17, 17, 17 }, /* test cpMin == cpMax */ - {5, 5, 5, 5, 5, 0}, + {5, 5, 5, 5, 5 }, /* test cpMin < 0 && cpMax >= 0 (bug 4462) */ - {-1, 0, 5, 5, 5, 0}, - {-1, 17, 5, 5, 5, 0}, - {-1, 18, 5, 5, 5, 0}, + {-1, 0, 5, 5, 5 }, + {-1, 17, 5, 5, 5 }, + {-1, 18, 5, 5, 5 }, /* test cpMin < 0 && cpMax < 0 */ - {-1, -1, 17, 17, 17, 0}, - {-4, -5, 17, 17, 17, 0}, + {-1, -1, 17, 17, 17 }, + {-4, -5, 17, 17, 17 }, /* test cpMin >=0 && cpMax < 0 (bug 6814) */ - {0, -1, 18, 0, 18, 0}, - {17, -5, 18, 17, 18, 0}, - {18, -3, 17, 17, 17, 0}, + {0, -1, 18, 0, 18 }, + {17, -5, 18, 17, 18 }, + {18, -3, 17, 17, 17 }, /* test if cpMin > cpMax */ - {15, 19, 18, 15, 18, 0}, - {19, 15, 18, 15, 18, 0}, + {15, 19, 18, 15, 18 }, + {19, 15, 18, 15, 18 }, /* cpMin == strlen() && cpMax > cpMin */ {17, 18, 18, 17, 18 }, {17, 50, 18, 17, 18 }, @@ -4470,7 +4470,7 @@ static void check_EM_EXSETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); - if (setsel->_getsel_todo_wine) { + if (setsel->todo) { todo_wine { ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_EXSETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); } @@ -4507,7 +4507,7 @@ static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); - if (setsel->_getsel_todo_wine) { + if (setsel->todo) { todo_wine { ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); }

1 0

Andrew Eikum : xaudio2_7: Simplify object creation.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: bb26db72337dec092a43bd1c63fc16c0fd816c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb26db72337dec092a43bd1c6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 16 14:41:16 2015 -0500 xaudio2_7: Simplify object creation. --- dlls/xaudio2_7/xaudio_dll.c | 64 ++++++++++++++------------------------------- 1 file changed, 19 insertions(+), 45 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index ef55dfd..9bc8999 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -71,14 +71,14 @@ HRESULT WINAPI DllUnregisterServer(void) } typedef struct { - IXAudio2 IXAudio2Impl_iface; + IXAudio2 IXAudio2_iface; LONG ref; } IXAudio2Impl; /*** IUnknown methods ***/ static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) { - return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2Impl_iface); + return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2_iface); } static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, void **ppvObject) @@ -254,16 +254,6 @@ static const IXAudio2Vtbl XAudio2_Vtbl = IXAudio2Impl_SetDebugConfiguration }; -typedef struct { - IClassFactory IClassFactory_iface; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, IUnknown **ppObj); -} IClassFactoryImpl; - -static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) -{ - return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); -} - static HRESULT WINAPI XAudio2CF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { if(IsEqualGUID(riid, &IID_IUnknown) @@ -292,26 +282,31 @@ static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface) static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hr; - IUnknown *punk; + IXAudio2Impl *object; - TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); + TRACE("(static)->(%p,%s,%p)\n", pOuter, debugstr_guid(riid), ppobj); *ppobj = NULL; - hr = This->pfnCreateInstance(pOuter, &punk); - if (FAILED(hr)) - return hr; - hr = IUnknown_QueryInterface(punk, riid, ppobj); - IUnknown_Release(punk); + if(pOuter) + return CLASS_E_NOAGGREGATION; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if(!object) + return E_OUTOFMEMORY; + + object->IXAudio2_iface.lpVtbl = &XAudio2_Vtbl; + + hr = IXAudio2_QueryInterface(&object->IXAudio2_iface, riid, ppobj); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, object); return hr; } static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = impl_from_IClassFactory(iface); - FIXME("(%p)->(%d): stub!\n", This, dolock); + FIXME("(static)->(%d): stub!\n", dolock); return S_OK; } @@ -324,28 +319,7 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl = XAudio2CF_LockServer }; -HRESULT XAudio2_create(IUnknown *pUnkOuter, IUnknown **ppObj) -{ - IXAudio2Impl *object; - - TRACE("(%p, %p)\n", pUnkOuter, ppObj); - - if(pUnkOuter) - return CLASS_E_NOAGGREGATION; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IXAudio2Impl)); - if(!object) - return E_OUTOFMEMORY; - - object->IXAudio2Impl_iface.lpVtbl = &XAudio2_Vtbl; - object->ref = 1; - - *ppObj = (IUnknown *)&object->IXAudio2Impl_iface; - - return S_OK; -} - -static IClassFactoryImpl xaudio2_cf = { { &XAudio2CF_Vtbl }, XAudio2_create }; +static IClassFactory xaudio2_cf = { &XAudio2CF_Vtbl }; HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { @@ -354,7 +328,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(rclsid, &CLSID_XAudio2)) { - factory = &xaudio2_cf.IClassFactory_iface; + factory = &xaudio2_cf; } if(!factory) return CLASS_E_CLASSNOTAVAILABLE;

1 0

André Hentschel : ntdll: Set platform register x18 to TEB on ARM64.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: aa139d3e86402ea98fc930d9fc78634b1c000700 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa139d3e86402ea98fc930d9f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 16 22:10:17 2015 +0200 ntdll: Set platform register x18 to TEB on ARM64. --- dlls/ntdll/signal_arm64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index f5c62d1..bd91d81 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -799,6 +799,10 @@ void signal_init_thread( TEB *teb ) pthread_key_create( &teb_key, NULL ); init_done = TRUE; } + + /* Win64/ARM applications expect the TEB pointer to be in the x18 platform register. */ + __asm__ __volatile__( "mov x18, %0" : : "r" (teb) ); + pthread_setspecific( teb_key, teb ); }

1 0

Andrew Eikum : xaudio2_7: Wrap long lines.
by Alexandre Julliard June 17, 2015

June 17, 2015

Module: wine Branch: master Commit: 4f88c63f789cc46358943a6441be4496acd552f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f88c63f789cc46358943a644… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jun 16 14:41:19 2015 -0500 xaudio2_7: Wrap long lines. --- dlls/xaudio2_7/xaudio_dll.c | 56 +++++++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 9bc8999..346e15d 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -81,7 +81,8 @@ static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2_iface); } -static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, void **ppvObject) +static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, + void **ppvObject) { IXAudio2Impl *This = impl_from_IXAudio2(iface); @@ -125,7 +126,8 @@ static ULONG WINAPI IXAudio2Impl_Release(IXAudio2 *iface) } /*** IXAudio2 methods ***/ -static HRESULT WINAPI IXAudio2Impl_GetDeviceCount(IXAudio2 *iface, UINT32 *pCount) +static HRESULT WINAPI IXAudio2Impl_GetDeviceCount(IXAudio2 *iface, + UINT32 *pCount) { IXAudio2Impl *This = impl_from_IXAudio2(iface); @@ -134,7 +136,8 @@ static HRESULT WINAPI IXAudio2Impl_GetDeviceCount(IXAudio2 *iface, UINT32 *pCoun return E_NOTIMPL; } -static HRESULT WINAPI IXAudio2Impl_GetDeviceDetails(IXAudio2 *iface, UINT32 index, XAUDIO2_DEVICE_DETAILS *pDeviceDetails) +static HRESULT WINAPI IXAudio2Impl_GetDeviceDetails(IXAudio2 *iface, + UINT32 index, XAUDIO2_DEVICE_DETAILS *pDeviceDetails) { IXAudio2Impl *This = impl_from_IXAudio2(iface); @@ -143,7 +146,8 @@ static HRESULT WINAPI IXAudio2Impl_GetDeviceDetails(IXAudio2 *iface, UINT32 inde return E_NOTIMPL; } -static HRESULT WINAPI IXAudio2Impl_Initialize(IXAudio2 *iface, UINT32 flags, XAUDIO2_PROCESSOR processor) +static HRESULT WINAPI IXAudio2Impl_Initialize(IXAudio2 *iface, UINT32 flags, + XAUDIO2_PROCESSOR processor) { IXAudio2Impl *This = impl_from_IXAudio2(iface); @@ -152,7 +156,8 @@ static HRESULT WINAPI IXAudio2Impl_Initialize(IXAudio2 *iface, UINT32 flags, XAU return S_OK; } -static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, IXAudio2EngineCallback *pCallback) +static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, + IXAudio2EngineCallback *pCallback) { IXAudio2Impl *This = impl_from_IXAudio2(iface); @@ -161,36 +166,53 @@ static HRESULT WINAPI IXAudio2Impl_RegisterForCallbacks(IXAudio2 *iface, IXAudio return E_NOTIMPL; } -static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface, IXAudio2EngineCallback *pCallback) +static void WINAPI IXAudio2Impl_UnregisterForCallbacks(IXAudio2 *iface, + IXAudio2EngineCallback *pCallback) { IXAudio2Impl *This = impl_from_IXAudio2(iface); FIXME("(%p)->(%p): stub!\n", This, pCallback); } -static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, IXAudio2SourceVoice **ppSourceVoice, const WAVEFORMATEX *pSourceFormat, UINT32 flags, float maxFrequencyRatio, IXAudio2VoiceCallback *pCallback, const XAUDIO2_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) +static HRESULT WINAPI IXAudio2Impl_CreateSourceVoice(IXAudio2 *iface, + IXAudio2SourceVoice **ppSourceVoice, const WAVEFORMATEX *pSourceFormat, + UINT32 flags, float maxFrequencyRatio, + IXAudio2VoiceCallback *pCallback, const XAUDIO2_VOICE_SENDS *pSendList, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(%p, %p, %u, %f, %p, %p, %p): stub!\n", This, ppSourceVoice, pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, pEffectChain); + FIXME("(%p)->(%p, %p, %u, %f, %p, %p, %p): stub!\n", This, ppSourceVoice, + pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, + pEffectChain); return E_NOTIMPL; } -static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, IXAudio2SubmixVoice **ppSubmixVoice, UINT32 inputChannels, UINT32 inputSampleRate, UINT32 flags, UINT32 processingStage, const XAUDIO2_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) +static HRESULT WINAPI IXAudio2Impl_CreateSubmixVoice(IXAudio2 *iface, + IXAudio2SubmixVoice **ppSubmixVoice, UINT32 inputChannels, + UINT32 inputSampleRate, UINT32 flags, UINT32 processingStage, + const XAUDIO2_VOICE_SENDS *pSendList, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(%p, %u, %u, %u, %u, %p, %p): stub!\n", This, ppSubmixVoice, inputChannels, inputSampleRate, flags, processingStage, pSendList, pEffectChain); + FIXME("(%p)->(%p, %u, %u, %u, %u, %p, %p): stub!\n", This, ppSubmixVoice, + inputChannels, inputSampleRate, flags, processingStage, pSendList, + pEffectChain); return E_NOTIMPL; } -static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, IXAudio2MasteringVoice **ppMasteringVoice, UINT32 inputChannels, UINT32 inputSampleRate, UINT32 flags, UINT32 deviceIndex, const XAUDIO2_EFFECT_CHAIN *pEffectChain) +static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, + IXAudio2MasteringVoice **ppMasteringVoice, UINT32 inputChannels, + UINT32 inputSampleRate, UINT32 flags, UINT32 deviceIndex, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(%p, %u, %u, %u, %u, %p): stub!\n", This, ppMasteringVoice, inputChannels, inputSampleRate, flags, deviceIndex, pEffectChain); + FIXME("(%p)->(%p, %u, %u, %u, %u, %p): stub!\n", This, ppMasteringVoice, + inputChannels, inputSampleRate, flags, deviceIndex, pEffectChain); return S_OK; } @@ -211,7 +233,8 @@ static void WINAPI IXAudio2Impl_StopEngine(IXAudio2 *iface) FIXME("(%p)->(): stub!\n", This); } -static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, UINT32 operationSet) +static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, + UINT32 operationSet) { IXAudio2Impl *This = impl_from_IXAudio2(iface); @@ -220,14 +243,17 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, UINT32 operati return E_NOTIMPL; } -static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, XAUDIO2_PERFORMANCE_DATA *pPerfData) +static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, + XAUDIO2_PERFORMANCE_DATA *pPerfData) { IXAudio2Impl *This = impl_from_IXAudio2(iface); FIXME("(%p)->(%p): stub!\n", This, pPerfData); } -static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, const XAUDIO2_DEBUG_CONFIGURATION *pDebugConfiguration, void *pReserved) +static void WINAPI IXAudio2Impl_SetDebugConfiguration(IXAudio2 *iface, + const XAUDIO2_DEBUG_CONFIGURATION *pDebugConfiguration, + void *pReserved) { IXAudio2Impl *This = impl_from_IXAudio2(iface);

1 0

Hugh McMaster : regsvr32: Move / i command line code to a separate function.
by Alexandre Julliard June 16, 2015

June 16, 2015

Module: wine Branch: master Commit: 00c13a20a6a078aa9582c7c2523d9d9591ef0011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c13a20a6a078aa9582c7c25… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 15 21:46:06 2015 +1000 regsvr32: Move /i command line code to a separate function. --- programs/regsvr32/regsvr32.c | 70 +++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 624acd6..e048b30 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -202,6 +202,37 @@ static int InstallDll(BOOL install, char *strDll, WCHAR *command_line) return 0; } +static WCHAR *parse_command_line(char *command_line) +{ + WCHAR *ret = NULL; + + if (command_line[0] == ':' && command_line[1]) + { + int len = strlen(command_line); + + command_line++; + len--; + /* remove double quotes */ + if (command_line[0] == '"') + { + command_line++; + len--; + if (command_line[0]) + { + len--; + command_line[len] = 0; + } + } + if (command_line[0]) + { + len = MultiByteToWideChar(CP_ACP, 0, command_line, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ret) MultiByteToWideChar(CP_ACP, 0, command_line, -1, ret, len); + } + } + return ret; +} + int main(int argc, char* argv[]) { int i; @@ -227,45 +258,10 @@ int main(int argc, char* argv[]) Silent = TRUE; else if ((!strncasecmp(argv[i], "/i", strlen("/i")))||(!strncasecmp(argv[i], "-i", strlen("-i")))) { - CHAR* command_line = argv[i] + strlen("/i"); - CallInstall = TRUE; - if (command_line[0] == ':' && command_line[1]) - { - int len = strlen(command_line); - - command_line++; - len--; - /* remove double quotes */ - if (command_line[0] == '"') - { - command_line++; - len--; - if (command_line[0]) - { - len--; - command_line[len] = 0; - } - } - if (command_line[0]) - { - len = MultiByteToWideChar(CP_ACP, 0, command_line, -1, - NULL, 0); - wsCommandLine = HeapAlloc(GetProcessHeap(), 0, - len * sizeof(WCHAR)); - if (wsCommandLine) - MultiByteToWideChar(CP_ACP, 0, command_line, -1, - wsCommandLine, len); - } - else - { - wsCommandLine = EmptyLine; - } - } - else - { + wsCommandLine = parse_command_line(argv[i] + strlen("/i")); + if (!wsCommandLine) wsCommandLine = EmptyLine; - } } else if((!strcasecmp(argv[i], "/n"))||(!strcasecmp(argv[i], "-n"))) CallRegister = FALSE;

1 0