Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 74814: [MLANG_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:29:06 2017 New Revision: 74814 URL: http://svn.reactos.org/svn/reactos?rev=74814&view=rev Log: [MLANG_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/mlang/mlang.c Modified: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… ============================================================================== --- trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] Sat Jun 3 22:29:06 2017 @@ -696,15 +696,49 @@ IEnumCodePage_Release(iEnumCP); } -static void test_GetCharsetInfo_alias(IMultiLanguage *ml) +static void test_GetCharsetInfo_other(IMultiLanguage *ml) { WCHAR asciiW[] = {'a','s','c','i','i',0}; + WCHAR iso88591_1W[] = {'I','S','O','-','8','8','5','9','-','1',0}; + WCHAR iso88591_1retW[] = {'i','s','o','-','8','8','5','9','-','1',0}; + WCHAR iso88591_2W[] = {'I','S','O','8','8','5','9','-','1',0}; + WCHAR iso88591_2retW[] = {'i','s','o','8','8','5','9','-','1',0}; + WCHAR iso88591_3W[] = {'I','S','O','8','8','5','9','1',0}; + WCHAR iso88591_4W[] = {'I','S','O','-','8','8','5','9','1',0}; + WCHAR iso88591_5W[] = {'I','S','O','8','8','-','5','9','1',0}; + WCHAR iso88591_6W[] = {'-','I','S','O','8','8','5','9','1',0}; + WCHAR iso88591_7W[] = {' ','I','S','O','-','8','8','5','9','-','1',0}; + struct other { + int todo; + HRESULT hr; + WCHAR* charset; + WCHAR* ret_charset; + } other[] = { + { 0, S_OK, asciiW, asciiW }, + { 0, S_OK, iso88591_1W, iso88591_1retW }, + { 1, S_OK, iso88591_2W, iso88591_2retW }, + { 0, E_FAIL, iso88591_3W, 0 }, + { 0, E_FAIL, iso88591_4W, 0 }, + { 0, E_FAIL, iso88591_5W, 0 }, + { 0, E_FAIL, iso88591_6W, 0 }, + { 0, E_FAIL, iso88591_7W, 0 }, + }; MIMECSETINFO info; HRESULT hr; - - hr = IMultiLanguage_GetCharsetInfo(ml, asciiW, &info); - ok(hr == S_OK, "got %08x\n", hr); - ok(!lstrcmpW(info.wszCharset, asciiW), "got %s\n", wine_dbgstr_w(info.wszCharset)); + int i; + + for (i = 0; i < sizeof(other)/sizeof(*other); i++) + { + hr = IMultiLanguage_GetCharsetInfo(ml, other[i].charset, &info); + + todo_wine_if(other[i].todo) + ok(hr == other[i].hr, "#%d: got %08x, expected %08x\n", i, hr, other[i].hr); + + if (hr == S_OK) + todo_wine_if(other[i].todo) + ok(!lstrcmpW(info.wszCharset, other[i].ret_charset), "#%d: got %s, expected %s\n", + i, wine_dbgstr_w(info.wszCharset), wine_dbgstr_w(other[i].ret_charset)); + } } static void scriptinfo_cmp(SCRIPTINFO *sinfo1, SCRIPTINFO *sinfo2) @@ -2206,7 +2240,7 @@ test_GetNumberOfCodePageInfo((IMultiLanguage2 *)iML); test_IMLangConvertCharset(iML); - test_GetCharsetInfo_alias(iML); + test_GetCharsetInfo_other(iML); IMultiLanguage_Release(iML);

1 0

[akhaldi] 74813: [MCIAVI32] Sync with Wine Staging 2.9. CORE-13362 c59dcfa mciavi32: Implement MCI_BREAK. d3c25df mciavi32: Trace MCIAVI_CreateWindow. 1b57f07 mciavi32: Report version as 1.1.
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:28:56 2017 New Revision: 74813 URL: http://svn.reactos.org/svn/reactos?rev=74813&view=rev Log: [MCIAVI32] Sync with Wine Staging 2.9. CORE-13362 c59dcfa mciavi32: Implement MCI_BREAK. d3c25df mciavi32: Trace MCIAVI_CreateWindow. 1b57f07 mciavi32: Report version as 1.1. Modified: trunk/reactos/dll/win32/mciavi32/info.c trunk/reactos/dll/win32/mciavi32/mciavi.c trunk/reactos/dll/win32/mciavi32/private_mciavi.h trunk/reactos/dll/win32/mciavi32/wnd.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciavi32/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/info.c?… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/info.c [iso-8859-1] Sat Jun 3 22:28:56 2017 @@ -187,6 +187,7 @@ WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); DWORD ret = 0; static const WCHAR wszAviPlayer[] = {'W','i','n','e','\'','s',' ','A','V','I',' ','p','l','a','y','e','r',0}; + static const WCHAR wszVersion[] = {'1','.','1',0}; if (lpParms == NULL || lpParms->lpstrReturn == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -199,6 +200,8 @@ if (dwFlags & MCI_INFO_PRODUCT) str = wszAviPlayer; + else if (dwFlags & MCI_INFO_VERSION) + str = wszVersion; else if (dwFlags & MCI_INFO_FILE) str = wma->lpFileName; else { Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mciavi.… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] Sat Jun 3 22:28:56 2017 @@ -351,6 +351,7 @@ DWORD numEvents = 1; HANDLE events[2]; double next_frame_us; + BOOL wait_audio = TRUE; EnterCriticalSection(&wma->cs); @@ -417,19 +418,37 @@ else delta = 0; + /* check if the playback was cancelled */ + if ((wma->mci_break.flags & MCI_BREAK_KEY) && + (GetAsyncKeyState(wma->mci_break.parms.nVirtKey) & 0x8000)) + { + if (!(wma->mci_break.flags & MCI_BREAK_HWND) || + GetForegroundWindow() == wma->mci_break.parms.hwndBreak) + { + /* we queue audio blocks ahead so ignore them otherwise the audio + * will keep playing until the buffer is empty */ + wait_audio = FALSE; + + TRACE("playback cancelled using break key\n"); + break; + } + } + LeaveCriticalSection(&wma->cs); ret = WaitForMultipleObjects(numEvents, events, FALSE, delta / 1000); EnterCriticalSection(&wma->cs); if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; } - if (wma->lpWaveFormat) { - while (wma->dwEventCount != nHdr - 1) - { - LeaveCriticalSection(&wma->cs); - Sleep(100); - EnterCriticalSection(&wma->cs); - } + if (wma->lpWaveFormat) + { + if (wait_audio) + while (wma->dwEventCount != nHdr - 1) + { + LeaveCriticalSection(&wma->cs); + Sleep(100); + EnterCriticalSection(&wma->cs); + } /* just to get rid of some race conditions between play, stop and pause */ LeaveCriticalSection(&wma->cs); @@ -869,6 +888,30 @@ } /****************************************************************************** + * MCIAVI_mciBreak [internal] + */ +static DWORD MCIAVI_mciBreak(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) +{ + WINE_MCIAVI *wma; + + TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIAVI_mciGetOpenDev(wDevID); + if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; + + EnterCriticalSection(&wma->cs); + + wma->mci_break.flags = dwFlags; + wma->mci_break.parms = *lpParms; + + LeaveCriticalSection(&wma->cs); + + return 0; +} + +/****************************************************************************** * MCIAVI_mciSetAudio [internal] */ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_PARMSW lpParms) @@ -986,6 +1029,7 @@ case MCI_WHERE: return MCIAVI_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); case MCI_STEP: return MCIAVI_mciStep (dwDevID, dwParam1, (LPMCI_DGV_STEP_PARMS) dwParam2); case MCI_CUE: return MCIAVI_mciCue (dwDevID, dwParam1, (LPMCI_DGV_CUE_PARMS) dwParam2); + case MCI_BREAK: return MCIAVI_mciBreak (dwDevID, dwParam1, (LPMCI_BREAK_PARMS) dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: return MCIAVI_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); case MCI_SIGNAL: return MCIAVI_mciSignal (dwDevID, dwParam1, (LPMCI_DGV_SIGNAL_PARMS) dwParam2); Modified: trunk/reactos/dll/win32/mciavi32/private_mciavi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/private… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/private_mciavi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/private_mciavi.h [iso-8859-1] Sat Jun 3 22:28:56 2017 @@ -81,6 +81,11 @@ DWORD dwToVideoFrame; /* play to */ DWORD dwCurrAudioBlock; /* current audio block being played */ RECT source, dest; + struct + { + DWORD flags; + MCI_BREAK_PARMS parms; + } mci_break; /* data for the background mechanism */ CRITICAL_SECTION cs; HANDLE hStopEvent; Modified: trunk/reactos/dll/win32/mciavi32/wnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/wnd.c?r… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/wnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/wnd.c [iso-8859-1] Sat Jun 3 22:28:56 2017 @@ -105,7 +105,7 @@ return FALSE; } -BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms) +BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpParms) { static const WCHAR captionW[] = {'W','i','n','e',' ','M','C','I','-','A','V','I',' ','p','l','a','y','e','r',0}; HWND hParent = 0; @@ -115,8 +115,8 @@ /* what should be done ? */ if (wma->hWnd) return TRUE; - if (dwFlags & MCI_DGV_OPEN_PARENT) hParent = lpOpenParms->hWndParent; - if (dwFlags & MCI_DGV_OPEN_WS) dwStyle = lpOpenParms->dwStyle; + if (dwFlags & MCI_DGV_OPEN_PARENT) hParent = lpParms->hWndParent; + if (dwFlags & MCI_DGV_OPEN_WS) dwStyle = lpParms->dwStyle; if (wma->hic) SetRect(&rc, 0, 0, wma->outbih->biWidth, wma->outbih->biHeight); @@ -137,6 +137,9 @@ hParent, 0, MCIAVI_hInstance, ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd; + + TRACE("(%04x, %08X, %p, style %x, parent %p, dimensions %dx%d, hwnd %p)\n", wma->wDevID, + dwFlags, lpParms, dwStyle, hParent, rc.right - rc.left, rc.bottom - rc.top, wma->hWnd); return wma->hWnd != 0; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 3 22:28:56 2017 @@ -90,7 +90,7 @@ reactos/dll/win32/loadperf # Synced to WineStaging-2.2 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11 reactos/dll/win32/mapi32 # Synced to WineStaging-2.2 -reactos/dll/win32/mciavi32 # Synced to WineStaging-1.9.16 +reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 reactos/dll/win32/mcicda # Synced to WineStaging-1.9.16 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.2 reactos/dll/win32/mciseq # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74812: [JSCRIPT_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:28:34 2017 New Revision: 74812 URL: http://svn.reactos.org/svn/reactos?rev=74812&view=rev Log: [JSCRIPT_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/jscript/lang.js Modified: trunk/rostests/winetests/jscript/lang.js URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/lang.js… ============================================================================== --- trunk/rostests/winetests/jscript/lang.js [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/lang.js [iso-8859-1] Sat Jun 3 22:28:34 2017 @@ -264,6 +264,8 @@ eval("testRes(); testRes()"); tmp = eval("3; if(false) {4;} else {};;;") ok(tmp === 3, "tmp = " + tmp); +tmp = eval("try { 1; } finally { 2; }") +ok(tmp === 2, "tmp = " + tmp); testNoRes(); testRes() && testRes(); @@ -977,6 +979,164 @@ i++; } return i; +})(); + +(function() { + var ret, x; + + function unreachable() { + ok(false, "unreachable"); + } + + function expect(value, expect_value) { + ok(value === expect_value, "got " + value + " expected " + expect_value); + } + + ret = (function() { + try { + return "try"; + unreachable(); + }catch(e) { + unreachable(); + }finally { + return "finally"; + unreachable(); + } + unreachable(); + })(); + expect(ret, "finally"); + + x = ""; + ret = (function() { + try { + x += "try,"; + return x; + unreachable(); + }catch(e) { + unreachable(); + }finally { + x += "finally,"; + } + unreachable(); + })(); + expect(ret, "try,"); + expect(x, "try,finally,"); + + x = ""; + ret = (function() { + try { + x += "try," + throw 1; + unreachable(); + }catch(e) { + x += "catch,"; + return "catch"; + unreachable(); + }finally { + x += "finally,"; + return "finally"; + unreachable(); + } + unreachable(); + })(); + expect(ret, "finally"); + expect(x, "try,catch,finally,"); + + x = ""; + ret = (function() { + try { + x += "try," + throw 1; + unreachable(); + }catch(e) { + x += "catch,"; + return "catch"; + unreachable(); + }finally { + x += "finally,"; + } + unreachable(); + })(); + expect(ret, "catch"); + expect(x, "try,catch,finally,"); + + x = ""; + ret = (function() { + try { + x += "try," + try { + x += "try2,"; + return "try2"; + }catch(e) { + unreachable(); + }finally { + x += "finally2,"; + } + unreachable(); + }catch(e) { + unreachable(); + }finally { + x += "finally,"; + } + unreachable(); + })(); + expect(ret, "try2"); + expect(x, "try,try2,finally2,finally,"); + + x = ""; + ret = (function() { + while(true) { + try { + x += "try," + try { + x += "try2,"; + break; + }catch(e) { + unreachable(); + }finally { + x += "finally2,"; + } + unreachable(); + }catch(e) { + unreachable(); + }finally { + x += "finally,"; + } + unreachable(); + } + x += "ret"; + return "ret"; + })(); + expect(ret, "ret"); + expect(x, "try,try2,finally2,finally,ret"); + + x = ""; + ret = (function() { + while(true) { + try { + x += "try," + try { + x += "try2,"; + continue; + }catch(e) { + unreachable(); + }finally { + x += "finally2,"; + } + unreachable(); + }catch(e) { + unreachable(); + }finally { + x += "finally,"; + break; + } + unreachable(); + } + x += "ret"; + return "ret"; + })(); + expect(ret, "ret"); + expect(x, "try,try2,finally2,finally,ret"); })(); tmp = eval("1"); @@ -1597,6 +1757,15 @@ })(); ok(tmp, "tmp = " + tmp); +tmp = (function() { + for(var iter in [1,2,3,4]) { + var ret = false; + with({ret: true}) + return ret; + } +})(); +ok(tmp, "tmp = " + tmp); + (function() { ok(typeof(func) === "function", "typeof(func) = " + typeof(func)); with(new Object()) {

1 0

[akhaldi] 74811: [JSCRIPT] Sync with Wine Staging 2.9. CORE-13362 59c39fa jscript: Added new debug channel printing details and backtrace of unwinded exceptions. 60232cc jscript: Always jump to fin...
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:28:19 2017 New Revision: 74811 URL: http://svn.reactos.org/svn/reactos?rev=74811&view=rev Log: [JSCRIPT] Sync with Wine Staging 2.9. CORE-13362 59c39fa jscript: Added new debug channel printing details and backtrace of unwinded exceptions. 60232cc jscript: Always jump to finally block from OP_pop_exept when available. 685cd43 jscript: Pass finally offset instead of catch ident to OP_push_except. 8bd99c3 jscript: Ensure that OP_pop_except is called with proper stack depth. 622eb72 jscript: Added new opcode to enter catch block and use it to setup the scope. b7bb166 jscript: Simplify pop_to_stat implementation. 1731629 jscript: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Modified: trunk/reactos/dll/win32/jscript/compile.c trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/engine.h trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/compile.… ============================================================================== --- trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] Sat Jun 3 22:28:19 2017 @@ -1376,24 +1376,30 @@ return S_OK; } -static HRESULT pop_to_stat(compiler_ctx_t *ctx, BOOL var_stack, BOOL scope_stack, statement_ctx_t *stat_ctx) +static HRESULT pop_to_stat(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx) { unsigned stack_pop = 0; statement_ctx_t *iter; + HRESULT hres; for(iter = ctx->stat_ctx; iter != stat_ctx; iter = iter->next) { - if(scope_stack) { - if(iter->using_scope && !push_instr(ctx, OP_pop_scope)) - return E_OUTOFMEMORY; - if(iter->using_except && !push_instr(ctx, OP_pop_except)) - return E_OUTOFMEMORY; + if(iter->using_scope && !push_instr(ctx, OP_pop_scope)) + return E_OUTOFMEMORY; + if(iter->using_except) { + if(stack_pop) { + hres = push_instr_uint(ctx, OP_pop, stack_pop); + if(FAILED(hres)) + return hres; + stack_pop = 0; + } + hres = push_instr_uint(ctx, OP_pop_except, ctx->code_off+1); + if(FAILED(hres)) + return hres; } stack_pop += iter->stack_use; } - if(var_stack && stack_pop) { - HRESULT hres; - + if(stack_pop) { hres = push_instr_uint(ctx, OP_pop, stack_pop); if(FAILED(hres)) return hres; @@ -1448,7 +1454,7 @@ } } - hres = pop_to_stat(ctx, TRUE, TRUE, pop_ctx); + hres = pop_to_stat(ctx, pop_ctx); if(FAILED(hres)) return hres; @@ -1485,7 +1491,7 @@ } } - hres = pop_to_stat(ctx, TRUE, TRUE, pop_ctx->next); + hres = pop_to_stat(ctx, pop_ctx->next); if(FAILED(hres)) return hres; @@ -1502,10 +1508,6 @@ return JS_E_MISPLACED_RETURN; } - hres = pop_to_stat(ctx, TRUE, FALSE, NULL); - if(FAILED(hres)) - return hres; - if(stat->expr) { hres = compile_expression(ctx, stat->expr, TRUE); if(FAILED(hres)) @@ -1514,7 +1516,7 @@ return E_OUTOFMEMORY; } - hres = pop_to_stat(ctx, FALSE, TRUE, NULL); + hres = pop_to_stat(ctx, NULL); if(FAILED(hres)) return hres; @@ -1680,9 +1682,8 @@ /* ECMA-262 3rd Edition 12.14 */ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) { - statement_ctx_t try_ctx = {0, FALSE, TRUE}, catch_ctx = {0, TRUE, FALSE}; - statement_ctx_t finally_ctx = {2, FALSE, FALSE}; - unsigned push_except; + statement_ctx_t try_ctx = {0, FALSE, TRUE}, finally_ctx = {2, FALSE, FALSE}; + unsigned push_except, finally_off = 0, catch_off = 0, pop_except, catch_pop_except = 0; BSTR ident; HRESULT hres; @@ -1698,26 +1699,25 @@ ident = NULL; } - instr_ptr(ctx, push_except)->u.arg[1].bstr = ident; - - if(!stat->catch_block) - try_ctx.stack_use = 2; - hres = compile_statement(ctx, &try_ctx, stat->try_statement); if(FAILED(hres)) return hres; - if(!push_instr(ctx, OP_pop_except)) + pop_except = push_instr(ctx, OP_pop_except); + if(!pop_except) return E_OUTOFMEMORY; if(stat->catch_block) { - unsigned jmp_finally; - - jmp_finally = push_instr(ctx, OP_jmp); - if(!jmp_finally) - return E_OUTOFMEMORY; - - instr_ptr(ctx, push_except)->u.arg[0].uint = ctx->code_off; + statement_ctx_t catch_ctx = {0, TRUE, stat->finally_statement != NULL}; + + if(stat->finally_statement) + catch_ctx.using_except = TRUE; + + catch_off = ctx->code_off; + + hres = push_instr_bstr(ctx, OP_enter_catch, ident); + if(FAILED(hres)) + return hres; hres = compile_statement(ctx, &catch_ctx, stat->catch_block->statement); if(FAILED(hres)) @@ -1726,20 +1726,33 @@ if(!push_instr(ctx, OP_pop_scope)) return E_OUTOFMEMORY; - set_arg_uint(ctx, jmp_finally, ctx->code_off); - }else { - set_arg_uint(ctx, push_except, ctx->code_off); + if(stat->finally_statement) { + catch_pop_except = push_instr(ctx, OP_pop_except); + if(!catch_pop_except) + return E_OUTOFMEMORY; + } } if(stat->finally_statement) { - hres = compile_statement(ctx, stat->catch_block ? NULL : &finally_ctx, stat->finally_statement); - if(FAILED(hres)) - return hres; - - if(!stat->catch_block && !push_instr(ctx, OP_end_finally)) + /* + * finally block expects two elements on the stack, which may be: + * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed addres + * - (false, exception_value) set when unwinding an exception, which OP_end_finally rethrows + */ + finally_off = ctx->code_off; + hres = compile_statement(ctx, &finally_ctx, stat->finally_statement); + if(FAILED(hres)) + return hres; + + if(!push_instr(ctx, OP_end_finally)) return E_OUTOFMEMORY; } + instr_ptr(ctx, pop_except)->u.arg[0].uint = ctx->code_off; + if(catch_pop_except) + instr_ptr(ctx, catch_pop_except)->u.arg[0].uint = ctx->code_off; + instr_ptr(ctx, push_except)->u.arg[0].uint = catch_off; + instr_ptr(ctx, push_except)->u.arg[1].uint = finally_off; return S_OK; } Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] Sat Jun 3 22:28:19 2017 @@ -18,6 +18,8 @@ #include "jscript.h" +WINE_DECLARE_DEBUG_CHANNEL(jscript_except); + static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; static const WCHAR numberW[] = {'n','u','m','b','e','r',0}; @@ -30,7 +32,7 @@ unsigned stack_top; scope_chain_t *scope; unsigned catch_off; - BSTR ident; + unsigned finally_off; except_frame_t *next; }; @@ -891,59 +893,64 @@ /* ECMA-262 3rd Edition 12.14 */ static HRESULT interp_push_except(script_ctx_t *ctx) { - const unsigned arg1 = get_op_uint(ctx, 0); - const BSTR arg2 = get_op_bstr(ctx, 1); + const unsigned catch_off = get_op_uint(ctx, 0); + const unsigned finally_off = get_op_uint(ctx, 1); call_frame_t *frame = ctx->call_ctx; except_frame_t *except; - unsigned stack_top; - - TRACE("\n"); - - stack_top = ctx->stack_top; - - if(!arg2) { + + TRACE("\n"); + + except = heap_alloc(sizeof(*except)); + if(!except) + return E_OUTOFMEMORY; + + except->stack_top = ctx->stack_top; + except->scope = frame->scope; + except->catch_off = catch_off; + except->finally_off = finally_off; + except->next = frame->except_frame; + frame->except_frame = except; + return S_OK; +} + +/* ECMA-262 3rd Edition 12.14 */ +static HRESULT interp_pop_except(script_ctx_t *ctx) +{ + const unsigned ret_off = get_op_uint(ctx, 0); + call_frame_t *frame = ctx->call_ctx; + except_frame_t *except; + unsigned finally_off; + + TRACE("%u\n", ret_off); + + except = frame->except_frame; + assert(except != NULL); + + finally_off = except->finally_off; + frame->except_frame = except->next; + heap_free(except); + + if(finally_off) { HRESULT hres; - hres = stack_push(ctx, jsval_bool(TRUE)); + hres = stack_push(ctx, jsval_number(ret_off)); if(FAILED(hres)) return hres; hres = stack_push(ctx, jsval_bool(TRUE)); if(FAILED(hres)) return hres; - } - - except = heap_alloc(sizeof(*except)); - if(!except) - return E_OUTOFMEMORY; - - except->stack_top = stack_top; - except->scope = frame->scope; - except->catch_off = arg1; - except->ident = arg2; - except->next = frame->except_frame; - frame->except_frame = except; - return S_OK; -} - -/* ECMA-262 3rd Edition 12.14 */ -static HRESULT interp_pop_except(script_ctx_t *ctx) -{ - call_frame_t *frame = ctx->call_ctx; - except_frame_t *except; - - TRACE("\n"); - - except = frame->except_frame; - assert(except != NULL); - - frame->except_frame = except->next; - heap_free(except); + frame->ip = finally_off; + }else { + frame->ip = ret_off; + } + return S_OK; } /* ECMA-262 3rd Edition 12.14 */ static HRESULT interp_end_finally(script_ctx_t *ctx) { + call_frame_t *frame = ctx->call_ctx; jsval_t v; TRACE("\n"); @@ -958,8 +965,30 @@ return DISP_E_EXCEPTION; } - stack_pop(ctx); + v = stack_pop(ctx); + assert(is_number(v)); + frame->ip = get_number(v); return S_OK; +} + +static HRESULT interp_enter_catch(script_ctx_t *ctx) +{ + const BSTR ident = get_op_bstr(ctx, 0); + jsdisp_t *scope_obj; + jsval_t v; + HRESULT hres; + + hres = create_dispex(ctx, NULL, NULL, &scope_obj); + if(FAILED(hres)) + return hres; + + v = stack_pop(ctx); + hres = jsdisp_propput_name(scope_obj, ident, v); + jsval_release(v); + if(SUCCEEDED(hres)) + hres = scope_push(ctx->call_ctx->scope, scope_obj, to_disp(scope_obj), &ctx->call_ctx->scope); + jsdisp_release(scope_obj); + return hres; } /* ECMA-262 3rd Edition 13 */ @@ -2626,13 +2655,71 @@ heap_free(frame); } +static void print_backtrace(script_ctx_t *ctx) +{ + unsigned depth = 0, i; + call_frame_t *frame; + + for(frame = ctx->call_ctx; frame; frame = frame->prev_frame) { + TRACE_(jscript_except)("%u\t", depth); + depth++; + + if(frame->this_obj && frame->this_obj != to_disp(ctx->global) && frame->this_obj != ctx->host_global) + TRACE_(jscript_except)("%p->", frame->this_obj); + TRACE_(jscript_except)("%s(", frame->function->name ? debugstr_w(frame->function->name) : "[unnamed]"); + if(frame->base_scope && frame->base_scope->frame) { + for(i=0; i < frame->argc; i++) { + if(i < frame->function->param_cnt) + TRACE_(jscript_except)("%s%s=%s", i ? ", " : "", + debugstr_w(frame->function->params[i]), + debugstr_jsval(ctx->stack[local_off(frame, -i-1)])); + else + TRACE_(jscript_except)("%s%s", i ? ", " : "", + debugstr_jsval(ctx->stack[local_off(frame, -i-1)])); + } + }else { + TRACE_(jscript_except)("[detached frame]"); + } + TRACE_(jscript_except)(")\n"); + + if(!(frame->flags & EXEC_RETURN_TO_INTERP)) { + TRACE_(jscript_except)("%u\t[native code]\n", depth); + depth++; + } + } +} + static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres) { except_frame_t *except_frame; call_frame_t *frame; jsval_t except_val; - BSTR ident; - HRESULT hres; + unsigned catch_off; + HRESULT hres; + + TRACE("%08x\n", exception_hres); + + if(TRACE_ON(jscript_except)) { + jsdisp_t *error_obj; + jsval_t msg; + + static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; + + TRACE_(jscript_except)("Exception %08x %s", exception_hres, debugstr_jsval(ctx->ei.val)); + if(jsval_type(ctx->ei.val) == JSV_OBJECT) { + error_obj = to_jsdisp(get_object(ctx->ei.val)); + if(error_obj) { + hres = jsdisp_propget_name(error_obj, messageW, &msg); + if(SUCCEEDED(hres)) { + TRACE_(jscript_except)(" (message %s)", debugstr_jsval(msg)); + jsval_release(msg); + } + } + } + TRACE_(jscript_except)(" in:\n"); + + print_backtrace(ctx); + } for(frame = ctx->call_ctx; !frame->except_frame; frame = ctx->call_ctx) { DWORD flags; @@ -2649,7 +2736,7 @@ } except_frame = frame->except_frame; - frame->except_frame = except_frame->next; + catch_off = except_frame->catch_off; assert(except_frame->stack_top <= ctx->stack_top); stack_popn(ctx, ctx->stack_top - except_frame->stack_top); @@ -2657,38 +2744,27 @@ while(except_frame->scope != frame->scope) scope_pop(&frame->scope); - frame->ip = except_frame->catch_off; + frame->ip = catch_off ? catch_off : except_frame->finally_off; + if(catch_off) assert(frame->bytecode->instrs[frame->ip].op == OP_enter_catch); except_val = ctx->ei.val; ctx->ei.val = jsval_undefined(); clear_ei(ctx); - ident = except_frame->ident; - heap_free(except_frame); - - if(ident) { - jsdisp_t *scope_obj; - - hres = create_dispex(ctx, NULL, NULL, &scope_obj); - if(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(scope_obj, ident, except_val); - if(FAILED(hres)) - jsdisp_release(scope_obj); - } - jsval_release(except_val); - if(FAILED(hres)) - return hres; - - hres = scope_push(frame->scope, scope_obj, to_disp(scope_obj), &frame->scope); - jsdisp_release(scope_obj); + /* keep current except_frame if we're entering catch block with finally block associated */ + if(catch_off && except_frame->finally_off) { + except_frame->catch_off = 0; }else { - hres = stack_push(ctx, except_val); - if(FAILED(hres)) - return hres; - + frame->except_frame = except_frame->next; + heap_free(except_frame); + } + + hres = stack_push(ctx, except_val); + if(FAILED(hres)) + return hres; + + if(!catch_off) hres = stack_push(ctx, jsval_bool(FALSE)); - } - return hres; } @@ -2705,8 +2781,6 @@ op = frame->bytecode->instrs[frame->ip].op; hres = op_funcs[op](ctx); if(FAILED(hres)) { - TRACE("EXCEPTION %08x\n", hres); - hres = unwind_exception(ctx, hres); if(FAILED(hres)) return hres; Modified: trunk/reactos/dll/win32/jscript/engine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.h… ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.h [iso-8859-1] Sat Jun 3 22:28:19 2017 @@ -36,7 +36,8 @@ X(delete_ident,1,ARG_BSTR, 0) \ X(div, 1, 0,0) \ X(double, 1, ARG_DBL, 0) \ - X(end_finally,1, 0,0) \ + X(end_finally,0, 0,0) \ + X(enter_catch,1, ARG_BSTR, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ X(forin, 0, ARG_ADDR, 0) \ @@ -69,11 +70,11 @@ X(obj_prop, 1, ARG_BSTR, 0) \ X(or, 1, 0,0) \ X(pop, 1, ARG_UINT, 0) \ - X(pop_except, 1, 0,0) \ + X(pop_except, 0, ARG_ADDR, 0) \ X(pop_scope, 1, 0,0) \ X(postinc, 1, ARG_INT, 0) \ X(preinc, 1, ARG_INT, 0) \ - X(push_except,1, ARG_ADDR, ARG_BSTR) \ + X(push_except,1, ARG_ADDR, ARG_UINT) \ X(push_ret, 1, 0,0) \ X(push_scope, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_UINT) \ @@ -89,7 +90,7 @@ X(typeofid, 1, 0,0) \ X(typeofident,1, 0,0) \ X(refval, 1, 0,0) \ - X(ret, 0, 0,0) \ + X(ret, 0, ARG_UINT, 0) \ X(setret, 1, 0,0) \ X(sub, 1, 0,0) \ X(undefined, 1, 0,0) \ Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] Sat Jun 3 22:28:19 2017 @@ -68,19 +68,19 @@ void heap_pool_free(heap_pool_t*) DECLSPEC_HIDDEN; heap_pool_t *heap_pool_mark(heap_pool_t*) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void *heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 3 22:28:19 2017 @@ -85,7 +85,7 @@ reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-1.9.11 reactos/dll/win32/itss # Synced to WineStaging-2.2 -reactos/dll/win32/jscript # Synced to WineStaging-2.2 +reactos/dll/win32/jscript # Synced to WineStaging-2.9 reactos/dll/win32/jsproxy # Synced to WineStaging-2.2 reactos/dll/win32/loadperf # Synced to WineStaging-2.2 reactos/dll/win32/lz32 # Synced to WineStaging-1.9.11

1 0

[akhaldi] 74810: [IMM32_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:28:03 2017 New Revision: 74810 URL: http://svn.reactos.org/svn/reactos?rev=74810&view=rev Log: [IMM32_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/imm32/imm32.c Modified: trunk/rostests/winetests/imm32/imm32.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imm32/imm32.c?r… ============================================================================== --- trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] (original) +++ trunk/rostests/winetests/imm32/imm32.c [iso-8859-1] Sat Jun 3 22:28:03 2017 @@ -1050,7 +1050,7 @@ CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, hwnd1, NULL, GetModuleHandleW(NULL), NULL); default_ime_wnd = ImmGetDefaultIMEWnd(hwnd2); - ok(IsWindow(default_ime_wnd), "Expected IME window existance\n"); + ok(IsWindow(default_ime_wnd), "Expected IME window existence\n"); DestroyWindow(hwnd2); DestroyWindow(hwnd1);

1 0

[akhaldi] 74809: [INETCOMM_WINETEST] Sync with Wine Staging 2.9. CORE-13362
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:27:55 2017 New Revision: 74809 URL: http://svn.reactos.org/svn/reactos?rev=74809&view=rev Log: [INETCOMM_WINETEST] Sync with Wine Staging 2.9. CORE-13362 Modified: trunk/rostests/winetests/inetcomm/mimeole.c Modified: trunk/rostests/winetests/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/mimeol… ============================================================================== --- trunk/rostests/winetests/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/mimeole.c [iso-8859-1] Sat Jun 3 22:27:55 2017 @@ -323,7 +323,12 @@ static ULONG WINAPI Stream_Release(IStream *iface) { TestStream *This = impl_from_IStream(iface); - return InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; } static HRESULT WINAPI Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead)

1 0

[akhaldi] 74808: [INETCOMM] Sync with Wine Staging 2.9. CORE-13362 dcc545b inetcomm: Fixed buffer leak on error path (Coverity).
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:27:45 2017 New Revision: 74808 URL: http://svn.reactos.org/svn/reactos?rev=74808&view=rev Log: [INETCOMM] Sync with Wine Staging 2.9. CORE-13362 dcc545b inetcomm: Fixed buffer leak on error path (Coverity). Modified: trunk/reactos/dll/win32/inetcomm/protocol.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/inetcomm/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/protoco… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/protocol.c [iso-8859-1] Sat Jun 3 22:27:45 2017 @@ -487,8 +487,10 @@ binding->url[url.mhtml_len] = 0; hres = CreateURLMoniker(NULL, binding->url, &mon); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(binding); return hres; + } binding->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; binding->ref = 1; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 3 22:27:45 2017 @@ -78,7 +78,7 @@ reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.2 reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 -reactos/dll/win32/inetcomm # Synced to WineStaging-2.2 +reactos/dll/win32/inetcomm # Synced to WineStaging-2.9 reactos/dll/win32/inetmib1 # Synced to WineStaging-1.9.11 reactos/dll/win32/initpki # Synced to WineStaging-1.9.11 reactos/dll/win32/inseng # Synced to WineStaging-2.2

1 0

[akhaldi] 74807: [IEFRAME] Sync with Wine Staging 2.9. CORE-13362 2bb8458 ieframe: Return DISP_E_UNKNOWNNAME in IShellUIHelper2::GetIDsOfNames. bd8bd97 ieframe: Fix IEWinMain spec file entry. f4993...
by akhaldi＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: akhaldi Date: Sat Jun 3 22:27:36 2017 New Revision: 74807 URL: http://svn.reactos.org/svn/reactos?rev=74807&view=rev Log: [IEFRAME] Sync with Wine Staging 2.9. CORE-13362 2bb8458 ieframe: Return DISP_E_UNKNOWNNAME in IShellUIHelper2::GetIDsOfNames. bd8bd97 ieframe: Fix IEWinMain spec file entry. f499395 ieframe: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Modified: trunk/reactos/dll/win32/ieframe/ieframe.h trunk/reactos/dll/win32/ieframe/ieframe.spec trunk/reactos/dll/win32/ieframe/shelluihelper.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.h [iso-8859-1] Sat Jun 3 22:27:36 2017 @@ -348,19 +348,19 @@ InterlockedDecrement(&module_ref); } -static inline void *heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void *heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem) Modified: trunk/reactos/dll/win32/ieframe/ieframe.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe.spec [iso-8859-1] Sat Jun 3 22:27:36 2017 @@ -1,5 +1,5 @@ # ordinal exports -101 stdcall -noname IEWinMain(str long) +101 stdcall -noname IEWinMain(wstr long) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) Modified: trunk/reactos/dll/win32/ieframe/shelluihelper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shelluih… ============================================================================== --- trunk/reactos/dll/win32/ieframe/shelluihelper.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/shelluihelper.c [iso-8859-1] Sat Jun 3 22:27:36 2017 @@ -98,9 +98,13 @@ LCID lcid, DISPID *rgDispId) { ShellUIHelper *This = impl_from_IShellUIHelper2(iface); - FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + unsigned i; + + FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + for(i = 0; i < cNames; i++) + FIXME("%s\n", debugstr_w(rgszNames[i])); + + return DISP_E_UNKNOWNNAME; } static HRESULT WINAPI ShellUIHelper2_Invoke(IShellUIHelper2 *iface, DISPID dispIdMember, Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jun 3 22:27:36 2017 @@ -74,7 +74,7 @@ reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/httpapi # Synced to WineStaging-2.9 reactos/dll/win32/iccvid # Synced to WineStaging-2.2 -reactos/dll/win32/ieframe # Synced to WineStaging-2.2 +reactos/dll/win32/ieframe # Synced to WineStaging-2.9 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-2.2 reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 reactos/dll/win32/imm32 # Synced to Wine-1.7.27

1 0

[pschweitzer] 74806: [UDFS] Don't use perf prints
by pschweitzer＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: pschweitzer Date: Sat Jun 3 21:56:32 2017 New Revision: 74806 URL: http://svn.reactos.org/svn/reactos?rev=74806&view=rev Log: [UDFS] Don't use perf prints Modified: trunk/reactos/drivers/filesystems/udfs/udf_dbg.h Modified: trunk/reactos/drivers/filesystems/udfs/udf_dbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_dbg.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_dbg.h [iso-8859-1] Sat Jun 3 21:56:32 2017 @@ -39,7 +39,7 @@ //#define UDF_SIMULATE_WRITES -#define USE_PERF_PRINT +//#define USE_PERF_PRINT #define USE_KD_PRINT #define USE_MM_PRINT

1 0

[pschweitzer] 74805: [UDFS] Revert r74780: it indeed works here, but when the problem happens in other places (it does!) where it cannot be solved that way, we're doomed. It will be required to fin...
by pschweitzer＠svn.reactos.org 03 Jun '17

03 Jun '17

Author: pschweitzer Date: Sat Jun 3 21:50:29 2017 New Revision: 74805 URL: http://svn.reactos.org/svn/reactos?rev=74805&view=rev Log: [UDFS] Revert r74780: it indeed works here, but when the problem happens in other places (it does!) where it cannot be solved that way, we're doomed. It will be required to find an appropriate solution... CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] Sat Jun 3 21:50:29 2017 @@ -1109,6 +1109,7 @@ { PtrUDFIrpContextLite IrpContextLite; BOOLEAN StartWorker = FALSE; + BOOLEAN AcquiredVcb = FALSE; NTSTATUS RC; AdPrint((" UDFQueueDelayedClose\n")); @@ -1118,6 +1119,7 @@ UDFAcquireResourceExclusive(&(UDFGlobalData.DelayedCloseResource), TRUE); UDFAcquireResourceShared(&(Fcb->Vcb->VCBResource), TRUE); + AcquiredVcb = TRUE; if(Fcb->FCBFlags & UDF_FCB_DELETE_ON_CLOSE) { try_return(RC = STATUS_DELETE_PENDING); @@ -1181,7 +1183,9 @@ if(!NT_SUCCESS(RC)) { Fcb->FCBFlags &= ~UDF_FCB_DELAY_CLOSE; } - UDFReleaseResource(&(Fcb->Vcb->VCBResource)); + if(AcquiredVcb) { + UDFReleaseResource(&(Fcb->Vcb->VCBResource)); + } // Release DelayedCloseResource UDFReleaseResource(&(UDFGlobalData.DelayedCloseResource)); } _SEH2_END;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs