July 2016 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : inetcomm: GetBody returns MIME_E_NOT_FOUND when no parent found.
by Alexandre Julliard July 18, 2016

July 18, 2016

Module: wine Branch: master Commit: ed880969b37c873ce6d46bcc1e03177228e4061e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed880969b37c873ce6d46bcc1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 12 08:02:46 2016 +0000 inetcomm: GetBody returns MIME_E_NOT_FOUND when no parent found. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 10 +++++++++- dlls/inetcomm/tests/mimeole.c | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 23bd930..6046c74 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2175,7 +2175,10 @@ static HRESULT get_body(MimeMessage *msg, BODYLOCATION location, HBODY pivot, bo switch(location) { case IBL_PARENT: - *out = body->parent; + if(body->parent) + *out = body->parent; + else + hr = MIME_E_NOT_FOUND; break; case IBL_FIRST: @@ -2239,6 +2242,11 @@ static HRESULT WINAPI MimeMessage_GetBody(IMimeMessage *iface, BODYLOCATION loca TRACE("(%p)->(%d, %p, %p)\n", iface, location, hPivot, phBody); + if(!phBody) + return E_INVALIDARG; + + *phBody = NULL; + hr = get_body(This, location, hPivot, &body); if(hr == S_OK) *phBody = UlongToHandle(body->index); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 58d0520..011c19f 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -214,7 +214,7 @@ static void test_CreateMessage(void) IStream *stream; LARGE_INTEGER pos; LONG ref; - HBODY hbody; + HBODY hbody, hbody2; IMimeBody *body; BODYOFFSETS offsets; ULONG count; @@ -266,6 +266,14 @@ static void test_CreateMessage(void) ok(hr == S_OK, "ret %08x\n", hr); ok(handle != NULL, "handle %p\n", handle); + hr = IMimeMessage_GetBody(msg, IBL_PARENT, hbody, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hbody2 = (HBODY)0xdeadbeef; + hr = IMimeMessage_GetBody(msg, IBL_PARENT, hbody, &hbody2); + ok(hr == MIME_E_NOT_FOUND, "ret %08x\n", hr); + ok(hbody2 == NULL, "hbody2 %p\n", hbody2); + PropVariantInit(&prop); hr = IMimeMessage_GetBodyProp(msg, hbody, att_pritype, 0, &prop); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Hugh McMaster : regedit: Use Unicode for registry key paths.
by Alexandre Julliard July 15, 2016

July 15, 2016

1 0

Hugh McMaster : regedit: Use Unicode when printing system error messages.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 86ebd5eee06c6d6b351dcad1154243acaf8f4fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ebd5eee06c6d6b351dcad11… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 15 07:49:58 2016 +0000 regedit: Use Unicode when printing system error messages. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 2 +- programs/regedit/regproc.c | 25 +++++++++++++------------ programs/regedit/regproc.h | 1 + 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 55f2b8d..c0a1eab 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); -static void output_writeconsole(const WCHAR *str, DWORD wlen) +void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f072650..4a27bd5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -31,8 +31,11 @@ #include <winreg.h> #include <assert.h> #include <wine/unicode.h> +#include <wine/debug.h> #include "regproc.h" +WINE_DEFAULT_DEBUG_CHANNEL(regedit); + #define REG_VAL_BUF_SIZE 4096 /* maximal number of characters in hexadecimal data line, @@ -856,20 +859,18 @@ static void processRegLinesW(FILE *in) static void REGPROC_print_error(void) { - LPVOID lpMsgBuf; - DWORD error_code; - int status; - - error_code = GetLastError (); - status = FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error_code, 0, (LPSTR) &lpMsgBuf, 0, NULL); - if (!status) { - fprintf(stderr, "regedit: Cannot display message for error %d, status %d\n", - error_code, GetLastError()); + WCHAR *str; + DWORD error_code, len; + + error_code = GetLastError(); + len = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error_code, 0, (WCHAR *)&str, 0, NULL); + if (len == 0 && GetLastError() != NO_ERROR) { + WINE_FIXME("FormatMessage failed: le=%u, previous=%u\n", GetLastError(), error_code); exit(1); } - puts(lpMsgBuf); - LocalFree(lpMsgBuf); + output_writeconsole(str, len); + LocalFree(str); exit(1); } diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index aff4bee..bc46009 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,6 +24,7 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 +void output_writeconsole(const WCHAR *str, DWORD wlen); void __cdecl output_message(unsigned int id, ...); BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format);

1 0

Hugh McMaster : regedit: Open export file with a wide-character stream.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 7c824cbfd46f1a7387186ad719c1da8acc5401df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c824cbfd46f1a7387186ad71… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 15 07:50:06 2016 +0000 regedit: Open export file with a wide-character stream. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4a27bd5..38c685a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1238,15 +1238,15 @@ static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) _setmode(_fileno(file), _O_BINARY); } else { - CHAR* file_nameA = GetMultiByteString(file_name); - file = fopen(file_nameA, "wb"); + WCHAR wb_mode[] = {'w','b',0}; + WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; + + file = _wfopen(file_name, wb_mode); if (!file) { - perror(""); + _wperror(regedit); output_message(STRING_CANNOT_OPEN_FILE, file_name); - HeapFree(GetProcessHeap(), 0, file_nameA); exit(1); } - HeapFree(GetProcessHeap(), 0, file_nameA); } if(unicode) {

1 0

Hugh McMaster : regedit: Use output_message() in regproc.c for better internationalization.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 8dfc25ea9eb19164c23f758b1511df743f2f2673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dfc25ea9eb19164c23f758b1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 15 07:49:48 2016 +0000 regedit: Use output_message() in regproc.c for better internationalization. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/bg.po | 64 +++++++++++++++++++++++++++++++++ po/ca.po | 86 +++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/da.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/de.po | 85 ++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 62 ++++++++++++++++++++++++++++++++ po/en.po | 62 ++++++++++++++++++++++++++++++++ po/en_US.po | 62 ++++++++++++++++++++++++++++++++ po/eo.po | 65 ++++++++++++++++++++++++++++++++++ po/es.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/fa.po | 60 +++++++++++++++++++++++++++++++ po/fi.po | 82 ++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 85 ++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 77 ++++++++++++++++++++++++++++++++++++++++ po/hi.po | 59 +++++++++++++++++++++++++++++++ po/hr.po | 77 ++++++++++++++++++++++++++++++++++++++++ po/hu.po | 79 +++++++++++++++++++++++++++++++++++++++++ po/it.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/ja.po | 84 +++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/lt.po | 82 ++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 59 +++++++++++++++++++++++++++++++ po/nb_NO.po | 83 +++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/or.po | 59 +++++++++++++++++++++++++++++++ po/pa.po | 59 +++++++++++++++++++++++++++++++ po/pl.po | 84 +++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 86 +++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 80 +++++++++++++++++++++++++++++++++++++++++ po/rm.po | 60 +++++++++++++++++++++++++++++++ po/ro.po | 79 +++++++++++++++++++++++++++++++++++++++++ po/ru.po | 82 ++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 75 +++++++++++++++++++++++++++++++++++++++ po/sl.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 69 ++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 69 ++++++++++++++++++++++++++++++++++++ po/sv.po | 79 +++++++++++++++++++++++++++++++++++++++++ po/te.po | 59 +++++++++++++++++++++++++++++++ po/th.po | 60 +++++++++++++++++++++++++++++++ po/tr.po | 84 +++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 82 ++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 60 +++++++++++++++++++++++++++++++ po/wine.pot | 59 +++++++++++++++++++++++++++++++ po/zh_CN.po | 78 ++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 78 ++++++++++++++++++++++++++++++++++++++++ programs/regedit/regedit.c | 3 +- programs/regedit/regedit.rc | 14 ++++++++ programs/regedit/regproc.c | 76 ++++++++++----------------------------- programs/regedit/regproc.h | 4 +++ programs/regedit/resource.h | 14 ++++++++ 51 files changed, 3438 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dfc25ea9eb19164c23f7…

1 0

Piotr Caban : msvcr100: Fix compilation on NetBSD ( conflicting fenv_t definitions).
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: d7dd5d8fe4aabc17a80600151ee7b23c90e1221d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7dd5d8fe4aabc17a80600151… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 15 13:10:31 2016 +0200 msvcr100: Fix compilation on NetBSD (conflicting fenv_t definitions). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e9d594c..cf33f01 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1201,7 +1201,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask /********************************************************************* * fegetenv (MSVCR120.@) */ -int CDECL MSVCRT_fegetenv(fenv_t *env) +int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) { env->control = _controlfp(0, 0) & (MSVCRT__EM_INEXACT | MSVCRT__EM_UNDERFLOW | MSVCRT__EM_OVERFLOW | MSVCRT__EM_ZERODIVIDE | MSVCRT__EM_INVALID); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 958ca4e..e744ef0 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -914,7 +914,7 @@ typedef struct { unsigned int control; unsigned int status; -} fenv_t; +} MSVCRT_fenv_t; #define MSVCRT_CLOCKS_PER_SEC 1000

1 0

Józef Kucia : wined3d: Recognize SM5 ubfe opcode.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 40278d5b33f4d34b839ef066c7f17a141bef79d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40278d5b33f4d34b839ef066c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 15 11:16:23 2016 +0200 wined3d: Recognize SM5 ubfe opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1760d6f..945abe5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5396,6 +5396,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2AR */ pshader_hw_texreg2ar, /* WINED3DSIH_TEXREG2GB */ pshader_hw_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, + /* WINED3DSIH_UBFE */ NULL, /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UGE */ NULL, /* WINED3DSIH_ULT */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ef3adbd..ff0fd2b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8814,6 +8814,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, + /* WINED3DSIH_UBFE */ NULL, /* WINED3DSIH_UDIV */ shader_glsl_udiv, /* WINED3DSIH_UGE */ shader_glsl_relop, /* WINED3DSIH_ULT */ shader_glsl_relop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7ccc1d4..5192b18 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -226,6 +226,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2AR */ "texreg2ar", /* WINED3DSIH_TEXREG2GB */ "texreg2gb", /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", + /* WINED3DSIH_UBFE */ "ubfe", /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_UGE */ "uge", /* WINED3DSIH_ULT */ "ult", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7b82bbb..256bcc7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -219,6 +219,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, + WINED3D_SM5_OP_UBFE = 0x8a, WINED3D_SM5_OP_BFI = 0x8c, WINED3D_SM5_OP_BFREV = 0x8d, WINED3D_SM5_OP_SWAPC = 0x8e, @@ -820,7 +821,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, - {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"}, + {WINED3D_SM5_OP_UBFE, WINED3DSIH_UBFE, "u", "iiu"}, + {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"}, {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0450181..bb71740 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -743,6 +743,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2AR, WINED3DSIH_TEXREG2GB, WINED3DSIH_TEXREG2RGB, + WINED3DSIH_UBFE, WINED3DSIH_UDIV, WINED3DSIH_UGE, WINED3DSIH_ULT,

1 0

Michael Stefaniuc : avifil32: Avoid casts of IAVIEditStream to the COM object.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: f68a760a6336672b899ae3fcd5a896b05f0d426e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f68a760a6336672b899ae3fcd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:21:03 2016 +0200 avifil32: Avoid casts of IAVIEditStream to the COM object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/editstream.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index a6c534e..815283b 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -70,7 +70,7 @@ struct _IAVIEditStreamImpl { LPBITMAPINFOHEADER lpFrame; /* frame of pCurStream */ }; -static IAVIEditStream *AVIFILE_CreateEditStream(IAVIStream *stream); +static IAVIEditStreamImpl *AVIFILE_CreateEditStream(IAVIStream *stream); static inline IAVIEditStreamImpl *impl_from_IAVIEditStream(IAVIEditStream *iface) { @@ -400,7 +400,7 @@ static HRESULT WINAPI IAVIEditStream_fnCopy(IAVIEditStream*iface,LONG*plStart, *(LPDWORD)plLength = This->sInfo.dwStart + This->sInfo.dwLength - *(LPDWORD)plStart; - pEdit = (IAVIEditStreamImpl*)AVIFILE_CreateEditStream(NULL); + pEdit = AVIFILE_CreateEditStream(NULL); if (pEdit == NULL) return AVIERR_MEMORY; @@ -616,7 +616,7 @@ static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface, return AVIERR_BADPARAM; *ppResult = NULL; - pEdit = (IAVIEditStreamImpl*)AVIFILE_CreateEditStream(NULL); + pEdit = AVIFILE_CreateEditStream(NULL); if (pEdit == NULL) return AVIERR_MEMORY; if (This->nStreams > pEdit->nTableSize) { @@ -1007,7 +1007,7 @@ static const struct IAVIStreamVtbl ieditstast = { IEditAVIStream_fnSetInfo }; -static IAVIEditStream *AVIFILE_CreateEditStream(IAVIStream *pstream) +static IAVIEditStreamImpl *AVIFILE_CreateEditStream(IAVIStream *pstream) { IAVIEditStreamImpl *pedit = NULL; @@ -1021,7 +1021,7 @@ static IAVIEditStream *AVIFILE_CreateEditStream(IAVIStream *pstream) IAVIStream_Create(&pedit->IAVIStream_iface, (LPARAM)pstream, 0); - return (PAVIEDITSTREAM)pedit; + return pedit; } /*********************************************************************** @@ -1030,6 +1030,7 @@ static IAVIEditStream *AVIFILE_CreateEditStream(IAVIStream *pstream) HRESULT WINAPI CreateEditableStream(IAVIStream **editable, IAVIStream *src) { IAVIEditStream *edit = NULL; + IAVIEditStreamImpl *editobj; HRESULT hr; TRACE("(%p,%p)\n", editable, src); @@ -1049,12 +1050,10 @@ HRESULT WINAPI CreateEditableStream(IAVIStream **editable, IAVIStream *src) } /* Need own implementation of IAVIEditStream */ - edit = AVIFILE_CreateEditStream(src); - if (!edit) + editobj = AVIFILE_CreateEditStream(src); + if (!editobj) return AVIERR_MEMORY; + *editable = &editobj->IAVIStream_iface; - hr = IAVIEditStream_QueryInterface(edit, &IID_IAVIStream, (void**)editable); - IAVIEditStream_Release(edit); - - return hr; + return S_OK; }

1 0

Michael Stefaniuc : avifil32: Move CreateEditableStream() to avoid exporting a helper.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: a0b7eb0d3e060b4e4ee6eb821a19c9259e171559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b7eb0d3e060b4e4ee6eb821… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 14 10:15:50 2016 +0200 avifil32: Move CreateEditableStream() to avoid exporting a helper. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/api.c | 38 -------------------------------------- dlls/avifil32/avifile_private.h | 1 - dlls/avifil32/editstream.c | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 40 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 0715d58..5c15c1f 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1982,44 +1982,6 @@ HRESULT WINAPI AVISaveVW(LPCWSTR szFile, CLSID *pclsidHandler, } /*********************************************************************** - * CreateEditableStream (AVIFIL32.@) - */ -HRESULT WINAPI CreateEditableStream(PAVISTREAM *ppEditable, PAVISTREAM pSource) -{ - IAVIEditStream *pEdit = NULL; - HRESULT hr; - - TRACE("(%p,%p)\n", ppEditable, pSource); - - if (ppEditable == NULL) - return AVIERR_BADPARAM; - - *ppEditable = NULL; - - if (pSource != NULL) { - hr = IAVIStream_QueryInterface(pSource, &IID_IAVIEditStream, - (LPVOID*)&pEdit); - if (SUCCEEDED(hr) && pEdit != NULL) { - hr = IAVIEditStream_Clone(pEdit, ppEditable); - IAVIEditStream_Release(pEdit); - - return hr; - } - } - - /* need own implementation of IAVIEditStream */ - pEdit = AVIFILE_CreateEditStream(pSource); - if (pEdit == NULL) - return AVIERR_MEMORY; - - hr = IAVIEditStream_QueryInterface(pEdit, &IID_IAVIStream, - (LPVOID*)ppEditable); - IAVIEditStream_Release(pEdit); - - return hr; -} - -/*********************************************************************** * EditStreamClone (AVIFIL32.@) */ HRESULT WINAPI EditStreamClone(PAVISTREAM pStream, PAVISTREAM *ppResult) diff --git a/dlls/avifil32/avifile_private.h b/dlls/avifil32/avifile_private.h index 0fd74c4..16893d9 100644 --- a/dlls/avifil32/avifile_private.h +++ b/dlls/avifil32/avifile_private.h @@ -62,7 +62,6 @@ extern HRESULT AVIFILE_CreateAVIFile(IUnknown *pUnkOuter, REFIID riid, LPVOID *p extern HRESULT AVIFILE_CreateWAVFile(IUnknown *outer_unk, REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateACMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT AVIFILE_CreateICMStream(REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) DECLSPEC_HIDDEN; extern PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pstream) DECLSPEC_HIDDEN; extern PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) DECLSPEC_HIDDEN; diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 45a4d98..a6c534e 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -70,6 +70,8 @@ struct _IAVIEditStreamImpl { LPBITMAPINFOHEADER lpFrame; /* frame of pCurStream */ }; +static IAVIEditStream *AVIFILE_CreateEditStream(IAVIStream *stream); + static inline IAVIEditStreamImpl *impl_from_IAVIEditStream(IAVIEditStream *iface) { return CONTAINING_RECORD(iface, IAVIEditStreamImpl, IAVIEditStream_iface); @@ -1005,7 +1007,7 @@ static const struct IAVIStreamVtbl ieditstast = { IEditAVIStream_fnSetInfo }; -PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) +static IAVIEditStream *AVIFILE_CreateEditStream(IAVIStream *pstream) { IAVIEditStreamImpl *pedit = NULL; @@ -1021,3 +1023,38 @@ PAVIEDITSTREAM AVIFILE_CreateEditStream(PAVISTREAM pstream) return (PAVIEDITSTREAM)pedit; } + +/*********************************************************************** + * CreateEditableStream (AVIFIL32.@) + */ +HRESULT WINAPI CreateEditableStream(IAVIStream **editable, IAVIStream *src) +{ + IAVIEditStream *edit = NULL; + HRESULT hr; + + TRACE("(%p,%p)\n", editable, src); + + if (!editable) + return AVIERR_BADPARAM; + *editable = NULL; + + if (src) { + hr = IAVIStream_QueryInterface(src, &IID_IAVIEditStream, (void**)&edit); + if (SUCCEEDED(hr) && edit) { + hr = IAVIEditStream_Clone(edit, editable); + IAVIEditStream_Release(edit); + + return hr; + } + } + + /* Need own implementation of IAVIEditStream */ + edit = AVIFILE_CreateEditStream(src); + if (!edit) + return AVIERR_MEMORY; + + hr = IAVIEditStream_QueryInterface(edit, &IID_IAVIStream, (void**)editable); + IAVIEditStream_Release(edit); + + return hr; +}

1 0

Michael Stefaniuc : dmsynth: Simplify error handling when creating a DMSynthSink object.
by Alexandre Julliard July 15, 2016

July 15, 2016

Module: wine Branch: master Commit: 165f8d1fff39df4d51599bf31008c962d4867cd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=165f8d1fff39df4d51599bf31… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 15 10:08:14 2016 +0200 dmsynth: Simplify error handling when creating a DMSynthSink object. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmsynth/synthsink.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 498c390..cb397ef 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -282,7 +282,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_i obj->IDirectMusicSynthSink_iface.lpVtbl = &DirectMusicSynthSink_Vtbl; obj->IKsControl_iface.lpVtbl = &DMSynthSinkImpl_IKsControl_Vtbl; - obj->ref = 0; + obj->ref = 1; hr = CoCreateInstance(&CLSID_SystemClock, NULL, CLSCTX_INPROC_SERVER, &IID_IReferenceClock, (LPVOID*)&obj->latency_clock); if (FAILED(hr)) @@ -291,13 +291,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl(LPCGUID riid, LPVOID* ret_i return hr; } - hr = IDirectMusicSynthSinkImpl_QueryInterface((LPDIRECTMUSICSYNTHSINK)obj, riid, ret_iface); - if (FAILED(hr)) - { - IReferenceClock_Release(obj->latency_clock); - HeapFree(GetProcessHeap(), 0, obj); - return hr; - } + hr = IDirectMusicSynthSink_QueryInterface(&obj->IDirectMusicSynthSink_iface, riid, ret_iface); + IDirectMusicSynthSink_Release(&obj->IDirectMusicSynthSink_iface); - return S_OK; + return hr; }

1 0