March 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : tools/sfnt2fnt: Separate the building of the font data and the actual file creation.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: a145b3069f2586ebfc8ce4ac263d62ccde75287e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a145b3069f2586ebfc8ce4ac2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 22 14:56:16 2008 +0100 tools/sfnt2fnt: Separate the building of the font data and the actual file creation. --- tools/sfnt2fnt.c | 204 +++++++++++++++++++++++++++++------------------------- 1 files changed, 109 insertions(+), 95 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a145b3069f2586ebfc8ce…

1 0

Alexandre Julliard : tools/sfnt2fnt: Merge the fnt2fon code into sfnt2fnt to allow generating fonts in a single step .
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: f5c49b210a8b9d19f56a6a79a93ad7a8458d632e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c49b210a8b9d19f56a6a79a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 22 20:11:25 2008 +0100 tools/sfnt2fnt: Merge the fnt2fon code into sfnt2fnt to allow generating fonts in a single step. --- fonts/.gitignore | 56 --------- fonts/Makefile.in | 326 +++++++++++++---------------------------------------- tools/sfnt2fnt.c | 230 ++++++++++++++++++++++++++++++++----- 3 files changed, 280 insertions(+), 332 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5c49b210a8b9d19f56a6…

1 0

Alexandre Julliard : tools/sfnt2fnt: Add getopt option parsing.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: f2734a1a64a949cb4eef782a276f06204bb2d4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2734a1a64a949cb4eef782a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 22 21:00:56 2008 +0100 tools/sfnt2fnt: Add getopt option parsing. --- fonts/Makefile.in | 78 ++++++++++++++++++------------------ tools/sfnt2fnt.c | 115 +++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 128 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f2734a1a64a949cb4eef7…

1 0

Alexandre Julliard : fonts: Store the generated TrueType fonts in the repository, and rebuild them only in maintainer mode.
by Alexandre Julliard 24 Mar '08

24 Mar '08

Module: wine Branch: master Commit: 8ad6049ac642bf61d338e0c2094b9a0b9a2f51bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ad6049ac642bf61d338e0c20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 22 21:23:56 2008 +0100 fonts: Store the generated TrueType fonts in the repository, and rebuild them only in maintainer mode. --- Make.rules.in | 2 +- configure | 7 +--- configure.ac | 9 ++--- fonts/.gitignore | 8 ---- fonts/Makefile.in | 85 +++++++++++++++++++++++---------------------- fonts/courier.ttf | Bin 0 -> 14060 bytes fonts/marlett.ttf | Bin 0 -> 6136 bytes fonts/ms_sans_serif.ttf | Bin 0 -> 27752 bytes fonts/small_fonts.ttf | Bin 0 -> 15956 bytes fonts/small_fonts_jp.ttf | Bin 0 -> 9116 bytes fonts/system.ttf | Bin 0 -> 23940 bytes fonts/tahoma.ttf | Bin 0 -> 86772 bytes fonts/tahomabd.ttf | Bin 0 -> 64396 bytes 13 files changed, 49 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8ad6049ac642bf61d338e…

1 0

Andrew Talbot : wineps.drv: Assign to structs instead of using memcpy.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 94dc49ed128247fb6bfab4cb47971578a2ea1076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94dc49ed128247fb6bfab4cb4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Mar 21 15:29:55 2008 +0000 wineps.drv: Assign to structs instead of using memcpy. --- dlls/wineps.drv/driver.c | 4 ++-- dlls/wineps.drv/escape.c | 2 +- dlls/wineps.drv/init.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 42e537a..d698065 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -279,7 +279,7 @@ static INT_PTR CALLBACK PSDRV_PaperDlgProc(HWND hwnd, UINT msg, di = (PSDRV_DLGINFO *)GetWindowLongPtrW(hwnd, DWLP_USER); switch(nmhdr->code) { case PSN_APPLY: - memcpy(di->pi->Devmode, di->dlgdm, sizeof(PSDRV_DEVMODEA)); + *di->pi->Devmode = *di->dlgdm; SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, PSNRET_NOERROR); return TRUE; @@ -370,7 +370,7 @@ INT PSDRV_ExtDeviceMode(LPSTR lpszDriver, HWND hwnd, LPDEVMODEA lpdmOutput, pPropertySheet = (void*)GetProcAddress(hinstComctl32, "PropertySheetW"); memset(&psp,0,sizeof(psp)); dlgdm = HeapAlloc( PSDRV_Heap, 0, sizeof(*dlgdm) ); - memcpy(dlgdm, pi->Devmode, sizeof(*dlgdm)); + *dlgdm = *pi->Devmode; di = HeapAlloc( PSDRV_Heap, 0, sizeof(*di) ); di->pi = pi; di->dlgdm = dlgdm; diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index e440047..b397461 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -107,7 +107,7 @@ INT PSDRV_ExtEscape( PSDRV_PDEVICE *physDev, INT nEscape, INT cbInput, LPCVOID i ibi->GraphicsRect.left, ibi->GraphicsRect.right ); - memcpy (obi, ibi, sizeof(*ibi)); + *obi = *ibi; return 1; } case NEXTBAND: diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e492730..5b85c45 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -352,7 +352,7 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi return FALSE; } - memcpy( physDev->Devmode, pi->Devmode, sizeof(PSDRV_DEVMODEA) ); + *physDev->Devmode = *pi->Devmode; physDev->logPixelsX = physDev->pi->ppd->DefaultResolution; physDev->logPixelsY = physDev->pi->ppd->DefaultResolution; @@ -566,7 +566,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) pi->Devmode = HeapAlloc( PSDRV_Heap, 0, sizeof(DefaultDevmode) ); if (pi->Devmode == NULL) goto cleanup; - memcpy(pi->Devmode, &DefaultDevmode, sizeof(DefaultDevmode) ); + *pi->Devmode = DefaultDevmode; lstrcpynA((LPSTR)pi->Devmode->dmPublic.dmDeviceName,name,CCHDEVICENAME); using_default_devmode = TRUE;

1 0

Andrew Talbot : winex11.drv: Indirection level fix.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 8789ed6f84d6c1ab5a6a36ea1a60eba91e8eeb22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8789ed6f84d6c1ab5a6a36ea1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Mar 21 15:30:01 2008 +0000 winex11.drv: Indirection level fix. --- dlls/winex11.drv/wintab.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 99cb6f4..47376c0 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -982,7 +982,7 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) /*********************************************************************** * X11DRV_GetCurrentPacket (X11DRV.@) */ -int X11DRV_GetCurrentPacket(LPWTPACKET *packet) +int X11DRV_GetCurrentPacket(LPWTPACKET packet) { memcpy(packet,&gMsgPacket,sizeof(WTPACKET)); return 1; @@ -1435,7 +1435,7 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner) /*********************************************************************** * GetCurrentPacket (X11DRV.@) */ -int X11DRV_GetCurrentPacket(LPWTPACKET *packet) +int X11DRV_GetCurrentPacket(LPWTPACKET packet) { return 0; }

1 0

Andrew Talbot : winedos: Assign to struct instead of using memcpy.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 2d08f90d76a788f75e5552d65c4217c107872527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d08f90d76a788f75e5552d65… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Mar 21 15:29:51 2008 +0000 winedos: Assign to struct instead of using memcpy. --- dlls/winedos/int21.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index ac99714..3b60719 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -2959,7 +2959,7 @@ static BOOL INT21_Fat32( CONTEXT86 *context ) source = &INT21_GetHeapPointer()->misc_dpb_list[drive]; *ptr = sizeof(INT21_DPB); - memcpy( target, source, sizeof(INT21_DPB)); + *target = *source; if (LOWORD(context->Esi) != 0xF1A6) {

1 0

Jason Green : d3d9: Allow for driver precision differences in some visual tests.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 740b56e87be64da60af9d23ea16291587a158edb URL: http://source.winehq.org/git/wine.git/?a=commit;h=740b56e87be64da60af9d23ea… Author: Jason Green <jave27(a)gmail.com> Date: Fri Mar 21 12:20:49 2008 -0400 d3d9: Allow for driver precision differences in some visual tests. --- dlls/d3d9/tests/visual.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 76c62b1..ac74879 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -765,13 +765,13 @@ static void fog_test(IDirect3DDevice9 *device) color = getPixelColor(device, 160, 360); ok(color == 0x00FF0000, "Untransformed vertex with no table or vertex fog has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000FF00, "Untransformed vertex with linear vertex fog has color %08x\n", color); + ok(color == 0x0000FF00 || color == 0x0000FE00, "Untransformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 120); ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); if(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) { color = getPixelColor(device, 480, 360); - ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + ok(color == 0x0000FF00 || color == 0x0000FE00, "Transformed vertex with linear table fog has color %08x\n", color); } else { @@ -835,9 +835,9 @@ static void fog_test(IDirect3DDevice9 *device) } IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); color = getPixelColor(device, 160, 360); - ok(color == 0x0000FF00, "Untransformed vertex with vertex fog and z = 0.1 has color %08x\n", color); + ok(color == 0x0000FF00 || color == 0x0000FE00, "Untransformed vertex with vertex fog and z = 0.1 has color %08x\n", color); color = getPixelColor(device, 160, 120); - ok(color == 0x0000FF00, "Untransformed vertex with vertex fog and z = 1.0 has color %08x\n", color); + ok(color == 0x0000FF00 || color == 0x0000FE00, "Untransformed vertex with vertex fog and z = 1.0 has color %08x\n", color); color = getPixelColor(device, 480, 120); ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); @@ -882,7 +882,7 @@ static void fog_test(IDirect3DDevice9 *device) } IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); color = getPixelColor(device, 160, 360); - ok(color == 0x0000FF00, "Reversed %s fog: z=0.1 has color 0x%08x, expected 0x0000ff00\n", mode, color); + ok(color == 0x0000FF00 || color == 0x0000FE00, "Reversed %s fog: z=0.1 has color 0x%08x, expected 0x0000ff00\n", mode, color); color = getPixelColor(device, 160, 120); r = (color & 0x00ff0000) >> 16;

1 0

Jason Green : d3d9: Add visual test for D3DRS_SHADEMODE states.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: 1a933d6b4487daec62711e75a454b5ef37288015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a933d6b4487daec62711e75a… Author: Jason Green <jave27(a)gmail.com> Date: Fri Mar 21 12:10:44 2008 -0400 d3d9: Add visual test for D3DRS_SHADEMODE states. --- dlls/d3d9/tests/visual.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6acba8d..76c62b1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1,6 +1,7 @@ /* * Copyright 2005, 2007 Henri Verbeet * Copyright (C) 2007 Stefan D�singer(for CodeWeavers) + * Copyright (C) 2008 Jason Green(for TransGaming) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -5497,6 +5498,136 @@ out: IDirect3D9_Release(d3d); } +static void shademode_test(IDirect3DDevice9 *device) +{ + /* Render a quad and try all of the different fixed function shading models. */ + HRESULT hr; + DWORD color0, color1; + DWORD shademode = D3DSHADE_FLAT; + DWORD primtype = D3DPT_TRIANGLESTRIP; + LPVOID data = NULL; + LPDIRECT3DVERTEXBUFFER9 vb_strip = NULL; + LPDIRECT3DVERTEXBUFFER9 vb_list = NULL; + UINT i, j; + struct vertex quad_strip[] = + { + {-1.0f, -1.0f, 0.0f, 0xffff0000 }, + {-1.0f, 1.0f, 0.0f, 0xff00ff00 }, + { 1.0f, -1.0f, 0.0f, 0xff0000ff }, + { 1.0f, 1.0f, 0.0f, 0xffffffff } + }; + struct vertex quad_list[] = + { + {-1.0f, -1.0f, 0.0f, 0xffff0000 }, + {-1.0f, 1.0f, 0.0f, 0xff00ff00 }, + { 1.0f, -1.0f, 0.0f, 0xff0000ff }, + + {-1.0f, 1.0f, 0.0f, 0xff00ff00 }, + { 1.0f, -1.0f, 0.0f, 0xff0000ff }, + { 1.0f, 1.0f, 0.0f, 0xffffffff } + }; + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad_strip), + 0, 0, D3DPOOL_MANAGED, &vb_strip, NULL); + ok(hr == D3D_OK, "CreateVertexBuffer failed with %s\n", DXGetErrorString9(hr)); + if (FAILED(hr)) goto bail; + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad_list), + 0, 0, D3DPOOL_MANAGED, &vb_list, NULL); + ok(hr == D3D_OK, "CreateVertexBuffer failed with %s\n", DXGetErrorString9(hr)); + if (FAILED(hr)) goto bail; + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DVertexBuffer9_Lock(vb_strip, 0, sizeof(quad_strip), (void **) &data, 0); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %s\n", DXGetErrorString9(hr)); + memcpy(data, quad_strip, sizeof(quad_strip)); + hr = IDirect3DVertexBuffer9_Unlock(vb_strip); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DVertexBuffer9_Lock(vb_list, 0, sizeof(quad_list), (void **) &data, 0); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %s\n", DXGetErrorString9(hr)); + memcpy(data, quad_list, sizeof(quad_list)); + hr = IDirect3DVertexBuffer9_Unlock(vb_list); + ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Unlock failed with %s\n", DXGetErrorString9(hr)); + + /* Try it first with a TRIANGLESTRIP. Do it with different geometry because + * the color fixups we have to do for FLAT shading will be dependent on that. */ + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb_strip, 0, sizeof(quad_strip[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %s\n", DXGetErrorString9(hr)); + + /* First loop uses a TRIANGLESTRIP geometry, 2nd uses a TRIANGLELIST */ + for (j=0; j<2; j++) { + + /* Inner loop just changes the D3DRS_SHADEMODE */ + for (i=0; i<3; i++) { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SHADEMODE, shademode); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitive(device, primtype, 0, 2); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitive failed with %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %s\n", DXGetErrorString9(hr)); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + + /* Sample two spots from the output */ + color0 = getPixelColor(device, 100, 100); /* Inside first triangle */ + color1 = getPixelColor(device, 500, 350); /* Inside second triangle */ + switch(shademode) { + case D3DSHADE_FLAT: + /* Should take the color of the first vertex of each triangle */ + todo_wine ok(color0 == 0x00ff0000, "FLAT shading has color0 %08x, expected 0x00ff0000 (todo)\n", color0); + todo_wine ok(color1 == 0x0000ff00, "FLAT shading has color1 %08x, expected 0x0000ff00 (todo)\n", color1); + shademode = D3DSHADE_GOURAUD; + break; + case D3DSHADE_GOURAUD: + /* Should be an interpolated blend */ + ok(color0 == 0x000dca28, "GOURAUD shading has color0 %08x, expected 0x000dca28\n", color0); + ok(color1 == 0x000d45c7, "GOURAUD shading has color1 %08x, expected 0x000d45c7\n", color1); + shademode = D3DSHADE_PHONG; + break; + case D3DSHADE_PHONG: + /* Should be the same as GOURAUD, since no hardware implements this */ + ok(color0 == 0x000dca28, "PHONG shading has color0 %08x, expected 0x000dca28\n", color0); + ok(color1 == 0x000d45c7, "PHONG shading has color1 %08x, expected 0x000d45c7\n", color1); + break; + } + } + /* Now, do it all over again with a TRIANGLELIST */ + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb_list, 0, sizeof(quad_list[0])); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %s\n", DXGetErrorString9(hr)); + primtype = D3DPT_TRIANGLELIST; + shademode = D3DSHADE_FLAT; + } + +bail: + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SHADEMODE, D3DSHADE_GOURAUD); + ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState returned %s\n", DXGetErrorString9(hr)); + + if (vb_strip) + IDirect3DVertexBuffer9_Release(vb_strip); + if (vb_list) + IDirect3DVertexBuffer9_Release(vb_list); +} + + static void fog_srgbwrite_test(IDirect3DDevice9 *device) { /* Draw a black quad, half fogged with white fog -> grey color. Enable sRGB writing. @@ -7364,6 +7495,7 @@ START_TEST(visual) } offscreen_test(device_ptr); alpha_test(device_ptr); + shademode_test(device_ptr); srgbtexture_test(device_ptr); release_buffer_test(device_ptr); float_texture_test(device_ptr);

1 0

Alexandre Julliard : kernel32/tests: Fix the FindFirstVolume test on Vista.
by Alexandre Julliard 22 Mar '08

22 Mar '08

Module: wine Branch: master Commit: c3ae7d1983471e101796fc12cdb7798b83bd779c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ae7d1983471e101796fc12c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 22 13:09:57 2008 +0100 kernel32/tests: Fix the FindFirstVolume test on Vista. --- dlls/kernel32/tests/volume.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index da34f54..f238146 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -59,7 +59,9 @@ static void test_FindFirstVolume(void) handle = pFindFirstVolumeA( volume, 0 ); ok( handle == INVALID_HANDLE_VALUE, "succeeded with short buffer\n" ); - ok( GetLastError() == ERROR_FILENAME_EXCED_RANGE, "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_MORE_DATA || /* XP */ + GetLastError() == ERROR_FILENAME_EXCED_RANGE, /* Vista */ + "wrong error %u\n", GetLastError() ); handle = pFindFirstVolumeA( volume, 49 ); ok( handle == INVALID_HANDLE_VALUE, "succeeded with short buffer\n" ); ok( GetLastError() == ERROR_FILENAME_EXCED_RANGE, "wrong error %u\n", GetLastError() );

1 0