wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Vincent Povirk : gdiplus: Stub GdipPlayMetafileRecord.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: fd7475546b46648234870d2ecd8959c8c26c367d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7475546b46648234870d2ec… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 7 11:02:33 2011 -0500 gdiplus: Stub GdipPlayMetafileRecord. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 8 ++++++++ include/gdiplusflat.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 533bf0f..9398658 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -443,7 +443,7 @@ 443 stdcall GdipPathIterNextSubpath(ptr ptr ptr ptr ptr) 444 stdcall GdipPathIterNextSubpathPath(ptr ptr ptr ptr) 445 stdcall GdipPathIterRewind(ptr) -446 stub GdipPlayMetafileRecord +446 stdcall GdipPlayMetafileRecord(ptr long long long ptr) 447 stdcall GdipPrivateAddFontFile(ptr wstr) 448 stdcall GdipPrivateAddMemoryFont(ptr ptr long) 449 stdcall GdipRecordMetafile(long long ptr long wstr ptr) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 322aecf..3d26b5c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -327,6 +327,14 @@ GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE * return Ok; } +GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, + EmfPlusRecordType recordType, UINT flags, UINT dataSize, GDIPCONST BYTE *data) +{ + FIXME("(%p,%x,%x,%d,%p)\n", metafile, recordType, flags, dataSize, data); + + return NotImplemented; +} + struct enum_metafile_data { EnumerateMetafileProc callback; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 676a78e..6792004 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -527,6 +527,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST Wm GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); +GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile*,EmfPlusRecordType,UINT,UINT,GDIPCONST BYTE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);

1 0

Henri Verbeet : wined3d: Make the surface parameter to d3dfmt_get_conv() const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: a26c5f9b1366696e5c27214a73d4d2b07534a715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26c5f9b1366696e5c27214a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:39 2011 +0200 wined3d: Make the surface parameter to d3dfmt_get_conv() const. --- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f162764..ce669e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4131,11 +4131,11 @@ static void flush_to_framebuffer_drawpixels(struct wined3d_surface *surface, context_release(context); } -HRESULT d3dfmt_get_conv(struct wined3d_surface *surface, BOOL need_alpha_ck, +HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, CONVERT_TYPES *convert) { BOOL colorkey_active = need_alpha_ck && (surface->CKeyFlags & WINEDDSD_CKSRCBLT); - struct wined3d_device *device = surface->resource.device; + const struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a0941b6..374c631 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2159,7 +2159,7 @@ typedef enum { CONVERT_RGB32_888 } CONVERT_TYPES; -HRESULT d3dfmt_get_conv(struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, +HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format *format, CONVERT_TYPES *convert) DECLSPEC_HIDDEN; void d3dfmt_p8_init_palette(struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the src_surface parameter to draw_textured_quad() const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: aa554046820b782bcc7ae504e2c707730c20829d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa554046820b782bcc7ae504e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:38 2011 +0200 wined3d: Make the src_surface parameter to draw_textured_quad() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f26cffe..f162764 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -288,7 +288,7 @@ static inline void surface_get_rect(struct wined3d_surface *surface, const RECT } /* GL locking and context activation is done by the caller */ -void draw_textured_quad(struct wined3d_surface *src_surface, const RECT *src_rect, +void draw_textured_quad(const struct wined3d_surface *src_surface, const RECT *src_rect, const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) { struct blt_info info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a33d94f..a0941b6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,8 +2095,8 @@ void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *wi void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_fbo(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; -void draw_textured_quad(struct wined3d_surface *src_surface, const RECT *src_rect, - const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) DECLSPEC_HIDDEN; +void draw_textured_quad(const struct wined3d_surface *src_surface, const RECT *src_rect, + const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) DECLSPEC_HIDDEN; void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) DECLSPEC_HIDDEN; /* Surface flags: */

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_upload_data( ) const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: 0d18f5df0ee6715764eb864d7da338d99829b2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d18f5df0ee6715764eb864d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:37 2011 +0200 wined3d: Make the surface parameter to surface_upload_data() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1403e1e..f26cffe 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2161,7 +2161,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, +void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7599e2d..a33d94f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2087,7 +2087,7 @@ void surface_set_container(struct wined3d_surface *surface, void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; -void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, +void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_translate_drawable_coords() const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: faebcc023604ec1a07055c6c1fb4a2e5cfabe9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faebcc023604ec1a07055c6c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:36 2011 +0200 wined3d: Make the surface parameter to surface_translate_drawable_coords() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 65ab767..1403e1e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4975,7 +4975,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st * drawable is limited to the window's client area. The sysmem and texture * copies do have the full screen size. Note that GL has a bottom-left * origin, while D3D has a top-left origin. */ -void surface_translate_drawable_coords(struct wined3d_surface *surface, HWND window, RECT *rect) +void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) { UINT drawable_height; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5e7930a..7599e2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2086,7 +2086,7 @@ void surface_set_container(struct wined3d_surface *surface, enum wined3d_container_type type, void *container) DECLSPEC_HIDDEN; void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target) DECLSPEC_HIDDEN; -void surface_translate_drawable_coords(struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; +void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the rt parameter to surface_set_compatible_renderbuffer() const.
by Alexandre Julliard 08 Jul '11

08 Jul '11

Module: wine Branch: master Commit: bb4b86f3659b393a9a617aef5bda2e3aaa839390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4b86f3659b393a9a617aef5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 7 21:01:35 2011 +0200 wined3d: Make the rt parameter to surface_set_compatible_renderbuffer() const. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d44904d..65ab767 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2349,7 +2349,7 @@ static void surface_allocate_surface(struct wined3d_surface *surface, const stru * render target dimensions. With FBOs, the dimensions have to be an exact match. */ /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* GL locking is done by the caller */ -void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct wined3d_surface *rt) +void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; struct wined3d_renderbuffer_entry *entry; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 535e2d3..5e7930a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2080,7 +2080,8 @@ void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) DECLSPEC_HIDDEN; void surface_prepare_texture(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct wined3d_surface *rt) DECLSPEC_HIDDEN; +void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, + const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_container(struct wined3d_surface *surface, enum wined3d_container_type type, void *container) DECLSPEC_HIDDEN; void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : oleaut32: Implement ICreateTypeInfo2 SetHelpStringContext.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 1a74194f9ed29ea2fbaa8b2df3632c0c69e8c016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74194f9ed29ea2fbaa8b2df… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 27 22:26:30 2011 +1000 oleaut32: Implement ICreateTypeInfo2 SetHelpStringContext. --- dlls/oleaut32/typelib2.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 3cbd4b5..d319ede 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3070,10 +3070,15 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeCustData( */ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext( ICreateTypeInfo2* iface, /* [I] The typeinfo on which to set the help string context. */ - ULONG dwHelpStringContext) /* [I] The help string context. */ + ULONG helpcontext) /* [I] The help string context. */ { - FIXME("(%p,%d), stub!\n", iface, dwHelpStringContext); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ICreateTypeInfo2(iface); + + TRACE("(%p, %d)\n", iface, helpcontext); + + This->typelib->typelib_header.helpcontext = helpcontext; + + return S_OK; } /******************************************************************************

1 0

Alistair Leslie-Hughes : oledb32: Add DBTYPE_UI2 support to DataConvert.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: d911374b9c009a389c19d1d618c21db6e3a99abc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d911374b9c009a389c19d1d61… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 28 20:41:04 2011 +1000 oledb32: Add DBTYPE_UI2 support to DataConvert. --- dlls/oledb32/convert.c | 25 ++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 3bb663f..1691792 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -533,6 +533,31 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + case DBTYPE_UI2: + { + WORD *d = dst; + switch(src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I2: hr = VarUI2FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarUI2FromI4(*(signed int*)src, d); break; + case DBTYPE_R4: hr = VarUI2FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarUI2FromR8(*(double*)src, d); break; + case DBTYPE_CY: hr = VarUI2FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarUI2FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarUI2FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarUI2FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarUI2FromDec((DECIMAL*)src, d); break; + case DBTYPE_I1: hr = VarUI2FromI1(*(signed char*)src, d); break; + case DBTYPE_UI1: hr = VarUI2FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: *d = *(WORD*)src; hr = S_OK; break; + case DBTYPE_UI4: hr = VarUI2FromUI4(*(DWORD*)src, d); break; + case DBTYPE_I8: hr = VarUI2FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI8: hr = VarUI2FromUI8(*(ULONGLONG*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> UI2\n", src_type); return E_NOTIMPL; + } + break; + } case DBTYPE_UI4: { diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a5ccdb9..1a1ea9a 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -610,6 +610,49 @@ todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(dst == 10, "got %08x\n", dst); + /* */ + dst_len = dst = 0x1234; + *(WORD*)src = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI2, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %08x\n", dst); + + dst_len = dst = 0x1234; + *(DWORD*)src = 0xabcd1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); +todo_wine + ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x1234, "got %08x\n", dst); + + dst_len = dst = 0x1234; + *(DWORD*)src = 0x1234abcd; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); +todo_wine + ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x1234, "got %08x\n", dst); + + dst_len = dst = 0x1234; + *(DWORD*)src = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %08x\n", dst); + + dst_len = dst = 0x1234; + memcpy(src, ten, sizeof(ten)); + hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, DBDATACONVERT_LENGTHFROMNTS); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 10, "got %08x\n", dst); + IDataConvert_Release(convert); }

1 0

Jacek Caban : mshtml: Mark some functions as cdecl.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 9f333b71b67dd6e79397d18c2c75adab33a7c63e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f333b71b67dd6e79397d18c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 15:09:27 2011 +0200 mshtml: Mark some functions as cdecl. --- dlls/mshtml/nsiface.idl | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8c11032..502fb30 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3013,13 +3013,13 @@ interface nsIParser : nsISupports PRInt32 aContextNamespace, PRBool aQuirks); nsresult BuildModel(); nsresult CancelParsingEvents(); - void Reset(); - PRBool CanInterrupt(); - PRBool IsInsertionPointDefined(); - void BeginEvaluatingParserInsertedScript(); - void EndEvaluatingParserInsertedScript(); - void MarkAsNotScriptCreated(); - PRBool IsScriptCreated(); + void cdecl Reset(); + PRBool cdecl CanInterrupt(); + PRBool cdecl IsInsertionPointDefined(); + void cdecl BeginEvaluatingParserInsertedScript(); + void cdecl EndEvaluatingParserInsertedScript(); + void cdecl MarkAsNotScriptCreated(); + PRBool cdecl IsScriptCreated(); } [

1 0

Jacek Caban : widl: Use proper calling convention attributes.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: f8c517978bf5c5f164ff91cb1b277e1e7433e422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c517978bf5c5f164ff91cb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 7 15:09:15 2011 +0200 widl: Use proper calling convention attributes. --- tools/widl/parser.y | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f034074..d4852d1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -588,10 +588,10 @@ uuid_string: $$ = parse_uuid($1); } ; -callconv: tCDECL { $$ = $<str>1; } - | tFASTCALL { $$ = $<str>1; } - | tPASCAL { $$ = $<str>1; } - | tSTDCALL { $$ = $<str>1; } +callconv: tCDECL { $$ = xstrdup("__cdecl"); } + | tFASTCALL { $$ = xstrdup("__fastcall"); } + | tPASCAL { $$ = xstrdup("__pascal"); } + | tSTDCALL { $$ = xstrdup("__stdcall"); } ; cases: { $$ = NULL; }

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
84
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 July 2011