May 2008 - Wine-Commits - list.winehq.org

Andrew Talbot : wineoss.drv: Memory allocation sizes fix.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: ddfbe4ee1fe353d326392509ea4e45108e081a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfbe4ee1fe353d326392509e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat May 10 16:25:33 2008 +0100 wineoss.drv: Memory allocation sizes fix. --- dlls/wineoss.drv/dscapture.c | 4 ++-- dlls/wineoss.drv/dsrender.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/dscapture.c b/dlls/wineoss.drv/dscapture.c index a2157ec..e474936 100644 --- a/dlls/wineoss.drv/dscapture.c +++ b/dlls/wineoss.drv/dscapture.c @@ -1239,7 +1239,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_Create( IDsCaptureDriverPropertySetImpl * dscdps; TRACE("(%p,%p)\n",dscdb,pdscdps); - dscdps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dscdps)); + dscdps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dscdps)); if (dscdps == NULL) { WARN("out of memory\n"); return DSERR_OUTOFMEMORY; @@ -1262,7 +1262,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_Create( IDsCaptureDriverNotifyImpl * dscdn; TRACE("(%p,%p)\n",dscdb,pdscdn); - dscdn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dscdn)); + dscdn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dscdn)); if (dscdn == NULL) { WARN("out of memory\n"); return DSERR_OUTOFMEMORY; diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c index dfc636a..563f86d 100644 --- a/dlls/wineoss.drv/dsrender.c +++ b/dlls/wineoss.drv/dsrender.c @@ -893,7 +893,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_Create( IDsDriverPropertySetImpl * dsdps; TRACE("(%p,%p)\n",dsdb,pdsdps); - dsdps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dsdps)); + dsdps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dsdps)); if (dsdps == NULL) { WARN("out of memory\n"); return DSERR_OUTOFMEMORY; @@ -916,7 +916,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_Create( IDsDriverNotifyImpl * dsdn; TRACE("(%p,%p)\n",dsdb,pdsdn); - dsdn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(dsdn)); + dsdn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dsdn)); if (dsdn == NULL) { WARN("out of memory\n");

1 0

Andrew Talbot : wined3d: Remove test for value of unsigned variable being less than zero.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: aeb3ba28693850f2f8cb21204adb942cf8d882be URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb3ba28693850f2f8cb21204… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri May 9 22:32:32 2008 +0100 wined3d: Remove test for value of unsigned variable being less than zero. --- dlls/wined3d/basetexture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 1f14a20..ace6124 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -433,7 +433,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface if(samplerStates[WINED3DSAMP_MAGFILTER] != This->baseTexture.states[WINED3DTEXSTA_MAGFILTER]) { GLint glValue; state = samplerStates[WINED3DSAMP_MAGFILTER]; - if (state < WINED3DTEXF_NONE || state > WINED3DTEXF_ANISOTROPIC) { + if (state > WINED3DTEXF_ANISOTROPIC) { FIXME("Unrecognized or unsupported MAGFILTER* value %d\n", state); } else { glValue = (*This->baseTexture.magLookup)[state - WINED3DTEXF_NONE];

1 0

Jonathan Ernst : winhelp: Updated French translation.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 46fcc228726335c162e5055382fa64d1ebc96409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fcc228726335c162e505538… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Fri May 9 21:21:26 2008 +0200 winhelp: Updated French translation. --- programs/winhelp/Fr.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/Fr.rc b/programs/winhelp/Fr.rc index 0a19713..32c3efb 100644 --- a/programs/winhelp/Fr.rc +++ b/programs/winhelp/Fr.rc @@ -53,7 +53,7 @@ MAIN_MENU MENU } } -IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Index" @@ -64,7 +64,7 @@ CAPTION "Index" } /* Strings */ -STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { STID_WINE_HELP, "Aide de WINE" STID_WHERROR, "ERREUR"

1 0

Ben Mayhew : wined3d: Only display Missing vbo streams fixme once.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: a3f503f876513bb0584c5c4f0959fcc3d2f325c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f503f876513bb0584c5c4f0… Author: Ben Mayhew <ben-dev(a)gmx.net> Date: Fri May 9 20:57:26 2008 +0200 wined3d: Only display Missing vbo streams fixme once. --- dlls/wined3d/drawprim.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index e8b39f8..b5e59b8 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -207,8 +207,12 @@ void primitiveDeclarationConvertToStridedData( else if(*fixup && !useVertexShaderFunction && (element->Usage == WINED3DDECLUSAGE_COLOR || element->Usage == WINED3DDECLUSAGE_POSITIONT)) { - /* This may be bad with the fixed function pipeline */ - FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); + static BOOL warned = FALSE; + if(!warned) { + /* This may be bad with the fixed function pipeline */ + FIXME("Missing vbo streams with unfixed colors or transformed position, expect problems\n"); + warned = TRUE; + } } } }

1 0

Paul Vriens : kernel32/tests: Skip tests if codepage is not installed/ available.
by Alexandre Julliard May 12, 2008

May 12, 2008

Module: wine Branch: master Commit: 6e8f8a0529a84bd0f00649e2c831a060a5135146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8f8a0529a84bd0f00649e2c… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri May 9 16:35:07 2008 +0200 kernel32/tests: Skip tests if codepage is not installed/available. --- dlls/kernel32/tests/locale.c | 40 +++++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 60e6f11..4f1907d 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2135,7 +2135,7 @@ static void test_EnumUILanguageA(void) { BOOL ret; if (!pEnumUILanguagesA) { - trace("EnumUILanguagesA is not available on Win9x\n"); + skip("EnumUILanguagesA is not available on Win9x or NT4\n"); return; } @@ -2280,21 +2280,35 @@ static void test_GetCPInfo(void) SetLastError(0xdeadbeef); ret = GetCPInfo(CP_UTF7, &cpinfo); - ok(ret, "GetCPInfo(CP_UTF7) error %u\n", GetLastError()); - ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); - ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); - ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); - ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); - ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); + if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) + { + skip("Codepage CP_UTF7 is not installed/available\n"); + } + else + { + ok(ret, "GetCPInfo(CP_UTF7) error %u\n", GetLastError()); + ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); + ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); + ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); + ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + ok(cpinfo.MaxCharSize == 5, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); + } SetLastError(0xdeadbeef); ret = GetCPInfo(CP_UTF8, &cpinfo); - ok(ret, "GetCPInfo(CP_UTF8) error %u\n", GetLastError()); - ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); - ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); - ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); - ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); - ok(cpinfo.MaxCharSize == 4, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); + if (!ret && GetLastError() == ERROR_INVALID_PARAMETER) + { + skip("Codepage CP_UTF8 is not installed/available\n"); + } + else + { + ok(ret, "GetCPInfo(CP_UTF8) error %u\n", GetLastError()); + ok(cpinfo.DefaultChar[0] == 0x3f, "expected 0x3f, got 0x%x\n", cpinfo.DefaultChar[0]); + ok(cpinfo.DefaultChar[1] == 0, "expected 0, got 0x%x\n", cpinfo.DefaultChar[1]); + ok(cpinfo.LeadByte[0] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[0]); + ok(cpinfo.LeadByte[1] == 0, "expected 0, got 0x%x\n", cpinfo.LeadByte[1]); + ok(cpinfo.MaxCharSize == 4, "expected 4, got 0x%x\n", cpinfo.MaxCharSize); + } } START_TEST(locale)

1 0

Alexandre Julliard : Wine release 1.0-rc1
by Alexandre Julliard May 9, 2008

May 9, 2008

Module: website Branch: master Commit: 2aed9ee76192f7e4e07b24135e1e2110ac5b3d4c URL: http://source.winehq.org/git/website.git/?a=commit;h=2aed9ee76192f7e4e07b24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 9 19:55:26 2008 +0200 Wine release 1.0-rc1 --- news/2008050901.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/2008050901.xml b/news/2008050901.xml new file mode 100644 index 0000000..483bfb9 --- /dev/null +++ b/news/2008050901.xml @@ -0,0 +1,21 @@ +<news> +<date>May 9, 2008</date> +<title>Wine 1.0-rc1 Released</title> +<body> +<p>Wine 1.0-rc1 was released today, with the following main changes:</p> + +<ul> +<li>Bug fixes only, we are in code freeze.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-1.0-rc1.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=1.0-rc1">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-1.0-rc1 : Alexandre Julliard : Release 1.0-rc1
by Alexandre Julliard May 9, 2008

May 9, 2008

Module: wine Branch: refs/tags/wine-1.0-rc1 Tag: 04fabd9e7c3bde0d447b4797deabb4ba36925784 URL: http://source.winehq.org/git/wine.git/?a=tag;h=04fabd9e7c3bde0d447b4797deab… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 9 19:42:56 2008 +0200 Release 1.0-rc1

1 0

Alexandre Julliard : Release 1.0-rc1.
by Alexandre Julliard May 9, 2008

May 9, 2008

Module: wine Branch: master Commit: ef304bbecf7f8f2cc51d69266009816a25f05e90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef304bbecf7f8f2cc51d69266… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 9 19:42:56 2008 +0200 Release 1.0-rc1. --- ANNOUNCE | 1143 ++++++++++++++++--------------------------------------------- ChangeLog | 734 +++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 1043 insertions(+), 854 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef304bbecf7f8f2cc51d6…

1 0

Alexandre Julliard : gdi32: Add missing braces in EMFDRV_SelectPalette.
by Alexandre Julliard May 9, 2008

May 9, 2008

Module: wine Branch: master Commit: 1d76b94b4796439948e4288ed0933a30204cd6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d76b94b4796439948e4288ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 9 12:02:21 2008 +0200 gdi32: Add missing braces in EMFDRV_SelectPalette. --- dlls/gdi32/enhmfdrv/objects.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 54c34bf..f46fed2 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -502,8 +502,10 @@ HPALETTE EMFDRV_SelectPalette( PHYSDEV dev, HPALETTE hPal, BOOL force ) DWORD index; if (hPal == GetStockObject( DEFAULT_PALETTE )) + { index = DEFAULT_PALETTE | 0x80000000; goto found; + } if ((index = EMFDRV_FindObject( dev, hPal )) != 0) goto found;

1 0

Kusanagi Kouichi : imm32: Avoid false FIXMEs.
by Alexandre Julliard May 9, 2008

May 9, 2008

Module: wine Branch: master Commit: fb35a5754ceac26672f797497602d96cdefb07db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb35a5754ceac26672f797497… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri May 9 12:35:06 2008 +0900 imm32: Avoid false FIXMEs. --- dlls/imm32/imm.c | 243 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 127 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb35a5754ceac26672f79…

1 0