wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Roderick Colenbrander : winex11.drv: Remove GLX_ATI_render_texture support.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: c754f28f171c5cf90fecf20d9d536f476316f1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c754f28f171c5cf90fecf20d9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jun 24 22:42:10 2012 -0700 winex11.drv: Remove GLX_ATI_render_texture support. --- dlls/winex11.drv/opengl.c | 419 ++++++++++++++------------------------------- include/wine/wgl.h | 36 ---- 2 files changed, 127 insertions(+), 328 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c754f28f171c5cf90fecf…

1 0

André Hentschel : ntdll: Check for ARMv7 architecture dynamically when loading a PE.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 567e44161c37be60a059f2f51acbda4a4ca12b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567e44161c37be60a059f2f51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:25:28 2012 +0200 ntdll: Check for ARMv7 architecture dynamically when loading a PE. --- dlls/ntdll/virtual.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d67f2d5..806b7a9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1061,11 +1061,15 @@ static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) } #elif defined(__arm__) && !defined(__ARMEB__) if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || -#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) - nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7 || -#endif nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) return STATUS_SUCCESS; + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARMV7) + { + SYSTEM_CPU_INFORMATION sci; + if (SUCCEEDED(NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL )) && + sci.Architecture == PROCESSOR_ARCHITECTURE_ARM && sci.Level >= 7) + return STATUS_SUCCESS; + } #endif switch (nt->FileHeader.Machine)

1 0

André Hentschel : configure: Downgrade the Thumb2 requirement to Thumb on ARM.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 74518c8d0472c6e494823d22291fc32cdc2a612d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74518c8d0472c6e494823d222… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:22:16 2012 +0200 configure: Downgrade the Thumb2 requirement to Thumb on ARM. --- configure | 8 ++++---- configure.ac | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 465bdc4..2a26441 100755 --- a/configure +++ b/configure @@ -4142,15 +4142,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi ;; arm*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb2" >&5 -$as_echo_n "checking whether $CC supports Thumb2... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb" >&5 +$as_echo_n "checking whether $CC supports Thumb... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int ac_test(int i) { return i; } int main () { -asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1 +asm(".thumb\nblx ac_test\n.arm"); if (ac_test(1)) return 1 ; return 0; } @@ -4161,7 +4161,7 @@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - as_fn_error $? "You need a target with Thumb2 support to build Wine for ARM." "$LINENO" 5 + as_fn_error $? "You need a target with Thumb support to build Wine for ARM." "$LINENO" 5 fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext diff --git a/configure.ac b/configure.ac index 1753e14..70e7663 100644 --- a/configure.ac +++ b/configure.ac @@ -169,11 +169,11 @@ case $host in fi ;; arm*) - AC_MSG_CHECKING([whether $CC supports Thumb2]) - WINE_TRY_ASM_LINK([".syntax unified\n.thumb\nb.w ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], + AC_MSG_CHECKING([whether $CC supports Thumb]) + WINE_TRY_ASM_LINK([".thumb\nblx ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([You need a target with Thumb2 support to build Wine for ARM.])]) + AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.])]) CFLAGS="$CFLAGS -marm" ;; *-mingw32*|*-cygwin*)

1 0

André Hentschel : winebuild: Put the PE header into the text section on ARM.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: e7730053f3c859b53df277386105967044a7848d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7730053f3c859b53df277386… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 25 00:20:50 2012 +0200 winebuild: Put the PE header into the text section on ARM. --- tools/winebuild/spec32.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7743acc..3dff304 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -403,22 +403,24 @@ static void output_asm_constructor( const char *constructor ) } else { - output( "\n\t.section \".init\",\"ax\"\n" ); switch(target_cpu) { case CPU_x86: case CPU_x86_64: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); break; case CPU_SPARC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tcall %s\n", asm_name(constructor) ); output( "\tnop\n" ); break; case CPU_ARM: + output( "\n\t.section \".text\",\"ax\"\n" ); output( "\tblx %s\n", asm_name(constructor) ); - output( "\t.arm\n" ); break; case CPU_POWERPC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tbl %s\n", asm_name(constructor) ); break; } @@ -452,20 +454,20 @@ void output_module( DLLSPEC *spec ) output( "\t.skip %u\n", 65536 + page_size ); break; default: - output( "\n\t.section \".init\",\"ax\"\n" ); switch(target_cpu) { case CPU_x86: case CPU_x86_64: case CPU_SPARC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tjmp 1f\n" ); break; case CPU_ARM: - output( "\n\t.syntax unified\n" ); - output( "\n\t.thumb\n" ); - output( "\tb.w 1f\n" ); + output( "\n\t.section \".text\",\"ax\"\n" ); + output( "\tb 1f\n" ); break; case CPU_POWERPC: + output( "\n\t.section \".init\",\"ax\"\n" ); output( "\tb 1f\n" ); break; }

1 0

Julian Rüger : winspool.drv/tests: Fix typos/grammar.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 0595619e0f0ff52ce2d22b5c0f98733824aa9a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0595619e0f0ff52ce2d22b5c0… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jun 24 19:40:56 2012 +0200 winspool.drv/tests: Fix typos/grammar. --- dlls/winspool.drv/tests/info.c | 54 ++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0595619e0f0ff52ce2d22…

1 0

Julian Rüger : localui/tests: Fix typos/grammar.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: f1709a9936eb5b798b03015fe1e5f9ac2c268962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1709a9936eb5b798b03015fe… Author: Julian Rüger <jr98(a)gmx.net> Date: Sun Jun 24 17:45:47 2012 +0200 localui/tests: Fix typos/grammar. --- dlls/localui/tests/localui.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index b3422aa..e32a376 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -72,7 +72,7 @@ static PORT_INFO_2W * find_portinfo2(LPWSTR pPort) if (!pi_buffer) { res = EnumPortsW(NULL, 2, NULL, 0, &pi_needed, &pi_numports); if (!res && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { - win_skip("The Service 'Spooler' is required for many test\n"); + win_skip("The service 'Spooler' is required for many tests\n"); return NULL; } ok(!res, "EnumPorts succeeded: got %d\n", res); @@ -165,12 +165,12 @@ static void test_AddPortUI(void) SetLastError(0xdeadbeef); new_portname = NULL; /* - * - On MSDN, you can read, that no dialogs should be displayed, when hWnd + * - On MSDN, you can read that no dialog should be displayed when hWnd * is NULL, but native localui does not care - * - when the new port already exist, + * - When the new port already exists, * TRUE is returned, but new_portname is NULL - * - when the new port starts with "COM" or "LPT", - * FALSE is returned with ERROR_NOT_SUPPORTED in windows + * - When the new port starts with "COM" or "LPT", + * FALSE is returned with ERROR_NOT_SUPPORTED on windows */ res = pAddPortUI(NULL, NULL, localportW, &new_portname); ok( res || @@ -297,7 +297,7 @@ START_TEST(localui) } } - /* find installed Ports */ + /* find installed ports */ /* "FILE:" */ file_present = find_portinfo2(portname_fileW);

1 0

Chris Robinson : quartz: Improve MPEG header parsing and sync recovery.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 3b454e8a6885592de5903dab4724a448d79ddcaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b454e8a6885592de5903dab4… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Jun 23 10:04:00 2012 -0700 quartz: Improve MPEG header parsing and sync recovery. --- dlls/quartz/mpegsplit.c | 44 +++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index a45f401..934238e 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -124,17 +124,14 @@ static const DWORD tabsel_123[2][3][16] = { static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) { - LONGLONG duration; - int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; - if (header[0] != 0xff) - return E_INVALIDARG; + LONGLONG duration; - if (!(((header[1]>>5)&0x7) == 0x7 && - ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && - ((header[2]>>2)&0x3) != 0x3)) + if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && + ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && + ((header[2]>>2)&0x3) != 0x3)) { - FIXME("Not a valid header: %02x:%02x\n", header[1], header[2]); + FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG; } @@ -509,17 +506,23 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO /* Skip ID3 v2 tag, if any */ if (SUCCEEDED(hr) && !memcmp("ID3", header, 3)) do { - UINT length; + UINT length = 0; hr = IAsyncReader_SyncRead(pPin->pReader, pos, 6, header + 4); if (FAILED(hr)) break; pos += 6; TRACE("Found ID3 v2.%d.%d\n", header[3], header[4]); - length = (header[6] & 0x7F) << 21; - length += (header[7] & 0x7F) << 14; - length += (header[8] & 0x7F) << 7; - length += (header[9] & 0x7F); - TRACE("Length: %u\n", length); + if(header[3] <= 4 && header[4] != 0xff && + (header[5]&0x0f) == 0 && (header[6]&0x80) == 0 && + (header[7]&0x80) == 0 && (header[8]&0x80) == 0 && + (header[9]&0x80) == 0) + { + length = (header[6]<<21) | (header[7]<<14) | + (header[8]<< 7) | (header[9] ); + if((header[5]&0x10)) + length += 10; + TRACE("Length: %u\n", length); + } pos += length; /* Read the real header for the mpeg splitter */ @@ -592,14 +595,17 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin, ALLOCATO hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); if (hr != S_OK) break; - while (parse_header(header, &length, &duration)) + while ((hr=parse_header(header, &length, &duration)) != S_OK && + pos + 4 < This->EndOfFile) { /* No valid header yet; shift by a byte and check again */ memmove(header, header+1, 3); - hr = IAsyncReader_SyncRead(pPin->pReader, pos++, 1, header + 3); - if (hr != S_OK || This->EndOfFile - pos < 4) + hr = IAsyncReader_SyncRead(pPin->pReader, ++pos + 3, 1, header + 3); + if (hr != S_OK) break; } + if (hr != S_OK) + break; pos += length; if (This->seektable && (duration / SEEK_INTERVAL) > last_entry) @@ -692,11 +698,11 @@ static HRESULT WINAPI MPEGSplitter_seek(IMediaSeeking *iface) if (hr != S_OK || timepos >= newpos) break; - while (parse_header(header, &length, &timepos) && bytepos + 3 < This->EndOfFile) + while (parse_header(header, &length, &timepos) && bytepos + 4 < This->EndOfFile) { /* No valid header yet; shift by a byte and check again */ memmove(header, header+1, 3); - hr = IAsyncReader_SyncRead(pPin->pReader, ++bytepos, 1, header + 3); + hr = IAsyncReader_SyncRead(pPin->pReader, ++bytepos + 3, 1, header + 3); if (hr != S_OK) break; }

1 0

Chris Robinson : quartz: Fix frame length calculation for MPEG audio.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 037cefc43b228b60d3fc287dfb38427e2aea2086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=037cefc43b228b60d3fc287df… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Jun 23 08:35:16 2012 -0700 quartz: Fix frame length calculation for MPEG audio. --- dlls/quartz/mpegsplit.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index 585851b..a45f401 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -154,11 +154,17 @@ static HRESULT parse_header(BYTE *header, LONGLONG *plen, LONGLONG *pduration) return E_INVALIDARG; } - - if (layer == 3 || layer == 2) + if (layer == 1) + length = 4 * (12 * bitrate / freqs[freq_index] + padding); + else if (layer == 2) length = 144 * bitrate / freqs[freq_index] + padding; + else if (layer == 3) + length = 144 * bitrate / (freqs[freq_index]<<lsf) + padding; else - length = 4 * (12 * bitrate / freqs[freq_index] + padding); + { + ERR("Impossible layer %d\n", layer); + return E_INVALIDARG; + } duration = (ULONGLONG)10000000 * (ULONGLONG)(length) / (ULONGLONG)(bitrate/8); *plen = length;

1 0

Francois Gouget : d3dx9_36/tests: Simplify test_D3DXSHMultiply3().
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: b2e3e2e9439ca0e7c106209a59e41d5beed54445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e3e2e9439ca0e7c106209a5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 23 17:11:25 2012 +0200 d3dx9_36/tests: Simplify test_D3DXSHMultiply3(). --- dlls/d3dx9_36/tests/math.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c2a652c..70290bf 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2403,10 +2403,11 @@ static void test_D3DXSHMultiply3(void) { unsigned int i; FLOAT a[20], b[20], c[20]; - const FLOAT expected[] = - { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, 1.726572f, 5.573538f, - 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f, }; - + /* D3DXSHMultiply only modifies the first 9 elements of the array */ + const FLOAT expected[20] = + { 7.813913f, 2.256058f, 5.9484005f, 4.970894f, 2.899858f, 3.598946f, + 1.726572f, 5.573538f, 0.622063f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, + 14.0f, 15.0f, 16.0f, 17.0f, 18.0f, 19.0f }; for (i = 0; i < 20; i++) { @@ -2416,14 +2417,8 @@ static void test_D3DXSHMultiply3(void) } D3DXSHMultiply3(c, a, b); - for (i = 0; i < 9; i++) - ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); - -/* D3DXSHMultiply does not modify the elements of the array after the nineth element */ - for (i = 8; i < 19; i++) + for (i = 0; i < 20; i++) ok(relative_error(c[i], expected[i]) < admitted_error, "Expected[%d] = %f, received = %f\n", i, expected[i], c[i]); - - return; } START_TEST(math)

1 0

Eric Pouech : winedbg: In 'info locals' command, show the full register/ stack layout for parameters & locals.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 244099689cbda165b0eaded0c7aeed05e26feec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=244099689cbda165b0eaded0c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jun 24 13:03:09 2012 +0200 winedbg: In 'info locals' command, show the full register/stack layout for parameters & locals. --- programs/winedbg/symbol.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 8d7af5d..99b382d 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -81,11 +81,20 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base, else if (sym->Flags & SYMFLAG_REGREL) { DWORD_PTR* pval; + size_t l; + *buffer++ = '['; sz--; if (!memory_get_register(sym->Register, &pval, buffer, sz)) return FALSE; + l = strlen(buffer); + sz -= l; + buffer += l; lvalue->cookie = DLV_TARGET; lvalue->addr.Offset = (ULONG64)*pval + sym->Address; + if ((LONG_PTR)sym->Address >= 0) + snprintf(buffer, sz, "+%ld]", (ULONG_PTR)sym->Address); + else + snprintf(buffer, sz, "-%ld]", -(LONG_PTR)sym->Address); } else if (sym->Flags & SYMFLAG_VALUEPRESENT) { @@ -711,7 +720,7 @@ void symbol_print_local(const SYMBOL_INFO* sym, DWORD_PTR base, BOOL detailed) { print_value(&lvalue, 0, 1); if (detailed) - dbg_printf(" (%s%s)", + dbg_printf(" (%s %s)", (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local", buffer); }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012