wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Vincent Povirk : gdiplus: Add test for image palette functions.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 01c26d14166b3102332c41a42e9094fb4fefa559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c26d14166b3102332c41a42… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 15:55:01 2009 -0600 gdiplus: Add test for image palette functions. --- dlls/gdiplus/tests/image.c | 174 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index cd761bd..1ef2651 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -876,6 +876,179 @@ static void test_getsetpixel(void) expect(Ok, stat); } +static void check_halftone_palette(ColorPalette *palette) +{ + static const BYTE halftone_values[6]={0x00,0x33,0x66,0x99,0xcc,0xff}; + UINT i; + + for (i=0; i<palette->Count; i++) + { + ARGB expected=0xff000000; + if (i<8) + { + if (i&1) expected |= 0x800000; + if (i&2) expected |= 0x8000; + if (i&4) expected |= 0x80; + } + else if (i == 8) + { + expected = 0xffc0c0c0; + } + else if (i < 16) + { + if (i&1) expected |= 0xff0000; + if (i&2) expected |= 0xff00; + if (i&4) expected |= 0xff; + } + else if (i < 40) + { + expected = 0x00000000; + } + else + { + expected |= halftone_values[(i-40)%6]; + expected |= halftone_values[((i-40)/6)%6] << 8; + expected |= halftone_values[((i-40)/36)%6] << 16; + } + ok(expected == palette->Entries[i], "Expected %.8x, got %.8x, i=%u/%u\n", + expected, palette->Entries[i], i, palette->Count); + } +} + +static void test_palette(void) +{ + GpStatus stat; + GpBitmap *bitmap; + INT size; + BYTE buffer[1040]; + ColorPalette *palette=(ColorPalette*)buffer; + + /* test initial palette from non-indexed bitmap */ + stat = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat32bppRGB, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB), size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(0, palette->Count); + + /* test setting palette on not-indexed bitmap */ + palette->Count = 3; + + stat = GdipSetImagePalette((GpImage*)bitmap, palette); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*3, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(3, palette->Count); + + GdipDisposeImage((GpImage*)bitmap); + + /* test initial palette on 1-bit bitmap */ + stat = GdipCreateBitmapFromScan0(2, 2, 4, PixelFormat1bppIndexed, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*2, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(PaletteFlagsGrayScale, palette->Flags); + expect(2, palette->Count); + + expect(0xff000000, palette->Entries[0]); + expect(0xffffffff, palette->Entries[1]); + + GdipDisposeImage((GpImage*)bitmap); + + /* test initial palette on 4-bit bitmap */ + stat = GdipCreateBitmapFromScan0(2, 2, 4, PixelFormat4bppIndexed, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*16, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(0, palette->Flags); + expect(16, palette->Count); + + check_halftone_palette(palette); + + GdipDisposeImage((GpImage*)bitmap); + + /* test initial palette on 8-bit bitmap */ + stat = GdipCreateBitmapFromScan0(2, 2, 8, PixelFormat8bppIndexed, NULL, &bitmap); + expect(Ok, stat); + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*256, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(PaletteFlagsHalftone, palette->Flags); + expect(256, palette->Count); + + check_halftone_palette(palette); + + /* test setting/getting a different palette */ + palette->Entries[1] = 0xffcccccc; + + stat = GdipSetImagePalette((GpImage*)bitmap, palette); + expect(Ok, stat); + + palette->Entries[1] = 0; + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*256, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(PaletteFlagsHalftone, palette->Flags); + expect(256, palette->Count); + expect(0xffcccccc, palette->Entries[1]); + + /* test count < 256 */ + palette->Flags = 12345; + palette->Count = 3; + + stat = GdipSetImagePalette((GpImage*)bitmap, palette); + expect(Ok, stat); + + palette->Entries[1] = 0; + palette->Entries[3] = 0xdeadbeef; + + stat = GdipGetImagePaletteSize((GpImage*)bitmap, &size); + expect(Ok, stat); + expect(sizeof(UINT)*2+sizeof(ARGB)*3, size); + + stat = GdipGetImagePalette((GpImage*)bitmap, palette, size); + expect(Ok, stat); + expect(12345, palette->Flags); + expect(3, palette->Count); + expect(0xffcccccc, palette->Entries[1]); + expect(0xdeadbeef, palette->Entries[3]); + + /* test count > 256 */ + palette->Count = 257; + + stat = GdipSetImagePalette((GpImage*)bitmap, palette); + expect(InvalidParameter, stat); + + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -903,6 +1076,7 @@ START_TEST(image) test_getrawformat(); test_createhbitmap(); test_getsetpixel(); + test_palette(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Initialize the palettes of new indexed bitmaps.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 6c040271c16a8d29eee0f8456e40f48f875aa2ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c040271c16a8d29eee0f8456… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 17:16:21 2009 -0600 gdiplus: Initialize the palettes of new indexed bitmaps. --- dlls/gdiplus/image.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 982956c..f78b70a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1134,6 +1134,44 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) return Ok; } +static void generate_halftone_palette(ARGB *entries, UINT count) +{ + static const BYTE halftone_values[6]={0x00,0x33,0x66,0x99,0xcc,0xff}; + UINT i; + + for (i=0; i<8 && i<count; i++) + { + entries[i] = 0xff000000; + if (i&1) entries[i] |= 0x800000; + if (i&2) entries[i] |= 0x8000; + if (i&4) entries[i] |= 0x80; + } + + if (8 < count) + entries[i] = 0xffc0c0c0; + + for (i=9; i<16 && i<count; i++) + { + entries[i] = 0xff000000; + if (i&1) entries[i] |= 0xff0000; + if (i&2) entries[i] |= 0xff00; + if (i&4) entries[i] |= 0xff; + } + + for (i=16; i<40 && i<count; i++) + { + entries[i] = 0; + } + + for (i=40; i<256 && i<count; i++) + { + entries[i] = 0xff000000; + entries[i] |= halftone_values[(i-40)%6]; + entries[i] |= halftone_values[((i-40)/6)%6] << 8; + entries[i] |= halftone_values[((i-40)/36)%6] << 16; + } +} + GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { @@ -1214,6 +1252,36 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->bits = bits; (*bitmap)->stride = dib_stride; + if (format == PixelFormat1bppIndexed || + format == PixelFormat4bppIndexed || + format == PixelFormat8bppIndexed) + { + (*bitmap)->image.palette_size = (*bitmap)->image.palette_count = 1 << PIXELFORMATBPP(format); + (*bitmap)->image.palette_entries = GdipAlloc(sizeof(ARGB) * ((*bitmap)->image.palette_size)); + + if (!(*bitmap)->image.palette_entries) + { + GdipDisposeImage(&(*bitmap)->image); + *bitmap = NULL; + return OutOfMemory; + } + + if (format == PixelFormat1bppIndexed) + { + (*bitmap)->image.palette_flags = PaletteFlagsGrayScale; + (*bitmap)->image.palette_entries[0] = 0xff000000; + (*bitmap)->image.palette_entries[1] = 0xffffffff; + } + else + { + if (format == PixelFormat8bppIndexed) + (*bitmap)->image.palette_flags = PaletteFlagsHalftone; + + generate_halftone_palette((*bitmap)->image.palette_entries, + (*bitmap)->image.palette_count); + } + } + return Ok; }

1 0

Vincent Povirk : gdiplus: Implement GdipGetImagePalette.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 9615dd8fdba958150dd7d3ea05eb8ae97c55bed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9615dd8fdba958150dd7d3ea0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 17:00:19 2009 -0600 gdiplus: Implement GdipGetImagePalette. --- dlls/gdiplus/image.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 74c3f11..982956c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2242,15 +2242,22 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, */ GpStatus WINGDIPAPI GdipGetImagePalette(GpImage *image, ColorPalette *palette, INT size) { - static int calls = 0; + TRACE("(%p,%p,%i)\n", image, palette, size); - if(!image) + if (!image || !palette) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (size < (sizeof(UINT)*2+sizeof(ARGB)*image->palette_count)) + { + TRACE("<-- InsufficientBuffer\n"); + return InsufficientBuffer; + } - return NotImplemented; + palette->Flags = image->palette_flags; + palette->Count = image->palette_count; + memcpy(palette->Entries, image->palette_entries, sizeof(ARGB)*image->palette_count); + + return Ok; } /*****************************************************************************

1 0

Vincent Povirk : gdiplus: Implement GdipGetImagePaletteSize.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 59f45f2cbb2e3bc0006f697c3c1cddd7b41a9739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f45f2cbb2e3bc0006f697c3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 16:56:08 2009 -0600 gdiplus: Implement GdipGetImagePaletteSize. --- dlls/gdiplus/image.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 340f2e6..74c3f11 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1465,12 +1465,19 @@ GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage *image, REAL *res) GpStatus WINGDIPAPI GdipGetImagePaletteSize(GpImage *image, INT *size) { - FIXME("%p %p\n", image, size); + TRACE("%p %p\n", image, size); if(!image || !size) return InvalidParameter; - return NotImplemented; + if (image->palette_count == 0) + *size = sizeof(ColorPalette); + else + *size = sizeof(UINT)*2 + sizeof(ARGB)*image->palette_count; + + TRACE("<-- %u\n", *size); + + return Ok; } /* FIXME: test this function for non-bitmap types */

1 0

Vincent Povirk : gdiplus: Implement GdipSetImagePalette.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 39dc81cc809b4a8bff19e5d166432d31c31a5183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dc81cc809b4a8bff19e5d16… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 16:51:46 2009 -0600 gdiplus: Implement GdipSetImagePalette. --- dlls/gdiplus/gdiplus_private.h | 4 ++++ dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/image.c | 32 +++++++++++++++++++++++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index dfff66c..0ceeb6e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -213,6 +213,10 @@ struct GpImage{ ImageType type; GUID format; UINT flags; + UINT palette_flags; + UINT palette_count; + UINT palette_size; + ARGB *palette_entries; }; struct GpMetafile{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index df107e4..80ef463 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1256,6 +1256,10 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, (*metafile)->image.type = ImageTypeMetafile; memcpy(&(*metafile)->image.format, &ImageFormatWMF, sizeof(GUID)); + (*metafile)->image.palette_flags = 0; + (*metafile)->image.palette_count = 0; + (*metafile)->image.palette_size = 0; + (*metafile)->image.palette_entries = NULL; (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Right) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 73a6bd6..340f2e6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1201,6 +1201,10 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->image.type = ImageTypeBitmap; memcpy(&(*bitmap)->image.format, &ImageFormatMemoryBMP, sizeof(GUID)); (*bitmap)->image.flags = ImageFlagsNone; + (*bitmap)->image.palette_flags = 0; + (*bitmap)->image.palette_count = 0; + (*bitmap)->image.palette_size = 0; + (*bitmap)->image.palette_entries = NULL; (*bitmap)->width = width; (*bitmap)->height = height; (*bitmap)->format = format; @@ -1318,6 +1322,7 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) GdipFree(((GpBitmap*)image)->bitmapbits); DeleteDC(((GpBitmap*)image)->hdc); } + GdipFree(image->palette_entries); GdipFree(image); return Ok; @@ -1891,6 +1896,10 @@ static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid (*image)->type = ImageTypeMetafile; (*image)->picture = pic; (*image)->flags = ImageFlagsNone; + (*image)->palette_flags = 0; + (*image)->palette_count = 0; + (*image)->palette_size = 0; + (*image)->palette_entries = NULL; return Ok; } @@ -2243,15 +2252,28 @@ GpStatus WINGDIPAPI GdipGetImagePalette(GpImage *image, ColorPalette *palette, I GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, GDIPCONST ColorPalette *palette) { - static int calls; + TRACE("(%p,%p)\n", image, palette); - if(!image || !palette) + if(!image || !palette || palette->Count > 256) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + if (palette->Count > image->palette_size) + { + ARGB *new_palette; - return NotImplemented; + new_palette = GdipAlloc(sizeof(ARGB) * palette->Count); + if (!new_palette) return OutOfMemory; + + GdipFree(image->palette_entries); + image->palette_entries = new_palette; + image->palette_size = palette->Count; + } + + image->palette_flags = palette->Flags; + image->palette_count = palette->Count; + memcpy(image->palette_entries, palette->Entries, sizeof(ARGB)*palette->Count); + + return Ok; } /*************************************************************************

1 0

Vincent Povirk : include: Add PaletteFlags enumeration.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: a5b9cbfffcf886fbf16bbdcb8b1e59c0813ad2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b9cbfffcf886fbf16bbdcb8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 17:19:53 2009 -0600 include: Add PaletteFlags enumeration. --- include/gdiplusenums.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 9997bf1..d472fd8 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -291,6 +291,13 @@ enum HotkeyPrefix HotkeyPrefixHide = 2 }; +enum PaletteFlags +{ + PaletteFlagsHasAlpha = 1, + PaletteFlagsGrayScale = 2, + PaletteFlagsHalftone = 4 +}; + enum ImageCodecFlags { ImageCodecFlagsEncoder = 1, @@ -455,6 +462,7 @@ typedef enum FontStyle FontStyle; typedef enum StringFormatFlags StringFormatFlags; typedef enum HotkeyPrefix HotkeyPrefix; typedef enum PenAlignment GpPenAlignment; +typedef enum PaletteFlags PaletteFlags; typedef enum ImageCodecFlags ImageCodecFlags; typedef enum CombineMode CombineMode; typedef enum FlushIntention FlushIntention;

1 0

Juan Lang : winhttp/tests: Skip secure connection tests if the request fails.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: c02ee1886924809039b5d38a3e2e0ecb33f98cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c02ee1886924809039b5d38a3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 14:10:27 2009 -0800 winhttp/tests: Skip secure connection tests if the request fails. --- dlls/winhttp/tests/winhttp.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 342dde2..d9966ea 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -783,6 +783,11 @@ static void test_secure_connection(void) ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); + if (!ret) + { + skip("secure connection failed, skipping remaining secure tests\n"); + goto cleanup; + } size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); @@ -806,6 +811,7 @@ static void test_secure_connection(void) ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, NULL, &size, NULL); ok(!ret, "succeeded unexpectedly\n"); +cleanup: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses);

1 0

Juan Lang : winhttp: Don't call a function whose result is never used.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 72025026db9e3802e6b23850110d89641f31b99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=72025026db9e3802e6b238501… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 11 14:07:43 2009 -0800 winhttp: Don't call a function whose result is never used. --- dlls/winhttp/net.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 034b229..df6b9d9 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -118,7 +118,6 @@ MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( SSL_CTX_set_verify ); -MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); MAKE_FUNCPTR( CRYPTO_set_id_callback ); MAKE_FUNCPTR( CRYPTO_set_locking_callback ); @@ -439,7 +438,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); \ return FALSE; \ } - LOAD_FUNCPTR( BIO_new_fp ); LOAD_FUNCPTR( CRYPTO_num_locks ); LOAD_FUNCPTR( CRYPTO_set_id_callback ); LOAD_FUNCPTR( CRYPTO_set_locking_callback ); @@ -454,7 +452,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) pSSL_library_init(); pSSL_load_error_strings(); - pBIO_new_fp( stderr, BIO_NOCLOSE ); method = pSSLv23_method(); ctx = pSSL_CTX_new( method );

1 0

Aric Stewart : shlwapi: Beginning implementation of IUnknown_QueryServiceForWebBrowserApp.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 0cdd4722fa138e44a80228097d696e2c7b51a804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cdd4722fa138e44a80228097… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 11 15:44:10 2009 -0600 shlwapi: Beginning implementation of IUnknown_QueryServiceForWebBrowserApp. --- dlls/shlwapi/ordinal.c | 24 ++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index f127ca1..223e4a8 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4728,3 +4728,27 @@ INT WINAPI SHVerbExistsNA(LPSTR verb, PVOID pUnknown, PVOID pUnknown2, DWORD dwU FIXME("(%s, %p, %p, %i) STUB\n",verb, pUnknown, pUnknown2, dwUnknown3); return 0; } + +/************************************************************************* + * @ [SHLWAPI.538] + * + * Undocumented: Implementation guessed at via Name and behavior + * + * PARAMS + * lpUnknown [I] Object to get an IServiceProvider interface from + * riid [I] Function requested for QueryService call + * lppOut [O] Destination for the service interface pointer + * + * RETURNS + * Success: S_OK. lppOut contains an object providing the requested service + * Failure: An HRESULT error code + * + * NOTES + * lpUnknown is expected to support the IServiceProvider interface. + */ +HRESULT WINAPI IUnknown_QueryServiceForWebBrowserApp(IUnknown* lpUnknown, + REFGUID riid, LPVOID *lppOut) +{ + FIXME("%p %s %p semi-STUB\n", lpUnknown, debugstr_guid(riid), lppOut); + return IUnknown_QueryService(lpUnknown,&IID_IWebBrowserApp,riid,lppOut); +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c877dd1..3a962eb 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -531,7 +531,7 @@ 535 stub -noname SHPropertyBag_Delete 536 stub -noname IUnknown_QueryServicePropertyBag 537 stub -noname SHBoolSystemParametersInfo -538 stub -noname IUnknown_QueryServiceForWebBrowserApp +538 stdcall -noname IUnknown_QueryServiceForWebBrowserApp(ptr ptr ptr) 539 stub -noname IUnknown_ShowBrowserBar 540 stub -noname SHInvokeCommandOnContextMenu 541 stub -noname SHInvokeCommandsOnContextMen

1 0

Vincent Povirk : winex11.drv: Use the old method to delete the desktop window.
by Alexandre Julliard 14 Dec '09

14 Dec '09

Module: wine Branch: master Commit: 6f9533feb112bd89c2b7dd983590682fc2dd4e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9533feb112bd89c2b7dd983… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 11 11:47:59 2009 -0600 winex11.drv: Use the old method to delete the desktop window. --- dlls/winex11.drv/event.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index e8e4522..32eb64a 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -507,6 +507,14 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (protocol == x11drv_atom(WM_DELETE_WINDOW)) { + if (hwnd == GetDesktopWindow()) + { + /* The desktop window does not have a close button that we can + * pretend to click. Therefore, we simply send it a close command. */ + SendMessageW(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + return; + } + /* Ignore the delete window request if the window has been disabled * and we are in managed mode. This is to disallow applications from * being closed by the window manager while in a modal state.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009