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

Piotr Chruściel : server: Move the \BaseNamedObjects symlink in \Sessions\0 to \Sessions\1\BaseNamedObjects.
by Alexandre Julliard 18 Jul '16

18 Jul '16

Module: wine Branch: master Commit: 84c3b8ae28fc799146f72a9dbc5f38bb188df672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c3b8ae28fc799146f72a9db… Author: Piotr Chruściel <flan(a)flande.re> Date: Fri Jul 8 17:53:03 2016 +0200 server: Move the \BaseNamedObjects symlink in \Sessions\0 to \Sessions\1\BaseNamedObjects. Signed-off-by: Piotr Chruściel <flan(a)flande.re> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/server/directory.c b/server/directory.c index 96555bb..9368421 100644 --- a/server/directory.c +++ b/server/directory.c @@ -258,6 +258,7 @@ void init_directories(void) static const WCHAR dir_mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t'}; static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s'}; static const WCHAR dir_sessionsW[] = {'S','e','s','s','i','o','n','s'}; + static const WCHAR dir_1W[] = {'1'}; static const WCHAR dir_kernelW[] = {'K','e','r','n','e','l','O','b','j','e','c','t','s'}; static const WCHAR dir_windowsW[] = {'W','i','n','d','o','w','s'}; static const WCHAR dir_winstationsW[] = {'W','i','n','d','o','w','S','t','a','t','i','o','n','s'}; @@ -270,6 +271,7 @@ void init_directories(void) static const struct unicode_str dir_mailslot_str = {dir_mailslotW, sizeof(dir_mailslotW)}; static const struct unicode_str dir_objtype_str = {dir_objtypeW, sizeof(dir_objtypeW)}; static const struct unicode_str dir_sessions_str = {dir_sessionsW, sizeof(dir_sessionsW)}; + static const struct unicode_str dir_1_str = {dir_1W, sizeof(dir_1W)}; static const struct unicode_str dir_kernel_str = {dir_kernelW, sizeof(dir_kernelW)}; static const struct unicode_str dir_windows_str = {dir_windowsW, sizeof(dir_windowsW)}; static const struct unicode_str dir_winstations_str = {dir_winstationsW, sizeof(dir_winstationsW)}; @@ -281,7 +283,7 @@ void init_directories(void) static const WCHAR link_nulW[] = {'N','U','L'}; static const WCHAR link_pipeW[] = {'P','I','P','E'}; static const WCHAR link_mailslotW[] = {'M','A','I','L','S','L','O','T'}; - static const WCHAR link_0W[] = {'0'}; + static const WCHAR link_basenamedW[] = {'B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s'}; static const WCHAR link_sessionW[] = {'S','e','s','s','i','o','n'}; static const WCHAR link_sessionsW[] = {'\\','S','e','s','s','i','o','n','s'}; static const struct unicode_str link_dosdev_str = {link_dosdevW, sizeof(link_dosdevW)}; @@ -290,7 +292,7 @@ void init_directories(void) static const struct unicode_str link_nul_str = {link_nulW, sizeof(link_nulW)}; static const struct unicode_str link_pipe_str = {link_pipeW, sizeof(link_pipeW)}; static const struct unicode_str link_mailslot_str = {link_mailslotW, sizeof(link_mailslotW)}; - static const struct unicode_str link_0_str = {link_0W, sizeof(link_0W)}; + static const struct unicode_str link_basenamed_str = {link_basenamedW, sizeof(link_basenamedW)}; static const struct unicode_str link_session_str = {link_sessionW, sizeof(link_sessionW)}; static const struct unicode_str link_sessions_str = {link_sessionsW, sizeof(link_sessionsW)}; @@ -321,8 +323,8 @@ void init_directories(void) }; static const struct unicode_str keyed_event_crit_sect_str = {keyed_event_crit_sectW, sizeof(keyed_event_crit_sectW)}; - struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_kernel, *dir_windows, *dir_winstation; - struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_nul, *link_pipe, *link_mailslot, *link_0, *link_session; + struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_1, *dir_kernel, *dir_windows, *dir_winstation; + struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_nul, *link_pipe, *link_mailslot, *link_basenamed, *link_session; struct keyed_event *keyed_event; unsigned int i; @@ -331,6 +333,7 @@ void init_directories(void) dir_device = create_directory( &root_directory->obj, &dir_device_str, 0, HASH_SIZE, NULL ); dir_objtype = create_directory( &root_directory->obj, &dir_objtype_str, 0, HASH_SIZE, NULL ); dir_sessions = create_directory( &root_directory->obj, &dir_sessions_str, 0, HASH_SIZE, NULL ); + dir_1 = create_directory( &dir_sessions->obj, &dir_1_str, 0, HASH_SIZE, NULL ); dir_kernel = create_directory( &root_directory->obj, &dir_kernel_str, 0, HASH_SIZE, NULL ); dir_windows = create_directory( &root_directory->obj, &dir_windows_str, 0, HASH_SIZE, NULL ); dir_winstation = create_directory( &dir_windows->obj, &dir_winstations_str, 0, HASH_SIZE, NULL ); @@ -356,7 +359,7 @@ void init_directories(void) link_nul = create_symlink( &dir_global->obj, &link_nul_str, 0, &dir_null_str, NULL ); link_pipe = create_symlink( &dir_global->obj, &link_pipe_str, 0, &dir_named_pipe_str, NULL ); link_mailslot = create_symlink( &dir_global->obj, &link_mailslot_str, 0, &dir_mailslot_str, NULL ); - link_0 = create_symlink( &dir_sessions->obj, &link_0_str, 0, &dir_basenamed_str, NULL ); + link_basenamed = create_symlink( &dir_1->obj, &link_basenamed_str, 0, &dir_basenamed_str, NULL ); link_session = create_symlink( &dir_basenamed->obj, &link_session_str, 0, &link_sessions_str, NULL ); make_object_static( (struct object *)link_dosdev ); make_object_static( (struct object *)link_global1 ); @@ -365,7 +368,7 @@ void init_directories(void) make_object_static( (struct object *)link_nul ); make_object_static( (struct object *)link_pipe ); make_object_static( (struct object *)link_mailslot ); - make_object_static( (struct object *)link_0 ); + make_object_static( (struct object *)link_basenamed ); make_object_static( (struct object *)link_session ); /* events */ @@ -382,6 +385,7 @@ void init_directories(void) release_object( dir_device ); release_object( dir_basenamed ); release_object( dir_sessions ); + release_object( dir_1 ); release_object( dir_kernel ); release_object( dir_windows ); }

1 0

Hugh McMaster : regedit: Use Unicode when printing system error messages.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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 15 Jul '16

15 Jul '16

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 Unicode for registry key paths.
by Alexandre Julliard 15 Jul '16

15 Jul '16

1 0

Józef Kucia : wined3d: Recognize SM5 ubfe opcode.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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

Aaryaman Vasishta : d3drm: Fix IDirect3DRMDevice{2-3}:: GetDirect3DDevice2 return values on failure.
by Alexandre Julliard 15 Jul '16

15 Jul '16

Module: wine Branch: master Commit: 88fc3a3ef504bf95090533cc5a3c2aff353592dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=88fc3a3ef504bf95090533cc5… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Fri Jul 15 16:04:06 2016 +0530 d3drm: Fix IDirect3DRMDevice{2-3}::GetDirect3DDevice2 return values on failure. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 8 ++++++-- dlls/d3drm/tests/d3drm.c | 8 ++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index b388b63..c5db652 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1267,7 +1267,8 @@ static HRESULT WINAPI d3drm_device3_GetDirect3DDevice2(IDirect3DRMDevice3 *iface TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); - IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); + if (FAILED(IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device))) + return D3DRMERR_BADOBJECT; return D3DRM_OK; } @@ -1278,7 +1279,10 @@ static HRESULT WINAPI d3drm_device2_GetDirect3DDevice2(IDirect3DRMDevice2 *iface TRACE("iface %p, d3d_device %p.\n", iface, d3d_device); - return d3drm_device3_GetDirect3DDevice2(&device->IDirect3DRMDevice3_iface, d3d_device); + IDirect3DDevice_QueryInterface(device->device, &IID_IDirect3DDevice2, (void**)d3d_device); + + /* d3drm returns D3DRM_OK even if the call fails. */ + return D3DRM_OK; } static HRESULT WINAPI d3drm_device3_FindPreferredTextureFormat(IDirect3DRMDevice3 *iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index e23f13f..5b5df66 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3992,15 +3992,15 @@ static void test_create_device_from_d3d1(void) hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device2); ok(SUCCEEDED(hr), "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr); hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); - ok(SUCCEEDED(hr), "Expected hr == DD_OK, got %x).\n", hr); + ok(SUCCEEDED(hr), "Expected hr == D3DRM_OK, got %#x.\n", hr); ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2); IDirect3DRMDevice2_Release(device2); d3ddevice2 = (IDirect3DDevice2 *)0xdeadbeef; - hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice2, (void **)&device3); - ok(hr == DD_OK, "Cannot get IDirect3DRMDevice2 Interface (hr = %x).\n", hr); + hr = IDirect3DRMDevice_QueryInterface(device1, &IID_IDirect3DRMDevice3, (void **)&device3); + ok(hr == DD_OK, "Cannot get IDirect3DRMDevice3 Interface (hr = %x).\n", hr); hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3ddevice2); - ok(hr == DD_OK, "Expected hr == DD_OK, got %x).\n", hr); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); ok(d3ddevice2 == NULL, "Expected d3ddevice2 == NULL, got %p.\n", d3ddevice2); IDirect3DRMDevice3_Release(device3);

1 0

Piotr Caban : msvcr100: Fix compilation on NetBSD ( conflicting fenv_t definitions).
by Alexandre Julliard 15 Jul '16

15 Jul '16

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

Michael Stefaniuc : dmsynth: Simplify error handling when creating a DMSynthSink object.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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

Michael Stefaniuc : avifil32: Move CreateEditableStream() to avoid exporting a helper.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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 : avifil32: Avoid casts of IAVIEditStream to the COM object.
by Alexandre Julliard 15 Jul '16

15 Jul '16

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