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

Nikolay Sivov : amstream: Implement GetDirectDraw().
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: eb0b1d55e41f24f0159ed0582b182bb415e0c23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0b1d55e41f24f0159ed0582… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 23:52:08 2015 +0300 amstream: Implement GetDirectDraw(). --- dlls/amstream/Makefile.in | 2 +- dlls/amstream/mediastream.c | 21 ++++++++++++++++++--- dlls/amstream/tests/amstream.c | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 1107223..c00822b 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -1,5 +1,5 @@ MODULE = amstream.dll -IMPORTS = strmiids strmbase uuid ole32 advapi32 +IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw C_SRCS = \ amstream.c \ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 4a8c19b..1a31706 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -42,6 +42,7 @@ typedef struct { IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; + IDirectDraw7 *ddraw; } DirectDrawMediaStreamImpl; static inline DirectDrawMediaStreamImpl *impl_from_DirectDrawMediaStream_IAMMediaStream(IAMMediaStream *iface) @@ -94,7 +95,11 @@ static ULONG WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_Release(IAMMediaStr TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); if (!ref) + { + if (This->ddraw) + IDirectDraw7_Release(This->ddraw); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -373,11 +378,21 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_SetFormat } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMediaStream *iface, - IDirectDraw **ppDirectDraw) + IDirectDraw **ddraw) { - FIXME("(%p)->(%p) stub!\n", iface, ppDirectDraw); + DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, ddraw); + + *ddraw = NULL; + if (!This->ddraw) + { + HRESULT hr = DirectDrawCreateEx(NULL, (void**)&This->ddraw, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + return hr; + } + + return IDirectDraw7_QueryInterface(This->ddraw, &IID_IDirectDraw, (void**)ddraw); } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a8986a6..b961084 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -458,6 +458,8 @@ static void test_IDirectDrawStreamSample(void) IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; IDirectDrawSurface *surface, *surface2; + IDirectDraw *ddraw, *ddraw2; + IDirectDraw7 *ddraw7; RECT rect; if (!(pams = create_ammultimediastream())) @@ -482,6 +484,20 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); if (FAILED(hr)) goto error; + hr = IDirectDrawMediaStream_GetDirectDraw(pddstream, &ddraw); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(pddstream, &ddraw2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ddraw == ddraw2, "got %p, %p\n", ddraw, ddraw2); + + hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void**)&ddraw7); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDirectDraw7_Release(ddraw7); + + IDirectDraw_Release(ddraw2); + IDirectDraw_Release(ddraw); + hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : amstream: Forward IUnknown methods to IAMMediaStream for streams.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 147068453983bd1211e51251eaf885796fbc0e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=147068453983bd1211e51251e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 23 10:09:08 2015 +0300 amstream: Forward IUnknown methods to IAMMediaStream for streams. --- dlls/amstream/mediastream.c | 72 +++++---------------------------------------- 1 file changed, 8 insertions(+), 64 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 1a31706..ca4f0ce 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -247,48 +247,22 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_QueryInte REFIID riid, void **ret_iface) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); - - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMediaStream) || - IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) - { - IDirectDrawMediaStream_AddRef(iface); - *ret_iface = iface; - return S_OK; - } - else if (IsEqualGUID(riid, &IID_IAMMediaStream)) - { - IDirectDrawMediaStream_AddRef(iface); - *ret_iface = &This->IAMMediaStream_iface; - return S_OK; - } - - ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ret_iface); - return E_NOINTERFACE; + return IAMMediaStream_QueryInterface(&This->IAMMediaStream_iface, riid, ret_iface); } static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_AddRef(IDirectDrawMediaStream *iface) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - TRACE("(%p/%p)\n", iface, This); - - return InterlockedIncrement(&This->ref); + return IAMMediaStream_AddRef(&This->IAMMediaStream_iface); } static ULONG WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_Release(IDirectDrawMediaStream *iface) { DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p)\n", iface, This); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + return IAMMediaStream_Release(&This->IAMMediaStream_iface); } /*** IMediaStream methods ***/ @@ -673,52 +647,22 @@ static HRESULT WINAPI AudioMediaStreamImpl_IAudioMediaStream_QueryInterface(IAud REFIID riid, void **ret_iface) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); - - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMediaStream) || - IsEqualGUID(riid, &IID_IAudioMediaStream)) - { - IAudioMediaStream_AddRef(iface); - *ret_iface = iface; - return S_OK; - } - else if (IsEqualGUID(riid, &IID_IAMMediaStream)) - { - IAudioMediaStream_AddRef(iface); - *ret_iface = &This->IAMMediaStream_iface; - return S_OK; - } - - - *ret_iface = NULL; - - ERR("(%p/%p)->(%s,%p),not found\n", iface, This, debugstr_guid(riid), ret_iface); - return E_NOINTERFACE; + return IAMMediaStream_QueryInterface(&This->IAMMediaStream_iface, riid, ret_iface); } static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_AddRef(IAudioMediaStream *iface) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p/%p): new ref = %u\n", iface, This, ref); - - return ref; + TRACE("(%p/%p)\n", iface, This); + return IAMMediaStream_AddRef(&This->IAMMediaStream_iface); } static ULONG WINAPI AudioMediaStreamImpl_IAudioMediaStream_Release(IAudioMediaStream *iface) { AudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p/%p): new ref = %u\n", iface, This, ref); - - if (!ref) - HeapFree(GetProcessHeap(), 0, This); - - return ref; + TRACE("(%p/%p)\n", iface, This); + return IAMMediaStream_Release(&This->IAMMediaStream_iface); } /*** IMediaStream methods ***/

1 0

Alistair Leslie-Hughes : dpnet: Correct adding components in Duplicate.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 275364d919e35da8261644eece44412faf6f2ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275364d919e35da8261644eec… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 11 08:55:48 2015 +1000 dpnet: Correct adding components in Duplicate. --- dlls/dpnet/address.c | 23 ++++++++++++++++++++++- dlls/dpnet/tests/address.c | 16 ++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 7a33f8a..d2a05f6 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -232,9 +232,30 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *ifa { struct component *entry = This->components[i]; - hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data, entry->size, entry->type); + switch (entry->type) + { + case DPNA_DATATYPE_DWORD: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data.value, entry->size, entry->type); + break; + case DPNA_DATATYPE_GUID: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data.guid, entry->size, entry->type); + break; + case DPNA_DATATYPE_STRING: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, entry->data.string, entry->size, entry->type); + break; + case DPNA_DATATYPE_STRING_ANSI: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, entry->data.ansi, entry->size, entry->type); + break; + case DPNA_DATATYPE_BINARY: + hr = IDirectPlay8Address_AddComponent(dup, entry->name, entry->data.binary, entry->size, entry->type); + break; + } + if(hr != S_OK) + { ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr); + break; + } } *ppdpaNewAddress = dup; diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index ee589f5..cb226f9 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -24,6 +24,7 @@ /* {6733C6E8-A0D6-450E-8C18-CEACF331DC27} */ static const GUID IID_Random = {0x6733c6e8, 0xa0d6, 0x450e, { 0x8c, 0x18, 0xce, 0xac, 0xf3, 0x31, 0xdc, 0x27 } }; +static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static void create_directplay_address(void) { @@ -70,7 +71,6 @@ static void create_directplay_address(void) static void address_addcomponents(void) { static const WCHAR UNKNOWN[] = { 'u','n','k','n','o','w','n',0 }; - static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const char testing[] = "testing"; HRESULT hr; IDirectPlay8Address *localaddr = NULL; @@ -309,14 +309,20 @@ static void address_duplicate(void) hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_GetNumComponents(localaddr, &components); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(components == 1, "components=%d\n", components); + ok(components == 2, "components=%d\n", components); hr = IDirectPlay8Address_Duplicate(localaddr, &duplicate); ok(hr == S_OK, "got 0x%08x\n", hr); if(SUCCEEDED(hr)) { + DWORD size, type; + WCHAR buffer[256]; + hr = IDirectPlay8Address_GetSP(duplicate, &guid); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&guid, &CLSID_DP8SP_TCPIP), "wrong guid\n"); @@ -325,6 +331,12 @@ static void address_duplicate(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(components == dupcomps, "expected %d got %d\n", components, dupcomps); + size = sizeof(buffer); + hr = IDirectPlay8Address_GetComponentByName(duplicate, DPNA_KEY_HOSTNAME, buffer, &size, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); + ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); + IDirectPlay8Address_Release(duplicate); }

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::xsgetn.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: a507132cdc11c44efc7702e9bac14b7dfd6884d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a507132cdc11c44efc7702e9b… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jun 20 16:40:06 2015 +0200 msvcirt: Add implementation of streambuf::xsgetn. --- dlls/msvcirt/msvcirt.c | 26 ++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 80 +++++++++++++++++++++++++++++++++++++------- 2 files changed, 92 insertions(+), 14 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 47a7f28..6b440fd 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -504,8 +504,30 @@ void __thiscall streambuf_unlock(streambuf *this) DEFINE_THISCALL_WRAPPER(streambuf_xsgetn, 12) int __thiscall streambuf_xsgetn(streambuf *this, char *buffer, int count) { - FIXME("(%p %p %d): stub\n", this, buffer, count); - return 0; + int copied = 0, chunk; + + TRACE("(%p %p %d)\n", this, buffer, count); + + if (this->unbuffered) { + if (this->stored_char == EOF) + this->stored_char = call_streambuf_underflow(this); + while (copied < count && this->stored_char != EOF) { + buffer[copied++] = this->stored_char; + this->stored_char = call_streambuf_underflow(this); + } + } else { + while (copied < count) { + if (call_streambuf_underflow(this) == EOF) + break; + chunk = this->egptr - this->gptr; + if (chunk > count - copied) + chunk = count - copied; + memcpy(buffer+copied, this->gptr, chunk); + this->gptr += chunk; + copied += chunk; + } + } + return copied; } /* ?xsputn(a)streambuf@@UAEHPBDH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 6c60dd0..c4777a2 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -65,6 +65,7 @@ static int (*__thiscall p_streambuf_sgetc)(streambuf*); static int (*__thiscall p_streambuf_sputc)(streambuf*, int); static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); +static int (*__thiscall p_streambuf_xsgetn)(streambuf*, char*, int); /* Emulate a __thiscall */ #ifdef __i386__ @@ -151,6 +152,7 @@ static BOOL init(void) SET(p_streambuf_sputc, "?sputc(a)streambuf@@QEAAHH(a)Z"); SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); + SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UEAAHPEADH(a)Z"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE(a)PADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IAE(a)XZ"); @@ -168,6 +170,7 @@ static BOOL init(void) SET(p_streambuf_sputc, "?sputc(a)streambuf@@QAEHH(a)Z"); SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); + SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UAEHPADH(a)Z"); } init_thiscall_thunk(); @@ -175,7 +178,9 @@ static BOOL init(void) } static int overflow_count, underflow_count; -static streambuf *test_overflow_this; +static streambuf *test_this; +static char test_get_buffer[24]; +static int buffer_pos, get_end; #ifdef __i386__ static int __thiscall test_streambuf_overflow(int ch) @@ -184,8 +189,8 @@ static int __thiscall test_streambuf_overflow(streambuf *this, int ch) #endif { overflow_count++; - if (!test_overflow_this->unbuffered) - test_overflow_this->pptr = test_overflow_this->pbase + 5; + if (!test_this->unbuffered) + test_this->pptr = test_this->pbase + 5; return ch; } @@ -196,7 +201,13 @@ static int __thiscall test_streambuf_underflow(streambuf *this) #endif { underflow_count++; - return 'u'; + if (test_this->unbuffered) { + return (buffer_pos < 23) ? test_get_buffer[buffer_pos++] : EOF; + } else if (test_this->gptr < test_this->egptr) { + return *test_this->gptr; + } else { + return get_end ? EOF : *(test_this->gptr = test_this->eback); + } } struct streambuf_lock_arg @@ -264,6 +275,8 @@ static void test_streambuf(void) sb2.vtable = test_streambuf_vtbl; sb3.vtable = test_streambuf_vtbl; overflow_count = underflow_count = 0; + strcpy(test_get_buffer, "CompuGlobalHyperMegaNet"); + buffer_pos = get_end = 0; /* setlock */ ok(sb.do_lock == -1, "expected do_lock value -1, got %d\n", sb.do_lock); @@ -426,21 +439,23 @@ static void test_streambuf(void) ok(ret == 0, "sync failed, expected 0 got %d\n", ret); /* sgetc */ + strcpy(sb2.eback, "WorstTestEver"); + test_this = &sb2; ret = (int) call_func1(p_streambuf_sgetc, &sb2); - ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(ret == 'W', "expected 'W' 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'; + sb2.gptr++; ret = (int) call_func1(p_streambuf_sgetc, &sb2); - ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(ret == 'o', "expected 'o' 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; + test_this = &sb3; ret = (int) call_func1(p_streambuf_sgetc, &sb3); - ok(ret == 'u', "expected 'u' got '%c'\n", ret); + ok(ret == 'C', "expected 'C' 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); + ok(sb3.stored_char == 'C', "wrong stored character, expected 'C' 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); @@ -454,12 +469,12 @@ static void test_streambuf(void) ok(overflow_count == 0, "no call to overflow expected\n"); ok(*sb.pbase == 'c', "expected 'c' in the put area, got %c\n", *sb.pbase); ok(sb.pptr == sb.pbase + 1, "wrong put pointer, expected %p got %p\n", sb.pbase + 1, sb.pptr); - test_overflow_this = &sb2; + test_this = &sb2; ret = (int) call_func2(p_streambuf_sputc, &sb2, 'c'); ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); ok(overflow_count == 1, "expected call to overflow\n"); ok(sb2.pptr == sb2.pbase + 5, "wrong put pointer, expected %p got %p\n", sb2.pbase + 5, sb2.pptr); - test_overflow_this = &sb3; + test_this = &sb3; ret = (int) call_func2(p_streambuf_sputc, &sb3, 'c'); ok(ret == 'c', "wrong return value, expected 'c' got %d\n", ret); ok(overflow_count == 2, "expected call to overflow\n"); @@ -471,6 +486,47 @@ static void test_streambuf(void) ok(*sb3.pbase == 'c', "expected 'c' in the put area, got %c\n", *sb3.pbase); sb3.pbase = sb3.pptr = sb3.epptr = NULL; + /* xsgetn */ + sb2.gptr = sb2.egptr = sb2.eback + 13; + test_this = &sb2; + ret = (int) call_func3(p_streambuf_xsgetn, &sb2, reserve, 5); + ok(ret == 5, "wrong return value, expected 5 got %d\n", ret); + ok(!strncmp(reserve, "Worst", 5), "expected 'Worst' got %s\n", reserve); + ok(sb2.gptr == sb2.eback + 5, "wrong get pointer, expected %p got %p\n", sb2.eback + 5, sb2.gptr); + ok(underflow_count == 4, "expected call to underflow\n"); + ret = (int) call_func3(p_streambuf_xsgetn, &sb2, reserve, 4); + ok(ret == 4, "wrong return value, expected 4 got %d\n", ret); + ok(!strncmp(reserve, "Test", 4), "expected 'Test' got %s\n", reserve); + ok(sb2.gptr == sb2.eback + 9, "wrong get pointer, expected %p got %p\n", sb2.eback + 9, sb2.gptr); + ok(underflow_count == 5, "expected call to underflow\n"); + get_end = 1; + ret = (int) call_func3(p_streambuf_xsgetn, &sb2, reserve, 16); + ok(ret == 4, "wrong return value, expected 4 got %d\n", ret); + ok(!strncmp(reserve, "Ever", 4), "expected 'Ever' got %s\n", reserve); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(underflow_count == 7, "expected 2 calls to underflow, got %d\n", underflow_count - 5); + test_this = &sb3; + ret = (int) call_func3(p_streambuf_xsgetn, &sb3, reserve, 11); + ok(ret == 11, "wrong return value, expected 11 got %d\n", ret); + ok(!strncmp(reserve, "bompuGlobal", 11), "expected 'bompuGlobal' got %s\n", reserve); + ok(sb3.stored_char == 'H', "wrong stored character, expected 'H' got %c\n", sb3.stored_char); + ok(underflow_count == 18, "expected 11 calls to underflow, got %d\n", underflow_count - 7); + ret = (int) call_func3(p_streambuf_xsgetn, &sb3, reserve, 16); + ok(ret == 12, "wrong return value, expected 12 got %d\n", ret); + ok(!strncmp(reserve, "HyperMegaNet", 12), "expected 'HyperMegaNet' got %s\n", reserve); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 30, "expected 12 calls to underflow, got %d\n", underflow_count - 18); + ret = (int) call_func3(p_streambuf_xsgetn, &sb3, reserve, 3); + ok(ret == 0, "wrong return value, expected 0 got %d\n", ret); + ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); + ok(underflow_count == 31, "expected call to underflow\n"); + buffer_pos = 0; + ret = (int) call_func3(p_streambuf_xsgetn, &sb3, reserve, 5); + ok(ret == 5, "wrong return value, expected 5 got %d\n", ret); + ok(!strncmp(reserve, "Compu", 5), "expected 'Compu' got %s\n", reserve); + ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); + ok(underflow_count == 37, "expected 6 calls to underflow, got %d\n", underflow_count - 31); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::xsputn.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: f71186b6450b0f5a345d4ec660667a4189ec905d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71186b6450b0f5a345d4ec66… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jun 20 16:40:15 2015 +0200 msvcirt: Add implementation of streambuf::xsputn. --- dlls/msvcirt/msvcirt.c | 21 +++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 6b440fd..e8faa54 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -535,8 +535,25 @@ int __thiscall streambuf_xsgetn(streambuf *this, char *buffer, int count) DEFINE_THISCALL_WRAPPER(streambuf_xsputn, 12) int __thiscall streambuf_xsputn(streambuf *this, const char *data, int length) { - FIXME("(%p %p %d): stub\n", this, data, length); - return 0; + int copied = 0, chunk; + + TRACE("(%p %p %d)\n", this, data, length); + + while (copied < length) { + if (this->unbuffered || this->pptr == this->epptr) { + if (call_streambuf_overflow(this, data[copied]) == EOF) + break; + copied++; + } else { + chunk = this->epptr - this->pptr; + if (chunk > length - copied) + chunk = length - copied; + memcpy(this->pptr, data+copied, chunk); + this->pptr += chunk; + copied += chunk; + } + } + return copied; } /* ?sgetc(a)streambuf@@QAEHXZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index c4777a2..a175531 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -66,6 +66,7 @@ static int (*__thiscall p_streambuf_sputc)(streambuf*, int); static int (*__thiscall p_streambuf_sync)(streambuf*); static void (*__thiscall p_streambuf_unlock)(streambuf*); static int (*__thiscall p_streambuf_xsgetn)(streambuf*, char*, int); +static int (*__thiscall p_streambuf_xsputn)(streambuf*, const char*, int); /* Emulate a __thiscall */ #ifdef __i386__ @@ -153,6 +154,7 @@ static BOOL init(void) SET(p_streambuf_sync, "?sync(a)streambuf@@UEAAHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QEAAXXZ"); SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UEAAHPEADH(a)Z"); + SET(p_streambuf_xsputn, "?xsputn(a)streambuf@@UEAAHPEBDH(a)Z"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE(a)PADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IAE(a)XZ"); @@ -171,6 +173,7 @@ static BOOL init(void) SET(p_streambuf_sync, "?sync(a)streambuf@@UAEHXZ"); SET(p_streambuf_unlock, "?unlock(a)streambuf@@QAEXXZ"); SET(p_streambuf_xsgetn, "?xsgetn(a)streambuf@@UAEHPADH(a)Z"); + SET(p_streambuf_xsputn, "?xsputn(a)streambuf@@UAEHPBDH(a)Z"); } init_thiscall_thunk(); @@ -189,6 +192,8 @@ static int __thiscall test_streambuf_overflow(streambuf *this, int ch) #endif { overflow_count++; + if (ch == 'L') /* simulate a failure */ + return EOF; if (!test_this->unbuffered) test_this->pptr = test_this->pbase + 5; return ch; @@ -527,6 +532,38 @@ static void test_streambuf(void) ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); ok(underflow_count == 37, "expected 6 calls to underflow, got %d\n", underflow_count - 31); + /* xsputn */ + ret = (int) call_func3(p_streambuf_xsputn, &sb, "Test\0ing", 8); + ok(ret == 8, "wrong return value, expected 8 got %d\n", ret); + ok(sb.pptr == sb.pbase + 9, "wrong put pointer, expected %p got %p\n", sb.pbase + 9, sb.pptr); + test_this = &sb2; + sb2.pptr = sb2.epptr - 7; + ret = (int) call_func3(p_streambuf_xsputn, &sb2, "Testing", 7); + ok(ret == 7, "wrong return value, expected 7 got %d\n", ret); + ok(sb2.pptr == sb2.epptr, "wrong put pointer, expected %p got %p\n", sb2.epptr, sb2.pptr); + ok(overflow_count == 2, "no call to overflow expected\n"); + sb2.pptr = sb2.epptr - 5; + sb2.pbase[5] = 'a'; + ret = (int) call_func3(p_streambuf_xsputn, &sb2, "Testing", 7); + ok(ret == 7, "wrong return value, expected 7 got %d\n", ret); + ok(sb2.pbase[5] == 'g', "expected 'g' got %c\n", sb2.pbase[5]); + ok(sb2.pptr == sb2.pbase + 6, "wrong put pointer, expected %p got %p\n", sb2.pbase + 6, sb2.pptr); + ok(overflow_count == 3, "expected call to overflow\n"); + sb2.pptr = sb2.epptr - 4; + ret = (int) call_func3(p_streambuf_xsputn, &sb2, "TestLing", 8); + ok(ret == 4, "wrong return value, expected 4 got %d\n", ret); + ok(sb2.pptr == sb2.epptr, "wrong put pointer, expected %p got %p\n", sb2.epptr, sb2.pptr); + ok(overflow_count == 4, "expected call to overflow\n"); + test_this = &sb3; + ret = (int) call_func3(p_streambuf_xsputn, &sb3, "Testing", 7); + ok(ret == 7, "wrong return value, expected 7 got %d\n", ret); + ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); + ok(overflow_count == 11, "expected 7 calls to overflow, got %d\n", overflow_count - 4); + ret = (int) call_func3(p_streambuf_xsputn, &sb3, "TeLephone", 9); + ok(ret == 2, "wrong return value, expected 2 got %d\n", ret); + ok(sb3.stored_char == 'G', "wrong stored character, expected 'G' got %c\n", sb3.stored_char); + ok(overflow_count == 14, "expected 3 calls to overflow, got %d\n", overflow_count - 11); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sgetn/sputn.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 7b877fbce8dab7d60faa29a1e97d0d73ee39a532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b877fbce8dab7d60faa29a1e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Sat Jun 20 16:40:21 2015 +0200 msvcirt: Add implementation of streambuf::sgetn/sputn. --- dlls/msvcirt/msvcirt.c | 18 ++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 8 ++++---- dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e8faa54..35777e3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -502,6 +502,7 @@ void __thiscall streambuf_unlock(streambuf *this) /* ?xsgetn(a)streambuf@@UAEHPADH(a)Z */ /* ?xsgetn(a)streambuf@@UEAAHPEADH(a)Z */ DEFINE_THISCALL_WRAPPER(streambuf_xsgetn, 12) +#define call_streambuf_xsgetn(this, buffer, count) CALL_VTBL_FUNC(this, 24, int, (streambuf*, char*, int), (this, buffer, count)) int __thiscall streambuf_xsgetn(streambuf *this, char *buffer, int count) { int copied = 0, chunk; @@ -533,6 +534,7 @@ int __thiscall streambuf_xsgetn(streambuf *this, char *buffer, int count) /* ?xsputn(a)streambuf@@UAEHPBDH(a)Z */ /* ?xsputn(a)streambuf@@UEAAHPEBDH(a)Z */ DEFINE_THISCALL_WRAPPER(streambuf_xsputn, 12) +#define call_streambuf_xsputn(this, data, length) CALL_VTBL_FUNC(this, 20, int, (streambuf*, const char*, int), (this, data, length)) int __thiscall streambuf_xsputn(streambuf *this, const char *data, int length) { int copied = 0, chunk; @@ -579,6 +581,22 @@ int __thiscall streambuf_sputc(streambuf *this, int ch) return (this->pptr < this->epptr) ? *this->pptr++ = ch : call_streambuf_overflow(this, ch); } +/* ?sgetn(a)streambuf@@QAEHPADH(a)Z */ +/* ?sgetn(a)streambuf@@QEAAHPEADH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_sgetn, 12) +int __thiscall streambuf_sgetn(streambuf *this, char *buffer, int count) +{ + return call_streambuf_xsgetn(this, buffer, count); +} + +/* ?sputn(a)streambuf@@QAEHPBDH(a)Z */ +/* ?sputn(a)streambuf@@QEAAHPEBDH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_sputn, 12) +int __thiscall streambuf_sputn(streambuf *this, const char *data, int length) +{ + return call_streambuf_xsputn(this, data, length); +} + /****************************************************************** * ??1ios@@UAE(a)XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 7d6df5f..2a65e2f 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -695,8 +695,8 @@ @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z @ 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 +@ thiscall -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z(ptr ptr long) streambuf_sgetn +@ cdecl -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z(ptr ptr long) streambuf_sgetn # @ extern ?sh_none(a)filebuf@@2HB # static int const filebuf::sh_none # @ extern ?sh_read(a)filebuf@@2HB # static int const filebuf::sh_read # @ extern ?sh_write(a)filebuf@@2HB # static int const filebuf::sh_write @@ -706,8 +706,8 @@ @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) streambuf_sputc @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) streambuf_sputc -@ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z # int __thiscall streambuf::sputn(char const *,int) -@ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z +@ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) streambuf_sputn +@ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) streambuf_sputn @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ # struct _iobuf * __thiscall stdiobuf::stdiofile(void) @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ @ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ # void __thiscall streambuf::stossc(void) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 79f5902..1be499b 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -683,8 +683,8 @@ @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z @ 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 +@ thiscall -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z(ptr ptr long) msvcirt.?sgetn(a)streambuf@@QAEHPADH(a)Z +@ cdecl -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z(ptr ptr long) msvcirt.?sgetn(a)streambuf@@QEAAHPEADH(a)Z # @ extern ?sh_none(a)filebuf@@2HB # @ extern ?sh_read(a)filebuf@@2HB # @ extern ?sh_write(a)filebuf@@2HB @@ -694,8 +694,8 @@ @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z -@ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z -@ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z +@ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QAEHPBDH(a)Z +@ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ @ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 86d3985..94d9035 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -755,8 +755,8 @@ @ stub -arch=win64 ?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z @ 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 +@ thiscall -arch=win32 ?sgetn(a)streambuf@@QAEHPADH(a)Z(ptr ptr long) msvcirt.?sgetn(a)streambuf@@QAEHPADH(a)Z +@ cdecl -arch=win64 ?sgetn(a)streambuf@@QEAAHPEADH(a)Z(ptr ptr long) msvcirt.?sgetn(a)streambuf@@QEAAHPEADH(a)Z # @ extern ?sh_none(a)filebuf@@2HB # @ extern ?sh_read(a)filebuf@@2HB # @ extern ?sh_write(a)filebuf@@2HB @@ -766,8 +766,8 @@ @ stub -arch=win64 ?sputbackc(a)streambuf@@QEAAHD(a)Z @ thiscall -arch=win32 ?sputc(a)streambuf@@QAEHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QAEHH(a)Z @ cdecl -arch=win64 ?sputc(a)streambuf@@QEAAHH(a)Z(ptr long) msvcirt.?sputc(a)streambuf@@QEAAHH(a)Z -@ stub -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z -@ stub -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z +@ thiscall -arch=win32 ?sputn(a)streambuf@@QAEHPBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QAEHPBDH(a)Z +@ cdecl -arch=win64 ?sputn(a)streambuf@@QEAAHPEBDH(a)Z(ptr str long) msvcirt.?sputn(a)streambuf@@QEAAHPEBDH(a)Z @ stub -arch=win32 ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ @ stub -arch=win64 ?stdiofile(a)stdiobuf@@QEAAPEAU_iobuf@@XZ @ stub -arch=win32 ?stossc(a)streambuf@@QAEXXZ

1 0

Erich E. Hoover : kernel32: Implement GetVolumePathName.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: f6c7e247add306e757c6b75e99dd23eba087f9f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c7e247add306e757c6b75e9… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Wed Jun 17 19:28:39 2015 -0600 kernel32: Implement GetVolumePathName. The purpose of this function is to return the most fundamental path without leaving a filesystem. Steam uses this so that it can use inode searches, without this functionality some installations/validations will fail if the Steam Library is not on the same drive as Steam itself (symlink'd to another location). --- dlls/kernel32/tests/volume.c | 3 -- dlls/kernel32/volume.c | 121 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 107 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index e934dee..2243da9 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -649,15 +649,12 @@ static void test_GetVolumePathNameA(void) volume[0] = '\0'; ret = pGetVolumePathNameA(pathC1, volume, sizeof(volume)); ok(ret, "expected success\n"); -todo_wine ok(!strcmp(expected, volume) || broken(!strcasecmp(expected, volume)) /* <=XP */, "expected name '%s', returned '%s'\n", expected, volume); volume[0] = '\0'; ret = pGetVolumePathNameA(pathC2, volume, sizeof(volume)); -todo_wine ok(ret, "expected success\n"); -todo_wine ok(!strcmp(expected, volume), "expected name '%s', returned '%s'\n", expected, volume); /* test an invalid path */ diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index d06dd05..a6b2b3d 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1792,7 +1792,7 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl BOOL ret; WCHAR *filenameW = NULL, *volumeW = NULL; - FIXME("(%s, %p, %d), stub!\n", debugstr_a(filename), volumepathname, buflen); + TRACE("(%s, %p, %d)\n", debugstr_a(filename), volumepathname, buflen); if (filename && !(filenameW = FILE_name_AtoW( filename, FALSE ))) return FALSE; @@ -1808,12 +1808,27 @@ BOOL WINAPI GetVolumePathNameA(LPCSTR filename, LPSTR volumepathname, DWORD bufl /*********************************************************************** * GetVolumePathNameW (KERNEL32.@) + * + * This routine is intended to find the most basic path on the same filesystem + * for any particular path name. Since we can have very complicated drive/path + * relationships on Unix systems, due to symbolic links, the safest way to + * handle this is to start with the full path and work our way back folder by + * folder unil we find a folder on a different drive (or run out of folders). */ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD buflen) { - const WCHAR *p = filename; + static const WCHAR ntprefixW[] = { '\\','\\','?','\\',0 }; + static const WCHAR fallbackpathW[] = { 'C',':','\\',0 }; + NTSTATUS status = STATUS_SUCCESS; + WCHAR *volumenameW = NULL, *c; + int pos, last_pos, stop_pos; + UNICODE_STRING nt_name; + ANSI_STRING unix_name; + BOOL first_run = TRUE; + dev_t search_dev = 0; + struct stat st; - FIXME("(%s, %p, %d), stub!\n", debugstr_w(filename), volumepathname, buflen); + TRACE("(%s, %p, %d)\n", debugstr_w(filename), volumepathname, buflen); if (!filename || !volumepathname || !buflen) { @@ -1821,24 +1836,102 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu return FALSE; } - if (p && tolowerW(p[0]) >= 'a' && tolowerW(p[0]) <= 'z' && p[1] ==':' && p[2] == '\\') + last_pos = pos = strlenW( filename ); + /* allocate enough memory for searching the path (need room for a slash and a NULL terminator) */ + if (!(volumenameW = HeapAlloc( GetProcessHeap(), 0, (pos + 2) * sizeof(WCHAR) ))) { - if (buflen < 4) + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + strcpyW( volumenameW, filename ); + stop_pos = 0; + /* stop searching slashes early for NT-type and nearly NT-type paths */ + if (strncmpW(ntprefixW, filename, strlenW(ntprefixW)) == 0) + stop_pos = strlenW(ntprefixW)-1; + else if (strncmpW(ntprefixW, filename, 2) == 0) + stop_pos = 2; + + do + { + volumenameW[pos+0] = '\\'; + volumenameW[pos+1] = '\0'; + if (!RtlDosPathNameToNtPathName_U( volumenameW, &nt_name, NULL, NULL )) + goto cleanup; + volumenameW[pos] = '\0'; + status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN, FALSE ); + RtlFreeUnicodeString( &nt_name ); + if (status == STATUS_SUCCESS) { - SetLastError(ERROR_FILENAME_EXCED_RANGE); - return FALSE; + if (stat( unix_name.Buffer, &st ) != 0) + { + RtlFreeAnsiString( &unix_name ); + status = STATUS_OBJECT_NAME_INVALID; + goto cleanup; + } + if (first_run) + { + first_run = FALSE; + search_dev = st.st_dev; + } + else if (st.st_dev != search_dev) + { + /* folder is on a new filesystem, return the last folder */ + RtlFreeAnsiString( &unix_name ); + break; + } } - volumepathname[0] = p[0]; - volumepathname[1] = ':'; - volumepathname[2] = '\\'; - volumepathname[3] = 0; - return TRUE; + RtlFreeAnsiString( &unix_name ); + last_pos = pos; + c = strrchrW( volumenameW, '\\' ); + if (c != NULL) + pos = c-volumenameW; + } while (c != NULL && pos > stop_pos); + + if (status != STATUS_SUCCESS) + { + /* the path was completely invalid */ + if (filename[0] == '\\') + { + /* NT-style paths fail */ + status = STATUS_OBJECT_NAME_INVALID; + goto cleanup; + } + + /* DOS-style paths revert to C:\ (anything not beginning with a slash) */ + last_pos = strlenW(fallbackpathW) - 1; /* points to \\ */ + filename = fallbackpathW; + status = STATUS_SUCCESS; } - SetLastError(ERROR_INVALID_NAME); - return FALSE; + if (last_pos + 1 <= buflen) + { + WCHAR *p; + memcpy(volumepathname, filename, last_pos * sizeof(WCHAR)); + if (last_pos + 2 <= buflen) volumepathname[last_pos++] = '\\'; + volumepathname[last_pos] = '\0'; + + /* Normalize path */ + for (p = volumepathname; *p; p++) if (*p == '/') *p = '\\'; + + /* DOS-style paths always return upper-case drive letters */ + if (volumepathname[1] == ':') + volumepathname[0] = toupperW(volumepathname[0]); + + TRACE("Successfully translated path %s to mount-point %s\n", + debugstr_w(filename), debugstr_w(volumepathname)); + } + else + status = STATUS_NAME_TOO_LONG; + +cleanup: + HeapFree( GetProcessHeap(), 0, volumenameW ); + + if (status != STATUS_SUCCESS) + SetLastError( RtlNtStatusToDosError(status) ); + return (status == STATUS_SUCCESS); } + /*********************************************************************** * GetVolumePathNamesForVolumeNameA (KERNEL32.@) */

1 0

Alistair Leslie-Hughes : d3dcompiler_46: Add stub dll.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: ca7ce1678b61b88966a48f591be566e04f3d669f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7ce1678b61b88966a48f591… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 16 11:00:26 2015 +1000 d3dcompiler_46: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/d3dcompiler_46/Makefile.in | 6 +++++ dlls/d3dcompiler_46/d3dcompiler_46.spec | 25 ++++++++++++++++++ dlls/d3dcompiler_46/d3dcompiler_46_main.c | 42 +++++++++++++++++++++++++++++++ dlls/d3dcompiler_46/version.rc | 27 ++++++++++++++++++++ tools/make_specfiles | 1 + 7 files changed, 104 insertions(+) diff --git a/configure b/configure index c0951db..80648ff 100755 --- a/configure +++ b/configure @@ -984,6 +984,7 @@ enable_d3dcompiler_40 enable_d3dcompiler_41 enable_d3dcompiler_42 enable_d3dcompiler_43 +enable_d3dcompiler_46 enable_d3dim enable_d3drm enable_d3dx10_33 @@ -17179,6 +17180,7 @@ wine_fn_config_dll d3dcompiler_41 enable_d3dcompiler_41 wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 implib d3dcompiler wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test +wine_fn_config_dll d3dcompiler_46 enable_d3dcompiler_46 wine_fn_config_dll d3dim enable_d3dim implib wine_fn_config_dll d3drm enable_d3drm implib wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index f9df3f0..22c12ac 100644 --- a/configure.ac +++ b/configure.ac @@ -2856,6 +2856,7 @@ WINE_CONFIG_DLL(d3dcompiler_41) WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler]) WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) +WINE_CONFIG_DLL(d3dcompiler_46) WINE_CONFIG_DLL(d3dim,,[implib]) WINE_CONFIG_DLL(d3drm,,[implib]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in new file mode 100644 index 0000000..08c5145 --- /dev/null +++ b/dlls/d3dcompiler_46/Makefile.in @@ -0,0 +1,6 @@ +MODULE = d3dcompiler_46.dll + +C_SRCS = \ + d3dcompiler_46_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec new file mode 100644 index 0000000..526a997 --- /dev/null +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -0,0 +1,25 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stub D3DCompile2 +@ stub D3DCompileFromFile +@ stub D3DCompressShaders +@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stub D3DDecompressShaders +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stub D3DDisassemble11Trace +@ stub D3DDisassembleRegion +@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stub D3DGetTraceInstructionOffsets +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stub D3DReadFileToBlob +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReturnFailure1 +@ stub D3DSetBlobPart +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stub D3DWriteBlobToFile +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_46/d3dcompiler_46_main.c b/dlls/d3dcompiler_46/d3dcompiler_46_main.c new file mode 100644 index 0000000..80da1ff --- /dev/null +++ b/dlls/d3dcompiler_46/d3dcompiler_46_main.c @@ -0,0 +1,42 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_46/version.rc b/dlls/d3dcompiler_46/version.rc new file mode 100644 index 0000000..7f2ff53 --- /dev/null +++ b/dlls/d3dcompiler_46/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_46.dll" +#define WINE_FILEVERSION 9,30,9200,20789 +#define WINE_FILEVERSION_STR "9.30.9200.20789" +#define WINE_PRODUCTVERSION 9,30,9200,20789 +#define WINE_PRODUCTVERSION_STR "9.30.9200.20789" + +#include "wine/wine_common_ver.rc" diff --git a/tools/make_specfiles b/tools/make_specfiles index 179e6d5..c61d9e6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -94,6 +94,7 @@ my @dll_groups = ], [ "d3dcompiler_43", + "d3dcompiler_46", "d3dcompiler_42", "d3dcompiler_41", "d3dcompiler_40",

1 0

Alistair Leslie-Hughes : d3dcompiler_47: Add stub dll.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: e70b50d7723d9770c4a056b72640fa5319ee0515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70b50d7723d9770c4a056b72… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 16 11:01:53 2015 +1000 d3dcompiler_47: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/d3dcompiler_47/Makefile.in | 6 +++++ dlls/d3dcompiler_47/d3dcompiler_47.spec | 29 +++++++++++++++++++++ dlls/d3dcompiler_47/d3dcompiler_47_main.c | 42 +++++++++++++++++++++++++++++++ dlls/d3dcompiler_47/version.rc | 27 ++++++++++++++++++++ tools/make_specfiles | 1 + 7 files changed, 108 insertions(+) diff --git a/configure b/configure index 80648ff..33dd534 100755 --- a/configure +++ b/configure @@ -985,6 +985,7 @@ enable_d3dcompiler_41 enable_d3dcompiler_42 enable_d3dcompiler_43 enable_d3dcompiler_46 +enable_d3dcompiler_47 enable_d3dim enable_d3drm enable_d3dx10_33 @@ -17181,6 +17182,7 @@ wine_fn_config_dll d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_dll d3dcompiler_43 enable_d3dcompiler_43 implib d3dcompiler wine_fn_config_test dlls/d3dcompiler_43/tests d3dcompiler_43_test wine_fn_config_dll d3dcompiler_46 enable_d3dcompiler_46 +wine_fn_config_dll d3dcompiler_47 enable_d3dcompiler_47 wine_fn_config_dll d3dim enable_d3dim implib wine_fn_config_dll d3drm enable_d3drm implib wine_fn_config_test dlls/d3drm/tests d3drm_test diff --git a/configure.ac b/configure.ac index 22c12ac..f56b6f6 100644 --- a/configure.ac +++ b/configure.ac @@ -2857,6 +2857,7 @@ WINE_CONFIG_DLL(d3dcompiler_42) WINE_CONFIG_DLL(d3dcompiler_43,,[implib],[d3dcompiler]) WINE_CONFIG_TEST(dlls/d3dcompiler_43/tests) WINE_CONFIG_DLL(d3dcompiler_46) +WINE_CONFIG_DLL(d3dcompiler_47) WINE_CONFIG_DLL(d3dim,,[implib]) WINE_CONFIG_DLL(d3drm,,[implib]) WINE_CONFIG_TEST(dlls/d3drm/tests) diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in new file mode 100644 index 0000000..9f6ef8f --- /dev/null +++ b/dlls/d3dcompiler_47/Makefile.in @@ -0,0 +1,6 @@ +MODULE = d3dcompiler_47.dll + +C_SRCS = \ + d3dcompiler_47_main.c + +RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec new file mode 100644 index 0000000..08bc418 --- /dev/null +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -0,0 +1,29 @@ +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stub D3DCompile2 +@ stub D3DCompileFromFile +@ stub D3DCompressShaders +@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stub D3DCreateFunctionLinkingGraph +@ stub D3DCreateLinker +@ stub D3DDecompressShaders +@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect +@ stub D3DDisassemble11Trace +@ stub D3DDisassembleRegion +@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart +@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stub D3DGetTraceInstructionOffsets +@ stub D3DLoadModule +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stub D3DReadFileToBlob +@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stub D3DReflectLibrary +@ stub D3DReturnFailure1 +@ stub D3DSetBlobPart +@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stub D3DWriteBlobToFile +@ stub DebugSetMute diff --git a/dlls/d3dcompiler_47/d3dcompiler_47_main.c b/dlls/d3dcompiler_47/d3dcompiler_47_main.c new file mode 100644 index 0000000..320a4e0 --- /dev/null +++ b/dlls/d3dcompiler_47/d3dcompiler_47_main.c @@ -0,0 +1,42 @@ +/* + * Direct3D shader compiler main file + * + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 + * + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instdll, DWORD reason, void *reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instdll); + break; + } + + return TRUE; +} diff --git a/dlls/d3dcompiler_47/version.rc b/dlls/d3dcompiler_47/version.rc new file mode 100644 index 0000000..5d03d7e --- /dev/null +++ b/dlls/d3dcompiler_47/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * 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 WINE_FILEDESCRIPTION_STR "Wine D3DCompiler" +#define WINE_FILENAME_STR "d3dcompiler_47.dll" +#define WINE_FILEVERSION 6,3,9600,16984 +#define WINE_FILEVERSION_STR "6.3.9600.16984" +#define WINE_PRODUCTVERSION 6,3,9600,16984 +#define WINE_PRODUCTVERSION_STR "6.3.9600.16984" + +#include "wine/wine_common_ver.rc" diff --git a/tools/make_specfiles b/tools/make_specfiles index c61d9e6..e967e68 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -94,6 +94,7 @@ my @dll_groups = ], [ "d3dcompiler_43", + "d3dcompiler_47", "d3dcompiler_46", "d3dcompiler_42", "d3dcompiler_41",

1 0

Nikolay Sivov : dwrite: Store character spacing layout settings.
by Alexandre Julliard 22 Jun '15

22 Jun '15

Module: wine Branch: master Commit: b43850a36320477653aa599cfb158b58a74806b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43850a36320477653aa599cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 18 19:52:15 2015 +0300 dwrite: Store character spacing layout settings. --- dlls/dwrite/layout.c | 109 ++++++++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 19 ++++++-- 2 files changed, 112 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b43850a36320477653aa5…

1 0