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

Stefan Dösinger : wined3d: Set WINED3DFMT_FLAG_FBO_ATTACHABLE on depth stencil formats.
by Alexandre Julliard June 9, 2015

June 9, 2015

Module: wine Branch: master Commit: 04c3c970724cae9d16ddaa33732d594fb14a4542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c3c970724cae9d16ddaa337… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:07 2015 +0200 wined3d: Set WINED3DFMT_FLAG_FBO_ATTACHABLE on depth stencil formats. --- dlls/wined3d/utils.c | 92 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 63 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04c3c970724cae9d16dda…

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf buffer getters.
by Alexandre Julliard June 9, 2015

June 9, 2015

Module: wine Branch: master Commit: 43b9cb71801186b23feac97ffc4f73e09d356e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b9cb71801186b23feac97ff… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:28 2015 +0200 msvcirt: Add implementation of streambuf buffer getters. --- dlls/msvcirt/msvcirt.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 36 ++++++++++---------- dlls/msvcrt20/msvcrt20.spec | 36 ++++++++++---------- dlls/msvcrt40/msvcrt40.spec | 36 ++++++++++---------- 4 files changed, 135 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43b9cb71801186b23feac…

1 0

Stefan Dösinger : wined3d: Require FBO attachability for render targets and depth stencils.
by Alexandre Julliard June 9, 2015

June 9, 2015

Module: wine Branch: master Commit: 28af7b407bb926953a73c373eb536449d1110e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28af7b407bb926953a73c373e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:08 2015 +0200 wined3d: Require FBO attachability for render targets and depth stencils. --- dlls/wined3d/resource.c | 7 +++++++ dlls/wined3d/utils.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7818deb..1891165 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -114,6 +114,13 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); continue; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) + { + WARN("Render target or depth stencil is not FBO attachable.\n"); + continue; + } if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) { WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a3c3def..687d3d7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1282,7 +1282,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_FRAMEBUFFER_OBJECT, NULL}, {WINED3DFMT_NULL, 0, 0, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FBO_ATTACHABLE, ARB_FRAMEBUFFER_OBJECT, NULL}, };

1 0

Nikolay Sivov : dwrite: Exit earlier when setting property for zero length range.
by Alexandre Julliard June 9, 2015

June 9, 2015

Module: wine Branch: master Commit: 1a2d520ee13cc126e303d797d56076c00128e871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2d520ee13cc126e303d797d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 21:12:54 2015 +0300 dwrite: Exit earlier when setting property for zero length range. --- dlls/dwrite/layout.c | 4 ++++ dlls/dwrite/tests/layout.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 96d4959..903e53d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1431,6 +1431,10 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo struct list *ranges; DWRITE_TEXT_RANGE r; + /* ignore zero length ranges */ + if (value->range.length == 0) + return S_OK; + /* select from ranges lists */ switch (attr) { diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 4dd0ab1..dd574b2 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1879,6 +1879,12 @@ static void test_SetFontSize(void) hr = IDWriteTextLayout_SetFontSize(layout, 15.0, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontSize(layout, 123.0, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + size = 0.0; hr = IDWriteTextLayout_GetFontSize(layout, 1, &size, &r); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1963,6 +1969,12 @@ static void test_SetFontFamilyName(void) hr = IDWriteTextLayout_SetFontFamilyName(layout, taHomaW, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontFamilyName(layout, arialW, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + r.startPosition = 0; r.length = 0; nameW[0] = 0; @@ -2034,6 +2046,12 @@ static void test_SetFontStyle(void) hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_ITALIC, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_NORMAL, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + style = DWRITE_FONT_STYLE_NORMAL; hr = IDWriteTextLayout_GetFontStyle(layout, 1, &style, &r); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2116,6 +2134,12 @@ static void test_SetFontStretch(void) hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_CONDENSED, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_NORMAL, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + stretch = DWRITE_FONT_STRETCH_UNDEFINED; hr = IDWriteTextLayout_GetFontStretch(layout, 1, &stretch, &r); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

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

June 9, 2015

Module: wine Branch: master Commit: 2e880feaab1d3868eb6779621e195f4153bb628d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e880feaab1d3868eb6779621… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:36 2015 +0200 msvcirt: Add implementation of streambuf::unbuffered. --- 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 7214699..a6d3749 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -385,6 +385,24 @@ int __thiscall streambuf_sync(streambuf *this) return EOF; } +/* ?unbuffered(a)streambuf@@IAEXH(a)Z */ +/* ?unbuffered(a)streambuf@@IEAAXH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_unbuffered_set, 8) +void __thiscall streambuf_unbuffered_set(streambuf *this, int buf) +{ + TRACE("(%p %d)\n", this, buf); + this->unbuffered = buf; +} + +/* ?unbuffered(a)streambuf@@IBEHXZ */ +/* ?unbuffered(a)streambuf@@IEBAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_unbuffered_get, 4) +int __thiscall streambuf_unbuffered_get(const streambuf *this) +{ + TRACE("(%p)\n", this); + return this->unbuffered; +} + /* Unexported */ DEFINE_THISCALL_WRAPPER(streambuf_underflow, 4) int __thiscall streambuf_underflow(streambuf *this) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 9ab9adf..8a57404 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -741,10 +741,10 @@ @ stub -arch=win64 ?tie(a)ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie(a)ios@@QBEPAVostream@@XZ # class ostream * __thiscall ios::tie(void)const @ stub -arch=win64 ?tie(a)ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z # void __thiscall streambuf::unbuffered(int) -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z -@ stub -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ # int __thiscall streambuf::unbuffered(void)const -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z(ptr long) streambuf_unbuffered_set +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z(ptr long) streambuf_unbuffered_set +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ(ptr) streambuf_unbuffered_get +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ(ptr) streambuf_unbuffered_get @ stub -arch=win32 ?underflow(a)filebuf@@UAEHXZ # virtual int __thiscall filebuf::underflow(void) @ stub -arch=win64 ?underflow(a)filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow(a)stdiobuf@@UAEHXZ # virtual int __thiscall stdiobuf::underflow(void) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 36dffbd..2c60964 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -730,10 +730,10 @@ @ stub -arch=win64 ?tie(a)ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie(a)ios@@QBEPAVostream@@XZ @ stub -arch=win64 ?tie(a)ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z -@ stub -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z(ptr long) msvcirt.?unbuffered(a)streambuf@@IAEXH(a)Z +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z(ptr long) msvcirt.?unbuffered(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ(ptr) msvcirt.?unbuffered(a)streambuf@@IBEHXZ +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ(ptr) msvcirt.?unbuffered(a)streambuf@@IEBAHXZ @ stub -arch=win32 ?underflow(a)filebuf@@UAEHXZ @ stub -arch=win64 ?underflow(a)filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow(a)stdiobuf@@UAEHXZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 4ae2ff4..a029b1b 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -802,10 +802,10 @@ @ stub -arch=win64 ?tie(a)ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie(a)ios@@QBEPAVostream@@XZ @ stub -arch=win64 ?tie(a)ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z -@ stub -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z(ptr long) msvcirt.?unbuffered(a)streambuf@@IAEXH(a)Z +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z(ptr long) msvcirt.?unbuffered(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ(ptr) msvcirt.?unbuffered(a)streambuf@@IBEHXZ +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ(ptr) msvcirt.?unbuffered(a)streambuf@@IEBAHXZ @ stub -arch=win32 ?underflow(a)filebuf@@UAEHXZ @ stub -arch=win64 ?underflow(a)filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow(a)stdiobuf@@UAEHXZ

1 0

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

June 9, 2015

Module: wine Branch: master Commit: 77dbfc8979ef5ed940e89557820f6dd2792158c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77dbfc8979ef5ed940e895578… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:21 2015 +0200 msvcirt: Add implementation of streambuf::allocate. --- dlls/msvcirt/msvcirt.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcirt/msvcirt.h | 1 + dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 23 +++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 6 files changed, 84 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e0781b9..507ed11 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); +#define RESERVE_SIZE 512 + /* class streambuf */ typedef struct { const vtable_ptr *vtable; @@ -47,6 +49,7 @@ typedef struct { CRITICAL_SECTION lock; } streambuf; +void __thiscall streambuf_setb(streambuf*, char*, char*, int); streambuf* __thiscall streambuf_setbuf(streambuf*, char*, int); void __thiscall streambuf_setg(streambuf*, char*, char*, char*); void __thiscall streambuf_setp(streambuf*, char*, char*); @@ -179,10 +182,29 @@ streambuf* __thiscall streambuf_scalar_dtor(streambuf *this, unsigned int flags) /* ?doallocate(a)streambuf@@MAEHXZ */ /* ?doallocate(a)streambuf@@MEAAHXZ */ DEFINE_THISCALL_WRAPPER(streambuf_doallocate, 4) +#define call_streambuf_doallocate(this) CALL_VTBL_FUNC(this, 40, int, (streambuf*), (this)) int __thiscall streambuf_doallocate(streambuf *this) { - FIXME("(%p): stub\n", this); - return EOF; + char *reserve; + + TRACE("(%p)\n", this); + reserve = MSVCRT_operator_new(RESERVE_SIZE); + if (!reserve) + return EOF; + + streambuf_setb(this, reserve, reserve + RESERVE_SIZE, 1); + return 1; +} + +/* ?allocate(a)streambuf@@IAEHXZ */ +/* ?allocate(a)streambuf@@IEAAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_allocate, 4) +int __thiscall streambuf_allocate(streambuf *this) +{ + TRACE("(%p)\n", this); + if (this->base != NULL || this->unbuffered) + return 0; + return call_streambuf_doallocate(this); } /* Unexported */ @@ -404,6 +426,35 @@ char * __thiscall MSVCIRT_str_sl_void(class_strstreambuf * _this) return 0; } +#ifdef __i386__ + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); +DEFINE_VTBL_WRAPPER(4); +DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); +DEFINE_VTBL_WRAPPER(16); +DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); +DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); +DEFINE_VTBL_WRAPPER(52); +DEFINE_VTBL_WRAPPER(56); + +#endif + +void* (__cdecl *MSVCRT_operator_new)(SIZE_T); void (__cdecl *MSVCRT_operator_delete)(void*); static void init_cxx_funcs(void) @@ -412,10 +463,12 @@ static void init_cxx_funcs(void) if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); } else { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); } } diff --git a/dlls/msvcirt/msvcirt.h b/dlls/msvcirt/msvcirt.h index bdcd7d8..5cf15de 100644 --- a/dlls/msvcirt/msvcirt.h +++ b/dlls/msvcirt/msvcirt.h @@ -23,6 +23,7 @@ typedef LONG streamoff; typedef LONG streampos; +extern void* (__cdecl *MSVCRT_operator_new)(SIZE_T); extern void (__cdecl *MSVCRT_operator_delete)(void*); void init_exception(void*); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index dfb2734..f987dfd 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -400,8 +400,8 @@ @ stub -arch=win32 ??_Gstrstream@@UAEPAXI(a)Z # virtual void * __thiscall strstream::`scalar deleting destructor'(unsigned int) @ stub -arch=win32 ??_Gstrstreambuf@@UAEPAXI(a)Z # virtual void * __thiscall strstreambuf::`scalar deleting destructor'(unsigned int) # @ extern ?adjustfield(a)ios@@2JB # static long const ios::adjustfield -@ stub -arch=win32 ?allocate(a)streambuf@@IAEHXZ # int __thiscall streambuf::allocate(void) -@ stub -arch=win64 ?allocate(a)streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) streambuf_allocate +@ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) streambuf_allocate @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z # class filebuf * __thiscall filebuf::attach(int) @ stub -arch=win64 ?attach(a)filebuf@@QEAAPEAV1(a)H@Z @ stub -arch=win32 ?attach(a)fstream@@QAEXH(a)Z # void __thiscall fstream::attach(int) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 311fd97..51b75ee 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -52,6 +52,8 @@ typedef struct { static streambuf* (*__thiscall p_streambuf_reserve_ctor)(streambuf*, char*, int); static streambuf* (*__thiscall p_streambuf_ctor)(streambuf*); static void (*__thiscall p_streambuf_dtor)(streambuf*); +static int (*__thiscall p_streambuf_allocate)(streambuf*); +static int (*__thiscall p_streambuf_doallocate)(streambuf*); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); @@ -127,12 +129,16 @@ static BOOL init(void) SET(p_streambuf_reserve_ctor, "??0streambuf@@IEAA(a)PEADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IEAA(a)XZ"); SET(p_streambuf_dtor, "??1streambuf@@UEAA(a)XZ"); + SET(p_streambuf_allocate, "?allocate(a)streambuf@@IEAAHXZ"); + SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MEAAHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IEAAXPEAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UEAAPEAV1(a)PEADH@Z"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE(a)PADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IAE(a)XZ"); SET(p_streambuf_dtor, "??1streambuf@@UAE(a)XZ"); + SET(p_streambuf_allocate, "?allocate(a)streambuf@@IAEHXZ"); + SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MAEHXZ"); SET(p_streambuf_setb, "?setb(a)streambuf@@IAEXPAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UAEPAV1(a)PADH@Z"); } @@ -145,6 +151,7 @@ static void test_streambuf(void) { streambuf sb, sb2, *psb; char reserve[16]; + int ret; memset(&sb, 0xab, sizeof(streambuf)); memset(&sb2, 0xab, sizeof(streambuf)); @@ -197,7 +204,21 @@ static void test_streambuf(void) ok(sb.base == reserve, "wrong base pointer, expected %p got %p\n", reserve, sb.base); ok(sb.ebuf == reserve+16, "wrong ebuf pointer, expected %p got %p\n", reserve+16, sb.ebuf); - sb.allocated = 0; + /* allocate */ + ret = (int) call_func1(p_streambuf_allocate, &sb); + ok(ret == 0, "wrong return value, expected 0 got %d\n", ret); + sb.base = NULL; + ret = (int) call_func1(p_streambuf_allocate, &sb); + ok(ret == 1, "wrong return value, expected 1 got %d\n", ret); + ok(sb.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb.allocated); + ok(sb.ebuf - sb.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb.ebuf, sb.base); + + /* doallocate */ + ret = (int) call_func1(p_streambuf_doallocate, &sb2); + ok(ret == 1, "doallocate failed, got %d\n", ret); + ok(sb2.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb2.allocated); + ok(sb2.ebuf - sb2.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb2.ebuf, sb2.base); + call_func1(p_streambuf_dtor, &sb); call_func1(p_streambuf_dtor, &sb2); } diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 3cefd74..195cdf1 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -388,8 +388,8 @@ @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z # @ extern ?adjustfield(a)ios@@2JB -@ stub -arch=win32 ?allocate(a)streambuf@@IAEHXZ -@ stub -arch=win64 ?allocate(a)streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) msvcirt.?allocate(a)streambuf@@IAEHXZ +@ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) msvcirt.?allocate(a)streambuf@@IEAAHXZ @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z @ stub -arch=win64 ?attach(a)filebuf@@QEAAPEAV1(a)H@Z @ stub -arch=win32 ?attach(a)fstream@@QAEXH(a)Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 705521a..0042f17 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -451,8 +451,8 @@ @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z # @ extern ?adjustfield(a)ios@@2JB -@ stub -arch=win32 ?allocate(a)streambuf@@IAEHXZ -@ stub -arch=win64 ?allocate(a)streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate(a)streambuf@@IAEHXZ(ptr) msvcirt.?allocate(a)streambuf@@IAEHXZ +@ cdecl -arch=win64 ?allocate(a)streambuf@@IEAAHXZ(ptr) msvcirt.?allocate(a)streambuf@@IEAAHXZ @ stub -arch=win32 ?attach(a)filebuf@@QAEPAV1(a)H@Z @ stub -arch=win64 ?attach(a)filebuf@@QEAAPEAV1(a)H@Z @ stub -arch=win32 ?attach(a)fstream@@QAEXH(a)Z

1 0

Michael Stefaniuc : dswave: Remove gratuitous IDirectMusicSegment8 from DirectSoundWave.
by Alexandre Julliard June 9, 2015

June 9, 2015

Module: wine Branch: master Commit: da07fe99a5f2276aa727fa4c3f73d7ab92fbf57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da07fe99a5f2276aa727fa4c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 8 21:33:09 2015 +0200 dswave: Remove gratuitous IDirectMusicSegment8 from DirectSoundWave. --- dlls/dswave/dswave.c | 226 ------------------------------------------- dlls/dswave/dswave_private.h | 1 - dlls/dswave/tests/dswave.c | 6 +- 3 files changed, 3 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da07fe99a5f2276aa727f…

1 0

Huw Davies : riched20: Append a final \par when writing the whole buffer.
by Alexandre Julliard June 9, 2015

June 9, 2015

Module: wine Branch: master Commit: 17f273360afc7bf4a3f7f4effe942404560f9fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f273360afc7bf4a3f7f4eff… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 8 14:53:46 2015 +0100 riched20: Append a final \par when writing the whole buffer. --- dlls/riched20/editor.c | 2 +- dlls/riched20/tests/editor.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/writer.c | 5 ++++- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 38861fd..3ce6c91 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1708,7 +1708,7 @@ ME_StreamInRTFString(ME_TextEditor *editor, BOOL selection, char *string) data.pos = 0; es.dwCookie = (DWORD_PTR)&data; es.pfnCallback = ME_ReadFromRTFString; - ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); + ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, TRUE); } diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 09437ef..c3470d4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3422,6 +3422,19 @@ static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, return 0; } +static int count_pars(const char *buf) +{ + const char *p = buf; + int count = 0; + while ((p = strstr( p, "\\par" )) != NULL) + { + if (!isalpha( p[4] )) + count++; + p++; + } + return count; +} + static void test_EM_STREAMOUT(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -3446,6 +3459,19 @@ static void test_EM_STREAMOUT(void) ok(strcmp(buf, TestItem1) == 0, "streamed text different, got %s\n", buf); + /* RTF mode writes the final end of para \r if it's part of the selection */ + p = buf; + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 12); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 0, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem2); p = buf; es.dwCookie = (DWORD_PTR)&p; @@ -3458,6 +3484,20 @@ static void test_EM_STREAMOUT(void) ok(r == 14, "streamed text length is %d, expecting 14\n", r); ok(strcmp(buf, TestItem3) == 0, "streamed text different from, got %s\n", buf); + + /* And again RTF mode writes the final end of para \r if it's part of the selection */ + p = buf; + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok (count_pars(buf) == 2, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, 13); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 1, "got %s\n", buf); + p = buf; + SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_RTF|SFF_SELECTION, (LPARAM)&es); + ok (count_pars(buf) == 2, "got %s\n", buf); + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)TestItem3); p = buf; es.dwCookie = (DWORD_PTR)&p; @@ -4904,7 +4944,7 @@ static void test_WM_PASTE(void) SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); - todo_wine ok(result == 0, + ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); /* Simulates undo (Ctrl-Z) */ hold_key(VK_CONTROL); @@ -4919,7 +4959,7 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('Y', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); - todo_wine ok(result == 0, + ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); release_key(VK_CONTROL); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 26a64a7..2c7386a 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -788,8 +788,11 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, ME_Cursor cursor = *start; ME_DisplayItem *prev_para = cursor.pPara; ME_Cursor endCur = cursor; + int actual_chars; - ME_MoveCursorChars(editor, &endCur, nChars); + actual_chars = ME_MoveCursorChars(editor, &endCur, nChars); + /* Include the final \r which MoveCursorChars will ignore. */ + if (actual_chars != nChars) endCur.nOffset++; if (!ME_StreamOutRTFHeader(pStream, dwFormat)) return FALSE;

1 0

Alexandre Julliard : server: Add a request to empty the clipboard.
by Alexandre Julliard June 9, 2015

June 9, 2015

Module: wine Branch: master Commit: 3d7aa246d5d812e93ba96f4ec78bf7c1b462102b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7aa246d5d812e93ba96f4ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 16:53:30 2015 +0900 server: Add a request to empty the clipboard. --- dlls/user32/clipboard.c | 64 +++++++++--------------------------------- dlls/user32/tests/clipboard.c | 4 +-- include/wine/server_protocol.h | 18 ++++++++++-- server/clipboard.c | 36 +++++++++++++----------- server/protocol.def | 6 +++- server/request.h | 3 ++ server/trace.c | 7 +++++ 7 files changed, 65 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d7aa246d5d812e93ba96…

1 0

Nikolay Sivov : kernel32/tests: Some tests for invalid classes in SetFileInformationByHandle().
by Alexandre Julliard June 9, 2015

June 9, 2015

Module: wine Branch: master Commit: 5742497a35691abc4fad7133265a0a69784679f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5742497a35691abc4fad71332… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 13:59:05 2015 +0300 kernel32/tests: Some tests for invalid classes in SetFileInformationByHandle(). --- dlls/kernel32/tests/file.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 31 ++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9480bd4..384dd8d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -55,6 +55,7 @@ static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES PLARGE_INTEGER, ULONG, ULONG, ULONG, ULONG, PVOID, ULONG); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR*); static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); +static BOOL (WINAPI *pSetFileInformationByHandle)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, void*, DWORD); static const char filename[] = "testfile.xxx"; static const char sillytext[] = @@ -99,6 +100,7 @@ static void InitFunctionPointers(void) pCreateFile2 = (void *) GetProcAddress(hkernel32, "CreateFile2"); pGetFinalPathNameByHandleA = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleA"); pGetFinalPathNameByHandleW = (void *) GetProcAddress(hkernel32, "GetFinalPathNameByHandleW"); + pSetFileInformationByHandle = (void *) GetProcAddress(hkernel32, "SetFileInformationByHandle"); } static void test__hread( void ) @@ -4581,6 +4583,62 @@ static void test_GetFinalPathNameByHandleW(void) CloseHandle(file); } +static void test_SetFileInformationByHandle(void) +{ + FILE_ATTRIBUTE_TAG_INFO fileattrinfo = { 0 }; + FILE_REMOTE_PROTOCOL_INFO protinfo = { 0 }; + FILE_STANDARD_INFO stdinfo = { }; + FILE_COMPRESSION_INFO compressinfo; + char tempFileName[MAX_PATH]; + char tempPath[MAX_PATH]; + HANDLE file; + BOOL ret; + + if (!pSetFileInformationByHandle) + { + win_skip("SetFileInformationByHandle is not supported\n"); + return; + } + + ret = GetTempPathA(sizeof(tempPath), tempPath); + ok(ret, "GetTempPathA failed, got error %u.\n", GetLastError()); + + /* ensure the existence of a file in the temp folder */ + ret = GetTempFileNameA(tempPath, "abc", 0, tempFileName); + ok(ret, "GetTempFileNameA failed, got error %u.\n", GetLastError()); + + file = CreateFileA(tempFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open the temp file, error %u.\n", GetLastError()); + + /* invalid classes */ + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileStandardInfo, &stdinfo, sizeof(stdinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + memset(&compressinfo, 0, sizeof(compressinfo)); + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileCompressionInfo, &compressinfo, sizeof(compressinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileAttributeTagInfo, &fileattrinfo, sizeof(fileattrinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + memset(&protinfo, 0, sizeof(protinfo)); + protinfo.StructureVersion = 1; + protinfo.StructureSize = sizeof(protinfo); + SetLastError(0xdeadbeef); + ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo)); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + + CloseHandle(file); +} + START_TEST(file) { InitFunctionPointers(); @@ -4636,4 +4694,5 @@ START_TEST(file) test_file_access(); test_GetFinalPathNameByHandleA(); test_GetFinalPathNameByHandleW(); + test_SetFileInformationByHandle(); } diff --git a/include/winbase.h b/include/winbase.h index 4795d87..c558b21 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -874,6 +874,37 @@ typedef struct _FILE_RENAME_INFO { WCHAR FileName[1]; } FILE_RENAME_INFO, *PFILE_RENAME_INFO; +typedef struct _FILE_ATTRIBUTE_TAG_INFO { + DWORD FileAttributes; + DWORD ReparseTag; +} FILE_ATTRIBUTE_TAG_INFO, *PFILE_ATTRIBUTE_TAG_INFO; + +typedef struct _FILE_COMPRESSION_INFO { + LARGE_INTEGER CompressedFileSize; + WORD CompressionFormat; + UCHAR CompressionUnitShift; + UCHAR ChunkShift; + UCHAR ClusterShift; + UCHAR Reserved[3]; +} FILE_COMPRESSION_INFO, *PFILE_COMPRESSION_INFO; + +typedef struct _FILE_REMOTE_PROTOCOL_INFO { + USHORT StructureVersion; + USHORT StructureSize; + ULONG Protocol; + USHORT ProtocolMajorVersion; + USHORT ProtocolMinorVersion; + USHORT ProtocolRevision; + USHORT Reserved; + ULONG Flags; + struct { + ULONG Reserved[8]; + } GenericReserved; + struct { + ULONG Reserved[16]; + } ProtocolSpecificReserved; +} FILE_REMOTE_PROTOCOL_INFO, *PFILE_REMOTE_PROTOCOL_INFO; + #define PIPE_ACCESS_INBOUND 1 #define PIPE_ACCESS_OUTBOUND 2 #define PIPE_ACCESS_DUPLEX 3

1 0