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

Nikolay Sivov : ole32: Check ComposeWith() return value too (PVS-Studio).
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 46914d8794ec98b8d96d46f6713a6a6221dfb39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46914d8794ec98b8d96d46f67… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:32:47 2015 +0300 ole32: Check ComposeWith() return value too (PVS-Studio). --- dlls/ole32/compositemoniker.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 3e6788e..40d3568 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -722,6 +722,8 @@ CompositeMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IBindCtx* pbc, IRunningObjectTable* rot; res = IMoniker_ComposeWith(pmkToLeft, iface, FALSE, &leftMk); + if (FAILED(res)) + return res; res = IBindCtx_GetRunningObjectTable(pbc,&rot); if (FAILED(res))

1 0

Nikolay Sivov : ole32: Handle some failures in Inverse() for composite moniker (PVS-Studio).
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 24dce2b2295ed660d6c3408aedaf44183369eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=24dce2b2295ed660d6c3408ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:47:55 2015 +0300 ole32: Handle some failures in Inverse() for composite moniker (PVS-Studio). --- dlls/ole32/compositemoniker.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 40d3568..faadca1 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -778,9 +778,16 @@ CompositeMonikerImpl_Inverse(IMoniker* iface,IMoniker** ppmk) /* This method returns a composite moniker that consists of the inverses of each of the components */ /* of the original composite, stored in reverse order */ + *ppmk = NULL; + res=CreateAntiMoniker(&antiMk); - res=IMoniker_ComposeWith(iface,antiMk,0,&tempMk); + if (FAILED(res)) + return res; + + res=IMoniker_ComposeWith(iface,antiMk,FALSE,&tempMk); IMoniker_Release(antiMk); + if (FAILED(res)) + return res; if (tempMk==NULL)

1 0

Nikolay Sivov : ole32: Handle Stat() failure in OleLoad() (PVS-Studio).
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 0e24c33332ce560033795cf831a2d87c41625a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e24c33332ce560033795cf83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 13 11:52:27 2015 +0300 ole32: Handle Stat() failure in OleLoad() (PVS-Studio). --- dlls/ole32/ole2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index b9cc1f0..38b23dc 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -1279,6 +1279,8 @@ HRESULT WINAPI OleLoad( * Get the class ID for the object. */ hres = IStorage_Stat(pStg, &storageInfo, STATFLAG_NONAME); + if (FAILED(hres)) + return hres; /* * Now, try and create the handler for the object

1 0

Piotr Caban : gdiplus/tests: Add gif frames composition tests.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: a3822f973e0d1f71f69ce89492e30c7cc6155cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3822f973e0d1f71f69ce8949… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:46 2015 +0100 gdiplus/tests: Add gif frames composition tests. --- dlls/gdiplus/tests/image.c | 95 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index f33cb90..cc8ae2d 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2423,6 +2423,51 @@ static const unsigned char gifanimation[72] = { 0x00,0x00,0x02,0x02,0x44,0x01,0x00,0x3b }; +/* Generated with ImageMagick: + * convert -transparent black -delay 100 -size 8x2 xc:black \ + * -dispose none -page +0+0 -size 2x2 xc:red \ + * -dispose background -page +2+0 -size 2x2 xc:blue \ + * -dispose previous -page +4+0 -size 2x2 xc:green \ + * -dispose undefined -page +6+0 -size 2x2 xc:gray \ + * test.gif + */ +static const unsigned char gifanimation2[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, + 0x02, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, + 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, + 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, + 0x30, 0x03, 0x01, 0x00, 0x00, 0x00, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x04, 0x84, 0x8f, 0x09, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x04, 0x64, 0x00, 0x00, 0x00, 0x2c, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x08, 0x64, + 0x00, 0x00, 0x00, 0x2c, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x81, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x02, 0x03, 0x44, 0x34, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x0c, 0x64, 0x00, 0x00, 0x00, 0x2c, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x80, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x00, 0x64, + 0x00, 0x00, 0x00, 0x2c, 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x80, 0x7e, 0x7e, 0x7e, + 0x00, 0x00, 0x00, 0x02, 0x02, 0x84, 0x51, 0x00, + 0x3b +}; + +static ARGB gifanimation2_pixels[5][4] = { + {0, 0, 0, 0}, + {0xffff0000, 0, 0, 0}, + {0xffff0000, 0xff0000ff, 0, 0}, + {0xffff0000, 0, 0xff008000, 0}, + {0xffff0000, 0, 0, 0xff7e7e7e} +}; + static void test_multiframegif(void) { LPSTREAM stream; @@ -2435,7 +2480,7 @@ static void test_multiframegif(void) UINT count; GUID dimension; PixelFormat pixel_format; - INT palette_size; + INT palette_size, i, j; /* Test frame functions with an animated GIF */ hglob = GlobalAlloc (0, sizeof(gifanimation)); @@ -2575,6 +2620,54 @@ static void test_multiframegif(void) GdipDisposeImage((GpImage*)bmp); IStream_Release(stream); + + /* Test frame dispose methods */ + hglob = GlobalAlloc (0, sizeof(gifanimation2)); + data = GlobalLock (hglob); + memcpy(data, gifanimation2, sizeof(gifanimation2)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok(stat == Ok, "Failed to create a Bitmap\n"); + IStream_Release(stream); + + stat = GdipImageGetFrameDimensionsList((GpImage*)bmp, &dimension, 1); + expect(Ok, stat); + expect_guid(&FrameDimensionTime, &dimension, __LINE__, FALSE); + + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + expect(Ok, stat); + expect(5, count); + + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 3); + stat = GdipBitmapGetPixel(bmp, 2, 0, &color); + expect(Ok, stat); + ok(color==0 || broken(color==0xff0000ff), "color = %x\n", color); + if(color != 0) { + win_skip("broken animated gif support\n"); + GdipDisposeImage((GpImage*)bmp); + return; + } + + for(i=0; i<6; i++) { + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, i%5); + expect(Ok, stat); + + for(j=0; j<4; j++) { + stat = GdipBitmapGetPixel(bmp, j*2, 0, &color); + expect(Ok, stat); + ok(gifanimation2_pixels[i%5][j] == color, "at %d,%d got %x, expected %x\n", i, j, color, gifanimation2_pixels[i%5][j]); + } + } + + GdipDisposeImage((GpImage*)bmp); } static void test_rotateflip(void)

1 0

Piotr Caban : windowscodecs: Show that WIC doesn' t do GIF frames composition.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 02d4c6b5acf58900811d5ffc6e38f4d0616a7142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d4c6b5acf58900811d5ffc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:18:51 2015 +0100 windowscodecs: Show that WIC doesn't do GIF frames composition. --- dlls/windowscodecs/tests/gifformat.c | 72 ++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 863a91f..5b4cd8bc 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -57,6 +57,27 @@ static const char gif_local_palette[] = { 0x02,0x02,0x44,0x01,0x00,0x3b }; +/* Generated with ImageMagick: + * convert -delay 100 -size 2x2 xc:red \ + * -dispose none -page +0+0 -size 2x1 xc:white \ + * test.gif + */ +static const char gif_frame_sizes[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x02, 0x00, + 0x02, 0x00, 0xf1, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, + 0x00, 0x21, 0xf9, 0x04, 0x00, 0x64, 0x00, 0x00, + 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, 0x54, 0x53, + 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, 0x30, 0x03, + 0x01, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, + 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x03, + 0x44, 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x04, + 0x64, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, + 0x00, 0x02, 0x00, 0x01, 0x00, 0x80, 0xff, 0xff, + 0xff, 0x00, 0x00, 0x00, 0x02, 0x02, 0x04, 0x0a, + 0x00, 0x3b +}; + static IWICImagingFactory *factory; static IWICBitmapDecoder *create_decoder(const void *image_data, UINT image_size) @@ -332,6 +353,55 @@ static void test_local_gif_palette(void) IWICBitmapDecoder_Release(decoder); } +static void test_gif_frame_sizes(void) +{ + static const BYTE frame0[] = {0, 1, 0xfe, 0xfe, 2, 3, 0xfe, 0xfe}; + static const BYTE frame1[] = {0, 0, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe}; + + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT width, height; + BYTE buf[8]; + HRESULT hr; + + decoder = create_decoder(gif_frame_sizes, sizeof(gif_frame_sizes)); + ok(decoder != 0, "Failed to load GIF image data\n"); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %x\n", hr); + ok(width == 2, "width = %d\n", width); + ok(height == 2, "height = %d\n", height); + + memset(buf, 0xfe, sizeof(buf)); + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 4, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %x\n", hr); + ok(!memcmp(buf, frame0, sizeof(buf)), "buf = %x %x %x %x %x %x %x %x\n", + buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); + + IWICBitmapFrameDecode_Release(frame); + + hr = IWICBitmapDecoder_GetFrame(decoder, 1, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %x\n", hr); + ok(width == 2, "width = %d\n", width); + ok(height == 1, "height = %d\n", height); + + memset(buf, 0xfe, sizeof(buf)); + hr = IWICBitmapFrameDecode_CopyPixels(frame, NULL, 4, sizeof(buf), buf); + ok(hr == S_OK, "CopyPixels error %x\n", hr); + ok(!memcmp(buf, frame1, sizeof(buf)), "buf = %x %x %x %x %x %x %x %x\n", + buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6], buf[7]); + + IWICBitmapFrameDecode_Release(frame); + + IWICBitmapDecoder_Release(decoder); +} + START_TEST(gifformat) { HRESULT hr; @@ -345,6 +415,7 @@ START_TEST(gifformat) test_global_gif_palette(); test_global_gif_palette_2frames(); test_local_gif_palette(); + test_gif_frame_sizes(); IWICImagingFactory_Release(factory); CoUninitialize(); @@ -356,6 +427,7 @@ START_TEST(gifformat) test_global_gif_palette(); test_global_gif_palette_2frames(); test_local_gif_palette(); + test_gif_frame_sizes(); IWICImagingFactory_Release(factory); }

1 0

Piotr Caban : gdiplus: Add pixel format test for transparent non-animated gif.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 3ece08ff4d3ee3f1ed2067ad53b77e8bc00f81e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ece08ff4d3ee3f1ed2067ad5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:19:05 2015 +0100 gdiplus: Add pixel format test for transparent non-animated gif. --- dlls/gdiplus/tests/image.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cc8ae2d..91f70b5 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -1335,6 +1335,12 @@ static const unsigned char gifimage[35] = { 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b }; +/* 1x1 pixel transparent gif */ +static const unsigned char transparentgif[] = { +0x47,0x49,0x46,0x38,0x39,0x61,0x01,0x00,0x01,0x00,0xf0,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x21,0xf9,0x04,0x01,0x00,0x00,0x00,0x00,0x2c,0x00,0x00,0x00,0x00, +0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44,0x01,0x00,0x3b +}; /* 1x1 pixel bmp */ static const unsigned char bmpimage[66] = { 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, @@ -2621,6 +2627,30 @@ static void test_multiframegif(void) GdipDisposeImage((GpImage*)bmp); IStream_Release(stream); + /* Test with a non-animated transparent gif */ + hglob = GlobalAlloc (0, sizeof(transparentgif)); + data = GlobalLock (hglob); + memcpy(data, transparentgif, sizeof(transparentgif)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + IStream_Release(stream); + ok(stat == Ok, "Failed to create a Bitmap\n"); + + stat = GdipGetImagePixelFormat((GpImage*)bmp, &pixel_format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, pixel_format); + + count = 12345; + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + expect(Ok, stat); + expect(1, count); + + GdipDisposeImage((GpImage*)bmp); + /* Test frame dispose methods */ hglob = GlobalAlloc (0, sizeof(gifanimation2)); data = GlobalLock (hglob);

1 0

Jacek Caban : user32: Allow making window visible by WM_SETREDRAW message.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: da72de967b4fab1a823229f525e5739aed76516d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da72de967b4fab1a823229f52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 5 14:20:51 2015 +0100 user32: Allow making window visible by WM_SETREDRAW message. --- dlls/user32/win.c | 7 ++----- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0516193..8ff3ebd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -774,10 +774,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) if (ok && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) { - /* Some apps try to make their window visible through WM_SETREDRAW. - * Only do that if the window was never explicitly hidden, - * because Steam messes with WM_SETREDRAW after hiding its windows. */ - made_visible = !(win->flags & WIN_HIDDEN) && (style.styleNew & WS_VISIBLE); + made_visible = (style.styleNew & WS_VISIBLE) != 0; invalidate_dce( win, NULL ); } WIN_ReleasePtr( win ); @@ -2499,7 +2496,7 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED))) { - made_visible = !(wndPtr->flags & WIN_HIDDEN) && (wndPtr->dwStyle & WS_VISIBLE); + made_visible = (wndPtr->dwStyle & WS_VISIBLE) != 0; invalidate_dce( wndPtr, NULL ); } WIN_ReleasePtr( wndPtr ); diff --git a/dlls/user32/win.h b/dlls/user32/win.h index a19ebe9..a182778 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -76,7 +76,6 @@ typedef struct tagWND #define WIN_ISUNICODE 0x0010 /* Window is Unicode */ #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ -#define WIN_HIDDEN 0x0080 /* hidden by an explicit SWP_HIDEWINDOW (as opposed to WM_SETREDRAW) */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 12d3ffa..f92a3dc 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1923,9 +1923,6 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) parent = GetAncestor( winpos->hwnd, GA_PARENT ); if (!IsWindowVisible( parent )) winpos->flags |= SWP_NOREDRAW; - if (winpos->flags & SWP_HIDEWINDOW) wndPtr->flags |= WIN_HIDDEN; - else if (winpos->flags & SWP_SHOWWINDOW) wndPtr->flags &= ~WIN_HIDDEN; - if (wndPtr->dwStyle & WS_VISIBLE) winpos->flags &= ~SWP_SHOWWINDOW; else {

1 0

Sebastian Lackner : wine.inf: Add some LicenseInformation registry values.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: dc0f544d6718589a6725d68d69132f897f45cdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0f544d6718589a6725d68d6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 11 02:14:54 2015 +0100 wine.inf: Add some LicenseInformation registry values. On Windows all the license information key/value pairs are stored in a single registry blob. The format is not properly documented, and unless we have some apps which expect it, there should be no need to spend too much time to figure out the internal details. --- loader/wine.inf.in | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a4548f2..3c401b1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -47,7 +47,8 @@ AddReg=\ Services, \ SessionMgr,\ Tapi,\ - Timezones + Timezones,\ + LicenseInformation [DefaultInstall.NT] RegisterDlls=RegisterDllsSection @@ -71,7 +72,8 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - VersionInfo + VersionInfo,\ + LicenseInformation [DefaultInstall.ntamd64] RegisterDlls=RegisterDllsSection @@ -97,7 +99,8 @@ AddReg=\ SessionMgr,\ Tapi,\ Timezones,\ - VersionInfo.ntamd64 + VersionInfo.ntamd64,\ + LicenseInformation [Wow64Install] RegisterDlls=RegisterDllsSection @@ -111,7 +114,8 @@ AddReg=\ MCI,\ Misc,\ Tapi,\ - VersionInfo.ntamd64 + VersionInfo.ntamd64,\ + LicenseInformation [DefaultInstall.Services] AddService=BITS,0,BITSService @@ -3140,3 +3144,17 @@ HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Time Zones,"Symbol HKLM,Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Time Zones,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Time Zones" HKLM,Software\Wow6432Node\Policies,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Policies" HKLM,Software\Wow6432Node\Registered Applications,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Registered Applications" + +[LicenseInformation] +; based on information from http://www.geoffchappell.com/notes/windows/license/install.htm +HKLM,Software\Wine\LicenseInformation,"Kernel-MUI-Language-Allowed",,"EMPTY" +HKLM,Software\Wine\LicenseInformation,"Kernel-MUI-Language-Disallowed",,"EMPTY" +HKLM,Software\Wine\LicenseInformation,"Kernel-MUI-Number-Allowed",0x10001,1000 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-FreeCell-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Hearts-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Minesweeper-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-PurblePlace-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Shanghai-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-Solitaire-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-InBoxGames-SpiderSolitaire-EnableGame",0x10001,0x00000001 +HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame",0x10001,0x00000001

1 0

Sebastian Lackner : ntdll: Implement [Nt|Zw]QueryLicenseValue.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 2daca626d4ba4f0ba5a28ee02bf5c94ecce7282a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daca626d4ba4f0ba5a28ee02… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 22 20:01:29 2014 +0100 ntdll: Implement [Nt|Zw]QueryLicenseValue. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/reg.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/reg.c | 2 +- include/winternl.h | 1 + 4 files changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9355d04..c3307b2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -255,6 +255,7 @@ @ stub NtQueryIntervalProfile @ stdcall NtQueryIoCompletion(long long ptr long ptr) @ stdcall NtQueryKey (long long ptr long ptr) +@ stdcall NtQueryLicenseValue(ptr ptr ptr long ptr) @ stdcall NtQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall NtQueryMutant(long long ptr long ptr) @ stdcall NtQueryObject(long long long long long) @@ -1134,6 +1135,7 @@ @ stub ZwQueryIntervalProfile @ stdcall ZwQueryIoCompletion(long long ptr long ptr) NtQueryIoCompletion @ stdcall ZwQueryKey(long long ptr long ptr) NtQueryKey +@ stdcall ZwQueryLicenseValue(ptr ptr ptr long ptr) NtQueryLicenseValue @ stdcall ZwQueryMultipleValueKey(long ptr long ptr long ptr) NtQueryMultipleValueKey @ stdcall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall ZwQueryObject(long long long long long) NtQueryObject diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index cdca88a..a104c2e 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1401,3 +1401,67 @@ NTSTATUS WINAPI RtlWriteRegistryValue( ULONG RelativeTo, PCWSTR path, PCWSTR nam return status; } + +/************************************************************************* + * NtQueryLicenseValue [NTDLL.@] + * + * NOTES + * On Windows all license properties are stored in a single key, but + * unless there is some app which explicitly depends on that, there is + * no good reason to reproduce that. + */ +NTSTATUS WINAPI NtQueryLicenseValue( const UNICODE_STRING *name, ULONG *result_type, + PVOID data, ULONG length, ULONG *result_len ) +{ + static const WCHAR LicenseInformationW[] = {'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','L','i','c','e','n','s','e', + 'I','n','f','o','r','m','a','t','i','o','n',0}; + KEY_VALUE_PARTIAL_INFORMATION *info; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + DWORD info_length, count; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING keyW; + HANDLE hkey; + + if (!name || !name->Buffer || !name->Length || !result_len) + return STATUS_INVALID_PARAMETER; + + info_length = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + length; + info = RtlAllocateHeap( GetProcessHeap(), 0, info_length ); + if (!info) return STATUS_NO_MEMORY; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &keyW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &keyW, LicenseInformationW ); + + /* @@ Wine registry key: HKLM\Software\Wine\LicenseInformation */ + if (!NtOpenKey( &hkey, KEY_READ, &attr )) + { + status = NtQueryValueKey( hkey, name, KeyValuePartialInformation, + info, info_length, &count ); + if (!status || status == STATUS_BUFFER_OVERFLOW) + { + if (result_type) + *result_type = info->Type; + + *result_len = info->DataLength; + + if (status == STATUS_BUFFER_OVERFLOW) + status = STATUS_BUFFER_TOO_SMALL; + else + memcpy( data, info->Data, info->DataLength ); + } + NtClose( hkey ); + } + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + FIXME( "License key %s not found\n", debugstr_w(name->Buffer) ); + + RtlFreeHeap( GetProcessHeap(), 0, info ); + return status; +} diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 4628f16..691a6b7 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -661,7 +661,7 @@ static void test_NtQueryLicenseKey(void) if (!pNtQueryLicenseValue) { - skip("NtQueryLicenseValue not found, skipping tests\n"); + win_skip("NtQueryLicenseValue not found, skipping tests\n"); return; } diff --git a/include/winternl.h b/include/winternl.h index 3992309..6dc8c74 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2189,6 +2189,7 @@ NTSYSAPI NTSTATUS WINAPI NtQuerySystemTime(PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtQueryTimer(HANDLE,TIMER_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryTimerResolution(PULONG,PULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryValueKey(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); +NTSYSAPI NTSTATUS WINAPI NtQueryLicenseValue(const UNICODE_STRING *,ULONG *,PVOID,ULONG,ULONG *); NTSYSAPI NTSTATUS WINAPI NtQueryVirtualMemory(HANDLE,LPCVOID,MEMORY_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtQueryVolumeInformationFile(HANDLE,PIO_STATUS_BLOCK,PVOID,ULONG,FS_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI NtRaiseException(PEXCEPTION_RECORD,PCONTEXT,BOOL);

1 0

Sebastian Lackner : slc: Implement SLGetWindowsInformationDWORD.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 731007886034dfd46dba3a006cd0c7790d091dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731007886034dfd46dba3a006… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 22 20:27:07 2014 +0100 slc: Implement SLGetWindowsInformationDWORD. --- dlls/slc/slc.c | 24 ++++++++++++++++++++++-- dlls/slc/tests/slc.c | 6 ------ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index 1b02c9b..a0d8999 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -19,8 +19,11 @@ #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" #include "slpublic.h" @@ -37,9 +40,26 @@ HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) { - FIXME("(%s) stub\n", debugstr_w(lpszValueName) ); + UNICODE_STRING nameW; + NTSTATUS status; + ULONG type, len; - return SL_E_RIGHT_NOT_GRANTED; + TRACE("(%s)\n", debugstr_w(lpszValueName) ); + + if (!lpszValueName || !pdwValue) + return E_INVALIDARG; + if (!lpszValueName[0]) + return SL_E_RIGHT_NOT_GRANTED; + + RtlInitUnicodeString( &nameW, lpszValueName ); + status = NtQueryLicenseValue( &nameW, &type, pdwValue, sizeof(DWORD), &len ); + + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + return SL_E_VALUE_NOT_FOUND; + if ((!status || status == STATUS_BUFFER_TOO_SMALL) && (type != REG_DWORD)) + return SL_E_DATATYPE_MISMATCHED; + + return status ? E_FAIL : S_OK; } /*********************************************************************** diff --git a/dlls/slc/tests/slc.c b/dlls/slc/tests/slc.c index 723cd4c..b9296b2 100644 --- a/dlls/slc/tests/slc.c +++ b/dlls/slc/tests/slc.c @@ -40,16 +40,13 @@ static void test_SLGetWindowsInformationDWORD(void) HRESULT res; res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, NULL); - todo_wine ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); res = SLGetWindowsInformationDWORD(NULL, &value); - todo_wine ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, &value); - todo_wine ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); @@ -61,15 +58,12 @@ static void test_SLGetWindowsInformationDWORD(void) value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(KernelMUILanguageAllowedW, &value); - todo_wine ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); value = 0xdeadbeef; res = SLGetWindowsInformationDWORD(KernelMUINumberAllowedW, &value); - todo_wine ok(res == S_OK, "expected S_OK, got %u\n", res); - todo_wine ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); }

1 0