December 2012 - Wine-devel - list.winehq.org

Re: [PATCH 2/3] [resend] [cmd] Add more tests for set /a
by Marvin 17 Dec '12

17 Dec '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23440 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') === W2KPROSP4 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === WXPPROSP3 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W2K3R2SESP2 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === WVISTAADM (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W2K8SE (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W7PRO (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W7PROX64 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === TEST64_W7SP1 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === W7PROX64 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]') === TEST64_W7SP1 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 816 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 819 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 822 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 825 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 828 (got 'WINE_baz correctly 3', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 832 (got 'WINE_baz correctly 2', wanted 'WINE_baz correctly 1') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 860 (got 'WINE_baz correctly 7', wanted 'WINE_baz correctly 6(a)or_broken@ERROR: WINE_baz incorrectly [7]')

1 0

cmd patches - please ignore them
by Ann and Jason Edmeades 17 Dec '12

17 Dec '12

Dont know what's happened, need to investigate further - Had 100% pass rate in job 23438 only to fail on submission... Needs some investigation so will work on it later in the week Jason

1 0

Re: [PATCH 1/3] [try2] [cmd] Convert the set /a tests to validate better
by Marvin 17 Dec '12

17 Dec '12

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=23439 Your paranoid android. === WNT4WSSP6 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2KPROSP4 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === WXPPROSP3 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2K3R2SESP2 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === WVISTAADM (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W2K8SE (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PRO (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PROX64 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === TEST64_W7SP1 (32 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === W7PROX64 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19') === TEST64_W7SP1 (64 bit) === batch.c:312: Test failed: unexpected char 0x57 position 0 in line 778 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 3(a)or_broken@ERROR: WINE_baz incorrectly [4]') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 802 (got 'WINE_baz correctly 4', wanted 'WINE_baz correctly 19')

1 0

Re: wined3d: Recognize Nvidia GTX660 cards.
by Bruno Jesus 16 Dec '12

16 Dec '12

On Fri, Dec 14, 2012 at 2:01 PM, Caron Jensen <caron(a)codeweavers.com> wrote: > CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, > CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, > CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, > + CARD_NVIDIA_GEFORCE_GTX660 = 0X1183, > CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, > CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, Accoding to the similar patch from Jiang Yike "GTX660 Ti" is 0x1183, I looked for GTX660 and found different PCI ID's like 0x1185 or 0x110C but I could not find this information in NVIDIA site, only in other sites: https://fah-web.stanford.edu/file-releases/public/GPUs.txt http://pciids.sourceforge.net/pci.ids http://www.techpowerup.com/vgabios/126661/Asus.GTX660.2048.120810.html http://foldingforum.org/viewtopic.php?f=83&t=22477 Best wishes, Bruno

1 0

Re: wined3d: Recognize Nvidia GTX660 cards.
by futureway＠asia.com 16 Dec '12

16 Dec '12

Hello, Caron! GTX 660 and GTX 660 Ti are different cards, and 0x1183 is the device code of GTX 660 Ti. You may view my patch: http://source.winehq.org/patches/data/92545 . Best regards! Jiang Yike > ----- Original Message ----- > From: Caron Jensen > Sent: 12/15/12 12:01 AM > To: wine-patches > Subject: wined3d: Recognize Nvidia GTX660 cards. > > --- > dlls/wined3d/directx.c | 3 +++ > dlls/wined3d/wined3d_private.h | 1 + > 2 files changed, 4 insertions(+) > > diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c > index 15ac2ea..386c87a 100644 > --- a/dlls/wined3d/directx.c > +++ b/dlls/wined3d/directx.c > @@ -1095,6 +1095,7 @@ static const struct gpu_description gpu_description_table[] = > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, > + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660, "NVIDIA GeForce GTX 660", DRIVER_NVIDIA_GEFORCE6, 2048}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, > {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, > > @@ -1495,6 +1496,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl > { > {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ > {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ > + {"GTX 660", CARD_NVIDIA_GEFORCE_GTX660}, /* Geforce 600 - midend */ > {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ > {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ > {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ > @@ -2018,6 +2020,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i > { > /* Kepler */ > {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, > + {"NVE7", CARD_NVIDIA_GEFORCE_GTX660}, > /* Fermi */ > {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, > {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 0bb3f27..13f9285 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -1425,6 +1425,7 @@ enum wined3d_pci_device > CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, > CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, > CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, > + CARD_NVIDIA_GEFORCE_GTX660 = 0X1183, > CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, > CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, > > -- > 1.7.9.5 >

1 0

Re: [PATCH 1/3] [cmd] Convert the set /a tests to validate better
by Frédéric Delanoy 15 Dec '12

15 Dec '12

On Thu, Dec 13, 2012 at 10:59 PM, Ann and Jason Edmeades <jason(a)edmeades.me.uk> wrote: > The tests previously set a variable which was not checked until > the subsequent test completed (as env vars are expanded as the > line is read, meaning a sequence of set /a var=x & echo %var% > echos the contents before the set is executed). In addition when > multiple variables are involved in the calculation, only the > first one was being checked, and this is changed to check all > variables involved in the calculation. > + +REM Check the variables are set to the expected value and clear their contents +:check_vars +if not "%1"=="" ( + if "%1"=="%WINE_var1%" ( + echo WINE_var1 correctly %1 + ) else ( + echo ERROR: WINE_var1 incorrectly %WINE_var1% [%1] + ) +) +if not "%2"=="" ( + if "%2"=="%WINE_var2%" ( + echo WINE_var2 correctly %2 + ) else ( + echo ERROR: WINE_var2 incorrectly %WINE_var2% [%2] + ) +) +if not "%3"=="" ( + if "%3"=="%WINE_var3%" ( + echo WINE_var3 correctly %1 + ) else ( + echo ERROR: WINE_var3 incorrectly %WINE_var3% [%3] + ) +) A couple comments: 1. I don't really like hardcoding a variable name in a function... Why not using something like: set /a var=1 +2 & call :compute var set /a foo=8, bar=foo+1 & call :compute foo bar goto :end :compute set %1 set %1= // to clear the contents if not "%2" == "" ( set %2 set %2= // clearing here as well ) goto :eof :end which prints the variable(s) name and value, without hardcoding? var=3 foo=8 bar=9 2. The check for the presence of the first parameter is unneeded since you always call with at least one param (you control all calls) 3. When only 1 variable is used, no need to add a '1' suffix as in 'foo1' or 'WINE_foo1': the '1' doesn't help/add useful information 4. Ideally, for clarity, one would use delayed expansion instead, such as setlocal EnableDelayedExpansion set /a var=1 +2 & echo !var! endlocal but this isn't implemented yet, so adding a preliminary comment like "REM FIXME Simplify tests when EnableDelayedExpansion is supported" would be good IMO 5. You could even simplify the above function (making it more generic, instead of testing for up to 3 arguments) by using SHIFT and an additional label, like :compute :comploop if not "%1" == "" ( set %1 set %1= shift ) else ( goto :eof ) goto :comploop goto :eof Or even better (if NT4 allows): :compute for %%i in (%*) do ( set %%i set %%i= ) goto :eof Frédéric

2 4

Re: gdi32: Indentation fix
by Dmitry Timoshkov 15 Dec '12

15 Dec '12

Andrew Talbot <andrew.talbot(a)talbotville.com> wrote: > Changelog: > gdi32: Indentation fix. Please keep 4 spaces indentation without tabs. -- Dmitry.

2 1

Re: [2/2] gdi32/tests: Added tests for GetFontResourceInfoW
by Dmitry Timoshkov 15 Dec '12

15 Dec '12

Stefan Leichter <Stefan.Leichter(a)camline.com> wrote: > + pCopyFileW = (void *)GetProcAddress(hkernel32, "CopyFileW"); > + pExpandEnvironmentStringsW = (void *)GetProcAddress(hkernel32, "ExpandEnvironmentStringsW"); > + pGetCurrentDirectoryW = (void *)GetProcAddress(hkernel32, "GetCurrentDirectoryW"); There is no reason to import these APIs using GetProcAddress. Also testing GetFontResourceInfo without checking actual buffer contents is not very useful. Google points to http://www.undocprint.org/winspool/getfontresourceinfo which seems to have some description of this API, with symbolic names of the type parameter, so testing something besides type == 1 would be a good idea as well. -- Dmitry.

2 4

Sponsorship to FOSDEM's Wine room
by Jeremy White 14 Dec '12

14 Dec '12

The Wine project has a limited fund to sponsor travel to the Wine conference. If you are interested in attending the Wine DevRoom at FOSDEM, but could only do so with financial assistance, we may be able to help! To apply, simply email me a request and indicate if you need help with transportation costs, lodging costs, or both. If you need help with transportation costs, please provide an estimate of your travel costs. Funding decisions will be made by a five member committee including myself, Alexandre, Michael Stefaniuc, Austin English, and Marcus Meissner. Priority will be given to those that have contributed to the Wine project in some form (not necessarily patches). Please send your request to me no later than December 31, 2012. We will try to communicate decisions on or before January 5th, 2013. Cheers, Jeremy

1 0

We're in at FOSDEM!
by Jeremy White 14 Dec '12

14 Dec '12

I'm stoked - we've been approved for a dev room at FOSDEM on Saturday, February 2nd, in Brussels. It is just the one day, but I figure we can find ways to gather on Friday night and/or Sunday as well. I really think this will be a fun change of pace for us. If it doesn't work out, we'll just go camp out in Marcus's back yard instead <evil grin>. One thing they require from us is a pre set schedule, so I'll be asking people to suggest topics, and then we'll have to weed through them to figure out what makes the most sense. Cheers, Jeremy

4 5