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
July
June
May
April
March
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
October 2012
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 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
960 discussions
Start a n
N
ew thread
James Eder : ntdll: Split up feature detection by architecture.
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 7978a38f24eca2eae944025a6fbb11c10d2f0fbc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7978a38f24eca2eae944025a6…
Author: James Eder <jimportal(a)gmail.com> Date: Mon Oct 22 15:22:51 2012 -0600 ntdll: Split up feature detection by architecture. --- dlls/ntdll/nt.c | 439 ++++++++++++++----------------------------------------- 1 files changed, 109 insertions(+), 330 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=7978a38f24eca2eae9440…
1
0
0
0
James Eder : ntdll: Use build-time API detection instead of OS detection for finding the number of processors .
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 0d5f301352232d1959086090b133a82ab3e1b7a4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0d5f301352232d1959086090b…
Author: James Eder <jimportal(a)gmail.com> Date: Mon Oct 22 15:22:50 2012 -0600 ntdll: Use build-time API detection instead of OS detection for finding the number of processors. --- dlls/ntdll/nt.c | 73 +++++++++++++++++++------------------------------------ 1 files changed, 25 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3f8e772..a851542 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1012,6 +1012,31 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) */ void fill_cpu_info(void) { + long num; + +#ifdef _SC_NPROCESSORS_ONLN + num = sysconf(_SC_NPROCESSORS_ONLN); + if (num < 1) + { + num = 1; + WARN("Failed to detect the number of processors.\n"); + } +#elif defined(CTL_HW) && defined(HW_NCPU) + int mib[2]; + size_t len = sizeof(num); + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + if (sysctl(mib, 2, &num, &len, NULL, 0) != 0) + { + num = 1; + WARN("Failed to detect the number of processors.\n"); + } +#else + num = 1; + FIXME("Detecting the number of processors not suported.\n"); +#endif + NtCurrentTeb()->Peb->NumberOfProcessors = num; + memset(&cached_sci, 0, sizeof(cached_sci)); /* choose sensible defaults ... * FIXME: perhaps overridable with precompiler flags? @@ -1034,8 +1059,6 @@ void fill_cpu_info(void) cached_sci.Reserved = 0; cached_sci.FeatureSet = 0x1fff; - NtCurrentTeb()->Peb->NumberOfProcessors = 1; - /* Hmm, reasonable processor feature defaults? */ #ifdef linux @@ -1064,17 +1087,6 @@ void fill_cpu_info(void) if ((s = strchr(value,'\n'))) *s='\0'; - if (!strcasecmp(line, "processor")) - { - /* processor number counts up... */ - unsigned int x; - - if (sscanf(value, "%d",&x)) - if (x + 1 > NtCurrentTeb()->Peb->NumberOfProcessors) - NtCurrentTeb()->Peb->NumberOfProcessors = x + 1; - - continue; - } if (!strcasecmp(line, "model")) { /* First part of Revision */ @@ -1206,11 +1218,6 @@ void fill_cpu_info(void) if (value) user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; #endif mib[0] = CTL_HW; - mib[1] = HW_NCPU; - val_len = sizeof(value); - if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) - if (value > NtCurrentTeb()->Peb->NumberOfProcessors) - NtCurrentTeb()->Peb->NumberOfProcessors = value; mib[1] = HW_MODEL; val_len = sizeof(model)-1; if (sysctl(mib, 2, model, &val_len, NULL, 0) >= 0) @@ -1270,9 +1277,6 @@ void fill_cpu_info(void) } #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) { - int ret, num; - size_t len; - get_cpuinfo( &cached_sci ); /* Check for OS support of SSE -- Is this used, and should it be sse1 or sse2? */ @@ -1280,32 +1284,10 @@ void fill_cpu_info(void) ret = sysctlbyname("hw.instruction_sse", &num, &len, NULL, 0); if (!ret) user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = num;*/ - - len = sizeof(num); - ret = sysctlbyname("hw.ncpu", &num, &len, NULL, 0); - if (!ret) - NtCurrentTeb()->Peb->NumberOfProcessors = num; } #elif defined(__sun) { - int num = sysconf( _SC_NPROCESSORS_ONLN ); - - if (num == -1) num = 1; get_cpuinfo( &cached_sci ); - NtCurrentTeb()->Peb->NumberOfProcessors = num; - } -#elif defined (__OpenBSD__) - { - int mib[2], num, ret; - size_t len; - - mib[0] = CTL_HW; - mib[1] = HW_NCPU; - len = sizeof(num); - - ret = sysctl(mib, 2, &num, &len, NULL, 0); - if (!ret) - NtCurrentTeb()->Peb->NumberOfProcessors = num; } #elif defined (__APPLE__) { @@ -1322,11 +1304,6 @@ void fill_cpu_info(void) else user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = TRUE; } - valSize = sizeof(int); - if (sysctlbyname ("hw.ncpu", &value, &valSize, NULL, 0) == 0) - NtCurrentTeb()->Peb->NumberOfProcessors = value; - - /* FIXME: we don't use the "hw.activecpu" value... but the cached one */ valSize = sizeof(int); if (sysctlbyname ("hw.cputype", &cputype, &valSize, NULL, 0) == 0)
1
0
0
0
André Hentschel : gdiplus/tests: Fix out-of-bounds access (coverity).
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 9e5936b36c75a417c2e5801049877d06e93fd417 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9e5936b36c75a417c2e580104…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 23:52:55 2012 +0200 gdiplus/tests: Fix out-of-bounds access (coverity). --- dlls/gdiplus/tests/graphics.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 475f7d6..4ed13ea 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2948,7 +2948,7 @@ static void test_string_functions(void) GpRegion *regions[4]; BOOL region_isempty[4]; int i; - PointF position; + PointF positions[8]; GpMatrix *identity; ok(hdc != NULL, "Expected HDC to be initialized\n"); @@ -3186,24 +3186,22 @@ static void test_string_functions(void) status = GdipCreateMatrix(&identity); expect(Ok, status); - position.X = 0; - position.Y = 0; - rc.X = 0; rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(NULL, teststring, 6, font, &position, + memset(positions, 0, sizeof(positions)); + status = GdipMeasureDriverString(NULL, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, NULL, 6, font, &position, + status = GdipMeasureDriverString(graphics, NULL, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, teststring, 6, NULL, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, NULL, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(InvalidParameter, status); @@ -3213,16 +3211,16 @@ static void test_string_functions(void) identity, &rc); expect(InvalidParameter, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, 0x100, identity, &rc); expect(Ok, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, NULL, &rc); expect(Ok, status); - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, NULL); expect(InvalidParameter, status); @@ -3231,7 +3229,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring, 6, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 6, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status); @@ -3248,7 +3246,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring, 4, font, &position, + status = GdipMeasureDriverString(graphics, teststring, 4, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status); @@ -3262,7 +3260,7 @@ static void test_string_functions(void) rc.Y = 0; rc.Width = 0; rc.Height = 0; - status = GdipMeasureDriverString(graphics, teststring2, 1, font, &position, + status = GdipMeasureDriverString(graphics, teststring2, 1, font, positions, DriverStringOptionsCmapLookup|DriverStringOptionsRealizedAdvance, identity, &rc); expect(Ok, status);
1
0
0
0
André Hentschel : atl: Warn when CoRegisterClassObject fails.
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 010e311b042404acf7f79b3aeb6590b7595157cb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=010e311b042404acf7f79b3ae…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 23:49:49 2012 +0200 atl: Warn when CoRegisterClassObject fails. --- dlls/atl/atl_main.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 2898835..5b47f5e 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -179,7 +179,6 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContex DWORD dwFlags) { _ATL_OBJMAP_ENTRYW_V1 *obj; - HRESULT hRes = S_OK; int i=0; TRACE("(%p %i %i)\n",pM, dwClsContext, dwFlags); @@ -199,15 +198,19 @@ HRESULT WINAPI AtlModuleRegisterClassObjects(_ATL_MODULEW *pM, DWORD dwClsContex (LPVOID*)&pUnknown); if (SUCCEEDED (rc) ) { - CoRegisterClassObject(obj->pclsid, pUnknown, dwClsContext, - dwFlags, &obj->dwRegister); + rc = CoRegisterClassObject(obj->pclsid, pUnknown, dwClsContext, + dwFlags, &obj->dwRegister); + + if (FAILED (rc) ) + WARN("Failed to register object %i: 0x%08x\n", i, rc); + if (pUnknown) IUnknown_Release(pUnknown); } } } - return hRes; + return S_OK; } HRESULT WINAPI AtlModuleUnregisterServerEx(_ATL_MODULEW* pM, BOOL bUnRegTypeLib, const CLSID* pCLSID)
1
0
0
0
André Hentschel : wing32: Use the correct size for memcpy (coverity).
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 859bf8d9e9e66227c7f6733320189e0493ac22a3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=859bf8d9e9e66227c7f673332…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:56:41 2012 +0200 wing32: Use the correct size for memcpy (coverity). --- dlls/wing32/wing32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index 0c942a6..dc6dfd6 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(*bmi) ); + memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(bmi->bmiHeader) ); return ds.dsBm.bmBits; } return NULL;
1
0
0
0
André Hentschel : wing32: Use the correct size for memcpy (coverity).
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 7b07e015a9c75867e4c3dc7d40a8bdfa5d1e127f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7b07e015a9c75867e4c3dc7d4…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:56:41 2012 +0200 wing32: Use the correct size for memcpy (coverity). --- dlls/wing32/wing32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wing32/wing32.c b/dlls/wing32/wing32.c index dc6dfd6..b6702ba 100644 --- a/dlls/wing32/wing32.c +++ b/dlls/wing32/wing32.c @@ -72,7 +72,7 @@ void * WINAPI WinGGetDIBPointer( HBITMAP hbmp, BITMAPINFO *bmi ) if (GetObjectW( hbmp, sizeof(ds), &ds ) == sizeof(ds)) { - memcpy( &bmi->bmiHeader, &ds.dsBmih, sizeof(bmi->bmiHeader) ); + bmi->bmiHeader = ds.dsBmih; return ds.dsBm.bmBits; } return NULL;
1
0
0
0
André Hentschel : winedbg: Fix check for register number (coverity).
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 72836c0b7eb13d8d840a73c1c999c35e38c2264e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=72836c0b7eb13d8d840a73c1c…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 22 19:46:44 2012 +0200 winedbg: Fix check for register number (coverity). --- programs/winedbg/gdbproxy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index ff845d2..b3978ae 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1547,7 +1547,7 @@ static enum packet_return packet_write_register(struct gdb_context* gdbctx) assert(gdbctx->in_trap); reg = strtoul(gdbctx->in_packet, &ptr, 16); - if (ptr == NULL || reg > cpu_num_regs || *ptr++ != '=') + if (ptr == NULL || reg >= cpu_num_regs || *ptr++ != '=') { if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR) fprintf(stderr, "Invalid register index %s\n", gdbctx->in_packet);
1
0
0
0
Henri Verbeet : d3dx9: Avoid LPDIRECT3DPIXELSHADER9.
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 4704e78337985b3011915c937dbed03c9777b485 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4704e78337985b3011915c937…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:45 2012 +0200 d3dx9: Avoid LPDIRECT3DPIXELSHADER9. --- dlls/d3dx9_36/effect.c | 37 +++++++++++++++---------------------- dlls/d3dx9_36/tests/effect.c | 14 +++++++------- include/d3dx9effect.h | 8 ++++---- 3 files changed, 26 insertions(+), 33 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4704e78337985b3011915…
1
0
0
0
Henri Verbeet : wined3d: Get rid of the mostly unused "num_textures_used" field from arbfp_ffp_desc.
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 672ad0610876f344f0cf1309b8a0747ebab3a93a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=672ad0610876f344f0cf1309b…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:44 2012 +0200 wined3d: Get rid of the mostly unused "num_textures_used" field from arbfp_ffp_desc. --- dlls/wined3d/arb_program_shader.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87e89fd..2a74171 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5618,7 +5618,6 @@ struct arbfp_ffp_desc { struct ffp_frag_desc parent; GLuint shader; - unsigned int num_textures_used; }; /* Context activation and GL locking are done by the caller. */ @@ -6421,13 +6420,6 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi ERR("Out of memory\n"); return; } - new_desc->num_textures_used = 0; - for (i = 0; i < gl_info->limits.texture_stages; ++i) - { - if (settings.op[i].cop == WINED3D_TOP_DISABLE) - break; - new_desc->num_textures_used = i; - } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info);
1
0
0
0
Henri Verbeet : include: Add the D3DDisassemble() prototype and flags.
by Alexandre Julliard
23 Oct '12
23 Oct '12
Module: wine Branch: master Commit: 6e4fd6b171fba63b0240d055e2d94593bd86d7a4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6e4fd6b171fba63b0240d055e…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:43 2012 +0200 include: Add the D3DDisassemble() prototype and flags. --- include/d3dcompiler.h | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 3950143..047c1ea 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -25,25 +25,31 @@ extern "C" { #endif -#define D3DCOMPILE_DEBUG 0x0001 -#define D3DCOMPILE_SKIP_VALIDATION 0x0002 -#define D3DCOMPILE_SKIP_OPTIMIZATION 0x0004 -#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x0008 -#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x0010 -#define D3DCOMPILE_PARTIAL_PRECISION 0x0020 -#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x0040 -#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x0080 -#define D3DCOMPILE_NO_PRESHADER 0x0100 -#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x0200 -#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x0400 -#define D3DCOMPILE_ENABLE_STRICTNESS 0x0800 -#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 -#define D3DCOMPILE_IEEE_STRICTNESS 0x2000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x4000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x0000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0xC000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x8000 -#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000 +#define D3DCOMPILE_DEBUG 0x00000001 +#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 +#define D3DCOMPILE_NO_PRESHADER 0x00000100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 + +#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 +#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 +#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 +#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 +#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, @@ -75,6 +81,8 @@ typedef enum D3D_BLOB_PART D3D_BLOB_TEST_COMPILE_PERF } D3D_BLOB_PART; +HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, + UINT flags, const char *comments, ID3DBlob **disassembly); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob);
1
0
0
0
← Newer
1
...
24
25
26
27
28
29
30
...
96
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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
Results per page:
10
25
50
100
200