June 2017 - Wine-Commits - list.winehq.org

Daniel Lehman : msvcrt: Move exception rethrow handling to call_catch_block.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: ac9db1138c84dc7a0da05a69366ef5316c28b8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9db1138c84dc7a0da05a693… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jun 14 11:58:20 2017 +0200 msvcrt: Move exception rethrow handling to call_catch_block. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 57fce93..baacc94 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -318,7 +318,18 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, unwind_help[0] = last_level; } -static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) +static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs) +{ + EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; + + if (rec->ExceptionCode != CXX_EXCEPTION) + return EXCEPTION_CONTINUE_SEARCH; + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + +static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) { ULONG64 frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; @@ -326,13 +337,23 @@ static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5]; int *unwind_help = rva_to_ptr(descr->unwind_help, frame); cxx_frame_info frame_info; - void *ret_addr; + void *ret_addr = NULL; TRACE("calling handler %p\n", handler); - /* FIXME: native does local_unwind here in case of exception rethrow */ __CxxRegisterExceptionObject(&prev_rec, &frame_info); - ret_addr = handler(0, frame); + __TRY + { + ret_addr = handler(0, frame); + } + __EXCEPT(cxx_rethrow_filter) + { + TRACE("detect rethrow: exception code: %x\n", prev_rec->ExceptionCode); + + RaiseException(prev_rec->ExceptionCode, prev_rec->ExceptionFlags, + prev_rec->NumberParameters, prev_rec->ExceptionInformation); + } + __ENDTRY __CxxUnregisterExceptionObject(&frame_info, FALSE); unwind_help[0] = -2; unwind_help[1] = -1; @@ -548,19 +569,6 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } if (!descr->tryblock_count) return ExceptionContinueSearch; - if (rec->ExceptionCode == CXX_EXCEPTION && - rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) - { - *rec = *msvcrt_get_thread_data()->exc_record; - rec->ExceptionFlags &= ~EH_UNWINDING; - if (TRACE_ON(seh)) { - TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); - if (rec->ExceptionCode == CXX_EXCEPTION) - TRACE("re-propage: obj: %lx, type: %lx\n", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); - } - } - if (rec->ExceptionCode == CXX_EXCEPTION) { exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];

1 0

André Hentschel : ntdll: Add support for relay debugging on ARM64.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 58d527ef93c458eed1ac03234e277a4997acb944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d527ef93c458eed1ac03234… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 14 10:46:32 2017 +0200 ntdll: Add support for relay debugging on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 997de1f..db21872 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay); -#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) +#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) WINE_DECLARE_DEBUG_CHANNEL(timestamp); WINE_DECLARE_DEBUG_CHANNEL(pid); @@ -594,6 +594,65 @@ static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_ { assert(0); /* should never be called */ } +#elif defined(__aarch64__) + +extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args, int flags ); +__ASM_GLOBAL_FUNC( call_entry_point, + "stp x29, x30, [SP,#-16]!\n\t" + "stp x19, x20, [SP,#-16]!\n\t" + "mov x29, SP\n\t" + "mov x19, x2\n\t" + "ldp x8, x9, [x19, #-32]\n\t" + "mov x9, x0\n\t" + "cbz w1, 2f\n\t" + "mov w10, w1\n\t" + "mov x11, x2\n\t" + "mov x12, #0\n\t" + "ldp x0, x1, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x2, x3, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x4, x5, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "ldp x6, x7, [x11], #16\n\t" + "add w12, w12, #2\n\t" + "cmp w12, w10\n\t" + "b.hs 2f\n\t" + "sub w12, w10, #8\n\t" + "lsl w12, w12, #3\n\t" + "sub SP, SP, w12, uxtw\n\t" + "tbz w12, #3, 1f\n\t" + "sub SP, SP, #8\n\t" + "1: sub w12, w12, #8\n\t" + "ldr x13, [x11, x12]\n\t" + "str x13, [SP, x12]\n\t" + "cbnz w12, 1b\n\t" + "2: blr x9\n\t" + "mov SP, x29\n\t" + "ldp x19, x20, [SP], #16\n\t" + "ldp x29, x30, [SP], #16\n\t" + "ret\n" ) + +static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ) +{ + BYTE nb_args = LOBYTE(HIWORD(idx)); + BYTE flags = HIBYTE(HIWORD(idx)); + void *func = relay_trace_entry( descr, idx, stack + 3 ); + LONGLONG ret = call_entry_point( func, nb_args, stack + 4, flags ); + relay_trace_exit( descr, idx, stack + 3, ret ); + return ret; +} + +static void WINAPI relay_call_regs( struct relay_descr *descr, INT_PTR idx, INT_PTR *stack ) +{ + assert(0); /* should never be called */ +} #elif defined(__x86_64__) @@ -751,7 +810,7 @@ void RELAY_SetupDLL( HMODULE module ) } } -#else /* __i386__ || __x86_64__ || __arm__ */ +#else /* __i386__ || __x86_64__ || __arm__ || __aarch64__ */ FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) @@ -763,7 +822,7 @@ void RELAY_SetupDLL( HMODULE module ) { } -#endif /* __i386__ || __x86_64__ || __arm__ */ +#endif /* __i386__ || __x86_64__ || __arm__ || __aarch64__ */ /***********************************************************************/

1 0

Paul Gofman : d3dx9: Introduce get_reg_components() helper function and use it instead of get_offset_reg() when appropriate.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: wine Branch: master Commit: 45b0add67853a715a4166efc629c212f50b24e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b0add67853a715a4166efc6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Jun 12 14:22:00 2017 +0300 d3dx9: Introduce get_reg_components() helper function and use it instead of get_offset_reg() when appropriate. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 522d484..126f3cc 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -296,6 +296,11 @@ static unsigned int get_offset_reg(unsigned int table, unsigned int reg_idx) return table == PRES_REGTAB_OBCONST ? reg_idx : reg_idx << 2; } +static unsigned int get_reg_components(unsigned int table) +{ + return get_offset_reg(table, 1); +} + #define PRES_BITMASK_BLOCK_SIZE (sizeof(unsigned int) * 8) static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstantTable *ctab); @@ -836,10 +841,10 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u if (FAILED(hr)) return hr; - if (const_count % get_offset_reg(PRES_REGTAB_IMMED, 1)) + if (const_count % get_reg_components(PRES_REGTAB_IMMED)) { FIXME("const_count %u is not a multiple of %u.\n", const_count, - get_offset_reg(PRES_REGTAB_IMMED, 1)); + get_reg_components(PRES_REGTAB_IMMED)); return D3DXERR_INVALIDDATA; } pres->regs.table_sizes[PRES_REGTAB_IMMED] = get_reg_offset(PRES_REGTAB_IMMED, const_count); @@ -1026,7 +1031,7 @@ static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set info->major = param->rows; info->minor = param->columns; } - info->major_stride = max(info->minor, get_offset_reg(table, 1)); + info->major_stride = max(info->minor, get_reg_components(table)); info->major_count = min(info->major * info->major_stride, get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; info->count = info->major_count * info->minor; @@ -1411,7 +1416,7 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper if (reg_index >= rs->table_sizes[table]) return 0.0; - offset = get_offset_reg(table, reg_index) + offset % get_offset_reg(table, 1); + offset = get_offset_reg(table, reg_index) + offset % get_reg_components(table); } return exec_get_reg_value(rs, table, offset);

1 0

Francois Gouget : winetest/dissect: Better check the task report.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: tools Branch: master Commit: ab725dad3b8b3076847aeaf06e94a89c8fb125e5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ab725dad3b8b3076847aeaf0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 10:47:10 2017 +0200 winetest/dissect: Better check the task report. This makes the dissect analysis match the expected results on the report test. In particular it now leverages the pid traces to detect when a test has no test summary line for its main process. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 437 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 334 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=ab725dad3b8b3076847a…

1 0

Francois Gouget : testbot: Update the TestLauncher binaries when updating Wine.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: tools Branch: master Commit: 0fd8f624e7a2888d5ba19959405da436053e8ac2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0fd8f624e7a2888d5ba19959… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 09:50:45 2017 +0200 testbot: Update the TestLauncher binaries when updating Wine. And remove the checked-in TestLauncher binaries since we no longer need them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunReconfig.pl | 13 +++++++++++++ testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/windows/TestLauncher32.exe | Bin 432844 -> 0 bytes testbot/bin/windows/TestLauncher64.exe | Bin 115348 -> 0 bytes 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c99c1ab..135a5c3 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -376,6 +376,19 @@ elsif (!defined $TAError) if ($NewStatus eq "completed") { use File::Copy; + for my $Bitness ("32", "64") + { + Debug(Elapsed($Start), " Retrieving the $Bitness bit TestLauncher to '$TaskDir/TestLauncher$Bitness.exe'\n"); + if ($TA->GetFile("../src/TestLauncher/TestLauncher$Bitness.exe", "$TaskDir/TestLauncher$Bitness.exe")) + { + copy "$TaskDir/TestLauncher$Bitness.exe", "$DataDir/latest/TestLauncher$Bitness.exe"; + } + elsif (!defined $TAError) + { + $TAError = "An error occurred while retrieving the $Bitness bit TestLauncher: ". $TA->GetLastError(); + } + } + Debug(Elapsed($Start), " Retrieving the updated test list '$TaskDir/testlist.txt'\n"); if ($TA->GetFile("testlist.txt", "$TaskDir/testlist.txt")) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index cd74119..22339b7 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -362,8 +362,8 @@ my $IsWineTest = 1; if ($Step->Type eq "single") { my $TestLauncher = "TestLauncher" . ($FileType eq "exe64" ? "64" : "32") . ".exe"; - Debug(Elapsed($Start), " Sending '$BinDir/windows/$TestLauncher'\n"); - if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0)) + Debug(Elapsed($Start), " Sending 'latest/$TestLauncher'\n"); + if (!$TA->SendFile("$DataDir/latest/$TestLauncher", $TestLauncher, 0)) { FatalTAError($TA, "Could not copy TestLauncher to the VM"); } diff --git a/testbot/bin/windows/TestLauncher32.exe b/testbot/bin/windows/TestLauncher32.exe deleted file mode 100755 index 3272652..0000000 Binary files a/testbot/bin/windows/TestLauncher32.exe and /dev/null differ diff --git a/testbot/bin/windows/TestLauncher64.exe b/testbot/bin/windows/TestLauncher64.exe deleted file mode 100755 index f18a904..0000000 Binary files a/testbot/bin/windows/TestLauncher64.exe and /dev/null differ

1 0

Francois Gouget : testbot/TestLauncher: The str*_s() functions are not portable. Avoid them.
by Alexandre Julliard June 14, 2017

June 14, 2017

Module: tools Branch: master Commit: 814671cfc719a5980b513bdb61cbe7e012934644 URL: http://source.winehq.org/git/tools.git/?a=commit;h=814671cfc719a5980b513bdb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 14 10:42:43 2017 +0200 testbot/TestLauncher: The str*_s() functions are not portable. Avoid them. They are missing in older versions of msvcrt, on Windows XP for instance. Also, simply mapping strncpy_s() to strncpy() means the string will not be NUL-terminated! The destination buffers are large enough anyway so use the regular string functions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index ed7fffb..53590f8 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -19,13 +19,9 @@ */ #include <stdio.h> +#include <errno.h> #include <windows.h> -#ifdef __MINGW32__ -#define strcpy_s(dest, size, src) strcpy((dest), (src)) -#define strncpy_s(dest, size, src, max) strncpy((dest), (src), (max)) -#define strcat_s(dest, size, src) strcat((dest), (src)) -#endif #define countof(Array) (sizeof(Array) / sizeof(Array[0])) static unsigned Failures = 0; @@ -339,9 +335,12 @@ int main(int argc, char *argv[]) if (Suffix == NULL) Suffix = strchr(TestExeFileName, '.'); if (Suffix == NULL) - strcpy_s(TestName, countof(TestName), TestExeFileName); + strcpy(TestName, TestExeFileName); else - strncpy_s(TestName, _MAX_PATH, TestExeFileName, Suffix - TestExeFileName); + { + strncpy(TestName, TestExeFileName, Suffix - TestExeFileName); + TestName[Suffix - TestExeFileName] = '\0'; + } Subtest = (Arg + 1 < argc ? argv[Arg + 1] : ""); CommandLen = strlen(TestExeFullName) + 3; @@ -356,13 +355,13 @@ int main(int argc, char *argv[]) } CommandLine[0] = '"'; - strcpy_s(CommandLine + 1, CommandLen - 1, TestExeFullName); - strcat_s(CommandLine, CommandLen, "\""); + strcpy(CommandLine + 1, TestExeFullName); + strcat(CommandLine, "\""); for (TestArg = Arg + 1; TestArg < argc; TestArg++) { - strcat_s(CommandLine, CommandLen, " \""); - strcat_s(CommandLine, CommandLen, argv[TestArg]); - strcat_s(CommandLine, CommandLen, "\""); + strcat(CommandLine, " \""); + strcat(CommandLine, argv[TestArg]); + strcat(CommandLine, "\""); } Arg = argc;

1 0

Zebediah Figura : include: Pack WAVEFORMAT structs.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: d31d656b6f16572025d297b010eba13390deeb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31d656b6f16572025d297b01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:35 2017 -0500 include: Pack WAVEFORMAT structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/tests/msacm.c | 13 +++++++++++++ include/mmreg.h | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 13494a6..44a6feb 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1139,6 +1139,18 @@ static void test_acmFormatSuggest(void) ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); } +static void test_acmFormatTagDetails(void) +{ + ACMFORMATTAGDETAILSW aftd = {0}; + MMRESULT rc; + + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3; + rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (rc == MMSYSERR_NOERROR) + ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); +} + static struct { struct @@ -1306,6 +1318,7 @@ START_TEST(msacm) driver_tests(); test_prepareheader(); test_acmFormatSuggest(); + test_acmFormatTagDetails(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */ test_acmDriverAdd(); diff --git a/include/mmreg.h b/include/mmreg.h index 2ee2b00..8bb581d 100644 --- a/include/mmreg.h +++ b/include/mmreg.h @@ -23,6 +23,8 @@ #ifndef __WINE_MMREG_H #define __WINE_MMREG_H +#include <pshpack1.h> + /*********************************************************************** * Defines/Enums */ @@ -512,6 +514,8 @@ typedef struct tagEXBMINFOHEADER { #endif +#include <poppack.h> + #endif /* __WINE_MMREG_H */ #else /* __WIDL__ */

1 0

Thomas Faber : devenum/tests: Fix return value check for IEnumMoniker_Next.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: d7eb469d5992f9901b0dd355e5e61709aed31d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7eb469d5992f9901b0dd355e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jun 13 11:50:01 2017 +0200 devenum/tests: Fix return value check for IEnumMoniker_Next. IEnumMoniker::Next returns S_FALSE when there are no (more) items, so checking SUCCEEDED does not make sense. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c2173fe..5a41183 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -154,8 +154,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); @@ -177,8 +177,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); @@ -201,8 +201,8 @@ static void test_moniker_isequal(void) ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); if (SUCCEEDED(res)) { - if (SUCCEEDED(IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL)) && - SUCCEEDED(IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL))) + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && + IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { res = IMoniker_IsEqual(moniker0, moniker1); ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res);

1 0

Hugh McMaster : regedit: Add status bar text for the 'Expand'/'Collapse' menu item.
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: a726343fa5a7bb2589dc014ff865fed39bb8f6a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a726343fa5a7bb2589dc014ff… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 13 12:43:10 2017 +0000 regedit: Add status bar text for the 'Expand'/'Collapse' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 184 ++++++++++++++++++++++---------------------- po/bg.po | 184 ++++++++++++++++++++++---------------------- po/ca.po | 184 ++++++++++++++++++++++---------------------- po/cs.po | 184 ++++++++++++++++++++++---------------------- po/da.po | 184 ++++++++++++++++++++++---------------------- po/de.po | 184 ++++++++++++++++++++++---------------------- po/el.po | 184 ++++++++++++++++++++++---------------------- po/en.po | 184 ++++++++++++++++++++++---------------------- po/en_US.po | 184 ++++++++++++++++++++++---------------------- po/eo.po | 184 ++++++++++++++++++++++---------------------- po/es.po | 184 ++++++++++++++++++++++---------------------- po/fa.po | 184 ++++++++++++++++++++++---------------------- po/fi.po | 184 ++++++++++++++++++++++---------------------- po/fr.po | 184 ++++++++++++++++++++++---------------------- po/he.po | 184 ++++++++++++++++++++++---------------------- po/hi.po | 184 ++++++++++++++++++++++---------------------- po/hr.po | 184 ++++++++++++++++++++++---------------------- po/hu.po | 184 ++++++++++++++++++++++---------------------- po/it.po | 184 ++++++++++++++++++++++---------------------- po/ja.po | 184 ++++++++++++++++++++++---------------------- po/ko.po | 184 ++++++++++++++++++++++---------------------- po/lt.po | 184 ++++++++++++++++++++++---------------------- po/ml.po | 184 ++++++++++++++++++++++---------------------- po/nb_NO.po | 184 ++++++++++++++++++++++---------------------- po/nl.po | 184 ++++++++++++++++++++++---------------------- po/or.po | 184 ++++++++++++++++++++++---------------------- po/pa.po | 184 ++++++++++++++++++++++---------------------- po/pl.po | 184 ++++++++++++++++++++++---------------------- po/pt_BR.po | 184 ++++++++++++++++++++++---------------------- po/pt_PT.po | 184 ++++++++++++++++++++++---------------------- po/rm.po | 184 ++++++++++++++++++++++---------------------- po/ro.po | 184 ++++++++++++++++++++++---------------------- po/ru.po | 184 ++++++++++++++++++++++---------------------- po/sk.po | 184 ++++++++++++++++++++++---------------------- po/sl.po | 184 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 184 ++++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 184 ++++++++++++++++++++++---------------------- po/sv.po | 184 ++++++++++++++++++++++---------------------- po/te.po | 184 ++++++++++++++++++++++---------------------- po/th.po | 184 ++++++++++++++++++++++---------------------- po/tr.po | 184 ++++++++++++++++++++++---------------------- po/uk.po | 184 ++++++++++++++++++++++---------------------- po/wa.po | 184 ++++++++++++++++++++++---------------------- po/wine.pot | 184 ++++++++++++++++++++++---------------------- po/zh_CN.po | 184 ++++++++++++++++++++++---------------------- po/zh_TW.po | 184 ++++++++++++++++++++++---------------------- programs/regedit/regedit.rc | 1 + 47 files changed, 4325 insertions(+), 4140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a726343fa5a7bb2589dc0…

1 0

Zebediah Figura : winemp3.acm: Fix error in acmStreamSize().
by Alexandre Julliard June 13, 2017

June 13, 2017

Module: wine Branch: master Commit: ffebb919101120feb55cef43bf48e1d142693ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffebb919101120feb55cef43b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 12 14:36:36 2017 -0500 winemp3.acm: Fix error in acmStreamSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index cc6008d..13a6109 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -940,11 +940,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_MPEG)) { nblocks = adss->cbSrcLength / (adsi->pwfxSrc->nBlockAlign * 1152); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nBlockAlign * 1152)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = 3000 + nblocks * (DWORD)(adsi->pwfxDst->nAvgBytesPerSec * 1152 / adsi->pwfxDst->nSamplesPerSec + 0.5); } else if ((adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_MPEGLAYER3 || @@ -952,11 +952,11 @@ static LRESULT MPEG3_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE ad adsi->pwfxDst->wFormatTag == WAVE_FORMAT_PCM) { nblocks = adss->cbSrcLength / (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec); - if (nblocks == 0) - return ACMERR_NOTPOSSIBLE; if (adss->cbSrcLength % (DWORD)(adsi->pwfxSrc->nAvgBytesPerSec * 1152 / adsi->pwfxSrc->nSamplesPerSec)) /* Round block count up. */ nblocks++; + if (nblocks == 0) + return ACMERR_NOTPOSSIBLE; adss->cbDstLength = nblocks * 1152 * adsi->pwfxDst->nBlockAlign; } else

1 0