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

Henri Verbeet : ddraw/tests: Move test_coop_level_mode_set() to ddraw7.c.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 5227dfa8ef9a1c9c19b35ef3b3f7e604b167d8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=5227dfa8ef9a1c9c19b35ef3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 31 16:46:47 2012 +0200 ddraw/tests: Move test_coop_level_mode_set() to ddraw7.c. --- dlls/ddraw/tests/d3d.c | 448 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 432 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 432 insertions(+), 448 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5227dfa8ef9a1c9c19b35…

1 0

Alexandre Julliard : gdi32: Don' t implement the gamma ramp functions in the DIB driver.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 61f4767adeee0b02786faeec4a2fb583f3439154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f4767adeee0b02786faeec4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 31 13:44:32 2012 +0200 gdi32: Don't implement the gamma ramp functions in the DIB driver. --- dlls/gdi32/dc.c | 16 ++++++++++++---- dlls/gdi32/dibdrv/dc.c | 22 ++-------------------- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3caa120..e128e53 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1245,8 +1245,12 @@ BOOL WINAPI GetDeviceGammaRamp(HDC hDC, LPVOID ptr) TRACE("%p, %p\n", hDC, ptr); if( dc ) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); - ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr ); + if (GetObjectType( hDC ) != OBJ_MEMDC) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetDeviceGammaRamp ); + ret = physdev->funcs->pGetDeviceGammaRamp( physdev, ptr ); + } + else SetLastError( ERROR_INVALID_PARAMETER ); release_dc_ptr( dc ); } return ret; @@ -1263,8 +1267,12 @@ BOOL WINAPI SetDeviceGammaRamp(HDC hDC, LPVOID ptr) TRACE("%p, %p\n", hDC, ptr); if( dc ) { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); - ret = physdev->funcs->pSetDeviceGammaRamp( physdev, ptr ); + if (GetObjectType( hDC ) != OBJ_MEMDC) + { + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceGammaRamp ); + ret = physdev->funcs->pSetDeviceGammaRamp( physdev, ptr ); + } + else SetLastError( ERROR_INVALID_PARAMETER ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 5c59041..798a9cd 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -392,24 +392,6 @@ static UINT dibdrv_SetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) return DCB_RESET; /* we don't have device-specific bounds */ } -/*********************************************************************** - * dibdrv_GetDeviceGammaRamp - */ -static BOOL dibdrv_GetDeviceGammaRamp( PHYSDEV dev, void *ramp ) -{ - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; -} - -/*********************************************************************** - * dibdrv_SetDeviceGammaRamp - */ -static BOOL dibdrv_SetDeviceGammaRamp( PHYSDEV dev, void *ramp ) -{ - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; -} - const struct gdi_dc_funcs dib_driver = { NULL, /* pAbortDoc */ @@ -453,7 +435,7 @@ const struct gdi_dc_funcs dib_driver = NULL, /* pGetCharABCWidthsI */ NULL, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ - dibdrv_GetDeviceGammaRamp, /* pGetDeviceGammaRamp */ + NULL, /* pGetDeviceGammaRamp */ NULL, /* pGetFontData */ NULL, /* pGetFontUnicodeRanges */ NULL, /* pGetGlyphIndices */ @@ -515,7 +497,7 @@ const struct gdi_dc_funcs dib_driver = dibdrv_SetDCPenColor, /* pSetDCPenColor */ NULL, /* pSetDIBitsToDevice */ dibdrv_SetDeviceClipping, /* pSetDeviceClipping */ - dibdrv_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ + NULL, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ NULL, /* pSetMapMode */ NULL, /* pSetMapperFlags */

1 0

Józef Kucia : d3dx9: Implement D3DXSaveTextureToFileInMemory.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 38b8949fea926a0afce627537f29df413397f34f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b8949fea926a0afce627537… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 29 11:29:24 2012 +0200 d3dx9: Implement D3DXSaveTextureToFileInMemory. --- dlls/d3dx9_36/texture.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 97d26d9..1e87a00 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1660,10 +1660,40 @@ HRESULT WINAPI D3DXSaveTextureToFileW(const WCHAR *dst_filename, D3DXIMAGE_FILEF HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE_FILEFORMAT file_format, IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette) { - FIXME("(%p, %#x, %p, %p): stub\n", + HRESULT hr; + D3DRESOURCETYPE type; + IDirect3DSurface9 *surface; + + TRACE("(%p, %#x, %p, %p)\n", dst_buffer, file_format, src_texture, src_palette); if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL; - return E_NOTIMPL; + if (file_format == D3DXIFF_DDS) + { + FIXME("DDS file format isn't supported yet\n"); + return E_NOTIMPL; + } + + type = IDirect3DBaseTexture9_GetType(src_texture); + switch (type) + { + case D3DRTYPE_TEXTURE: + case D3DRTYPE_CUBETEXTURE: + hr = get_surface(type, src_texture, D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface); + break; + case D3DRTYPE_VOLUMETEXTURE: + FIXME("Volume textures aren't supported yet\n"); + return E_NOTIMPL; + default: + return D3DERR_INVALIDCALL; + } + + if (SUCCEEDED(hr)) + { + hr = D3DXSaveSurfaceToFileInMemory(dst_buffer, file_format, surface, src_palette, NULL); + IDirect3DSurface9_Release(surface); + } + + return hr; }

1 0

Alexandre Julliard : gdi32: Keep the source DC locked until the end in StretchBlt and AlphaBlend.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 6d23f3e7e17b5f88c66a46b65cd31e55ee881b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d23f3e7e17b5f88c66a46b65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 30 22:55:30 2012 +0200 gdi32: Keep the source DC locked until the end in StretchBlt and AlphaBlend. --- dlls/gdi32/bitblt.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 8763218..238e375 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -256,9 +256,11 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); - err = src_dev->funcs->pGetImage( src_dev, src_info, &bits, src ); - release_dc_ptr( dc_src ); - if (err) return FALSE; + if (src_dev->funcs->pGetImage( src_dev, src_info, &bits, src )) + { + release_dc_ptr( dc_src ); + return FALSE; + } dst_dev = GET_DC_PHYSDEV( dc_dst, pPutImage ); copy_bitmapinfo( dst_info, src_info ); @@ -299,6 +301,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (bits.free) bits.free( &bits ); + release_dc_ptr( dc_src ); return !err; } @@ -317,7 +320,6 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (!(dc_src = get_dc_ptr( src_dev->hdc ))) return FALSE; src_dev = GET_DC_PHYSDEV( dc_src, pGetImage ); err = src_dev->funcs->pGetImage( src_dev, src_info, &bits, src ); - release_dc_ptr( dc_src ); if (err) goto done; dst_dev = GET_DC_PHYSDEV( dc_dst, pBlendImage ); @@ -339,6 +341,7 @@ BOOL nulldrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, if (bits.free) bits.free( &bits ); done: + release_dc_ptr( dc_src ); if (err) SetLastError( err ); return !err; }

1 0

Henri Verbeet : wined3d: Update nouveau card info.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 948065a52f2c205391c6665a8f81f417cdde00ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=948065a52f2c205391c6665a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 31 16:46:46 2012 +0200 wined3d: Update nouveau card info. --- dlls/wined3d/directx.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f2542b9..f7e62a7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2054,10 +2054,17 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i } cards[] = { + /* Kepler */ + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, + /* Fermi */ + {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, + {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, + {"NVC1", CARD_NVIDIA_GEFORCE_GT420}, {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, + /* Tesla */ {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, {"NVAC", CARD_NVIDIA_GEFORCE_8200}, {"NVAA", CARD_NVIDIA_GEFORCE_8200}, @@ -2071,10 +2078,11 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, + {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, + /* Curie */ {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ - {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ {"NV4B", CARD_NVIDIA_GEFORCE_7600}, @@ -2088,15 +2096,18 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i {"NV42", CARD_NVIDIA_GEFORCE_6800}, {"NV41", CARD_NVIDIA_GEFORCE_6800}, {"NV40", CARD_NVIDIA_GEFORCE_6800}, + /* Rankine */ {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, + /* Kelvin */ {"nv28", CARD_NVIDIA_GEFORCE4_TI4200}, {"nv25", CARD_NVIDIA_GEFORCE4_TI4200}, {"nv20", CARD_NVIDIA_GEFORCE3}, + /* Celsius */ {"nv1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ {"nv1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ {"nv18", CARD_NVIDIA_GEFORCE4_MX}, @@ -2105,6 +2116,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i {"nv15", CARD_NVIDIA_GEFORCE2}, {"nv11", CARD_NVIDIA_GEFORCE2_MX}, {"nv10", CARD_NVIDIA_GEFORCE}, + /* Fahrenheit */ {"nv05", CARD_NVIDIA_RIVA_TNT2}, {"nv04", CARD_NVIDIA_RIVA_TNT}, {"nv03", CARD_NVIDIA_RIVA_128}, @@ -2119,8 +2131,10 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer)); d3d_level = d3d_level_from_gl_info(gl_info); + if (d3d_level >= 10) + return CARD_NVIDIA_GEFORCE_8800GTX; if (d3d_level >= 9) - return CARD_NVIDIA_GEFORCEFX_5600; + return CARD_NVIDIA_GEFORCEFX_5800; if (d3d_level >= 8) return CARD_NVIDIA_GEFORCE3; if (d3d_level >= 7)

1 0

Józef Kucia : windowscodecs: Implement IWICStream:: InitializeFromIStream.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: d770297c37ec46bbff395e156464080f24da6f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d770297c37ec46bbff395e156… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 29 11:29:21 2012 +0200 windowscodecs: Implement IWICStream::InitializeFromIStream. --- dlls/windowscodecs/stream.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index cd235a3..a123b9d 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -735,8 +735,13 @@ static HRESULT WINAPI IWICStreamImpl_Clone(IWICStream *iface, static HRESULT WINAPI IWICStreamImpl_InitializeFromIStream(IWICStream *iface, IStream *pIStream) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + ULARGE_INTEGER offset, size; + TRACE("(%p): relay\n", iface); + + offset.QuadPart = 0; + size.u.LowPart = 0xffffffff; + size.u.HighPart = 0xffffffff; + return IWICStream_InitializeFromIStreamRegion(iface, pIStream, offset, size); } static HRESULT WINAPI IWICStreamImpl_InitializeFromFilename(IWICStream *iface,

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DIndexBuffer9Impl.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 6341389fe4ec21d6a5b63f5b94641284b7e8521e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6341389fe4ec21d6a5b63f5b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 31 16:46:50 2012 +0200 d3d9: Get rid of IDirect3DIndexBuffer9Impl. --- dlls/d3d9/buffer.c | 86 ++++++++++++++++++++++----------------------- dlls/d3d9/d3d9_private.h | 21 ++++------- dlls/d3d9/device.c | 8 ++-- 3 files changed, 53 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6341389fe4ec21d6a5b63…

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DVertexBuffer9Impl.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 503b16392b622fd2be43b1f7ec4fc4544e290702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503b16392b622fd2be43b1f7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 31 16:46:49 2012 +0200 d3d9: Get rid of IDirect3DVertexBuffer9Impl. --- dlls/d3d9/buffer.c | 83 ++++++++++++++++++++++----------------------- dlls/d3d9/d3d9_private.h | 21 ++++-------- dlls/d3d9/device.c | 12 +++--- 3 files changed, 54 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=503b16392b622fd2be43b…

1 0

Józef Kucia : d3dx9/tests: Add tests for D3DXSaveTextureToFileInMemory.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 13b2a3b9bca935e1d0d8896fb9a735a46becbbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b2a3b9bca935e1d0d8896fb… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue May 29 11:29:25 2012 +0200 d3dx9/tests: Add tests for D3DXSaveTextureToFileInMemory. --- dlls/d3dx9_36/tests/texture.c | 191 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 191 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13b2a3b9bca935e1d0d88…

1 0

Detlef Riekenberg : kernel32/tests: Add tests for GetProductInfo.
by Alexandre Julliard May 31, 2012

May 31, 2012

Module: wine Branch: master Commit: 64fbf5cac2d1c09e7c4dd25f42c74350f324ab19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fbf5cac2d1c09e7c4dd25f4… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed May 30 18:40:34 2012 +0200 kernel32/tests: Add tests for GetProductInfo. --- dlls/kernel32/tests/version.c | 100 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 94 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 9f9b72e..bb71cf8 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -18,31 +18,118 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* Needed for PRODUCT_* defines and GetProductInfo() */ +#define _WIN32_WINNT 0x0600 + #include <assert.h> #include "wine/test.h" #include "winbase.h" +static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); static BOOL (WINAPI * pVerifyVersionInfoA)(LPOSVERSIONINFOEXA, DWORD, DWORDLONG); static ULONGLONG (WINAPI * pVerSetConditionMask)(ULONGLONG, DWORD, BYTE); #define KERNEL32_GET_PROC(func) \ - p##func = (void *)GetProcAddress(hKernel32, #func); \ - if(!p##func) trace("GetProcAddress(hKernel32, '%s') failed\n", #func); + p##func = (void *)GetProcAddress(hKernel32, #func); static void init_function_pointers(void) { HMODULE hKernel32; - pVerifyVersionInfoA = NULL; - pVerSetConditionMask = NULL; - hKernel32 = GetModuleHandleA("kernel32.dll"); - assert(hKernel32); + + KERNEL32_GET_PROC(GetProductInfo); KERNEL32_GET_PROC(VerifyVersionInfoA); KERNEL32_GET_PROC(VerSetConditionMask); } +#define PRODUCT2NAME(x) case x:\ + return #x; + +static const char * product_to_name(DWORD product) +{ + switch (product) + { + PRODUCT2NAME(PRODUCT_PROFESSIONAL) + PRODUCT2NAME(PRODUCT_STANDARD_SERVER) + PRODUCT2NAME(PRODUCT_BUSINESS) + PRODUCT2NAME(PRODUCT_ULTIMATE) + PRODUCT2NAME(PRODUCT_ULTIMATE_N) + PRODUCT2NAME(PRODUCT_HOME_PREMIUM) + } + return ""; +} +#undef PRODUCT2NAME + +static void test_GetProductInfo(void) +{ + OSVERSIONINFOEXA os; + DWORD product; + DWORD res; + DWORD table[] = {9,8,7,6, + 7,0,0,0, + 6,2,0,0, + 6,1,2,0, + 6,1,1,0, + 6,1,0,2, + 6,1,0,0, + 6,0,3,0, + 6,0,2,0, + 6,0,1,5, + 6,0,1,0, + 6,0,0,0, + 5,3,0,0, + 5,2,0,0, + 5,1,0,0, + 5,0,0,0, + 0}; + + DWORD *entry = table; + + if (!pGetProductInfo) + { + /* Not present before Vista */ + win_skip("GetProductInfo() not available\n"); + return; + } + + memset(&os, 0, sizeof(OSVERSIONINFOEXA)); + os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); + res = GetVersionExA((OSVERSIONINFOA *)&os); + ok(res, "got %d (expected TRUE)\n", res); + + trace("%s %u.%u (SP: %u.%u)\n", os.wProductType == VER_NT_WORKSTATION ? "Workstation" : "Server", + os.dwMajorVersion, os.dwMinorVersion, os.wServicePackMajor, os.wServicePackMinor); + + while (*entry) + { + /* SetLastError() / GetLastError(): value is untouched */ + product = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pGetProductInfo(entry[0], entry[1], entry[2], entry[3], &product); + trace("%d.%d / %d.%d: got %d and 0x%x %s\n", + entry[0], entry[1], entry[2], entry[3], res, product, product_to_name(product)); + + if (entry[0] >= 6) + ok(res && (product > PRODUCT_UNDEFINED) && (product <= PRODUCT_EMBEDDED) && (GetLastError() == 0xdeadbeef), + "got %d and 0x%x with 0x%x (expected TRUE and a valid PRODUCT_* value with LastError untouched)\n", + res, product, GetLastError()); + else + ok(!res && !product && (GetLastError() == 0xdeadbeef), + "got %d and 0x%x with 0x%x (expected FALSE and PRODUCT_UNDEFINED with LastError untouched)\n", + res, product, GetLastError()); + + entry+= 4; + } + + /* NULL pointer is not a problem */ + SetLastError(0xdeadbeef); + res = pGetProductInfo(6, 1, 0, 0, NULL); + ok( (!res) && (GetLastError() == 0xdeadbeef), + "got %d with 0x%x (expected FALSE with LastError untouched\n", res, GetLastError()); +} + static void test_GetVersionEx(void) { OSVERSIONINFOA infoA; @@ -292,6 +379,7 @@ START_TEST(version) { init_function_pointers(); + test_GetProductInfo(); test_GetVersionEx(); test_VerifyVersionInfo(); }

1 0