March 2015 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Use the correct object type for __non_rtti_object exceptions.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: b7f6362ddc0fd0bc04b6689a4772e8e39b06fd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f6362ddc0fd0bc04b6689a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 13:57:29 2015 +0900 msvcrt: Use the correct object type for __non_rtti_object exceptions. --- dlls/msvcrt/cpp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index de9a9b4..8f7fdf2 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -904,7 +904,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -941,7 +941,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -1028,7 +1028,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -1091,7 +1091,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY @@ -1131,7 +1131,7 @@ void* CDECL MSVCRT___RTCastToVoid(void *cppobj) { __non_rtti_object e; MSVCRT___non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); + _CxxThrowException( &e, &__non_rtti_object_exception_type ); return NULL; } __ENDTRY

1 0

Alexandre Julliard : wrc: Remove duplicate parentheses.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: f15d077f936e01c7b95f55e26dffde990420d91f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15d077f936e01c7b95f55e26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:40:01 2015 +0900 wrc: Remove duplicate parentheses. --- tools/wrc/translation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index b7caa07..bdbcb43 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -611,7 +611,7 @@ static int compare_ver_block(ver_block_t *ver_block1, ver_block_t *ver_block2); static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) { int different = 0; int i = 0; - if((ver_value1->type == ver_value2->type)) { + if (ver_value1->type == ver_value2->type) { switch(ver_value1->type) { case val_str: if(ver_value1->key && ver_value2->key)

1 0

Alexandre Julliard : msvcp90: Add support for throwing bad cast exception to avoid unused variable warning.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: e1cf7f5a2ef83460fd1e8639636b2ce68349232c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cf7f5a2ef83460fd1e86396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 13:42:13 2015 +0900 msvcp90: Add support for throwing bad cast exception to avoid unused variable warning. --- dlls/msvcp90/cxx.h | 1 + dlls/msvcp90/exception.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index cf63ac4..fe45bf6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -303,6 +303,7 @@ typedef enum __exception_type { EXCEPTION_RERAISE, EXCEPTION, EXCEPTION_BAD_ALLOC, + EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, EXCEPTION_LENGTH_ERROR, EXCEPTION_OUT_OF_RANGE, diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index da3a4bf..568fa5f 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -623,6 +623,11 @@ void throw_exception(exception_type et, const char *str) MSVCP_bad_alloc_ctor(&e, &addr); _CxxThrowException(&e, &bad_alloc_cxx_type); } + case EXCEPTION_BAD_CAST: { + bad_cast e; + MSVCP_bad_cast_ctor(&e, str); + _CxxThrowException(&e, &bad_cast_cxx_type); + } case EXCEPTION_LOGIC_ERROR: { logic_error e; MSVCP_logic_error_ctor(&e, &addr);

1 0

Alexandre Julliard : msvcrt: Undefine __thiscall before redefining it.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: cdef3287dba7702f7c379101c769e587d3a14e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdef3287dba7702f7c379101c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 13:48:55 2015 +0900 msvcrt: Undefine __thiscall before redefining it. --- dlls/msvcp60/cxx.h | 3 ++- dlls/msvcp90/cxx.h | 3 ++- dlls/msvcrt/cxx.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/cxx.h b/dlls/msvcp60/cxx.h index 0a1241c..e34a9e3 100644 --- a/dlls/msvcp60/cxx.h +++ b/dlls/msvcp60/cxx.h @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Copied from dlls/msvcrt/cpp.c */ +/* Copied from dlls/msvcrt/cxx.h */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index fe45bf6..12a7f84 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Copied from dlls/msvcrt/cpp.c */ +/* Copied from dlls/msvcrt/cxx.h */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index e649f03..8f31f24 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#undef __thiscall #ifdef __i386__ /* thiscall functions are i386-specific */ #define THISCALL(func) __thiscall_ ## func

1 0

Alexandre Julliard : gdi32: Use shorter constants for byte and word masks to avoid warnings.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 336be2f694b669b5c6d6168aa5f8c29d954b2be9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=336be2f694b669b5c6d6168aa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 15:43:14 2015 +0900 gdi32: Use shorter constants for byte and word masks to avoid warnings. --- dlls/gdi32/dibdrv/primitives.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 1569bc0..c7b48ed 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -6020,7 +6020,7 @@ static void shrink_row_24(const dib_info *dst_dib, const POINT *dst_start, else { struct rop_codes codes; - BYTE init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BYTE init_val = (mode == STRETCH_ANDSCANS) ? 0xff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes ); @@ -6070,7 +6070,7 @@ static void shrink_row_16(const dib_info *dst_dib, const POINT *dst_start, else { struct rop_codes codes; - WORD init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + WORD init_val = (mode == STRETCH_ANDSCANS) ? 0xffff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes ); @@ -6118,7 +6118,7 @@ static void shrink_row_8(const dib_info *dst_dib, const POINT *dst_start, else { struct rop_codes codes; - BYTE init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BYTE init_val = (mode == STRETCH_ANDSCANS) ? 0xff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes ); @@ -6149,7 +6149,7 @@ static void shrink_row_4(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width, dst_x = dst_dib->rect.left + dst_start->x, src_x = src_dib->rect.left + src_start->x; struct rop_codes codes; - BYTE src_val, init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BYTE src_val, init_val = (mode == STRETCH_ANDSCANS) ? 0xff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes ); @@ -6189,7 +6189,7 @@ static void shrink_row_1(const dib_info *dst_dib, const POINT *dst_start, int err = params->err_start; int width, dst_x = dst_dib->rect.left + dst_start->x, src_x = src_dib->rect.left + src_start->x; struct rop_codes codes; - BYTE src_val, init_val = (mode == STRETCH_ANDSCANS) ? ~0u : 0u; + BYTE src_val, init_val = (mode == STRETCH_ANDSCANS) ? 0xff : 0; BOOL new_pix = TRUE; rop_codes_from_stretch_mode( mode, &codes );

1 0

Sebastian Lackner : winecfg: Add library override instead of closing winecfg when pressing Enter.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 317fc7aaf8dfa5153d4efbb27d0944514b73de0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=317fc7aaf8dfa5153d4efbb27… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 7 08:00:34 2015 +0100 winecfg: Add library override instead of closing winecfg when pressing Enter. Based on a patch by Hugh McMaster. --- programs/winecfg/libraries.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 660737b..a9889e5 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -421,9 +421,15 @@ static void on_add_combo_change(HWND dialog) len=SendDlgItemMessageW(dialog, IDC_DLLCOMBO, CB_GETLBTEXTLEN, sel, 0); if (buffer[0] || len>0) + { enable(IDC_DLLS_ADDDLL) + SendMessageW(GetParent(dialog), DM_SETDEFID, IDC_DLLS_ADDDLL, 0); + } else + { disable(IDC_DLLS_ADDDLL); + SendMessageW(GetParent(dialog), DM_SETDEFID, IDOK, 0); + } } static void set_dllmode(HWND dialog, DWORD id) @@ -492,7 +498,8 @@ static void on_add_click(HWND dialog) SendDlgItemMessageW(dialog, IDC_DLLCOMBO, WM_SETTEXT, 0, (LPARAM)emptyW); disable(IDC_DLLS_ADDDLL); - + SendMessageW(GetParent(dialog), DM_SETDEFID, IDOK, 0); + WINE_TRACE("Adding %s as native, builtin\n", buffer); SendMessageW(GetParent(dialog), PSM_CHANGED, 0, 0); @@ -605,18 +612,18 @@ LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case WM_COMMAND: switch(HIWORD(wParam)) { - - /* FIXME: when the user hits enter in the DLL combo box we should invoke the add - * add button, rather than the propsheet OK button. But I don't know how to do that! - */ - case CBN_EDITCHANGE: - if(LOWORD(wParam) == IDC_DLLCOMBO) - { - on_add_combo_change(hDlg); - break; - } - + if (LOWORD(wParam) == IDC_DLLCOMBO) + on_add_combo_change(hDlg); + break; + case CBN_SETFOCUS: + if (LOWORD(wParam) == IDC_DLLCOMBO) + on_add_combo_change(hDlg); + break; + case CBN_KILLFOCUS: + if (LOWORD(wParam) == IDC_DLLCOMBO) + SendMessageW(GetParent(hDlg), DM_SETDEFID, IDOK, 0); + break; case BN_CLICKED: switch(LOWORD(wParam)) { case IDC_DLLS_ADDDLL:

1 0

Nikolay Sivov : rpcrt4: Implement MesEncodeDynBufferHandleCreate().
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 36bc8563cffc1b640e9f883e63d44e8a8c423597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bc8563cffc1b640e9f883e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 3 23:07:26 2015 +0300 rpcrt4: Implement MesEncodeDynBufferHandleCreate(). --- dlls/rpcrt4/ndr_es.c | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index e3cd48a..59ea816 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -167,6 +167,17 @@ RPC_STATUS WINAPI MesHandleFree(handle_t Handle) return RPC_S_OK; } +static RPC_STATUS validate_mes_buffer_pointer(const char *Buffer) +{ + if (!Buffer) + return RPC_S_INVALID_ARG; + + if (((ULONG_PTR)Buffer & 7) != 0) + return RPC_X_INVALID_BUFFER; + + return RPC_S_OK; +} + /*********************************************************************** * MesEncodeFixedBufferHandleCreate [RPCRT4.@] */ @@ -174,14 +185,12 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( char *Buffer, ULONG BufferSize, ULONG *pEncodedSize, handle_t *pHandle) { MIDL_ES_MESSAGE *pEsMsg; + RPC_STATUS status; TRACE("(%p, %d, %p, %p)\n", Buffer, BufferSize, pEncodedSize, pHandle); - if (!Buffer) - return RPC_S_INVALID_ARG; - - if (((ULONG_PTR)Buffer % 8) != 0) - return RPC_X_INVALID_BUFFER; + if ((status = validate_mes_buffer_pointer(Buffer))) + return status; if (!pEncodedSize) return RPC_S_INVALID_ARG; @@ -208,10 +217,29 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( /*********************************************************************** * MesEncodeDynBufferHandleCreate [RPCRT4.@] */ -RPC_STATUS RPC_ENTRY MesEncodeDynBufferHandleCreate(char **ppBuffer, +RPC_STATUS RPC_ENTRY MesEncodeDynBufferHandleCreate(char **Buffer, ULONG *pEncodedSize, handle_t *pHandle) { - FIXME("%p %p %p stub\n", ppBuffer, pEncodedSize, pHandle); + MIDL_ES_MESSAGE *pEsMsg; + + TRACE("(%p, %p, %p)\n", Buffer, pEncodedSize, pHandle); + + if (!pEncodedSize) + return RPC_S_INVALID_ARG; + + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); + if (!pEsMsg) + return RPC_S_OUT_OF_MEMORY; + + init_MIDL_ES_MESSAGE(pEsMsg); + + pEsMsg->Operation = MES_ENCODE; + pEsMsg->HandleStyle = MES_DYNAMIC_BUFFER_HANDLE; + pEsMsg->pDynBuffer = (unsigned char **)Buffer; + pEsMsg->pEncodedSize = pEncodedSize; + + *pHandle = (handle_t)pEsMsg; + return RPC_S_OK; } @@ -222,9 +250,13 @@ RPC_STATUS RPC_ENTRY MesDecodeBufferHandleCreate( char *Buffer, ULONG BufferSize, handle_t *pHandle) { MIDL_ES_MESSAGE *pEsMsg; + RPC_STATUS status; TRACE("(%p, %d, %p)\n", Buffer, BufferSize, pHandle); + if ((status = validate_mes_buffer_pointer(Buffer))) + return status; + pEsMsg = HeapAlloc(GetProcessHeap(), 0, sizeof(*pEsMsg)); if (!pEsMsg) return RPC_S_OUT_OF_MEMORY;

1 0

Alexandre Julliard : mmdevapi/tests: Use float constants with fabsf.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 9f59a60968bb444eb7ba202072bb05fa2a5fc5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f59a60968bb444eb7ba20207… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 15:41:10 2015 +0900 mmdevapi/tests: Use float constants with fabsf. --- dlls/mmdevapi/tests/capture.c | 8 ++++---- dlls/mmdevapi/tests/render.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 23075ea..702843c 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -948,15 +948,15 @@ static void test_volume_dependence(void) hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.2) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.2f) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelVolume(cav, 0, &vol); ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.4) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); ok(hr == S_OK, "SAV_GetMasterVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.6) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.6f) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -976,7 +976,7 @@ static void test_volume_dependence(void) hr = IChannelAudioVolume_GetChannelVolume(cav2, 0, &vol); ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.4) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IAudioStreamVolume_GetChannelVolume(asv2, 0, &vol); ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index af296ac..c6b8e90 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1855,15 +1855,15 @@ static void test_volume_dependence(void) hr = IAudioStreamVolume_GetChannelVolume(asv, 0, &vol); ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.2) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.2f) < 0.05f, "ASV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IChannelAudioVolume_GetChannelVolume(cav, 0, &vol); ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.4) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); ok(hr == S_OK, "SAV_GetMasterVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.6) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.6f) < 0.05f, "SAV_GetMasterVolume gave wrong volume: %f\n", vol); hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac2); @@ -1889,7 +1889,7 @@ static void test_volume_dependence(void) hr = IChannelAudioVolume_GetChannelVolume(cav2, 0, &vol); ok(hr == S_OK, "CAV_GetChannelVolume failed: %08x\n", hr); - ok(fabsf(vol - 0.4) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); + ok(fabsf(vol - 0.4f) < 0.05f, "CAV_GetChannelVolume gave wrong volume: %f\n", vol); hr = IAudioStreamVolume_GetChannelVolume(asv2, 0, &vol); ok(hr == S_OK, "ASV_GetChannelVolume failed: %08x\n", hr);

1 0

Alexandre Julliard : scrrun: Fix typo in header guard.
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 74b627e89478ee38bd84bd61e880d4b590e4e306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b627e89478ee38bd84bd61e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 14:25:52 2015 +0900 scrrun: Fix typo in header guard. --- dlls/scrrun/scrrun_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index a149202..43b20a9 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef _SCRRUN_PRIVATE_H_ -#define _SCRRUN_PRIVATE_H +#define _SCRRUN_PRIVATE_H_ extern HRESULT WINAPI FileSystem_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT WINAPI Dictionary_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : Revert "shell32: Also return Attributes in GetFolderDefinition."
by Alexandre Julliard March 4, 2015

March 4, 2015

Module: wine Branch: master Commit: 39f6d04aa0d69cf417e6a9c119a13b09c603f8b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f6d04aa0d69cf417e6a9c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:34:15 2015 +0900 Revert "shell32: Also return Attributes in GetFolderDefinition." This reverts commit 0becff824466b330675fabbd59241a150eebabeb. The wrong patch was committed. --- dlls/vbscript/global.c | 25 ++----------------------- dlls/vbscript/tests/api.vbs | 42 ------------------------------------------ 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 012383b..448b886 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1268,29 +1268,8 @@ static HRESULT Global_ChrB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Asc(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - HRESULT hres; - BSTR bstr; - WCHAR ret; - - TRACE("(%s)\n", debugstr_variant(arg)); - - switch(V_VT(arg)) { - case VT_NULL: - return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); - case VT_EMPTY: - return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - case VT_BSTR: - bstr = V_BSTR(arg); - default: - hres = to_string(arg, &bstr); - if(FAILED(hres)) - return hres; - } - - ret = bstr[0]; - if(ret == 0) - return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - return return_short(res, ret); + FIXME("\n"); + return E_NOTIMPL; } /* The function supports only single-byte and double-byte character sets. It diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a44f8e6..8c92cf5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1324,46 +1324,4 @@ Call testRGBError(&h4d&, -2, &h2f&, 5) Call ok(getVT(Timer) = "VT_R4", "getVT(Timer) = " & getVT(Timer)) - -Sub testAscError(strings, error_num) - on error resume next - Dim x - - Call Err.clear() - x = Asc(strings) - Call ok(Err.number = error_num, "Err.number = " & Err.number) -End Sub - -Call ok(Asc(0) = 48, "Asc(0) = " & Asc(0)) -Call ok(getVT(Asc(0)) = "VT_I2", "getVT(Asc(0)) = " & getVT(Asc(0))) -Call ok(Asc(-32769) = 45, "Asc(-32769) = " & Asc(-32769)) -Call ok(getVT(Asc(-32769)) = "VT_I2", "getVT(Asc(-32769)) = " & getVT(Asc(-32769))) -Call ok(Asc(CSng(90.68)) = 57, "Asc(CSng(90.68)) = " & Asc(CSng(90.68))) -Call ok(getVT(Asc(CSng(90.68))) = "VT_I2", "getVT(Asc(CSng(90.68))) = " & getVT(Asc(CSng(90.68)))) -Call ok(Asc(123) = 49, "Asc(123) = " & Asc(123)) -Call ok(getVT(Asc(123)) = "VT_I2", "getVT(Asc(123)) = " & getVT(Asc(123))) -Call ok(Asc(CCur(234)) = 50, "Asc(CCur(234)) = " & Asc(CCur(234))) -Call ok(getVT(Asc(CCur(234))) = "VT_I2", "getVT(Asc(CCur(234))) = " & getVT(Asc(CCur(234)))) -Call ok(Asc("abc") = 97, "Asc(""abc"") = " & Asc("abc")) -Call ok(getVT(Asc("abc")) = "VT_I2", "getVT(Asc(""abc"")) = " & getVT(Asc("abc"))) -Call ok(Asc("?") = 63, "Asc(""?"") = " & Asc("?")) -Call ok(getVT(Asc("?")) = "VT_I2", "getVT(Asc(""?"")) = " & getVT(Asc("?"))) -Call ok(Asc(" space") = 32, "Asc("" space"") = " & Asc(" space")) -Call ok(getVT(Asc(" space")) = "VT_I2", "getVT(Asc("" space"")) = " & getVT(Asc(" space"))) -Call ok(Asc("@") = 64, "Asc(""@"") = " & Asc("@")) -Call ok(getVT(Asc("@")) = "VT_I2", "getVT(Asc(""@"")) = " & getVT(Asc("@"))) -Call ok(Asc("\n") = 92, "Asc(""\n"") = " & Asc("\n")) -Call ok(getVT(Asc("\n")) = "VT_I2", "getVT(Asc(""\n"")) = " & getVT(Asc("\n"))) -if isEnglishLang then - Call ok(Asc(False) = 70, "Asc(False) = " & Asc(False)) - Call ok(getVT(Asc(False)) = "VT_I2", "getVT(Asc(False)) = " & getVT(Asc(False))) - Call ok(Asc(True) = 84, "Asc(True) = " & Asc(True)) - Call ok(getVT(Asc(True)) = "VT_I2", "getVT(Asc(True)) = " & getVT(Asc(True))) -End if -Call ok(Asc(CByte(7)) = 55, "Asc(CByte(7)) = " & Asc(CByte(7))) -Call ok(getVT(Asc(CByte(7))) = "VT_I2", "getVT(Asc(CByte(7))) = " & getVT(Asc(CByte(7)))) -Call testAscError(Empty, 5) -Call testAscError(Null, 94) -Call testAscError("", 5) - Call reportSuccess()

1 0