wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Piotr Caban : msvcp90: Added operator<<(basic_ostream<char>, basic_string< char>) implementation.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: e43f6ec6385fdefa87138c2881a29e593a101b32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43f6ec6385fdefa87138c288… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 15 11:07:23 2012 +0200 msvcp90: Added operator<<(basic_ostream<char>, basic_string<char>) implementation. --- dlls/msvcp90/ios.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 2 +- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9cb3a59..4fd7640 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3940,6 +3940,50 @@ basic_ostream_char* __cdecl basic_ostream_char_endl(basic_ostream_char *ostr) return ostr; } +/* $?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ +/* ??$?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z */ +basic_ostream_char* __cdecl basic_ostream_char_print_bstr(basic_ostream_char *ostr, const basic_string_char *str) +{ + basic_ios_char *base = basic_ostream_char_get_basic_ios(ostr); + IOSB_iostate state = IOSTATE_goodbit; + + TRACE("(%p %p)\n", ostr, str); + + if(basic_ostream_char_sentry_create(ostr)) { + MSVCP_size_t len = MSVCP_basic_string_char_length(str); + streamsize pad = (base->base.wide>len ? base->base.wide-len : 0); + + if((base->base.fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } + } + } + + if(state == IOSTATE_goodbit) { + if(basic_streambuf_char_sputn(base->strbuf, MSVCP_basic_string_char_c_str(str), len) != len) + state = IOSTATE_badbit; + } + + for(; pad!=0; pad--) { + if(basic_streambuf_char_sputc(base->strbuf, base->fillch) == EOF) { + state = IOSTATE_badbit; + break; + } + } + + base->base.wide = 0; + }else { + state = IOSTATE_badbit; + } + basic_ostream_char_sentry_destroy(ostr); + + basic_ios_char_setstate(base, state); + return ostr; +} + /* Caution: basic_istream uses virtual inheritance. */ static inline basic_ios_char* basic_istream_char_get_basic_ios(basic_istream_char *this) { diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 4523845..a7091ee 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -258,6 +258,7 @@ void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); void __thiscall MSVCP_basic_string_char_clear(basic_string_char*); basic_string_char* __thiscall MSVCP_basic_string_char_append_ch(basic_string_char*, char); +MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char*); #define BUF_SIZE_WCHAR 8 typedef struct _basic_string_wchar diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5c2477a..5290c68 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -42,8 +42,8 @@ @ stub -arch=win64 ??$?5_WU?$char_traits@_W@std@@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@PEA_W@Z @ stub -arch=win32 ??$?5_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YAAAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AAV10@AAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z @ stub -arch=win64 ??$?5_WU?$char_traits@_W@std@@V?$allocator@_W@1@@std@@YAAEAV?$basic_istream@_WU?$char_traits@_W@std@@@0@AEAV10@AEAV?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@0@@Z -@ stub -arch=win32 ??$?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z -@ stub -arch=win64 ??$?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z +@ cdecl -arch=win32 ??$?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAAV?$basic_ostream@DU?$char_traits@D@std@@@0@AAV10@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr +@ cdecl -arch=win64 ??$?6DU?$char_traits@D@std@@V?$allocator@D@1@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_ostream_char_print_bstr @ stub -arch=win32 ??$?6GU?$char_traits@G@std@@@std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@0@AAV10@G@Z @ stub -arch=win64 ??$?6GU?$char_traits@G@std@@@std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@0@AEAV10@G@Z @ stub -arch=win32 ??$?6GU?$char_traits@G@std@@@std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@0@AAV10@PBG@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index e404699..bb42944 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1077,7 +1077,7 @@ void __thiscall MSVCP_basic_string_char_dtor(basic_string_char *this) /* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ */ /* ?length@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_length, 4) -MSVCP_size_t __thiscall MSVCP_basic_string_char_length(basic_string_char *this) +MSVCP_size_t __thiscall MSVCP_basic_string_char_length(const basic_string_char *this) { TRACE("%p\n", this); return this->size;

1 0

André Hentschel : d3drm: Implement IDirect3DRMMeshBuilderX_GetClassName.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: afe616b5885ee89e71f2244d676aafabf27a1e9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe616b5885ee89e71f2244d6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 14 20:31:22 2012 +0200 d3drm: Implement IDirect3DRMMeshBuilderX_GetClassName. --- dlls/d3drm/meshbuilder.c | 18 ++++++++++++------ dlls/d3drm/tests/d3drm.c | 22 ++++++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 21cfc2f..a05c597 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -454,13 +454,13 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetName(IDirect3DRMMeshBuilder } static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetClassName(IDirect3DRMMeshBuilder2* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p, %p)\n", This, size, name); - return E_NOTIMPL; + return IDirect3DRMMeshBuilder3_GetClassName(&This->IDirect3DRMMeshBuilder3_iface, size, name); } /*** IDirect3DRMMeshBuilder2 methods ***/ @@ -1080,13 +1080,19 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetName(IDirect3DRMMeshBuilder } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetClassName(IDirect3DRMMeshBuilder3* iface, - LPDWORD lpdwSize, LPSTR lpName) + LPDWORD size, LPSTR name) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(%p,%p): stub\n", This, lpdwSize, lpName); + TRACE("(%p)->(%p, %p)\n", This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Builder") || !name) + return E_INVALIDARG; + + strcpy(name, "Builder"); + *size = sizeof("Builder"); + + return D3DRM_OK; } HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index bbe2da3..2766098 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -198,13 +198,18 @@ static void test_MeshBuilder(void) hr = IDirect3DRM_CreateMeshBuilder(pD3DRM, &pMeshBuilder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); hr = IDirect3DRMMeshBuilder_GetClassName(pMeshBuilder, &size, cname); - todo_wine { ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(size == sizeof("Builder"), "wrong strlen: %u\n", size); ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); - } info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version); @@ -463,13 +468,18 @@ static void test_MeshBuilder3(void) hr = IDirect3DRM3_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, &size, cname); - todo_wine { ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(size == sizeof("Builder"), "wrong strlen: %u\n", size); ok(!strcmp(cname, "Builder"), "Expected cname to be \"Builder\", but got \"%s\"\n", cname); - } info.lpMemory = data_bad_version; info.dSize = strlen(data_bad_version);

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_GetClassName.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 546a3dcffcdf40134c72478f3fb6b081471ffab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546a3dcffcdf40134c72478f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 14 20:30:07 2012 +0200 d3drm: Implement IDirect3DRMLight_GetClassName. --- dlls/d3drm/light.c | 10 ++++++++-- dlls/d3drm/tests/d3drm.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 67baaa7..558d836 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -172,9 +172,15 @@ static HRESULT WINAPI IDirect3DRMLightImpl_GetClassName(IDirect3DRMLight* iface, { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Light") || !name) + return E_INVALIDARG; + + strcpy(name, "Light"); + *size = sizeof("Light"); + + return D3DRM_OK; } /*** IDirect3DRMLight methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 9444756..bbe2da3 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -879,13 +879,18 @@ static void test_Light(void) hr = IDirect3DRM_CreateLightRGB(pD3DRM, D3DRMLIGHT_SPOT, 0.5, 0.5, 0.5, &pLight); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); + hr = IDirect3DRMLight_GetClassName(pLight, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMLight_GetClassName(pLight, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + size = 1; + hr = IDirect3DRMLight_GetClassName(pLight, &size, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); hr = IDirect3DRMLight_GetClassName(pLight, &size, cname); - todo_wine { ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(size != sizeof(cname), "size didn't change: %u\n", size); + ok(size == sizeof("Light"), "wrong strlen: %u\n", size); ok(!strcmp(cname, "Light"), "Expected cname to be \"Light\", but got \"%s\"\n", cname); - } type = IDirect3DRMLight_GetType(pLight); ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type);

1 0

André Hentschel : d3drm: Implement IDirect3DRMFrameX_GetClassName.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 9014211796b561abcbf90d11a545a76b71136cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9014211796b561abcbf90d11a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 14 20:29:21 2012 +0200 d3drm: Implement IDirect3DRMFrameX_GetClassName. --- dlls/d3drm/frame.c | 14 ++++++++++---- dlls/d3drm/tests/d3drm.c | 11 ++++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 26ebaf3..0100221 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -594,9 +594,9 @@ static HRESULT WINAPI IDirect3DRMFrame2Impl_GetClassName(IDirect3DRMFrame2* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame2(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + return IDirect3DRMFrame3_GetClassName(&This->IDirect3DRMFrame3_iface, size, name); } /*** IDirect3DRMFrame methods ***/ @@ -1493,9 +1493,15 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_GetClassName(IDirect3DRMFrame3* ifac { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name); + TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name); - return E_NOTIMPL; + if (!size || *size < strlen("Frame") || !name) + return E_INVALIDARG; + + strcpy(name, "Frame"); + *size = sizeof("Frame"); + + return D3DRM_OK; } /*** IDirect3DRMFrame methods ***/ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7ed4394..9444756 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -569,13 +569,18 @@ static void test_Frame(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRMFrame interface (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameC, 1); + hr = IDirect3DRMFrame_GetClassName(pFrameC, NULL, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + hr = IDirect3DRMFrame_GetClassName(pFrameC, NULL, NULL); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); + count = 1; + hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); + ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); count = sizeof(cname); hr = IDirect3DRMFrame_GetClassName(pFrameC, &count, cname); - todo_wine { ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); - ok(count != sizeof(cname), "size didn't change: %u\n", count); + ok(count == sizeof("Frame"), "wrong strlen: %u\n", count); ok(!strcmp(cname, "Frame"), "Expected cname to be \"Frame\", but got \"%s\"\n", cname); - } hr = IDirect3DRMFrame_GetParent(pFrameC, NULL); ok(hr == D3DRMERR_BADVALUE, "Should fail and return D3DRM_BADVALUE (hr = %x)\n", hr);

1 0

Dmitry Timoshkov : include: Fix WICPersistOptions definition.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: ce5ac728eca10b59d09eb566d5419bc4734cf8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5ac728eca10b59d09eb566d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 15 12:42:24 2012 +0900 include: Fix WICPersistOptions definition. --- include/wincodecsdk.idl | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 0a8a531..e42be4d 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -21,10 +21,11 @@ import "wincodec.idl"; typedef enum WICPersistOptions { WICPersistOptionsDefault = 0x00000000, - WICPersistOptionsLittleEndian = 0x00000001, - WICPersistOptionsBigEndian = 0x00000002, - WICPersistOptionsStrictFormat = 0x00000004, - WICPersistOptionsNoCacheStream = 0x00000008, + WICPersistOptionsLittleEndian = 0x00000000, + WICPersistOptionsBigEndian = 0x00000001, + WICPersistOptionsStrictFormat = 0x00000002, + WICPersistOptionsNoCacheStream = 0x00000004, + WICPersistOptionPreferUTF8 = 0x00000008, WICPersistOptionsMask = 0x0000FFFF } WICPersistOptions;

1 0

André Hentschel : ntdll: Check for NetBSD in CDROM_Verify.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 4f08dc0a7b1697a92efb00fdcd3c500e92eb0588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f08dc0a7b1697a92efb00fdc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 14 23:37:33 2012 +0200 ntdll: Check for NetBSD in CDROM_Verify. --- dlls/ntdll/cdrom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 1188772..53854a8 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1141,7 +1141,7 @@ static NTSTATUS CDROM_Verify(int dev, int fd) return STATUS_SUCCESS; else return STATUS_NO_MEDIA_IN_DEVICE; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__) int ret; ret = ioctl(fd, CDIOCSTART, NULL); if(ret == 0)

1 0

Vincent Povirk : kernel32: Return success from ReadFileEx/ WriteFileEx when I/O is pending.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 14404713de18cc04e2f9b91603c4c68397a16820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14404713de18cc04e2f9b9160… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 14 14:42:47 2012 -0500 kernel32: Return success from ReadFileEx/WriteFileEx when I/O is pending. --- dlls/kernel32/file.c | 10 +++++++--- dlls/kernel32/tests/pipe.c | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 089f693..18ed188 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -352,7 +352,7 @@ BOOL WINAPI ReadFileEx(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, status = NtReadFile(hFile, NULL, FILE_ReadWriteApc, lpCompletionRoutine, io_status, buffer, bytesToRead, &offset, NULL); - if (status) + if (status && status != STATUS_PENDING) { SetLastError( RtlNtStatusToDosError(status) ); return FALSE; @@ -484,8 +484,12 @@ BOOL WINAPI WriteFileEx(HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, status = NtWriteFile(hFile, NULL, FILE_ReadWriteApc, lpCompletionRoutine, io_status, buffer, bytesToWrite, &offset, NULL); - if (status) SetLastError( RtlNtStatusToDosError(status) ); - return !status; + if (status && status != STATUS_PENDING) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + return TRUE; } diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 64af60331..1a33e10 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1795,7 +1795,7 @@ static void test_readfileex_pending(void) completion_called = 0; ResetEvent(event); ret = ReadFileEx(server, read_buf, sizeof(read_buf), &overlapped, completion_routine); - todo_wine ok(ret == TRUE, "ReadFileEx failed, err=%i\n", GetLastError()); + ok(ret == TRUE, "ReadFileEx failed, err=%i\n", GetLastError()); ok(completion_called == 0, "completion routine called before ReadFileEx returned\n"); ret = WriteFile(client, test_string, sizeof(test_string), &num_bytes, NULL); @@ -1837,7 +1837,7 @@ static void test_readfileex_pending(void) ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); } - todo_wine ok(ret == TRUE, "WriteFileEx failed, err=%i\n", err); + ok(ret == TRUE, "WriteFileEx failed, err=%i\n", err); ok(completion_called == 0, "completion routine called but wait timed out\n"); ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n");

1 0

Vincent Povirk : kernel32: Add test for pending ReadFileEx/ WriteFileEx calls.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 982153605a0835993b3b6b10d826377fbe4e2b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=982153605a0835993b3b6b10d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 14 14:35:27 2012 -0500 kernel32: Add test for pending ReadFileEx/WriteFileEx calls. --- dlls/kernel32/tests/pipe.c | 111 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 7648f80..64af60331 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1750,6 +1750,116 @@ static void test_NamedPipeHandleState(void) CloseHandle(server); } +static void test_readfileex_pending(void) +{ + HANDLE server, client, event; + BOOL ret; + DWORD err, wait, num_bytes; + OVERLAPPED overlapped; + char read_buf[1024]; + char write_buf[1024]; + const char *test_string = "test"; + int i; + + server = CreateNamedPipe(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "cf failed\n"); + + event = CreateEventA(NULL, TRUE, FALSE, NULL); + ok(event != NULL, "CreateEventA failed\n"); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = event; + + ret = ConnectNamedPipe(server, &overlapped); + err = GetLastError(); + ok(ret == FALSE, "ConnectNamedPipe succeeded\n"); + ok(err == ERROR_IO_PENDING, "ConnectNamedPipe set error %i\n", err); + + wait = WaitForSingleObject(event, 0); + ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", wait); + + client = CreateFileA(PIPENAME, GENERIC_READ|GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, NULL); + ok(client != INVALID_HANDLE_VALUE, "cf failed\n"); + + wait = WaitForSingleObject(event, 0); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + + /* Start a read that can't complete immediately. */ + completion_called = 0; + ResetEvent(event); + ret = ReadFileEx(server, read_buf, sizeof(read_buf), &overlapped, completion_routine); + todo_wine ok(ret == TRUE, "ReadFileEx failed, err=%i\n", GetLastError()); + ok(completion_called == 0, "completion routine called before ReadFileEx returned\n"); + + ret = WriteFile(client, test_string, sizeof(test_string), &num_bytes, NULL); + ok(ret == TRUE, "WriteFile failed\n"); + ok(num_bytes == sizeof(test_string), "only %i bytes written\n", num_bytes); + + ok(completion_called == 0, "completion routine called during WriteFile\n"); + + wait = WaitForSingleObjectEx(event, 0, TRUE); + ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObjectEx returned %x\n", wait); + + ok(completion_called == 1, "completion not called after writing pipe\n"); + ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); + ok(completion_num_bytes == sizeof(test_string), "ReadFileEx returned only %d bytes\n", completion_num_bytes); + ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + ok(!memcmp(test_string, read_buf, sizeof(test_string)), "ReadFileEx read wrong bytes\n"); + + /* Make writes until the pipe is full and the write fails */ + memset(write_buf, 0xaa, sizeof(write_buf)); + for (i=0; i<256; i++) + { + completion_called = 0; + ResetEvent(event); + ret = WriteFileEx(server, write_buf, sizeof(write_buf), &overlapped, completion_routine); + err = GetLastError(); + + ok(completion_called == 0, "completion routine called during WriteFileEx\n"); + + wait = WaitForSingleObjectEx(event, 0, TRUE); + + if (wait == WAIT_TIMEOUT) + /* write couldn't complete immediately, presumably the pipe is full */ + break; + + ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + + ok(ret == TRUE, "WriteFileEx failed, err=%i\n", err); + ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); + ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + } + + todo_wine ok(ret == TRUE, "WriteFileEx failed, err=%i\n", err); + ok(completion_called == 0, "completion routine called but wait timed out\n"); + ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); + ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + + /* free up some space in the pipe */ + ret = ReadFile(client, read_buf, sizeof(read_buf), &num_bytes, NULL); + ok(ret == TRUE, "ReadFile failed\n"); + + ok(completion_called == 0, "completion routine called during ReadFile\n"); + + wait = WaitForSingleObjectEx(event, 0, TRUE); + ok(wait == WAIT_IO_COMPLETION || wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + + ok(completion_called == 1, "completion routine not called\n"); + ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); + ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + + CloseHandle(client); + CloseHandle(server); + CloseHandle(event); +} + START_TEST(pipe) { HMODULE hmod; @@ -1769,4 +1879,5 @@ START_TEST(pipe) test_impersonation(); test_overlapped(); test_NamedPipeHandleState(); + test_readfileex_pending(); }

1 0

Vincent Povirk : kernel32: Add named pipe server test with ReadFileEx/ WriteFileEx.
by Alexandre Julliard 15 Jun '12

15 Jun '12

Module: wine Branch: master Commit: 0a2d6e518326d2e3b1765346a610b327f4e9d81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2d6e518326d2e3b1765346a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 14 13:38:19 2012 -0500 kernel32: Add named pipe server test with ReadFileEx/WriteFileEx. --- dlls/kernel32/tests/pipe.c | 113 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 3484c62..7648f80 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -798,6 +798,113 @@ static DWORD CALLBACK serverThreadMain4(LPVOID arg) return 0; } +static int completion_called; +static DWORD completion_errorcode; +static DWORD completion_num_bytes; +static LPOVERLAPPED completion_lpoverlapped; + +static VOID WINAPI completion_routine(DWORD errorcode, DWORD num_bytes, LPOVERLAPPED lpoverlapped) +{ + completion_called++; + completion_errorcode = errorcode; + completion_num_bytes = num_bytes; + completion_lpoverlapped = lpoverlapped; + SetEvent(lpoverlapped->hEvent); +} + +/** Trivial byte echo server - uses ReadFileEx/WriteFileEx */ +static DWORD CALLBACK serverThreadMain5(LPVOID arg) +{ + int i; + HANDLE hEvent; + + trace("serverThreadMain5\n"); + /* Set up a simple echo server */ + hnp = CreateNamedPipe(PIPENAME "serverThreadMain5", PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + hEvent = CreateEvent(NULL, /* security attribute */ + TRUE, /* manual reset event */ + FALSE, /* initial state */ + NULL); /* name */ + ok(hEvent != NULL, "CreateEvent\n"); + + for (i = 0; i < NB_SERVER_LOOPS; i++) { + char buf[512]; + DWORD readden; + DWORD success; + OVERLAPPED oOverlap; + DWORD err; + + memset(&oOverlap, 0, sizeof(oOverlap)); + oOverlap.hEvent = hEvent; + + /* Wait for client to connect */ + trace("Server calling ConnectNamedPipe...\n"); + success = ConnectNamedPipe(hnp, NULL); + err = GetLastError(); + ok(success || (err == ERROR_PIPE_CONNECTED), "ConnectNamedPipe failed: %d\n", err); + trace("ConnectNamedPipe operation complete.\n"); + + /* Echo bytes once */ + memset(buf, 0, sizeof(buf)); + + trace("Server reading...\n"); + completion_called = 0; + ResetEvent(hEvent); + success = ReadFileEx(hnp, buf, sizeof(buf), &oOverlap, completion_routine); + trace("Server ReadFileEx returned...\n"); + ok(success, "ReadFileEx failed, err=%i\n", GetLastError()); + ok(completion_called == 0, "completion routine called before ReadFileEx return\n"); + trace("ReadFileEx returned.\n"); + if (success) { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait ReadFileEx returned %x\n", ret); + } + ok(completion_called == 1, "completion routine called %i times\n", completion_called); + ok(completion_errorcode == ERROR_SUCCESS, "completion routine got error %d\n", completion_errorcode); + ok(completion_num_bytes != 0, "read 0 bytes"); + ok(completion_lpoverlapped == &oOverlap, "got wrong overlapped pointer %p\n", completion_lpoverlapped); + readden = completion_num_bytes; + trace("Server done reading.\n"); + + trace("Server writing...\n"); + completion_called = 0; + ResetEvent(hEvent); + success = WriteFileEx(hnp, buf, readden, &oOverlap, completion_routine); + trace("Server WriteFileEx returned...\n"); + ok(success, "WriteFileEx failed, err=%i\n", GetLastError()); + ok(completion_called == 0, "completion routine called before ReadFileEx return\n"); + trace("overlapped WriteFile returned.\n"); + if (success) { + DWORD ret; + do { + ret = WaitForSingleObjectEx(hEvent, INFINITE, TRUE); + } while (ret == WAIT_IO_COMPLETION); + ok(ret == 0, "wait WriteFileEx returned %x\n", ret); + } + trace("Server done writing.\n"); + ok(completion_called == 1, "completion routine called %i times\n", completion_called); + ok(completion_errorcode == ERROR_SUCCESS, "completion routine got error %d\n", completion_errorcode); + ok(completion_num_bytes == readden, "read %i bytes wrote %i\n", readden, completion_num_bytes); + ok(completion_lpoverlapped == &oOverlap, "got wrong overlapped pointer %p\n", completion_lpoverlapped); + + /* finish this connection, wait for next one */ + ok(FlushFileBuffers(hnp), "FlushFileBuffers\n"); + ok(DisconnectNamedPipe(hnp), "DisconnectNamedPipe\n"); + } + return 0; +} + static void exercizeServer(const char *pipename, HANDLE serverThread) { int i; @@ -891,6 +998,12 @@ static void test_NamedPipe_2(void) ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); exercizeServer(PIPENAME "serverThreadMain4", serverThread); + /* Try server #5 */ + SetLastError(0xdeadbeef); + serverThread = CreateThread(NULL, 0, serverThreadMain5, 0, 0, &serverThreadId); + ok(serverThread != NULL, "CreateThread failed: %d\n", GetLastError()); + exercizeServer(PIPENAME "serverThreadMain5", serverThread); + ok(SetEvent( alarm_event ), "SetEvent\n"); CloseHandle( alarm_event ); trace("test_NamedPipe_2 returning\n");

1 0

Erich Hoover : hhctrl.ocx: Fix displaying the first page for some help files.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: e412c8c7b815271f248936e0a07a1fdc0970129c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e412c8c7b815271f248936e0a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jun 14 09:44:08 2012 -0600 hhctrl.ocx: Fix displaying the first page for some help files. --- dlls/hhctrl.ocx/chm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index af4fb19..f040e5d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -251,6 +251,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) HRESULT hr; DWORD cbRead; + static const WCHAR null[] = {0}; static const WCHAR toc_extW[] = {'h','h','c',0}; static const WCHAR index_extW[] = {'h','h','k',0}; static const WCHAR windowsW[] = {'#','W','I','N','D','O','W','S',0}; @@ -260,7 +261,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) { /* no defined window types so use (hopefully) sane defaults */ static const WCHAR defaultwinW[] = {'d','e','f','a','u','l','t','w','i','n','\0'}; - static const WCHAR null[] = {0}; memset((void*)&(info->WinType), 0, sizeof(info->WinType)); info->WinType.cbStruct=sizeof(info->WinType); info->WinType.fUniCodeStrings=TRUE; @@ -292,13 +292,16 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) info->WinType.pszType = info->pszType = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszType)); info->WinType.pszCaption = info->pszCaption = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszCaption)); - info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); info->WinType.pszHome = info->pszHome = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszHome)); info->WinType.pszJump1 = info->pszJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump1)); info->WinType.pszJump2 = info->pszJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump2)); info->WinType.pszUrlJump1 = info->pszUrlJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump1)); info->WinType.pszUrlJump2 = info->pszUrlJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump2)); + if (info->WinType.pszFile) + info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); + else + info->WinType.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); if (info->WinType.pszToc) info->WinType.pszToc = info->pszToc = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszToc)); else

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012