April 2012 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Store source code range in function_code_t.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: 375ab889d8929db12f58e3498c0760328b2697fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=375ab889d8929db12f58e3498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 24 17:39:40 2012 +0200 jscript: Store source code range in function_code_t. --- dlls/jscript/compile.c | 5 +++++ dlls/jscript/engine.c | 4 ++-- dlls/jscript/engine.h | 5 ++++- dlls/jscript/function.c | 12 +++--------- dlls/jscript/jscript.c | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 3f6a2b6..f8aaa41 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1804,6 +1804,11 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return E_OUTOFMEMORY; } + if(func_expr) { + func->source = func_expr->src_str; + func->source_len = func_expr->src_len; + } + func->source_elements = source; func->expr = func_expr; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 929be80..ec906a1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -814,7 +814,7 @@ static HRESULT interp_func(exec_ctx_t *ctx) expr = ctx->func_code->funcs[func_idx].expr; hres = create_source_function(ctx->script, ctx->code, expr->parameter_list, ctx->func_code->funcs+func_idx, - ctx->scope_chain, expr->src_str, expr->src_len, &dispex); + ctx->scope_chain, &dispex); if(FAILED(hres)) return hres; @@ -2629,7 +2629,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO expr = func->funcs[i].expr; hres = create_source_function(ctx->script, code, expr->parameter_list, func->funcs+i, - ctx->scope_chain, expr->src_str, expr->src_len, &func_obj); + ctx->scope_chain, &func_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ce7ff8c..a2be6ee 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -173,6 +173,9 @@ typedef struct _function_code_t { function_expression_t *expr; /* FIXME */ source_elements_t *source_elements; /* FIXME */ + const WCHAR *source; + unsigned source_len; + unsigned func_cnt; struct _function_code_t *funcs; } function_code_t; @@ -268,7 +271,7 @@ HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,BOOL,jsexcept_t*,VA typedef struct _parameter_t parameter_t; HRESULT create_source_function(script_ctx_t*,bytecode_t*,parameter_t*,function_code_t*,scope_chain_t*, - const WCHAR*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; + jsdisp_t**) DECLSPEC_HIDDEN; typedef enum { LT_INT, diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index f79ac04..dc4c5e8 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -32,8 +32,6 @@ typedef struct { scope_chain_t *scope_chain; bytecode_t *code; function_code_t *func_code; - const WCHAR *src_str; - DWORD src_len; DWORD length; jsdisp_t *arguments; } FunctionInstance; @@ -303,7 +301,7 @@ static HRESULT function_to_string(FunctionInstance *function, BSTR *ret) memcpy(str + sizeof(native_prefixW)/sizeof(WCHAR), function->name, name_len*sizeof(WCHAR)); memcpy(str + sizeof(native_prefixW)/sizeof(WCHAR) + name_len, native_suffixW, sizeof(native_suffixW)); }else { - str = SysAllocStringLen(function->src_str, function->src_len); + str = SysAllocStringLen(function->func_code->source, function->func_code->source_len); if(!str) return E_OUTOFMEMORY; } @@ -661,7 +659,7 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, } HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, parameter_t *parameters, function_code_t *func_code, - scope_chain_t *scope_chain, const WCHAR *src_str, DWORD src_len, jsdisp_t **ret) + scope_chain_t *scope_chain, jsdisp_t **ret) { FunctionInstance *function; jsdisp_t *prototype; @@ -698,9 +696,6 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, parameter_t length++; function->length = length; - function->src_str = src_str; - function->src_len = src_len; - *ret = &function->dispex; return S_OK; } @@ -786,8 +781,7 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t } expr = code->global_code.funcs[0].expr; - hres = create_source_function(ctx, code, expr->parameter_list, code->global_code.funcs, NULL, expr->src_str, - expr->src_len, &function); + hres = create_source_function(ctx, code, expr->parameter_list, code->global_code.funcs, NULL, &function); release_bytecode(code); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index dfd7d6c..da34c11 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -836,7 +836,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars return hres; } - hres = create_source_function(This->ctx, code, NULL, &code->global_code, NULL, NULL, 0, &dispex); + hres = create_source_function(This->ctx, code, NULL, &code->global_code, NULL, &dispex); release_bytecode(code); if(FAILED(hres)) return hres;

1 0

Christian Costa : amstream: Add IAudioMediaStream stub implementation.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: d5bbdabf283acd7c2c4a8c97fc82f13253807884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bbdabf283acd7c2c4a8c97f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 23 21:44:28 2012 +0200 amstream: Add IAudioMediaStream stub implementation. --- dlls/amstream/amstream.c | 3 +- dlls/amstream/amstream_private.h | 2 + dlls/amstream/mediastream.c | 204 +++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 4 +- 4 files changed, 207 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 4dec521..c61fcd0 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -371,8 +371,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); else - /* FIXME: should call audiomediastream_create instead */ - hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IMediaStream*)); diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index d81b915..0881c3e 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -37,5 +37,7 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN; +HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, + STREAM_TYPE stream_type, IMediaStream **media_stream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 366bfac..afebdcd 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1,7 +1,7 @@ /* - * Implementation of IMediaStream Interface + * Implementation of IMediaStream Interfaces * - * Copyright 2005, 2008 Christian Costa + * Copyright 2005, 2008, 2012 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -254,3 +254,203 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurpose return S_OK; } + +typedef struct { + IAudioMediaStream IAudioMediaStream_iface; + LONG ref; + IMultiMediaStream* parent; + MSPID purpose_id; + STREAM_TYPE stream_type; +} IAudioMediaStreamImpl; + +static inline IAudioMediaStreamImpl *impl_from_IAudioMediaStream(IAudioMediaStream *iface) +{ + return CONTAINING_RECORD(iface, IAudioMediaStreamImpl, IAudioMediaStream_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI IAudioMediaStreamImpl_QueryInterface(IAudioMediaStream *iface, + REFIID riid, void **ret_iface) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMediaStream) || + IsEqualGUID(riid, &IID_IAudioMediaStream)) + { + IAudioMediaStream_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + + ERR("(%p/%p)->(%s,%p),not found\n", iface, This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI IAudioMediaStreamImpl_AddRef(IAudioMediaStream *iface) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p/%p): new ref = %u\n", iface, This, ref); + + return ref; +} + +static ULONG WINAPI IAudioMediaStreamImpl_Release(IAudioMediaStream *iface) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p/%p): new ref = %u\n", iface, This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IMediaStream methods ***/ +static HRESULT WINAPI IAudioMediaStreamImpl_GetMultiMediaStream(IAudioMediaStream *iface, + IMultiMediaStream** multimedia_stream) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream); + + return S_FALSE; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_GetInformation(IAudioMediaStream *iface, + MSPID *purpose_id, STREAM_TYPE *type) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + TRACE("(%p/%p)->(%p,%p)\n", iface, This, purpose_id, type); + + if (purpose_id) + *purpose_id = This->purpose_id; + if (type) + *type = This->stream_type; + + return S_OK; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_SetSameFormat(IAudioMediaStream *iface, + IMediaStream *stream_format, DWORD flags) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x) stub!\n", iface, This, stream_format, flags); + + return S_FALSE; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_AllocateSample(IAudioMediaStream *iface, + DWORD flags, IStreamSample **sample) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%x,%p) stub!\n", iface, This, flags, sample); + + return S_FALSE; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_CreateSharedSample(IAudioMediaStream *iface, + IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x,%p) stub!\n", iface, This, existing_sample, flags, sample); + + return S_FALSE; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_SendEndOfStream(IAudioMediaStream *iface, + DWORD flags) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%x) stub!\n", iface, This, flags); + + return S_FALSE; +} + +/*** IAudioMediaStream methods ***/ +static HRESULT WINAPI IAudioMediaStreamImpl_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *wave_format_current) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); + + return E_NOTIMPL; + +} + +static HRESULT WINAPI IAudioMediaStreamImpl_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_CreateSample(IAudioMediaStream *iface, IAudioData *audio_data, + DWORD flags, IAudioStreamSample **sample) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p,%u,%p) stub!\n", iface, This, audio_data, flags, sample); + + return E_NOTIMPL; +} + +static const struct IAudioMediaStreamVtbl AudioMediaStream_Vtbl = +{ + /*** IUnknown methods ***/ + IAudioMediaStreamImpl_QueryInterface, + IAudioMediaStreamImpl_AddRef, + IAudioMediaStreamImpl_Release, + /*** IMediaStream methods ***/ + IAudioMediaStreamImpl_GetMultiMediaStream, + IAudioMediaStreamImpl_GetInformation, + IAudioMediaStreamImpl_SetSameFormat, + IAudioMediaStreamImpl_AllocateSample, + IAudioMediaStreamImpl_CreateSharedSample, + IAudioMediaStreamImpl_SendEndOfStream, + /*** IAudioMediaStream methods ***/ + IAudioMediaStreamImpl_GetFormat, + IAudioMediaStreamImpl_SetFormat, + IAudioMediaStreamImpl_CreateSample +}; + +HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, + STREAM_TYPE stream_type, IMediaStream **media_stream) +{ + IAudioMediaStreamImpl *object; + + TRACE("(%p,%s,%p)\n", parent, debugstr_guid(purpose_id), media_stream); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAudioMediaStreamImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStream_Vtbl; + object->ref = 1; + + object->parent = parent; + object->purpose_id = *purpose_id; + object->stream_type = stream_type; + + *media_stream = (IMediaStream*)&object->IAudioMediaStream_iface; + + return S_OK; +} diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 87bbcc7..14c3e42 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -325,10 +325,10 @@ static void test_media_streams(void) IAMMediaStream_Release(am_media_stream); hr = IMediaStream_QueryInterface(audio_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); - todo_wine ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); + ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); hr = IMediaStream_QueryInterface(audio_stream, &IID_IAudioMediaStream, (LPVOID*)&audio_media_stream); - todo_wine ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); if (SUCCEEDED(hr)) {

1 0

Dmitry Timoshkov : gdiplus: Do not rely on an enumerated font size being equal to otmEMSquare.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: e43fce0da93058eabd83a5a1e4f774ddb0f7ff30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43fce0da93058eabd83a5a1e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 17:02:59 2012 +0900 gdiplus: Do not rely on an enumerated font size being equal to otmEMSquare. --- dlls/gdiplus/font.c | 61 ++++++++++++++++++++++++--------------- dlls/gdiplus/gdiplus_private.h | 2 +- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index df3d407..eab8284 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -97,7 +97,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, { WCHAR facename[LF_FACESIZE]; LOGFONTW* lfw; - const NEWTEXTMETRICW* tmw; + const OUTLINETEXTMETRICW *otm; GpStatus stat; if (!fontFamily || !font) @@ -110,16 +110,16 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, if (stat != Ok) return stat; *font = GdipAlloc(sizeof(GpFont)); - tmw = &fontFamily->tmw; + otm = &fontFamily->otm; lfw = &((*font)->lfw); ZeroMemory(&(*lfw), sizeof(*lfw)); - lfw->lfWeight = tmw->tmWeight; - lfw->lfItalic = tmw->tmItalic; - lfw->lfUnderline = tmw->tmUnderlined; - lfw->lfStrikeOut = tmw->tmStruckOut; - lfw->lfCharSet = tmw->tmCharSet; - lfw->lfPitchAndFamily = tmw->tmPitchAndFamily; + lfw->lfWeight = otm->otmTextMetrics.tmWeight; + lfw->lfItalic = otm->otmTextMetrics.tmItalic; + lfw->lfUnderline = otm->otmTextMetrics.tmUnderlined; + lfw->lfStrikeOut = otm->otmTextMetrics.tmStruckOut; + lfw->lfCharSet = otm->otmTextMetrics.tmCharSet; + lfw->lfPitchAndFamily = otm->otmTextMetrics.tmPitchAndFamily; lstrcpynW(lfw->lfFaceName, facename, LF_FACESIZE); switch (unit) @@ -155,8 +155,8 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->unit = unit; (*font)->emSize = emSize; - (*font)->height = tmw->ntmSizeEM; - (*font)->line_spacing = tmw->tmAscent + tmw->tmDescent + tmw->tmExternalLeading; + (*font)->height = otm->otmEMSquare; + (*font)->line_spacing = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent + otm->otmTextMetrics.tmExternalLeading; TRACE("<-- %p\n", *font); @@ -529,20 +529,33 @@ static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, return 1; } - *(NEWTEXTMETRICW*)lParam = *(const NEWTEXTMETRICW*)ntm; + *(LOGFONTW *)lParam = *elf; return 0; } -static BOOL find_installed_font(const WCHAR *name, NEWTEXTMETRICW *ntm) +static BOOL find_installed_font(const WCHAR *name, OUTLINETEXTMETRICW *otm) { - HDC hdc = GetDC(0); + LOGFONTW lf; + HDC hdc = CreateCompatibleDC(0); BOOL ret = FALSE; - if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, (LPARAM)ntm)) - ret = TRUE; + if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, (LPARAM)&lf)) + { + HFONT hfont; + + lf.lfHeight = -2048; + hfont = CreateFontIndirectW(&lf); + hfont = SelectObject(hdc, hfont); - ReleaseDC(0, hdc); + otm->otmSize = sizeof(*otm); + if (GetOutlineTextMetricsW(hdc, otm->otmSize, otm)) + ret = TRUE; + + DeleteObject(SelectObject(hdc, hfont)); + } + + DeleteDC(hdc); return ret; } @@ -571,7 +584,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, GpFontFamily **FontFamily) { GpFontFamily* ffamily; - NEWTEXTMETRICW ntm; + OUTLINETEXTMETRICW otm; TRACE("%s, %p %p\n", debugstr_w(name), fontCollection, FontFamily); @@ -580,13 +593,13 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, if (fontCollection) FIXME("No support for FontCollections yet!\n"); - if (!find_installed_font(name, &ntm)) + if (!find_installed_font(name, &otm)) return FontFamilyNotFound; ffamily = GdipAlloc(sizeof (GpFontFamily)); if (!ffamily) return OutOfMemory; - ffamily->tmw = ntm; + ffamily->otm = otm; lstrcpynW(ffamily->FamilyName, name, LF_FACESIZE); *FontFamily = ffamily; @@ -618,7 +631,7 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** *clonedFontFamily = GdipAlloc(sizeof(GpFontFamily)); if (!*clonedFontFamily) return OutOfMemory; - (*clonedFontFamily)->tmw = FontFamily->tmw; + (*clonedFontFamily)->otm = FontFamily->otm; lstrcpyW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName); TRACE("<-- %p\n", *clonedFontFamily); @@ -691,7 +704,7 @@ GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, { if (!(family && CellAscent)) return InvalidParameter; - *CellAscent = family->tmw.tmAscent; + *CellAscent = family->otm.otmTextMetrics.tmAscent; return Ok; } @@ -703,7 +716,7 @@ GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, if (!(family && CellDescent)) return InvalidParameter; - *CellDescent = family->tmw.tmDescent; + *CellDescent = family->otm.otmTextMetrics.tmDescent; return Ok; } @@ -728,7 +741,7 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U TRACE("%p (%s), %d, %p\n", family, debugstr_w(family->FamilyName), style, EmHeight); - *EmHeight = family->tmw.ntmSizeEM; + *EmHeight = family->otm.otmEMSquare; return Ok; } @@ -758,7 +771,7 @@ GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, if (style) FIXME("ignoring style\n"); - *LineSpacing = family->tmw.tmAscent + family->tmw.tmDescent + family->tmw.tmExternalLeading; + *LineSpacing = family->otm.otmTextMetrics.tmAscent + family->otm.otmTextMetrics.tmDescent + family->otm.otmTextMetrics.tmExternalLeading; return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 06dee29..72de9cb 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -377,7 +377,7 @@ struct GpFontCollection{ }; struct GpFontFamily{ - NEWTEXTMETRICW tmw; + OUTLINETEXTMETRICW otm; WCHAR FamilyName[LF_FACESIZE]; };

1 0

Nikolay Sivov : msxml3: Implement getLocalName() for IMXAttributes.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: 3f5ec72fcf2113292e95d7227b1c7c6b88bee042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5ec72fcf2113292e95d7227… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 24 11:30:24 2012 +0400 msxml3: Implement getLocalName() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index e4224ed..48d9f8d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1795,12 +1795,20 @@ static HRESULT WINAPI SAXAttributes_getURI(ISAXAttributes *iface, int nIndex, co return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int nIndex, const WCHAR **localName, - int *length) +static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int index, const WCHAR **name, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, localName, length); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, name, len); + + if (index >= This->length || index < 0) return E_INVALIDARG; + if (!name || !len) return E_POINTER; + + *len = SysStringLen(This->attr[index].local); + *name = This->attr[index].local; + + return S_OK; } static HRESULT WINAPI SAXAttributes_getQName(ISAXAttributes *iface, int index, const WCHAR **qname, int *length)

1 0

Owen Rudge : mapistub: Forward MAPISendMailW.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: c0b006f868f95fe121b8a142b61be0300f4f2971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b006f868f95fe121b8a142b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 14:29:02 2012 +0100 mapistub: Forward MAPISendMailW. --- dlls/mapistub/mapistub.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mapistub/mapistub.spec b/dlls/mapistub/mapistub.spec index 15cd25d..fce027d 100644 --- a/dlls/mapistub/mapistub.spec +++ b/dlls/mapistub/mapistub.spec @@ -188,3 +188,4 @@ 253 stub FixMAPI(a)0 254 stdcall FGetComponentPath(str str ptr long long) mapi32.FGetComponentPath 255 stdcall FGetComponentPath(a)20(str str ptr long long) mapi32.FGetComponentPath +256 stdcall MAPISendMailW(long long ptr long long) mapi32.MAPISendMailW

1 0

Owen Rudge : mapi32: Add stub implementation of MAPISendMailW.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: 7031588c7668fdee0561f0fa55c84ce1cc0d41a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7031588c7668fdee0561f0fa5… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 14:05:49 2012 +0100 mapi32: Add stub implementation of MAPISendMailW. --- dlls/mapi32/mapi32.spec | 1 + dlls/mapi32/sendmail.c | 28 ++++++++++++++++++++++++++++ dlls/mapi32/util.c | 1 + dlls/mapi32/util.h | 1 + 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index ae85b4a..c84cfd4 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -188,3 +188,4 @@ 253 stub FixMAPI(a)0 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath(a)20(str str ptr long long) FGetComponentPath +256 stdcall MAPISendMailW(ptr ptr ptr long long) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 89daf0f..e313b53 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -408,6 +408,34 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, return MAPI_E_NOT_SUPPORTED; } +/************************************************************************** + * MAPISendMailW (MAPI32.256) + * + * Send a mail. + * + * PARAMS + * session [I] Handle to a MAPI session. + * uiparam [I] Parent window handle. + * message [I] Pointer to a MAPIMessageW structure. + * flags [I] Flags. + * reserved [I] Reserved, pass 0. + * + * RETURNS + * Success: SUCCESS_SUCCESS + * Failure: MAPI_E_FAILURE + * + */ +ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessageW message, FLAGS flags, ULONG reserved) +{ + /* Check to see if we have a Simple MAPI provider loaded */ + if (mapiFunctions.MAPISendMailW) + return mapiFunctions.MAPISendMailW(session, uiparam, message, flags, reserved); + + WARN("STUB\n"); + return MAPI_E_NOT_SUPPORTED; +} + ULONG WINAPI MAPISendDocuments(ULONG_PTR uiparam, LPSTR delim, LPSTR paths, LPSTR filenames, ULONG reserved) { diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 90cfa6e..abc4db6 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -1075,6 +1075,7 @@ void load_mapi_providers(void) mapiFunctions.MAPISaveMail = (void*) GetProcAddress(mapi_provider, "MAPISaveMail"); mapiFunctions.MAPISendDocuments = (void*) GetProcAddress(mapi_provider, "MAPISendDocuments"); mapiFunctions.MAPISendMail = (void*) GetProcAddress(mapi_provider, "MAPISendMail"); + mapiFunctions.MAPISendMailW = (void*) GetProcAddress(mapi_provider, "MAPISendMailW"); } /* Extended MAPI functions */ diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 6fbf81e..4582855 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -41,6 +41,7 @@ typedef struct MAPI_FUNCTIONS { LPMAPIRESOLVENAME MAPIResolveName; LPMAPISAVEMAIL MAPISaveMail; LPMAPISENDMAIL MAPISendMail; + LPMAPISENDMAILW MAPISendMailW; LPMAPISENDDOCUMENTS MAPISendDocuments; LPMAPIUNINITIALIZE MAPIUninitialize;

1 0

Huw Davies : winspool: Don't leak the handle returned by AddPrinter.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: 5d47a691f1283341f8afabb52ac26889d752f7df URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d47a691f1283341f8afabb52… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 24 12:55:48 2012 +0100 winspool: Don't leak the handle returned by AddPrinter. --- dlls/winspool.drv/info.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a09ebbe..2f09855 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -494,6 +494,7 @@ static BOOL CUPS_LoadPrinters(void) HKEY hkeyPrinter, hkeyPrinters; char loaderror[256]; WCHAR nameW[MAX_PATH]; + HANDLE added_printer; cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, loaderror, sizeof(loaderror)); if (!cupshandle) { @@ -548,10 +549,10 @@ static BOOL CUPS_LoadPrinters(void) pi2.pShareName = emptyStringW; pi2.pSepFile = emptyStringW; - if (!AddPrinterW(NULL, 2, (LPBYTE)&pi2)) { - if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) - ERR("printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError()); - } + added_printer = AddPrinterW( NULL, 2, (LPBYTE)&pi2 ); + if (added_printer) ClosePrinter( added_printer ); + else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) + ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError() ); } HeapFree(GetProcessHeap(),0,port); @@ -571,8 +572,8 @@ static BOOL CUPS_LoadPrinters(void) } #endif -static BOOL -PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { +static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) +{ PRINTER_INFO_2A pinfo2a; const char *r; size_t name_len; @@ -581,6 +582,7 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { char *port = NULL, *env_default; HKEY hkeyPrinter, hkeyPrinters; WCHAR devnameW[MAX_PATH]; + HANDLE added_printer; while (isspace(*pent)) pent++; r = strchr(pent,':'); @@ -678,10 +680,10 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { pinfo2a.pShareName = share_name; pinfo2a.pSepFile = sep_file; - if (!AddPrinterA(NULL,2,(LPBYTE)&pinfo2a)) { - if (GetLastError()!=ERROR_PRINTER_ALREADY_EXISTS) - ERR("%s not added by AddPrinterA (%d)\n",name,GetLastError()); - } + added_printer = AddPrinterA( NULL, 2, (LPBYTE)&pinfo2a ); + if (added_printer) ClosePrinter( added_printer ); + else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) + ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_a(name), GetLastError() ); } RegCloseKey(hkeyPrinters);

1 0

Christian Costa : amstream: Use proper constructor name for ddraw mediastream.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: badb5d555d7e24f97528665a2145d61d83c27880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=badb5d555d7e24f97528665a2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 23 21:44:19 2012 +0200 amstream: Use proper constructor name for ddraw mediastream. --- dlls/amstream/amstream.c | 6 +++++- dlls/amstream/amstream_private.h | 2 +- dlls/amstream/mediastream.c | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 156fd69..4dec521 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -368,7 +368,11 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream } } - hr = mediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) + hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + else + /* FIXME: should call audiomediastream_create instead */ + hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IMediaStream*)); diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index e40c409..d81b915 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -35,7 +35,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT mediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, +HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 12d3542..366bfac 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -45,6 +45,7 @@ static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDire return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface); } +/*** IUnknown methods ***/ static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream *iface, REFIID riid, void **ppv) { @@ -153,6 +154,7 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_SendEndOfStream(IDirectDrawMedi return S_FALSE; } +/*** IDirectDrawMediaStream methods ***/ static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream *iface, DDSURFACEDESC *pDDSDCurrent, IDirectDrawPalette **ppDirectDrawPalette, DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) @@ -207,15 +209,18 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMedi static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl = { + /*** IUnknown methods ***/ IDirectDrawMediaStreamImpl_QueryInterface, IDirectDrawMediaStreamImpl_AddRef, IDirectDrawMediaStreamImpl_Release, + /*** IMediaStream methods ***/ IDirectDrawMediaStreamImpl_GetMultiMediaStream, IDirectDrawMediaStreamImpl_GetInformation, IDirectDrawMediaStreamImpl_SetSameFormat, IDirectDrawMediaStreamImpl_AllocateSample, IDirectDrawMediaStreamImpl_CreateSharedSample, IDirectDrawMediaStreamImpl_SendEndOfStream, + /*** IDirectDrawMediaStream methods ***/ IDirectDrawMediaStreamImpl_GetFormat, IDirectDrawMediaStreamImpl_SetFormat, IDirectDrawMediaStreamImpl_GetDirectDraw, @@ -224,7 +229,7 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl = IDirectDrawMediaStreamImpl_GetTimePerFrame }; -HRESULT mediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, +HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, STREAM_TYPE StreamType, IMediaStream **ppMediaStream) { IDirectDrawMediaStreamImpl *object;

1 0

Dmitry Timoshkov : gdi32: Enumerated font size should not be too large.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: 57fbf1434c9e975d44ef2216b2091aad5c5e27ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fbf1434c9e975d44ef2216b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 17:03:12 2012 +0900 gdi32: Enumerated font size should not be too large. This reverts commit f4625d1ae1109ee9a30faa8254b10779853f0ac2. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3875e4f..401cfd1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5048,7 +5048,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, font = alloc_font(); if(face->scalable) { - height = -2048; /* 2048 is the most common em size */ + height = 100; width = 0; } else { height = face->size.y_ppem >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9bd5f1c..bda8fc8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2058,6 +2058,7 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO struct enum_font_data *efd = (struct enum_font_data *)lParam; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); + ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; if (0) /* Disabled to limit console spam */ @@ -2076,6 +2077,7 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, struct enum_font_dataW *efd = (struct enum_font_dataW *)lParam; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); + ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; if (0) /* Disabled to limit console spam */

1 0

Christian Costa : dmusic: COM clean-up of IDirectMusicBuffer.
by Alexandre Julliard April 24, 2012

April 24, 2012

Module: wine Branch: master Commit: 46884bfcbe93bd4f0702f1beff166790b9a783e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46884bfcbe93bd4f0702f1bef… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 23 21:26:02 2012 +0200 dmusic: COM clean-up of IDirectMusicBuffer. --- dlls/dmusic/buffer.c | 165 +++++++++++++++++++++++++++--------------- dlls/dmusic/dmusic_private.h | 2 +- 2 files changed, 107 insertions(+), 60 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 7bb41c3..a56a8f0 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -21,9 +21,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); +static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicBufferImpl, IDirectMusicBuffer_iface); +} + /* IDirectMusicBufferImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ppobj) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; +static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface(LPDIRECTMUSICBUFFER iface, REFIID riid, LPVOID *ppobj) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); TRACE("(%p, (%s, %p)\n",This,debugstr_dmguid(riid),ppobj); if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDirectMusicBuffer)) { @@ -35,8 +41,9 @@ static HRESULT WINAPI IDirectMusicBufferImpl_QueryInterface (LPDIRECTMUSICBUFFER return E_NOINTERFACE; } -static ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; +static ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -46,8 +53,9 @@ static ULONG WINAPI IDirectMusicBufferImpl_AddRef (LPDIRECTMUSICBUFFER iface) { return refCount; } -static ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; +static ULONG WINAPI IDirectMusicBufferImpl_Release(LPDIRECTMUSICBUFFER iface) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -63,82 +71,121 @@ static ULONG WINAPI IDirectMusicBufferImpl_Release (LPDIRECTMUSICBUFFER iface) { } /* IDirectMusicBufferImpl IDirectMusicBuffer part: */ -static HRESULT WINAPI IDirectMusicBufferImpl_Flush (LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p): stub\n", This); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_Flush(LPDIRECTMUSICBUFFER iface) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p): stub\n", This); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_TotalTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prtTime) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, prtTime); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_TotalTime(LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prtTime) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, prtTime); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, 0x%s, %d, %d): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, dwChannelMessage); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_PackStructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD dwChannelMessage) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, 0x%s, %d, %d): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, dwChannelMessage); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, 0x%s, %d, %d, %p): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, cb, lpb); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_PackUnstructured(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt, DWORD dwChannelGroup, DWORD cb, LPBYTE lpb) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, 0x%s, %d, %d, %p): stub\n", This, wine_dbgstr_longlong(rt), dwChannelGroup, cb, lpb); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_ResetReadPtr (LPDIRECTMUSICBUFFER iface) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p): stub\n", This); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_ResetReadPtr(LPDIRECTMUSICBUFFER iface) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p): stub\n", This); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetNextEvent (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt, LPDWORD pdwChannelGroup, LPDWORD pdwLength, LPBYTE* ppData) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p, %p, %p, %p): stub\n", This, prt, pdwChannelGroup, pdwLength, ppData); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetNextEvent(LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt, LPDWORD pdwChannelGroup, LPDWORD pdwLength, LPBYTE* ppData) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p, %p, %p, %p): stub\n", This, prt, pdwChannelGroup, pdwLength, ppData); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr (LPDIRECTMUSICBUFFER iface, LPBYTE* ppData) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, ppData); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetRawBufferPtr(LPDIRECTMUSICBUFFER iface, LPBYTE* ppData) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, ppData); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime (LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, prt); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetStartTime(LPDIRECTMUSICBUFFER iface, LPREFERENCE_TIME prt) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, prt); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, pcb); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetUsedBytes(LPDIRECTMUSICBUFFER iface, LPDWORD pcb) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, pcb); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes (LPDIRECTMUSICBUFFER iface, LPDWORD pcb) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, pcb); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetMaxBytes(LPDIRECTMUSICBUFFER iface, LPDWORD pcb) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, pcb); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat (LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %p): stub\n", This, pGuidFormat); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_GetBufferFormat(LPDIRECTMUSICBUFFER iface, LPGUID pGuidFormat) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %p): stub\n", This, pGuidFormat); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime (LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, 0x%s): stub\n", This, wine_dbgstr_longlong(rt)); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime(LPDIRECTMUSICBUFFER iface, REFERENCE_TIME rt) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, 0x%s): stub\n", This, wine_dbgstr_longlong(rt)); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb) { - IDirectMusicBufferImpl *This = (IDirectMusicBufferImpl *)iface; - FIXME("(%p, %d): stub\n", This, cb); - return S_OK; +static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb) +{ + IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); + + FIXME("(%p, %d): stub\n", This, cb); + + return S_OK; } static const IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = { @@ -173,7 +220,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID if (!dmbuffer) return E_OUTOFMEMORY; - dmbuffer->lpVtbl = &DirectMusicBuffer_Vtbl; + dmbuffer->IDirectMusicBuffer_iface.lpVtbl = &DirectMusicBuffer_Vtbl; dmbuffer->ref = 0; /* Will be inited by QueryInterface */ memcpy(&dmbuffer->format, &desc->guidBufferFormat, sizeof(GUID)); diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 069df24..2f351de 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -106,7 +106,7 @@ struct IDirectMusic8Impl { */ struct IDirectMusicBufferImpl { /* IUnknown fields */ - const IDirectMusicBufferVtbl *lpVtbl; + IDirectMusicBuffer IDirectMusicBuffer_iface; LONG ref; /* IDirectMusicBufferImpl fields */

1 0