winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
737 discussions
Start a n
N
ew thread
Hans Leidekker : fusion: Handle DWORD-sized blob indices when loading the public key.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: 7c06862c52683dc230dd0f372eaf8fb6a5d3284a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7c06862c52683dc230dd0f372…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 23 13:05:14 2012 +0200 fusion: Handle DWORD-sized blob indices when loading the public key. --- dlls/fusion/assembly.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index 46c4db4..b655df1 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -825,23 +825,22 @@ PEKIND assembly_get_architecture(ASSEMBLY *assembly) return peI386; /* x86 assembly */ } -static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) +static BYTE *assembly_get_blob(ASSEMBLY *assembly, DWORD index, ULONG *size) { return GetData(&assembly->blobs[index], size); } HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) { - ASSEMBLYTABLE *asmtbl; ULONG i, size; LONG offset; - BYTE *hashdata; + BYTE *hashdata, *pubkey, *ptr; HCRYPTPROV crypt; HCRYPTHASH hash; - BYTE *pubkey; BYTE tokbytes[BYTES_PER_TOKEN]; HRESULT hr = E_FAIL; LPWSTR tok; + DWORD idx; *token = NULL; @@ -849,11 +848,17 @@ HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token) if (offset == -1) return E_FAIL; - asmtbl = assembly_data_offset(assembly, offset); - if (!asmtbl) + ptr = assembly_data_offset(assembly, offset); + if (!ptr) return E_FAIL; - pubkey = assembly_get_blob(assembly, asmtbl->PublicKey, &size); + ptr += FIELD_OFFSET(ASSEMBLYTABLE, PublicKey); + if (assembly->blobsz == sizeof(DWORD)) + idx = *(DWORD *)ptr; + else + idx = *(WORD *)ptr; + + pubkey = assembly_get_blob(assembly, idx, &size); if (!CryptAcquireContextA(&crypt, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
1
0
0
0
Hans Leidekker : fusion: Add a "v4.0_" prefix to version 4. 0 assembly directories.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: 0b82e284013dafd20f14377dda38820f5645a9b4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0b82e284013dafd20f14377dd…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 23 09:14:58 2012 +0200 fusion: Add a "v4.0_" prefix to version 4.0 assembly directories. --- dlls/fusion/asmcache.c | 10 ++++++++-- dlls/fusion/asmenum.c | 29 ++++++++++++++++------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index 93047d4..1cba6f6 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -375,7 +375,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, LPCWSTR pszManifestFilePath, LPCFUSION_INSTALL_REFERENCE pRefData) { - static const WCHAR format[] = {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR format[] = + {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR format_v40[] = + {'%','s','\\','%','s','\\','v','4','.','0','_','%','s','_','_','%','s','\\',0}; static const WCHAR ext_exe[] = {'.','e','x','e',0}; static const WCHAR ext_dll[] = {'.','d','l','l',0}; IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); @@ -430,7 +433,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, architecture = assembly_get_architecture(assembly); get_assembly_directory(asmdir, MAX_PATH, clr_version, architecture); - sprintfW(path, format, asmdir, name, version, token); + if (!strcmp(clr_version, "v4.0.30319")) + sprintfW(path, format_v40, asmdir, name, version, token); + else + sprintfW(path, format, asmdir, name, version, token); create_full_path(path); diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index f4da88a..641ed2f 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -291,17 +291,6 @@ static void insert_assembly(struct list *assemblies, ASMNAME *to_insert) static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, int depth, LPWSTR path) { - WIN32_FIND_DATAW ffd; - WCHAR buf[MAX_PATH]; - WCHAR disp[MAX_PATH]; - WCHAR asmpath[MAX_PATH]; - ASMNAME *asmname; - HANDLE hfind; - LPWSTR ptr; - HRESULT hr = S_OK; - - static WCHAR parent[MAX_PATH]; - static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; static const WCHAR search_fmt[] = {'%','s','\\','*',0}; @@ -311,6 +300,14 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, 'C','u','l','t','u','r','e','=','n','e','u','t','r','a','l',',',' ', 'P','u','b','l','i','c','K','e','y','T','o','k','e','n','=','%','s',0}; static const WCHAR ss_fmt[] = {'%','s','\\','%','s',0}; + static const WCHAR v40[] = {'v','4','.','0','_'}; + WIN32_FIND_DATAW ffd; + WCHAR buf[MAX_PATH], disp[MAX_PATH], asmpath[MAX_PATH]; + static WCHAR parent[MAX_PATH]; + ASMNAME *asmname; + HANDLE hfind; + WCHAR *ptr; + HRESULT hr = S_OK; if (name) parse_name(name, depth, path, buf); @@ -337,13 +334,19 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, } else if (depth == 1) { + unsigned int prefix_len = sizeof(v40)/sizeof(WCHAR); + const WCHAR *token, *version = ffd.cFileName; + sprintfW(asmpath, path_fmt, path, ffd.cFileName, parent); ptr = strstrW(ffd.cFileName, dblunder); *ptr = '\0'; - ptr += 2; + token = ptr + 2; + + if (strlenW(ffd.cFileName) >= prefix_len && + !memcmp(ffd.cFileName, v40, sizeof(v40))) version += prefix_len; - sprintfW(disp, fmt, parent, ffd.cFileName, ptr); + sprintfW(disp, fmt, parent, version, token); asmname = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); if (!asmname)
1
0
0
0
Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: 072c96565dd47c5bbbd5711934936ed000ba7ce3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=072c96565dd47c5bbbd571193…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 23 09:05:38 2012 +0400 po: Update Russian translation. --- po/ru.po | 53 +++++------------------------------------------------ 1 files changed, 5 insertions(+), 48 deletions(-) diff --git a/po/ru.po b/po/ru.po index ed63276..01b747f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -159,21 +159,10 @@ msgid "Cancel" msgstr "Отмена" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Установка Wine Gecko" +msgstr "Установка Wine Mono" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"
http://wiki.winehq.org/Gecko\
">
http://wiki.winehq.org/Gecko
</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -182,13 +171,12 @@ msgid "" "href=\"
http://wiki.winehq.org/Mono\
">
http://wiki.winehq.org/Mono
</a> for " "details." msgstr "" -"Wine не может найти пакет Gecko, который необходим для корректной работы " -"приложений с поддержкой HTML. Wine может автоматически загрузить и " -"установить его.\n" +"Wine не может найти пакет Mono, который необходим для корректной работы .NET " +"приложений. Wine может автоматически загрузить и установить его.\n" "\n" "Примечание: рекомендуется использовать пакет, предоставляемый вашим " -"дистрибутивом. Посетите <a href=\"
http://wiki.winehq.org/Gecko\
">
http://wiki
." -"
winehq.org/Gecko
</a> для получения более подробной информации." +"дистрибутивом. Посетите <a href=\"
http://wiki.winehq.org/Mono\
">
http://wiki
." +"
winehq.org/Mono
</a> для получения более подробной информации." #: appwiz.rc:28 msgid "Add/Remove Programs" @@ -6679,37 +6667,6 @@ msgid "insert disk %s" msgstr "вставьте диск %s" #: msi.rc:30 -#, fuzzy -#| msgid "" -#| "Windows Installer %s\n" -#| "\n" -#| "Usage:\n" -#| "msiexec command {required parameter} [optional parameter]\n" -#| "\n" -#| "Install a product:\n" -#| "\t/i {package|product_code} [property]\n" -#| "\t/package {package|product_code} [property]\n" -#| "\t/a package [property]\n" -#| "Repair an installation:\n" -#| "\t/f[p|o|e|d|c|a|u|m|s|v] {package|product_code}\n" -#| "Uninstall a product:\n" -#| "\t/uninstall {package|product_code} [property]\n" -#| "\t/x {package|product_code} [property]\n" -#| "Advertise a product:\n" -#| "\t/j[u|m] package [/t transform] [/g languageid]\n" -#| "Apply a patch:\n" -#| "\t/p patch_package [property]\n" -#| "\t/p patch_package /a package [property]\n" -#| "Log and UI Modifiers for above commands:\n" -#| "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -#| "\t/q{|n|b|r|f|n+|b+|b-}\n" -#| "Register MSI Service:\n" -#| "\t/y\n" -#| "Unregister MSI Service:\n" -#| "\t/z\n" -#| "Display this help:\n" -#| "\t/help\n" -#| "\t/?\n" msgid "" "Windows Installer %s\n" "\n"
1
0
0
0
Józef Kucia : d3dx9: Add support for luminance pixel formats.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: ada51526503db123dec4207d8a4750c0d3d06ed5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ada51526503db123dec4207d8…
Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:58 2012 +0200 d3dx9: Add support for luminance pixel formats. --- dlls/d3dx9_36/tests/surface.c | 12 ++++-------- dlls/d3dx9_36/util.c | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 15336da..2f1f2a8 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -465,10 +465,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFile */ if(testbitmap_ok) { - todo_wine { - hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); @@ -506,10 +504,8 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* D3DXLoadSurfaceFromFileInMemory */ - todo_wine { - hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); - } + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index ad8a6ea..d936fb9 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -63,6 +63,8 @@ static const PixelFormatDesc formats[] = {D3DFMT_A8, {8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, {D3DFMT_A8L8, {8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_L8, {0, 8, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, + {D3DFMT_L16, {0, 16, 0, 0}, { 0, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL },
1
0
0
0
Józef Kucia : d3dx9: Add a WARN to get_image_info_from_dds about too short DDS files.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: 3a944738025b4f608e746b28f9ea747f5755e447 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3a944738025b4f608e746b28f…
Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:57 2012 +0200 d3dx9: Add a WARN to get_image_info_from_dds about too short DDS files. --- dlls/d3dx9_36/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 6b0786c..821d51e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -372,7 +372,10 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG expected_length *= faces; expected_length += sizeof(*header); if (length < expected_length) + { + WARN("File is too short %u, expected at least %u bytes\n", length, expected_length); return D3DXERR_INVALIDDATA; + } info->ImageFileFormat = D3DXIFF_DDS;
1
0
0
0
Józef Kucia : d3dx9: Fix the expected_length computation for non-square DDS files.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: d313e4f9d3288bc9ee958a258bd4fd730af8cc8a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d313e4f9d3288bc9ee958a258…
Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:35:56 2012 +0200 d3dx9: Fix the expected_length computation for non-square DDS files. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 28975b9..6b0786c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -366,7 +366,7 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG calculate_dds_surface_size(info, width, height, &pitch, &size); expected_length += size; width = max(1, width / 2); - height = max(1, width / 2); + height = max(1, height / 2); } expected_length *= faces;
1
0
0
0
Józef Kucia : d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8:: GetLevelDesc is called with invalid level.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: 7b1aa04b00796238c0abd1556d26c295e9ca3105 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7b1aa04b00796238c0abd1556…
Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:19:33 2012 +0200 d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8::GetLevelDesc is called with invalid level. --- dlls/d3d8/texture.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 14f8207..59bc693 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -628,6 +628,12 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); + if (level >= wined3d_texture_get_level_count(texture->wined3d_texture)) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else
1
0
0
0
Józef Kucia : d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8:: GetCubeMapSurface is called with invalid level.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: 707c3559a209441b1e585b46d41eafc0c18b7ba8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=707c3559a209441b1e585b46d…
Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 22 22:19:32 2012 +0200 d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8::GetCubeMapSurface is called with invalid level. --- dlls/d3d8/texture.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 6b5f95c..14f8207 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -656,11 +656,19 @@ static HRESULT WINAPI d3d8_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture8 struct wined3d_resource *sub_resource; struct d3d8_surface *surface_impl; UINT sub_resource_idx; + DWORD level_count; TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface); wined3d_mutex_lock(); - sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; + level_count = wined3d_texture_get_level_count(texture->wined3d_texture); + if (level >= level_count) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + + sub_resource_idx = level_count * face + level; if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) { wined3d_mutex_unlock();
1
0
0
0
Henri Verbeet : d3d8: Get rid of IDirect3DVolume8Impl.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: 75d166f62c5b5c359650ccaf281923c9b99a5108 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=75d166f62c5b5c359650ccaf2…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:34 2012 +0200 d3d8: Get rid of IDirect3DVolume8Impl. --- dlls/d3d8/d3d8_private.h | 17 +---- dlls/d3d8/device.c | 2 +- dlls/d3d8/texture.c | 6 +- dlls/d3d8/volume.c | 156 +++++++++++++++++++++++---------------------- 4 files changed, 88 insertions(+), 93 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=75d166f62c5b5c359650c…
1
0
0
0
Henri Verbeet : d3d8: Get rid of IDirect3DSurface8Impl.
by Alexandre Julliard
23 May '12
23 May '12
Module: wine Branch: master Commit: ec466ff3b7ee94fa4e09134e2b6cdf3c775098d6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ec466ff3b7ee94fa4e09134e2…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 23 18:14:33 2012 +0200 d3d8: Get rid of IDirect3DSurface8Impl. --- dlls/d3d8/d3d8_private.h | 18 ++---- dlls/d3d8/device.c | 37 +++++------ dlls/d3d8/surface.c | 163 ++++++++++++++++++++++++---------------------- dlls/d3d8/swapchain.c | 2 +- dlls/d3d8/texture.c | 12 ++-- 5 files changed, 114 insertions(+), 118 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec466ff3b7ee94fa4e091…
1
0
0
0
← Newer
1
...
17
18
19
20
21
22
23
...
74
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
Results per page:
10
25
50
100
200