September 2013 - Wine-Commits

Jacek Caban : mshtml: Added IHTMLFormElement::sumit tests.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: 66988a681a6bf8d04eb93d75dd33e6665b9099b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66988a681a6bf8d04eb93d75d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 27 15:22:43 2013 +0200 mshtml: Added IHTMLFormElement::sumit tests. --- dlls/mshtml/tests/htmldoc.c | 228 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 216 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66988a681a6bf8d04eb93…

1 0

Piotr Caban : msvcr90: Don't forward exception constructors to msvcrt.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: 8b21fefbf66595849e837c91811ab6627164c111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b21fefbf66595849e837c918… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 12:00:44 2013 +0200 msvcr90: Don't forward exception constructors to msvcrt. --- dlls/msvcr90/msvcr90.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 16 ++++---- 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 4787867..7640738 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -18,17 +18,58 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + #include <stdarg.h> #include "stdio.h" #include "windef.h" #include "winbase.h" +#ifdef __i386__ + +#define THISCALL(func) __thiscall_ ## func +#define __thiscall __stdcall +#define DEFINE_THISCALL_WRAPPER(func,args) \ + extern void THISCALL(func)(void); \ + __ASM_GLOBAL_FUNC(__thiscall_ ## func, \ + "popl %eax\n\t" \ + "pushl %ecx\n\t" \ + "pushl %eax\n\t" \ + "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) ) + +extern void *call_thiscall_func; +__ASM_GLOBAL_FUNC(call_thiscall_func, + "popl %eax\n\t" + "popl %edx\n\t" + "popl %ecx\n\t" + "pushl %eax\n\t" + "jmp *%edx\n\t") + +#define call_func1(func,this) ((void* (WINAPI*)(void*,void*))&call_thiscall_func)(func,this) +#define call_func2(func,this,a) ((void* (WINAPI*)(void*,void*,const void*))&call_thiscall_func)(func,this,(const void*)(a)) +#define call_func3(func,this,a,b) ((void* (WINAPI*)(void*,void*,const void*,const void*))&call_thiscall_func)(func,this,(const void*)(a),(const void*)(b)) + +#else /* __i386__ */ + +#define __thiscall __cdecl +#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */ + +#define call_func1(func,this) func(this) +#define call_func2(func,this,a) func(this,a) +#define call_func3(func,this,a,b) func(this,a,b) + +#endif /* __i386__ */ + typedef void (__cdecl *MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); static void* (__cdecl *MSVCRT_operator_new)(size_t); static void (__cdecl *MSVCRT_operator_delete)(void*); static MSVCRT__se_translator_function (__cdecl *MSVCRT__set_se_translator)(MSVCRT__se_translator_function); +static void* (__thiscall *MSVCRT_exception_ctor)(void*, const char**); +static void* (__thiscall *MSVCRT_exception_ctor_noalloc)(void*, char**, int); +static void* (__thiscall *MSVCRT_exception_copy_ctor)(void*, const void*); +static void (__thiscall *MSVCRT_exception_dtor)(void*); static void init_cxx_funcs(void) { @@ -40,6 +81,10 @@ static void init_cxx_funcs(void) MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, "?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z"); + MSVCRT_exception_ctor = (void*)GetProcAddress(hmod, "??0exception@@QEAA(a)AEBQEBD@Z"); + MSVCRT_exception_ctor_noalloc = (void*)GetProcAddress(hmod, "??0exception@@QEAA(a)AEBQEBDH@Z"); + MSVCRT_exception_copy_ctor = (void*)GetProcAddress(hmod, "??0exception@@QEAA(a)AEBV0@@Z"); + MSVCRT_exception_dtor = (void*)GetProcAddress(hmod, "??1exception@@UEAA(a)XZ"); } else { @@ -47,6 +92,10 @@ static void init_cxx_funcs(void) MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, "?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z"); + MSVCRT_exception_ctor = (void*)GetProcAddress(hmod, "??0exception@@QAE(a)ABQBD@Z"); + MSVCRT_exception_ctor_noalloc = (void*)GetProcAddress(hmod, "??0exception@@QAE(a)ABQBDH@Z"); + MSVCRT_exception_copy_ctor = (void*)GetProcAddress(hmod, "??0exception@@QAE(a)ABV0@@Z"); + MSVCRT_exception_dtor = (void*)GetProcAddress(hmod, "??1exception@@UAE(a)XZ"); } } @@ -116,3 +165,35 @@ MSVCRT__se_translator_function CDECL MSVCR90__set_se_translator(MSVCRT__se_trans { return MSVCRT__set_se_translator(func); } + +/* ??0exception(a)std@@QAE(a)ABQBD@Z */ +/* ??0exception(a)std@@QEAA(a)AEBQEBD@Z */ +DEFINE_THISCALL_WRAPPER(exception_ctor, 8) +void* __thiscall exception_ctor(void *this, const char **name) +{ + return call_func2(MSVCRT_exception_ctor, this, name); +} + +/* ??0exception(a)std@@QAE(a)ABQBDH@Z */ +/* ??0exception(a)std@@QEAA(a)AEBQEBDH@Z */ +DEFINE_THISCALL_WRAPPER(exception_ctor_noalloc, 12) +void* __thiscall exception_ctor_noalloc(void *this, char **name, int noalloc) +{ + return call_func3(MSVCRT_exception_ctor_noalloc, this, name, noalloc); +} + +/* ??0exception(a)std@@QAE(a)ABV01@@Z */ +/* ??0exception(a)std@@QEAA(a)AEBV01@@Z */ +DEFINE_THISCALL_WRAPPER(exception_copy_ctor, 8) +void* __thiscall exception_copy_ctor(void *this, const void *rhs) +{ + return call_func2(MSVCRT_exception_copy_ctor, this, rhs); +} + +/* ??1exception(a)std@@UAE(a)XZ */ +/* ??1exception(a)std@@UEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(exception_dtor, 4) +void __thiscall exception_dtor(void *this) +{ + call_func1(MSVCRT_exception_dtor, this); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3632599..36cf2e4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -12,12 +12,12 @@ @ cdecl -arch=win64 ??0bad_typeid(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0bad_typeid@@QEAA(a)AEBV0@@Z @ thiscall -arch=i386 ??0bad_typeid(a)std@@QAE(a)PBD@Z(ptr str) msvcrt.??0bad_typeid@@QAE(a)PBD@Z @ cdecl -arch=win64 ??0bad_typeid(a)std@@QEAA(a)PEBD@Z(ptr str) msvcrt.??0bad_typeid@@QEAA(a)PEBD@Z -@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABQBD@Z(ptr ptr) msvcrt.??0exception@@QAE(a)ABQBD@Z -@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBQEBD@Z(ptr ptr) msvcrt.??0exception@@QEAA(a)AEBQEBD@Z -@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABQBDH@Z(ptr ptr long) msvcrt.??0exception@@QAE(a)ABQBDH@Z -@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBQEBDH@Z(ptr ptr long) msvcrt.??0exception@@QEAA(a)AEBQEBDH@Z -@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABV01@@Z(ptr ptr) msvcrt.??0exception@@QAE(a)ABV0@@Z -@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0exception@@QEAA(a)AEBV0@@Z +@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABQBD@Z(ptr ptr) exception_ctor +@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBQEBD@Z(ptr ptr) exception_ctor +@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABQBDH@Z(ptr ptr long) exception_ctor_noalloc +@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBQEBDH@Z(ptr ptr long) exception_ctor_noalloc +@ thiscall -arch=i386 ??0exception(a)std@@QAE(a)ABV01@@Z(ptr ptr) exception_copy_ctor +@ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) exception_copy_ctor @ thiscall -arch=i386 ??0exception(a)std@@QAE(a)XZ(ptr) msvcrt.??0exception@@QAE(a)XZ @ cdecl -arch=win64 ??0exception(a)std@@QEAA(a)XZ(ptr) msvcrt.??0exception@@QEAA(a)XZ @ thiscall -arch=i386 ??1__non_rtti_object(a)std@@UAE(a)XZ(ptr) msvcrt.??1__non_rtti_object@@UAE(a)XZ @@ -26,8 +26,8 @@ @ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_cast@@UEAA(a)XZ @ thiscall -arch=i386 ??1bad_typeid(a)std@@UAE(a)XZ(ptr) msvcrt.??1bad_typeid@@UAE(a)XZ @ cdecl -arch=win64 ??1bad_typeid(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_typeid@@UEAA(a)XZ -@ thiscall -arch=i386 ??1exception(a)std@@UAE(a)XZ(ptr) msvcrt.??1exception@@UAE(a)XZ -@ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) msvcrt.??1exception@@UEAA(a)XZ +@ thiscall -arch=i386 ??1exception(a)std@@UAE(a)XZ(ptr) exception_dtor +@ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) exception_dtor @ cdecl -arch=arm ??1type_info@@UAA(a)XZ(ptr) msvcrt.??1type_info@@UAA(a)XZ @ thiscall -arch=i386 ??1type_info@@UAE(a)XZ(ptr) msvcrt.??1type_info@@UAE(a)XZ @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ

1 0

Frédéric Delanoy : user32: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: 2dd332789b5816c41e7598c4b9e933548656b69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd332789b5816c41e7598c4b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 27 08:43:21 2013 +0200 user32: Use BOOL type where appropriate. --- dlls/user32/text.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/user32/text.c b/dlls/user32/text.c index a32792e..12432b8 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -357,7 +357,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, unsigned int *chars_used, SIZE *size) { WCHAR *p; - int word_fits; + BOOL word_fits; SCRIPT_LOGATTR *sla; SCRIPT_ANALYSIS sa; int i; @@ -395,7 +395,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, /* If there was one or the first character didn't fit then */ if (word_fits) { - int next_is_space; + BOOL next_is_space; /* break the line before/after that character */ if (!(format & (DT_RIGHT | DT_CENTER)) || *p != SPACE) p++; @@ -562,7 +562,7 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns, * newline representation or nothing */ -static int remainder_is_none_or_newline (int num_chars, const WCHAR *str) +static BOOL remainder_is_none_or_newline (int num_chars, const WCHAR *str) { if (!num_chars) return TRUE; if (*str != LF && *str != CR) return FALSE; @@ -615,10 +615,8 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, int seg_i, seg_count, seg_j; int max_seg_width; int num_fit; - int word_broken; - int line_fits; + BOOL word_broken, line_fits, ellipsified; unsigned int j_in_seg; - int ellipsified; *pprefix_offset = -1; /* For each text segment in the line */ @@ -699,7 +697,7 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, * combined, and may differ between versions (to say nothing of the * several bugs in the Microsoft versions). */ - word_broken = 0; + word_broken = FALSE; line_fits = (num_fit >= j_in_seg); if (!line_fits && (format & DT_WORDBREAK)) { @@ -712,19 +710,19 @@ static const WCHAR *TEXT_NextLineW( HDC hdc, const WCHAR *str, int *count, TEXT_SkipChars (count, &s, seg_count, str+seg_i, i-seg_i, chars_used, !(format & DT_NOPREFIX)); i = s - str; - word_broken = 1; + word_broken = TRUE; } pellip->before = j_in_seg; pellip->under = 0; pellip->after = 0; pellip->len = 0; - ellipsified = 0; + ellipsified = FALSE; if (!line_fits && (format & DT_PATH_ELLIPSIS)) { TEXT_PathEllipsify (hdc, dest + seg_j, maxl-seg_j, &j_in_seg, max_seg_width, &size, *p_retstr, pellip); line_fits = (size.cx <= max_seg_width); - ellipsified = 1; + ellipsified = TRUE; } /* NB we may end up ellipsifying a word-broken or path_ellipsified * string */ @@ -885,7 +883,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int tabwidth /* to keep gcc happy */ = 0; int prefix_offset; ellipsis_data ellip; - int invert_y=0; + BOOL invert_y=FALSE; TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); @@ -935,7 +933,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, GetWindowExtEx(hdc, &window_ext); GetViewportExtEx(hdc, &viewport_ext); if ((window_ext.cy > 0) != (viewport_ext.cy > 0)) - invert_y = 1; + invert_y = TRUE; } if (dtp)

1 0

Henri Verbeet : wined3d: Send draw operation through the command stream.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: baf285d46a8d93b673a6368c68f833dbbcbc39f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf285d46a8d93b673a6368c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:15 2013 +0200 wined3d: Send draw operation through the command stream. --- dlls/wined3d/cs.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 9 ++++----- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 988c8d4..cdd7794 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -27,6 +27,7 @@ enum wined3d_cs_op { WINED3D_CS_OP_PRESENT, WINED3D_CS_OP_CLEAR, + WINED3D_CS_OP_DRAW, }; struct wined3d_cs_present @@ -51,6 +52,16 @@ struct wined3d_cs_clear DWORD stencil; }; +struct wined3d_cs_draw +{ + enum wined3d_cs_op opcode; + UINT start_idx; + UINT index_count; + UINT start_instance; + UINT instance_count; + BOOL indexed; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -111,10 +122,35 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * cs->ops->submit(cs); } +static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_draw *op = data; + + draw_primitive(cs->device, op->start_idx, op->index_count, + op->start_instance, op->instance_count, op->indexed); +} + +void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_count, + UINT start_instance, UINT instance_count, BOOL indexed) +{ + struct wined3d_cs_draw *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_DRAW; + op->start_idx = start_idx; + op->index_count = index_count; + op->start_instance = start_instance; + op->instance_count = instance_count; + op->indexed = indexed; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, + /* WINED3D_CS_OP_DRAW */ wined3d_cs_exec_draw, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6722990..6d5f913 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3542,9 +3542,8 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - /* Account for the loading offset due to index buffers. Instead of - * reloading all sources correct it with the startvertex parameter. */ - draw_primitive(device, start_vertex, vertex_count, 0, 0, FALSE); + wined3d_cs_emit_draw(device->cs, start_vertex, vertex_count, 0, 0, FALSE); + return WINED3D_OK; } @@ -3577,7 +3576,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - draw_primitive(device, start_idx, index_count, 0, 0, TRUE); + wined3d_cs_emit_draw(device->cs, start_idx, index_count, 0, 0, TRUE); return WINED3D_OK; } @@ -3587,7 +3586,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device { TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); - draw_primitive(device, start_idx, index_count, start_instance, instance_count, TRUE); + wined3d_cs_emit_draw(device->cs, start_idx, index_count, start_instance, instance_count, TRUE); } /* This is a helper function for UpdateTexture, there is no UpdateVolume method in D3D. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a4ca29..3ffa4da 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2475,6 +2475,8 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_count, + UINT start_instance, UINT instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send clear operations through the command stream.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: 708b938f64732d23d05606fe2fb08f1e8ce134a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708b938f64732d23d05606fe2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:14 2013 +0200 wined3d: Send clear operations through the command stream. --- dlls/wined3d/cs.c | 52 ++++++++++++++++++++++++++++++++++++--- dlls/wined3d/device.c | 8 +---- dlls/wined3d/wined3d_private.h | 5 +++- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5f9bb56..988c8d4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); enum wined3d_cs_op { WINED3D_CS_OP_PRESENT, + WINED3D_CS_OP_CLEAR, }; struct wined3d_cs_present @@ -39,7 +40,18 @@ struct wined3d_cs_present DWORD flags; }; -static void wined3d_cs_exec_present(const void *data) +struct wined3d_cs_clear +{ + enum wined3d_cs_op opcode; + DWORD rect_count; + const RECT *rects; + DWORD flags; + const struct wined3d_color *color; + float depth; + DWORD stencil; +}; + +static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; struct wined3d_swapchain *swapchain; @@ -69,9 +81,40 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw cs->ops->submit(cs); } -static void (* const wined3d_cs_op_handlers[])(const void *data) = +static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_clear *op = data; + struct wined3d_device *device; + RECT draw_rect; + + device = cs->device; + wined3d_get_draw_rect(&device->state, &draw_rect); + device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, + &device->fb, op->rect_count, op->rects, &draw_rect, op->flags, + op->color, op->depth, op->stencil); +} + +void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, + DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) +{ + struct wined3d_cs_clear *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_CLEAR; + op->rect_count = rect_count; + op->rects = rects; + op->flags = flags; + op->color = color; + op->depth = depth; + op->stencil = stencil; + + cs->ops->submit(cs); +} + +static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, + /* WINED3D_CS_OP_CLEAR */ wined3d_cs_exec_clear, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) @@ -94,7 +137,7 @@ static void wined3d_cs_st_submit(struct wined3d_cs *cs) { enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)cs->data; - wined3d_cs_op_handlers[opcode](cs->data); + wined3d_cs_op_handlers[opcode](cs, cs->data); } static const struct wined3d_cs_ops wined3d_cs_st_ops = @@ -103,7 +146,7 @@ static const struct wined3d_cs_ops wined3d_cs_st_ops = wined3d_cs_st_submit, }; -struct wined3d_cs *wined3d_cs_create(void) +struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) { struct wined3d_cs *cs; @@ -111,6 +154,7 @@ struct wined3d_cs *wined3d_cs_create(void) return NULL; cs->ops = &wined3d_cs_st_ops; + cs->device = device; cs->data_size = WINED3D_INITIAL_CS_SIZE; if (!(cs->data = HeapAlloc(GetProcessHeap(), 0, cs->data_size))) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff23770..6722990 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3466,8 +3466,6 @@ HRESULT CDECL wined3d_device_present(const struct wined3d_device *device, const HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - RECT draw_rect; - TRACE("device %p, rect_count %u, rects %p, flags %#x, color {%.8e, %.8e, %.8e, %.8e}, depth %.8e, stencil %u.\n", device, rect_count, rects, flags, color->r, color->g, color->b, color->a, depth, stencil); @@ -3497,9 +3495,7 @@ HRESULT CDECL wined3d_device_clear(struct wined3d_device *device, DWORD rect_cou } } - wined3d_get_draw_rect(&device->state, &draw_rect); - device_clear_render_targets(device, device->adapter->gl_info.limits.buffers, - &device->fb, rect_count, rects, &draw_rect, flags, color, depth, stencil); + wined3d_cs_emit_clear(device->cs, rect_count, rects, flags, color, depth, stencil); return WINED3D_OK; } @@ -4982,7 +4978,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, state_init_default(&device->state, &adapter->gl_info); device->update_state = &device->state; - if (!(device->cs = wined3d_cs_create())) + if (!(device->cs = wined3d_cs_create(device))) { WARN("Failed to create command stream.\n"); state_cleanup(&device->state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 251de34..5a4ca29 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2464,14 +2464,17 @@ struct wined3d_cs_ops struct wined3d_cs { const struct wined3d_cs_ops *ops; + struct wined3d_device *device; size_t data_size; void *data; }; -struct wined3d_cs *wined3d_cs_create(void) DECLSPEC_HIDDEN; +struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; +void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, + DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send present operations through a command stream.
by Alexandre Julliard Sept. 27, 2013

Sept. 27, 2013

Module: wine Branch: master Commit: 602c82bce86db8fff427b146176490db8bf7529d URL: http://source.winehq.org/git/wine.git/?a=commit;h=602c82bce86db8fff427b1461… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 27 00:15:13 2013 +0200 wined3d: Send present operations through a command stream. The eventual goal is to have a multithreaded implementation of wined3d_cs_ops and offload some processing to a different thread. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/cs.c | 128 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 25 ++++++-- dlls/wined3d/swapchain.c | 5 +- dlls/wined3d/wined3d_private.h | 24 ++++++++ 5 files changed, 174 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index b1051c2..f77f35d 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -7,6 +7,7 @@ C_SRCS = \ ati_fragment_shader.c \ buffer.c \ context.c \ + cs.c \ device.c \ directx.c \ drawprim.c \ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c new file mode 100644 index 0000000..5f9bb56 --- /dev/null +++ b/dlls/wined3d/cs.c @@ -0,0 +1,128 @@ +/* + * Copyright 2013 Henri Verbeet for CodeWeavers + * + * 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 "wined3d_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d); + +#define WINED3D_INITIAL_CS_SIZE 4096 + +enum wined3d_cs_op +{ + WINED3D_CS_OP_PRESENT, +}; + +struct wined3d_cs_present +{ + enum wined3d_cs_op opcode; + HWND dst_window_override; + struct wined3d_swapchain *swapchain; + const RECT *src_rect; + const RECT *dst_rect; + const RGNDATA *dirty_region; + DWORD flags; +}; + +static void wined3d_cs_exec_present(const void *data) +{ + const struct wined3d_cs_present *op = data; + struct wined3d_swapchain *swapchain; + + swapchain = op->swapchain; + wined3d_swapchain_set_window(swapchain, op->dst_window_override); + + swapchain->swapchain_ops->swapchain_present(swapchain, + op->src_rect, op->dst_rect, op->dirty_region, op->flags); +} + +void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + const RGNDATA *dirty_region, DWORD flags) +{ + struct wined3d_cs_present *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_PRESENT; + op->dst_window_override = dst_window_override; + op->swapchain = swapchain; + op->src_rect = src_rect; + op->dst_rect = dst_rect; + op->dirty_region = dirty_region; + op->flags = flags; + + cs->ops->submit(cs); +} + +static void (* const wined3d_cs_op_handlers[])(const void *data) = +{ + /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, +}; + +static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) +{ + if (size > cs->data_size) + { + void *new_data; + + if (!(new_data = HeapReAlloc(GetProcessHeap(), 0, cs->data, cs->data_size * 2))) + return NULL; + + cs->data_size *= 2; + cs->data = new_data; + } + + return cs->data; +} + +static void wined3d_cs_st_submit(struct wined3d_cs *cs) +{ + enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)cs->data; + + wined3d_cs_op_handlers[opcode](cs->data); +} + +static const struct wined3d_cs_ops wined3d_cs_st_ops = +{ + wined3d_cs_st_require_space, + wined3d_cs_st_submit, +}; + +struct wined3d_cs *wined3d_cs_create(void) +{ + struct wined3d_cs *cs; + + if (!(cs = HeapAlloc(GetProcessHeap(), 0, sizeof(*cs)))) + return NULL; + + cs->ops = &wined3d_cs_st_ops; + + cs->data_size = WINED3D_INITIAL_CS_SIZE; + if (!(cs->data = HeapAlloc(GetProcessHeap(), 0, cs->data_size))) + { + HeapFree(GetProcessHeap(), 0, cs); + return NULL; + } + + return cs; +} + +void wined3d_cs_destroy(struct wined3d_cs *cs) +{ + HeapFree(GetProcessHeap(), 0, cs); +} diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 34ceaa7..ff23770 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -485,6 +485,8 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { UINT i; + wined3d_cs_destroy(device->cs); + if (device->recording && wined3d_stateblock_decref(device->recording)) FIXME("Something's still holding the recording stateblock.\n"); device->recording = NULL; @@ -4975,17 +4977,28 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, if (FAILED(hr = state_init(&device->state, &device->fb, &adapter->d3d_info))) { ERR("Failed to initialize device state, hr %#x.\n", hr); - for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) - { - HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); - } - wined3d_decref(device->wined3d); - return hr; + goto err; } state_init_default(&device->state, &adapter->gl_info); device->update_state = &device->state; + if (!(device->cs = wined3d_cs_create())) + { + WARN("Failed to create command stream.\n"); + state_cleanup(&device->state); + hr = E_FAIL; + goto err; + } + return WINED3D_OK; + +err: + for (i = 0; i < sizeof(device->multistate_funcs) / sizeof(device->multistate_funcs[0]); ++i) + { + HeapFree(GetProcessHeap(), 0, device->multistate_funcs[i]); + } + wined3d_decref(device->wined3d); + return hr; } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 62827c9..2bab9ed 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -149,9 +149,8 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, return WINED3DERR_INVALIDCALL; } - wined3d_swapchain_set_window(swapchain, dst_window_override); - - swapchain->swapchain_ops->swapchain_present(swapchain, src_rect, dst_rect, dirty_region, flags); + wined3d_cs_emit_present(swapchain->device->cs, swapchain, src_rect, + dst_rect, dst_window_override, dirty_region, flags); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b979dc..251de34 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1939,6 +1939,9 @@ struct wined3d_device UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS]; UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS]; + /* Command stream */ + struct wined3d_cs *cs; + /* Context management */ struct wined3d_context **contexts; UINT context_count; @@ -2452,6 +2455,27 @@ HRESULT state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, void state_init_default(struct wined3d_state *state, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; +struct wined3d_cs_ops +{ + void *(*require_space)(struct wined3d_cs *cs, size_t size); + void (*submit)(struct wined3d_cs *cs); +}; + +struct wined3d_cs +{ + const struct wined3d_cs_ops *ops; + + size_t data_size; + void *data; +}; + +struct wined3d_cs *wined3d_cs_create(void) DECLSPEC_HIDDEN; +void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; + +void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; + /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d * allows GetData on a created issue, but opengl doesn't

1 0

Jacek Caban : mshtml: Use proper BINF flags for form submit.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: fe252319f01085ecfa1fb951cb2d37ea7495158f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe252319f01085ecfa1fb951c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:34:59 2013 +0200 mshtml: Use proper BINF flags for form submit. --- dlls/mshtml/navigate.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4091529..539d2c4 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1855,12 +1855,17 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, BOOL is_doc_binding, nsChannelBSC **retval) { nsChannelBSC *ret; + DWORD bindf; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; - init_bscallback(&ret->bsc, &nsChannelBSCVtbl, mon, BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA); + bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; + if(post_data_size) + bindf |= BINDF_FORMS_SUBMIT | BINDF_PRAGMA_NO_CACHE | BINDF_HYPERLINK | BINDF_GETNEWESTVERSION; + + init_bscallback(&ret->bsc, &nsChannelBSCVtbl, mon, bindf); ret->is_doc_channel = is_doc_binding; if(headers) {

1 0

Jacek Caban : mshtml: Call set_current_mon in channelbsc_load_stream.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 553eae881bec144e733d62906664e340f9350e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553eae881bec144e733d62906… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:34:40 2013 +0200 mshtml: Call set_current_mon in channelbsc_load_stream. --- dlls/mshtml/binding.h | 2 +- dlls/mshtml/navigate.c | 4 +++- dlls/mshtml/persist.c | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 392713b..d953541 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -118,7 +118,7 @@ HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; -HRESULT channelbsc_load_stream(HTMLInnerWindow*,IStream*) DECLSPEC_HIDDEN; +HRESULT channelbsc_load_stream(HTMLInnerWindow*,IMoniker*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2c0666e..4e6ed61 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1953,7 +1953,7 @@ void abort_window_bindings(HTMLInnerWindow *window) } } -HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IStream *stream) +HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IMoniker *mon, IStream *stream) { nsChannelBSC *bscallback = pending_window->bscallback; HRESULT hres = S_OK; @@ -1967,6 +1967,8 @@ HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IStream *stream) if(!bscallback->nschannel->content_type) return E_OUTOFMEMORY; + set_current_mon(pending_window->base.outer_window, mon, 0); + bscallback->bsc.window = pending_window; if(stream) hres = read_stream_data(bscallback, stream); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 8f36c75..8c0ad68 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -844,11 +844,12 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); - IMoniker_Release(mon); if(FAILED(hres)) return hres; - return channelbsc_load_stream(This->window->pending_window, pStm); + hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); + IMoniker_Release(mon); + return hres; } static HRESULT WINAPI PersistStreamInit_Save(IPersistStreamInit *iface, LPSTREAM pStm, @@ -901,11 +902,12 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); - IMoniker_Release(mon); if(FAILED(hres)) return hres; - return channelbsc_load_stream(This->window->pending_window, NULL); + hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); + IMoniker_Release(mon); + return hres; } static const IPersistStreamInitVtbl PersistStreamInitVtbl = {

1 0

Frédéric Delanoy : winevdm: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 8683b6dee5e9d7edeaa50c7cf5580ebeec4cdd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8683b6dee5e9d7edeaa50c7cf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 26 08:42:50 2013 +0200 winevdm: Use BOOL type where appropriate. --- programs/winevdm/winevdm.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index b818d76..290ad25 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -392,19 +392,20 @@ static char *build_command_line( char **argv ) len = 0; for (arg = argv; *arg; arg++) { - int has_space,bcount; + BOOL has_space; + int bcount; char* a; - has_space=0; + has_space=FALSE; bcount=0; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space=TRUE; while (*a!='\0') { if (*a=='\\') { bcount++; } else { if (*a==' ' || *a=='\t') { - has_space=1; + has_space=TRUE; } else if (*a=='"') { /* doubling of '\' preceding a '"', * plus escaping of said '"' @@ -427,20 +428,20 @@ static char *build_command_line( char **argv ) *p++ = (len < 256) ? len : 255; for (arg = argv; *arg; arg++) { - int has_space,has_quote; + BOOL has_space,has_quote; char* a; /* Check for quotes and spaces in this argument */ - has_space=has_quote=0; + has_space=has_quote=FALSE; a=*arg; - if( !*a ) has_space=1; + if( !*a ) has_space=TRUE; while (*a!='\0') { if (*a==' ' || *a=='\t') { - has_space=1; + has_space=TRUE; if (has_quote) break; } else if (*a=='"') { - has_quote=1; + has_quote=TRUE; if (has_space) break; }

1 0

Jacek Caban : mshtml: Add trailing null byte to post data.
by Alexandre Julliard Sept. 26, 2013

Sept. 26, 2013

Module: wine Branch: master Commit: 7bcbb93c5a308c5270dacf265dfc03764a8fd0cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bcbb93c5a308c5270dacf265… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 26 17:35:13 2013 +0200 mshtml: Add trailing null byte to post data. --- dlls/mshtml/navigate.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 539d2c4..be3d1a8 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1022,7 +1022,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade if(NS_FAILED(nsres)) return E_FAIL; - post_data = data = GlobalAlloc(0, available); + post_data = data = GlobalAlloc(0, available+1); if(!data) return E_OUTOFMEMORY; @@ -1080,7 +1080,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade }else if(post_data != data) { char *new_data; - new_data = GlobalAlloc(0, data_len); + new_data = GlobalAlloc(0, data_len+1); if(new_data) memcpy(new_data, post_data, data_len); GlobalFree(data); @@ -1089,6 +1089,7 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade post_data = new_data; } + post_data[data_len] = 0; request_data->post_data = post_data; request_data->post_data_len = data_len; TRACE("post_data = %s\n", debugstr_an(request_data->post_data, request_data->post_data_len)); @@ -1877,7 +1878,7 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, } if(post_data) { - ret->bsc.request_data.post_data = GlobalAlloc(0, post_data_size); + ret->bsc.request_data.post_data = GlobalAlloc(0, post_data_size+1); if(!ret->bsc.request_data.post_data) { release_request_data(&ret->bsc.request_data); IBindStatusCallback_Release(&ret->bsc.IBindStatusCallback_iface); @@ -1885,6 +1886,7 @@ HRESULT create_channelbsc(IMoniker *mon, const WCHAR *headers, BYTE *post_data, } memcpy(ret->bsc.request_data.post_data, post_data, post_data_size); + ((BYTE*)ret->bsc.request_data.post_data)[post_data_size] = 0; ret->bsc.request_data.post_data_len = post_data_size; }

1 0