March 2014 - Wine-commits - list.winehq.org

Austin English : shell32: Fix a typo.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 4903dda319f092af37f5b0e58716e3a0cb7aa025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4903dda319f092af37f5b0e58… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 23 17:09:36 2014 -0700 shell32: Fix a typo. --- dlls/shell32/shellpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index afa2543..2dfed75 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2265,8 +2265,8 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( if (FAILED(hr)) goto end; if(pszSubPath) { - /* make sure the new path does not exceed th bufferlength - * rememebr to backslash and the termination */ + /* make sure the new path does not exceed the buffer length + * and remember to backslash and terminate it */ if(MAX_PATH < (lstrlenW(szBuildPath) + lstrlenW(pszSubPath) + 2)) { hr = HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); goto end;

1 0

Marcus Meissner : wbemprox: Fixed leaks in fill_datafile (Coverity).
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: c820bddd749e2d13c729095e54070fc3dbff3426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c820bddd749e2d13c729095e5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Mar 24 08:51:04 2014 +0100 wbemprox: Fixed leaks in fill_datafile (Coverity). --- dlls/wbemprox/builtin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 66f2882..9fda507 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1270,11 +1270,13 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c DWORD drives = GetLogicalDrives(); WIN32_FIND_DATAW data; HANDLE handle; - struct dirstack *dirstack = alloc_dirstack(2); + struct dirstack *dirstack; enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, 8, sizeof(*rec) )) return FILL_STATUS_FAILED; + dirstack = alloc_dirstack(2); + for (i = 0; i < sizeof(drives); i++) { if (!(drives & (1 << i))) continue; @@ -1300,6 +1302,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c if (!resize_table( table, row + 1, sizeof(*rec) )) { status = FILL_STATUS_FAILED; + FindClose( handle ); goto done; } if (!strcmpW( data.cFileName, dotW ) || !strcmpW( data.cFileName, dotdotW )) continue; @@ -1309,6 +1312,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c { if (push_dir( dirstack, new_path, len )) continue; heap_free( new_path ); + FindClose( handle ); status = FILL_STATUS_FAILED; goto done; }

1 0

Shuai Meng : oleaut32: Fixed bounds of VarIntFromFloat.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 1809f7c782daa6663b8228639f811dd1713f434f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1809f7c782daa6663b8228639… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Mar 24 22:56:34 2014 +0800 oleaut32: Fixed bounds of VarIntFromFloat. --- dlls/oleaut32/tests/vartype.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/vartype.c | 12 ++++++------ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 61ad45e..ea5065f 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -739,11 +739,15 @@ static void test_VarI1FromR4(void) CHECKPTR(VarI1FromR4); CONVERT(VarI1FromR4, -129.0f); EXPECT_OVERFLOW; + CONVERT(VarI1FromR4, -128.51f); EXPECT_OVERFLOW; + CONVERT(VarI1FromR4, -128.5f); EXPECT(-128); CONVERT(VarI1FromR4, -128.0f); EXPECT(-128); CONVERT(VarI1FromR4, -1.0f); EXPECT(-1); CONVERT(VarI1FromR4, 0.0f); EXPECT(0); CONVERT(VarI1FromR4, 1.0f); EXPECT(1); CONVERT(VarI1FromR4, 127.0f); EXPECT(127); + CONVERT(VarI1FromR4, 127.49f); EXPECT(127); + CONVERT(VarI1FromR4, 127.5f); EXPECT_OVERFLOW; CONVERT(VarI1FromR4, 128.0f); EXPECT_OVERFLOW; CONVERT(VarI1FromR4, -1.5f); EXPECT(-2); @@ -762,11 +766,15 @@ static void test_VarI1FromR8(void) CHECKPTR(VarI1FromR8); CONVERT(VarI1FromR8, -129.0); EXPECT_OVERFLOW; + CONVERT(VarI1FromR8, -128.51); EXPECT_OVERFLOW; + CONVERT(VarI1FromR8, -128.5); EXPECT(-128); CONVERT(VarI1FromR8, -128.0); EXPECT(-128); CONVERT(VarI1FromR8, -1.0); EXPECT(-1); CONVERT(VarI1FromR8, 0.0); EXPECT(0); CONVERT(VarI1FromR8, 1.0); EXPECT(1); CONVERT(VarI1FromR8, 127.0); EXPECT(127); + CONVERT(VarI1FromR8, 127.49); EXPECT(127); + CONVERT(VarI1FromR8, 127.5); EXPECT_OVERFLOW; CONVERT(VarI1FromR8, 128.0); EXPECT_OVERFLOW; CONVERT(VarI1FromR8, -1.5); EXPECT(-2); @@ -983,9 +991,13 @@ static void test_VarUI1FromR4(void) CHECKPTR(VarUI1FromR4); CONVERT(VarUI1FromR4, -1.0f); EXPECT_OVERFLOW; + CONVERT(VarUI1FromR4, -0.51f); EXPECT_OVERFLOW; + CONVERT(VarUI1FromR4, -0.5f); EXPECT(0); CONVERT(VarUI1FromR4, 0.0f); EXPECT(0); CONVERT(VarUI1FromR4, 1.0f); EXPECT(1); CONVERT(VarUI1FromR4, 255.0f); EXPECT(255); + CONVERT(VarUI1FromR4, 255.49f); EXPECT(255); + CONVERT(VarUI1FromR4, 255.5f); EXPECT_OVERFLOW; CONVERT(VarUI1FromR4, 256.0f); EXPECT_OVERFLOW; /* Rounding */ @@ -1005,9 +1017,13 @@ static void test_VarUI1FromR8(void) CHECKPTR(VarUI1FromR8); CONVERT(VarUI1FromR8, -1.0); EXPECT_OVERFLOW; + CONVERT(VarUI1FromR8, -0.51); EXPECT_OVERFLOW; + CONVERT(VarUI1FromR8, -0.5); EXPECT(0); CONVERT(VarUI1FromR8, 0.0); EXPECT(0); CONVERT(VarUI1FromR8, 1.0); EXPECT(1); CONVERT(VarUI1FromR8, 255.0); EXPECT(255); + CONVERT(VarUI1FromR8, 255.49); EXPECT(255); + CONVERT(VarUI1FromR8, 255.5); EXPECT_OVERFLOW; CONVERT(VarUI1FromR8, 256.0); EXPECT_OVERFLOW; /* Rounding */ @@ -1281,11 +1297,15 @@ static void test_VarI2FromR4(void) CHECKPTR(VarI2FromR4); CONVERT(VarI2FromR4, -32769.0f); EXPECT_OVERFLOW; + CONVERT(VarI2FromR4, -32768.51f); EXPECT_OVERFLOW; + CONVERT(VarI2FromR4, -32768.5f); EXPECT(-32768); CONVERT(VarI2FromR4, -32768.0f); EXPECT(-32768); CONVERT(VarI2FromR4, -1.0f); EXPECT(-1); CONVERT(VarI2FromR4, 0.0f); EXPECT(0); CONVERT(VarI2FromR4, 1.0f); EXPECT(1); CONVERT(VarI2FromR4, 32767.0f); EXPECT(32767); + CONVERT(VarI2FromR4, 32767.49f); EXPECT(32767); + CONVERT(VarI2FromR4, 32767.5f); EXPECT_OVERFLOW; CONVERT(VarI2FromR4, 32768.0f); EXPECT_OVERFLOW; /* Rounding */ @@ -1305,11 +1325,15 @@ static void test_VarI2FromR8(void) CHECKPTR(VarI2FromR8); CONVERT(VarI2FromR8, -32769.0); EXPECT_OVERFLOW; + CONVERT(VarI2FromR8, -32768.51); EXPECT_OVERFLOW; + CONVERT(VarI2FromR8, -32768.5); EXPECT(-32768); CONVERT(VarI2FromR8, -32768.0); EXPECT(-32768); CONVERT(VarI2FromR8, -1.0); EXPECT(-1); CONVERT(VarI2FromR8, 0.0); EXPECT(0); CONVERT(VarI2FromR8, 1.0); EXPECT(1); CONVERT(VarI2FromR8, 32767.0); EXPECT(32767); + CONVERT(VarI2FromR8, 32767.49); EXPECT(32767); + CONVERT(VarI2FromR8, 32767.5); EXPECT_OVERFLOW; CONVERT(VarI2FromR8, 32768.0); EXPECT_OVERFLOW; /* Rounding */ @@ -1529,9 +1553,13 @@ static void test_VarUI2FromR4(void) CHECKPTR(VarUI2FromR4); CONVERT(VarUI2FromR4, -1.0f); EXPECT_OVERFLOW; + CONVERT(VarUI2FromR4, -0.51f); EXPECT_OVERFLOW; + CONVERT(VarUI2FromR4, -0.5f); EXPECT(0); CONVERT(VarUI2FromR4, 0.0f); EXPECT(0); CONVERT(VarUI2FromR4, 1.0f); EXPECT(1); CONVERT(VarUI2FromR4, 65535.0f); EXPECT(65535); + CONVERT(VarUI2FromR4, 65535.49f); EXPECT(65535); + CONVERT(VarUI2FromR4, 65535.5f); EXPECT_OVERFLOW; CONVERT(VarUI2FromR4, 65536.0f); EXPECT_OVERFLOW; /* Rounding */ @@ -1551,9 +1579,13 @@ static void test_VarUI2FromR8(void) CHECKPTR(VarUI2FromR8); CONVERT(VarUI2FromR8, -1.0); EXPECT_OVERFLOW; + CONVERT(VarUI2FromR8, -0.51); EXPECT_OVERFLOW; + CONVERT(VarUI2FromR8, -0.5); EXPECT(0); CONVERT(VarUI2FromR8, 0.0); EXPECT(0); CONVERT(VarUI2FromR8, 1.0); EXPECT(1); CONVERT(VarUI2FromR8, 65535.0); EXPECT(65535); + CONVERT(VarUI2FromR8, 65535.49); EXPECT(65535); + CONVERT(VarUI2FromR8, 65535.5); EXPECT_OVERFLOW; CONVERT(VarUI2FromR8, 65536.0); EXPECT_OVERFLOW; /* Rounding */ @@ -1792,11 +1824,15 @@ static void test_VarI4FromR8(void) CHECKPTR(VarI4FromR8); CONVERT(VarI4FromR8, -2147483649.0); EXPECT_OVERFLOW; + CONVERT(VarI4FromR8, -2147483648.51); EXPECT_OVERFLOW; + CONVERT(VarI4FromR8, -2147483648.5); EXPECT(-2147483647 - 1); CONVERT(VarI4FromR8, -2147483648.0); EXPECT(-2147483647 - 1); CONVERT(VarI4FromR8, -1.0); EXPECT(-1); CONVERT(VarI4FromR8, 0.0); EXPECT(0); CONVERT(VarI4FromR8, 1.0); EXPECT(1); CONVERT(VarI4FromR8, 2147483647.0); EXPECT(2147483647); + CONVERT(VarI4FromR8, 2147483647.49); EXPECT(2147483647); + CONVERT(VarI4FromR8, 2147483647.5); EXPECT_OVERFLOW; CONVERT(VarI4FromR8, 2147483648.0); EXPECT_OVERFLOW; CONVERT(VarI4FromR8, -1.5); EXPECT(-2); @@ -2017,6 +2053,8 @@ static void test_VarUI4FromR4(void) CHECKPTR(VarUI4FromR4); /* We can't test max values as they are not exactly representable in a float */ CONVERT(VarUI4FromR4, -1.0f); EXPECT_OVERFLOW; + CONVERT(VarUI4FromR4, -0.51f); EXPECT_OVERFLOW; + CONVERT(VarUI4FromR4, -0.5f); EXPECT(0); CONVERT(VarUI4FromR4, 0.0f); EXPECT(0); CONVERT(VarUI4FromR4, 1.0f); EXPECT(1); @@ -2037,9 +2075,13 @@ static void test_VarUI4FromR8(void) CHECKPTR(VarUI4FromR8); CONVERT(VarUI4FromR8, -1.0); EXPECT_OVERFLOW; + CONVERT(VarUI4FromR4, -0.51f); EXPECT_OVERFLOW; + CONVERT(VarUI4FromR4, -0.5f); EXPECT(0); CONVERT(VarUI4FromR8, 0.0); EXPECT(0); CONVERT(VarUI4FromR8, 1.0); EXPECT(1); CONVERT(VarUI4FromR8, 4294967295.0); EXPECT(4294967295ul); + CONVERT(VarUI4FromR8, 4294967295.49); EXPECT(4294967295ul); + CONVERT(VarUI4FromR8, 4294967295.5); EXPECT_OVERFLOW; CONVERT(VarUI4FromR8, 4294967296.0); EXPECT_OVERFLOW; CONVERT(VarUI4FromR8, -1.5); EXPECT_OVERFLOW; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 43902c5..4d067e0 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -362,7 +362,7 @@ HRESULT WINAPI VarI1FromR4(FLOAT fltIn, signed char* pcOut) */ HRESULT WINAPI VarI1FromR8(double dblIn, signed char* pcOut) { - if (dblIn < (double)I1_MIN || dblIn > (double)I1_MAX) + if (dblIn < I1_MIN - 0.5 || dblIn >= I1_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(CHAR, dblIn, *pcOut); return S_OK; @@ -652,7 +652,7 @@ HRESULT WINAPI VarUI1FromR4(FLOAT fltIn, BYTE* pbOut) */ HRESULT WINAPI VarUI1FromR8(double dblIn, BYTE* pbOut) { - if (dblIn < -0.5 || dblIn > (double)UI1_MAX) + if (dblIn < -0.5 || dblIn >= UI1_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(BYTE, dblIn, *pbOut); return S_OK; @@ -958,7 +958,7 @@ HRESULT WINAPI VarI2FromR4(FLOAT fltIn, SHORT* psOut) */ HRESULT WINAPI VarI2FromR8(double dblIn, SHORT* psOut) { - if (dblIn < (double)I2_MIN || dblIn > (double)I2_MAX) + if (dblIn < I2_MIN - 0.5 || dblIn >= I2_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(SHORT, dblIn, *psOut); return S_OK; @@ -1270,7 +1270,7 @@ HRESULT WINAPI VarUI2FromR4(FLOAT fltIn, USHORT* pusOut) */ HRESULT WINAPI VarUI2FromR8(double dblIn, USHORT* pusOut) { - if (dblIn < -0.5 || dblIn > (double)UI2_MAX) + if (dblIn < -0.5 || dblIn >= UI2_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(USHORT, dblIn, *pusOut); return S_OK; @@ -1550,7 +1550,7 @@ HRESULT WINAPI VarI4FromR4(FLOAT fltIn, LONG *piOut) */ HRESULT WINAPI VarI4FromR8(double dblIn, LONG *piOut) { - if (dblIn < (double)I4_MIN || dblIn > (double)I4_MAX) + if (dblIn < I4_MIN - 0.5 || dblIn >= I4_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(LONG, dblIn, *piOut); return S_OK; @@ -1859,7 +1859,7 @@ HRESULT WINAPI VarUI4FromR4(FLOAT fltIn, ULONG *pulOut) */ HRESULT WINAPI VarUI4FromR8(double dblIn, ULONG *pulOut) { - if (dblIn < -0.5 || dblIn > (double)UI4_MAX) + if (dblIn < -0.5 || dblIn >= UI4_MAX + 0.5) return DISP_E_OVERFLOW; VARIANT_DutchRound(ULONG, dblIn, *pulOut); return S_OK;

1 0

Markus Weiland : dxdiagn: Added properties for hardware acceleration capabilities.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 7462da1345e1ad9d4cb06339f1300271e658faa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7462da1345e1ad9d4cb06339f… Author: Markus Weiland <markusw(a)graph-ix.net> Date: Sun Mar 23 21:18:45 2014 -0400 dxdiagn: Added properties for hardware acceleration capabilities. --- dlls/dxdiagn/provider.c | 20 ++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 76bbcf0..451270c 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -915,10 +915,15 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node static const WCHAR id_fmtW[] = {'0','x','%','0','4','x',0}; static const WCHAR subsysid_fmtW[] = {'0','x','%','0','8','x',0}; static const WCHAR mem_fmt[] = {'%','.','1','f',' ','M','B',0}; + static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; + static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; D3DADAPTER_IDENTIFIER9 adapter_info; D3DDISPLAYMODE adapter_mode; + D3DCAPS9 device_caps; DWORD available_mem = 0; + BOOL hardware_accel; snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), adapterid_fmtW, index); display_adapter = allocate_information_node(buffer); @@ -1043,6 +1048,21 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node hr = add_bstr_property(display_adapter, szDisplayMemoryEnglish, buffer); if (FAILED(hr)) goto cleanup; + + hr = IDirect3D9_GetDeviceCaps(pDirect3D9, index, D3DDEVTYPE_HAL, &device_caps); + hardware_accel = SUCCEEDED(hr); + + hr = add_bool_property(display_adapter, b3DAccelerationEnabled, hardware_accel); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, b3DAccelerationExists, hardware_accel); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(display_adapter, bDDAccelerationEnabled, hardware_accel); + if (FAILED(hr)) + goto cleanup; } hr = S_OK; diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 9959665..ce0fb77 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -938,6 +938,9 @@ static void test_DxDiag_DisplayDevices(void) static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I','d',0}; static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; + static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; + static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; static const struct property_test property_tests[] = { @@ -959,6 +962,9 @@ static void test_DxDiag_DisplayDevices(void) {szRevisionId, VT_BSTR}, {dwRefreshRate, VT_UI4}, {szManufacturer, VT_BSTR}, + {b3DAccelerationExists, VT_BOOL}, + {b3DAccelerationEnabled, VT_BOOL}, + {bDDAccelerationEnabled, VT_BOOL}, }; IDxDiagContainer *display_cont = NULL;

1 0

Hermès Bélusca-Maïto : usp10 : Avoid non-standard array initialization.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 8fb52c7c5d711918fadf2590061d668093d14708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb52c7c5d711918fadf25900… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Tue Mar 25 14:31:16 2014 +0100 usp10: Avoid non-standard array initialization. --- dlls/usp10/bidi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index ceb498e..3962671 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -827,10 +827,13 @@ static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel, int uCount, struct list *set) { int run_start, run_end, i; - Run runs[uCount]; int run_count = 0; + Run *runs; IsolatedRun *current_isolated; + runs = HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(Run)); + if (!runs) return; + list_init(set); /* Build Runs */ @@ -857,6 +860,7 @@ static void computeIsolatingRunsSet(unsigned baselevel, WORD *pcls, WORD *pLevel int type_fence, real_end; int j; current_isolated = HeapAlloc(GetProcessHeap(), 0, sizeof(IsolatedRun) + sizeof(WORD*)*uCount); + if (!current_isolated) break; run_start = runs[k].start; current_isolated->e = runs[k].e; @@ -944,6 +948,8 @@ search: } i++; } + + HeapFree(GetProcessHeap(), 0, runs); } /*************************************************************

1 0

Jacek Caban : vbscript: Store required stack offset before doing jump.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: f6d6238e935808298362bfbc02985d9b5cc4db14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d6238e935808298362bfbc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 25 14:58:41 2014 +0100 vbscript: Store required stack offset before doing jump. --- dlls/vbscript/interp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a9c8766..4be96a2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2124,9 +2124,8 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP TRACE("unwind jmp %d stack_off %d\n", exec.instr->arg1.uint, exec.instr->arg2.uint); - instr_jmp(&exec, exec.instr->arg1.uint); - stack_off = exec.instr->arg2.uint; + instr_jmp(&exec, exec.instr->arg1.uint); if(exec.top > stack_off) { stack_popn(&exec, exec.top-stack_off);

1 0

Piotr Caban : msvcp90: Add _Random_device implementation.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 3b96069e587c6f56d62c584d5df21c25d759aea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b96069e587c6f56d62c584d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 25 15:26:13 2014 +0100 msvcp90: Add _Random_device implementation. --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp90/misc.c | 14 ++++++++++++++ dlls/msvcp90/msvcp90.spec | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index e949b98..1dcbded 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1214,7 +1214,7 @@ @ cdecl -arch=win64 ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K_W(a)Z(ptr ptr ptr str long long) num_put_wchar__Putgrouped @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA -@ stub ?_Random_device(a)tr1@std@@YAIXZ +@ cdecl ?_Random_device(a)tr1@std@@YAIXZ() _Random_device @ cdecl -arch=win32 ?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@DI(a)Z(ptr ptr long ptr long long) num_put_char__Rep @ cdecl -arch=win64 ?_Rep@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@D_K(a)Z(ptr ptr ptr long long) num_put_char__Rep @ cdecl -arch=win32 ?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@GI(a)Z(ptr ptr long ptr long long) num_put_wchar__Rep diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3bdff79..0527936 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1710,7 +1710,7 @@ @ cdecl -arch=win64 ?_Put@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEB_W_K(a)Z(ptr ptr ptr wstr long) num_put_wchar__Put @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA -@ stub ?_Random_device(a)std@@YAIXZ +@ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device @ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADPADPAXAAW4file_type(a)123@@Z @ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADPEADPEAXAEAW4file_type(a)123@@Z @ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index f2ae32f..1c3bd2f 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -360,3 +360,17 @@ LONGLONG __cdecl _Xtime_get_ticks(void) GetSystemTimeAsFileTime(&ft); return ((LONGLONG)ft.dwHighDateTime<<32) + ft.dwLowDateTime - TICKS_1601_TO_1970; } + +#if _MSVCP_VER >= 90 +unsigned int __cdecl _Random_device(void) +{ + unsigned int ret; + + TRACE("\n"); + + /* TODO: throw correct exception in case of failure */ + if(rand_s(&ret)) + throw_exception(EXCEPTION, "random number generator failed\n"); + return ret; +} +#endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a5116fa..fe02bbb 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3062,7 +3062,7 @@ @ stub -arch=win64 ?_Putmfld@?$money_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_NAEAVios_base(a)2@_W1V?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2@@Z @ stub -arch=win32 ?_Raise_handler(a)std@@3P6AXABVexception(a)stdext@@@ZA @ stub -arch=win64 ?_Raise_handler(a)std@@3P6AXAEBVexception(a)stdext@@@ZEA -@ stub ?_Random_device(a)tr1@std@@YAIXZ +@ cdecl ?_Random_device(a)tr1@std@@YAIXZ() _Random_device @ thiscall -arch=win32 ?_Read_s@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)PADIH@Z(ptr ptr long long) basic_istream_char__Read_s @ cdecl -arch=win64 ?_Read_s@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)PEAD_K_J@Z(ptr ptr long long) basic_istream_char__Read_s @ thiscall -arch=win32 ?_Read_s@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)PAGIH@Z(ptr ptr long long) basic_istream_wchar__Read_s

1 0

Piotr Caban : msvcrt: Remove setlocale test with empty locale string.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 9c1d687a7ab13b4c7cc43da9220014382abc054d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1d687a7ab13b4c7cc43da92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 25 17:26:24 2014 +0100 msvcrt: Remove setlocale test with empty locale string. --- dlls/msvcrt/tests/locale.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 6ef07ec..dfb2146 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -49,9 +49,6 @@ static void test_setlocale(void) ret = setlocale(20, "C"); ok(ret == NULL, "ret = %s\n", ret); - ret = setlocale(LC_ALL, ""); - ok(ret != NULL, "ret == NULL\n"); - ret = setlocale(LC_ALL, "C"); ok(!strcmp(ret, "C"), "ret = %s\n", ret);

1 0

Andrew Eikum : winmm/tests: Accept MMSYSERR_ALLOCATED for more tests.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: a6bf8328fde9c332b9dd00108ffe4d550135d4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bf8328fde9c332b9dd00108… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 25 10:07:28 2014 -0500 winmm/tests: Accept MMSYSERR_ALLOCATED for more tests. --- dlls/winmm/tests/capture.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 05c5735..54c3793 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -454,7 +454,8 @@ static void wave_in_test_device(UINT_PTR device) format.cbSize=0; rc=waveInOpen(&win,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR || rc==WAVERR_BADFORMAT || - rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, + rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_ALLOCATED, "waveInOpen(%s): returned: %s\n",dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { waveInClose(win); @@ -472,7 +473,8 @@ static void wave_in_test_device(UINT_PTR device) format.cbSize=0; rc=waveInOpen(&win,device,&format,0,0,CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR || rc==WAVERR_BADFORMAT || - rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, + rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_ALLOCATED, "waveInOpen(%s): returned: %s\n",dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { waveInClose(win); @@ -496,7 +498,8 @@ static void wave_in_test_device(UINT_PTR device) rc=waveInOpen(&win,device,&wfex.Format,0,0, CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR || rc==WAVERR_BADFORMAT || - rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, + rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_ALLOCATED, "waveInOpen(%s): returned: %s\n",dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { waveInClose(win); @@ -520,7 +523,8 @@ static void wave_in_test_device(UINT_PTR device) rc=waveInOpen(&win,device,&wfex.Format,0,0, CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR || rc==WAVERR_BADFORMAT || - rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, + rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_ALLOCATED, "waveInOpen(%s): returned: %s\n",dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { waveInClose(win); @@ -544,7 +548,8 @@ static void wave_in_test_device(UINT_PTR device) rc=waveInOpen(&win,device,&wfex.Format,0,0, CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR || rc==WAVERR_BADFORMAT || - rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, + rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_ALLOCATED, "waveInOpen(%s): returned: %s\n",dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { waveInClose(win); @@ -571,7 +576,8 @@ static void wave_in_test_device(UINT_PTR device) rc=waveInOpen(&win,device,&wfex.Format,0,0, CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR || rc==WAVERR_BADFORMAT || - rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, + rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_ALLOCATED, "waveInOpen(%s): returned: %s\n",dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { waveInClose(win); @@ -596,7 +602,8 @@ static void wave_in_test_device(UINT_PTR device) rc=waveInOpen(&win,device,&wfex.Format,0,0, CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR || rc==WAVERR_BADFORMAT || - rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, + rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_ALLOCATED, "waveInOpen(%s): returned: %s\n",dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { waveInClose(win); @@ -620,7 +627,8 @@ static void wave_in_test_device(UINT_PTR device) rc=waveInOpen(&win,device,&wfex.Format,0,0, CALLBACK_NULL|WAVE_FORMAT_DIRECT); ok(rc==MMSYSERR_NOERROR || rc==WAVERR_BADFORMAT || - rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM, + rc==MMSYSERR_INVALFLAG || rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_ALLOCATED, "waveInOpen(%s): returned: %s\n",dev_name(device),wave_in_error(rc)); if (rc==MMSYSERR_NOERROR) { waveInClose(win);

1 0

Jacek Caban : dxgi.idl: Added IDXGIDevice1 declaration.
by Alexandre Julliard 25 Mar '14

25 Mar '14

Module: wine Branch: master Commit: 22b675ed810b73b371e247d21664263124aa77de URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b675ed810b73b371e247d21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 25 16:41:30 2014 +0100 dxgi.idl: Added IDXGIDevice1 declaration. --- include/dxgi.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index bb12283..bc9538e 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -446,6 +446,18 @@ interface IDXGIAdapter1 : IDXGIAdapter [ object, + uuid(77db970f-6276-48ba-ba28-070143b4392c), + local, + pointer_default(unique) +] +interface IDXGIDevice1 : IDXGIDevice +{ + HRESULT SetMaximumFrameLatency([in] UINT MaxLatency); + HRESULT GetMaximumFrameLatency([out] UINT *pMaxLatency); +} + +[ + object, uuid(770aae78-f26f-4dba-a829-253c83d1b387), local, pointer_default(unique)

1 0