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

Mikołaj Zalewski : comdlg32: Move font style names to resources.
by Alexandre Julliard 11 Mar '08

11 Mar '08

Module: wine Branch: master Commit: 89c86dd99485b4031bcbb9d995f4990fe38890ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c86dd99485b4031bcbb9d99… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 10 21:36:35 2008 +0100 comdlg32: Move font style names to resources. --- dlls/comdlg32/cdlg.h | 7 +++++++ dlls/comdlg32/cdlg_En.rc | 8 ++++++++ dlls/comdlg32/cdlg_Pl.rc | 8 ++++++++ dlls/comdlg32/fontdlg.c | 18 ++++++++---------- 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index 22cd5a2..f88e2d4 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -126,6 +126,13 @@ typedef struct { #define IDS_CHARSET_ISO10 223 #define IDS_CHARSET_CELTIC 224 +/* Font styles */ + +#define IDS_FONT_REGULAR 256 +#define IDS_FONT_BOLD 257 +#define IDS_FONT_ITALIC 258 +#define IDS_FONT_BOLD_ITALIC 259 + /* Color names string IDs */ #define IDS_COLOR_BLACK 1040 diff --git a/dlls/comdlg32/cdlg_En.rc b/dlls/comdlg32/cdlg_En.rc index a9be1a9..2021448 100644 --- a/dlls/comdlg32/cdlg_En.rc +++ b/dlls/comdlg32/cdlg_En.rc @@ -443,6 +443,14 @@ Please install one and retry." PD32_PRINTER_STATUS_POWER_SAVE "Power save mode; " } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Regular" + IDS_FONT_BOLD "Bold" + IDS_FONT_ITALIC "Italic" + IDS_FONT_BOLD_ITALIC "Bold Italic" +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "Black" diff --git a/dlls/comdlg32/cdlg_Pl.rc b/dlls/comdlg32/cdlg_Pl.rc index 7376fb7..f28b00e 100644 --- a/dlls/comdlg32/cdlg_Pl.rc +++ b/dlls/comdlg32/cdlg_Pl.rc @@ -449,6 +449,14 @@ STRINGTABLE DISCARDABLE IDS_OPEN_FILE "Otw�rz plik" } +STRINGTABLE DISCARDABLE /* Font styles */ +{ + IDS_FONT_REGULAR "Regularny" + IDS_FONT_BOLD "Pogrubiony" + IDS_FONT_ITALIC "Kusywa" + IDS_FONT_BOLD_ITALIC "Pogrubiona kursywa" +} + STRINGTABLE DISCARDABLE /* Color names */ { IDS_COLOR_BLACK "Czarny" diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 899cfe4..2532f2f 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -357,17 +357,13 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf) { int italic; int weight; - const WCHAR *stname; + UINT resId; }; - static const WCHAR strRegular[] = {'R','e','g','u','l','a','r',0}; - static const WCHAR strItalic[] = {'I','t','a','l','i','c',0}; - static const WCHAR strBold[] = {'B','o','l','d',0}; - static const WCHAR strBoldItalic[] = {'B','o','l','d',' ','I','t','a','l','i','c',0}; static const struct FONTSTYLE fontstyles[FSTYLES]={ - { 0, FW_NORMAL, strRegular }, - { 1, FW_NORMAL, strItalic }, - { 0, FW_BOLD, strBold }, - { 1, FW_BOLD, strBoldItalic } + { 0, FW_NORMAL, IDS_FONT_REGULAR }, + { 1, FW_NORMAL, IDS_FONT_ITALIC }, + { 0, FW_BOLD, IDS_FONT_BOLD }, + { 1, FW_BOLD, IDS_FONT_BOLD_ITALIC } }; HFONT hf; TEXTMETRICW tm; @@ -390,7 +386,9 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf) (fontstyles[i].weight == FW_BOLD && tm.tmWeight > FW_MEDIUM)) && ((tm.tmItalic != 0)==fontstyles[i].italic)) { - j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)fontstyles[i].stname ); + WCHAR name[64]; + LoadStringW(COMDLG32_hInstance, fontstyles[i].resId, name, 64); + j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)name ); if (j==CB_ERR) return 1; j=SendMessageW(hwnd, CB_SETITEMDATA, j, MAKELONG(tm.tmWeight,fontstyles[i].italic));

1 0

Rob Shearman : urlmon: Initialise the cache_file field of DownloadBSC on creation.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 503b1bc107a549665e16ccb615704f18a3074c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503b1bc107a549665e16ccb61… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 10 19:30:20 2008 +0000 urlmon: Initialise the cache_file field of DownloadBSC on creation. --- dlls/urlmon/download.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/download.c b/dlls/urlmon/download.c index 3082dd1..d81dffa 100644 --- a/dlls/urlmon/download.c +++ b/dlls/urlmon/download.c @@ -309,6 +309,7 @@ static IBindStatusCallback *DownloadBSC_Create(IBindStatusCallback *callback, LP ret->lpServiceProviderVtbl = &ServiceProviderVtbl; ret->ref = 1; ret->file_name = heap_strdupW(file_name); + ret->cache_file = NULL; if(callback) IBindStatusCallback_AddRef(callback);

1 0

Nathan Beckmann : gdiplus: Add more sophisticated tests for GdipSaveImageToFile.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 67e811cc3c2f7e152883e5f3256ef119d9f51213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e811cc3c2f7e152883e5f32… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Mon Mar 10 08:16:57 2008 -0700 gdiplus: Add more sophisticated tests for GdipSaveImageToFile. Add a test to make sure the saved image has the same dimensions as original. Delete the test file when finished. --- dlls/gdiplus/tests/image.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 489b1a8..821d358 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -128,6 +128,8 @@ static void test_SavingImages(void) GpBitmap *bm; UINT n; UINT s; + const REAL WIDTH = 10.0, HEIGHT = 20.0; + REAL w, h; ImageCodecInfo *codecs; static const WCHAR filename[] = { 'a','.','b','m','p',0 }; @@ -137,7 +139,7 @@ static void test_SavingImages(void) expect(InvalidParameter, stat); bm = NULL; - stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, NULL, &bm); + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB, NULL, &bm); expect(Ok, stat); if (!bm) return; @@ -149,7 +151,7 @@ static void test_SavingImages(void) stat = GdipSaveImageToFile((GpImage*)bm, filename, 0, 0); expect(InvalidParameter, stat); - /* this should succeed */ + /* encoder tests should succeed -- already tested */ stat = GdipGetImageEncodersSize(&n, &s); if (stat != Ok || n == 0) goto cleanup; @@ -162,11 +164,26 @@ static void test_SavingImages(void) stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0); expect(stat, Ok); + GdipDisposeImage((GpImage*)bm); + bm = 0; + + /* re-load and check image stats */ + stat = GdipLoadImageFromFile(filename, (GpImage**)&bm); + expect(stat, Ok); + if (stat != Ok) goto cleanup; + + stat = GdipGetImageDimension((GpImage*)bm, &w, &h); + if (stat != Ok) goto cleanup; + + ok((fabs(w - WIDTH) < 0.01) && (fabs(h - HEIGHT) < 0.01), + "Saved image dimensions are different!\n"); + cleanup: if (codecs) GdipFree(codecs); if (bm) GdipDisposeImage((GpImage*)bm); + ok(DeleteFileW(filename), "Delete failed.\n"); } static void test_encoders(void)

1 0

L. Rahyen : winecfg: Make DPI interval to be the same as in Windows.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 0110512904d9c646abef416819a057c06d3f2c97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0110512904d9c646abef41681… Author: L. Rahyen <research(a)science.su> Date: Mon Mar 10 15:54:16 2008 +0000 winecfg: Make DPI interval to be the same as in Windows. --- programs/winecfg/winecfg.c | 5 +++++ programs/winecfg/x11drvdlg.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index c492a11..b21599d 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -461,6 +461,11 @@ void set_reg_key_dword(HKEY root, const char *path, const char *name, DWORD valu HeapFree(GetProcessHeap(), 0, wname); } +void set_reg_key_dwordW(HKEY root, const WCHAR *path, const WCHAR *name, DWORD value) +{ + set_reg_key_ex(root, path, name, &value, REG_DWORD); +} + /** * enumerates the value names at the given path, taking into account * the changes in the settings list. diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index d6e9912..972ca6d 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -37,10 +37,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); #define RES_MAXLEN 5 /* the maximum number of characters in a screen dimension. 5 digits should be plenty, what kind of crazy person runs their screen >10,000 pixels across? */ #define MINDPI 96 -#define MAXDPI 160 +#define MAXDPI 480 #define DEFDPI 96 -static const char logpixels_reg[] = "System\\CurrentControlSet\\Hardware Profiles\\Current\\Software\\Fonts"; +static const WCHAR logpixels_reg[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s','\\','C','u','r','r','e','n','t','\\','S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; +static const WCHAR logpixels[] = {'L','o','g','P','i','x','e','l','s',0}; static struct SHADERMODE { @@ -244,8 +245,7 @@ static void on_d3d_pshader_mode_clicked(HWND dialog) { static INT read_logpixels_reg(void) { DWORD dwLogPixels; - char *buf = get_reg_key(HKEY_LOCAL_MACHINE, logpixels_reg, - "LogPixels", NULL); + WCHAR *buf = get_reg_keyW(HKEY_LOCAL_MACHINE, logpixels_reg, logpixels, NULL); dwLogPixels = buf ? *buf : DEFDPI; HeapFree(GetProcessHeap(), 0, buf); return dwLogPixels; @@ -357,7 +357,7 @@ GraphDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) buf[0] = 0; sprintf(buf, "%d", i); SendMessage(GetDlgItem(hDlg, IDC_RES_DPIEDIT), WM_SETTEXT, 0, (LPARAM) buf); - set_reg_key_dword(HKEY_LOCAL_MACHINE, logpixels_reg, "LogPixels", i); + set_reg_key_dwordW(HKEY_LOCAL_MACHINE, logpixels_reg, logpixels, i); break; } }

1 0

Chris Robinson : quartz: Don't print errors for handled return values.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: c925e3abc83cf924eba98c11e537ed93fd0bdeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c925e3abc83cf924eba98c11e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 10 01:50:57 2008 -0700 quartz: Don't print errors for handled return values. --- dlls/quartz/acmwrapper.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b4e3274..de90b81 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -137,7 +137,8 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte unprepare_header = TRUE; if ((res = acmStreamConvert(This->has, &ash, This->reinit_codec ? ACM_STREAMCONVERTF_START : 0))) { - ERR("Cannot convert data header %d\n", res); + if(res != MMSYSERR_MOREDATA) + ERR("Cannot convert data header %d\n", res); goto error; } This->reinit_codec = FALSE; @@ -154,10 +155,11 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte else This->current_size = 0; - hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); - if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { - ERR("Error sending sample (%x)\n", hr); - goto error; + hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); + if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { + if (FAILED(hr)) + ERR("Error sending sample (%x)\n", hr); + goto error; } error:

1 0

Nathan Beckmann : gdiplus: Remove unnecessary IStream_AddRef from GdipLoadImageFromFile.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: f4b4d03a19042670182ce240ad4b5abdfcbe13b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b4d03a19042670182ce240a… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Mon Mar 10 08:16:53 2008 -0700 gdiplus: Remove unnecessary IStream_AddRef from GdipLoadImageFromFile. --- dlls/gdiplus/image.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4f05ba0..f150637 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -740,8 +740,6 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream* stream, GpImage **image) return GenericError; } - IStream_AddRef(stream); - IPicture_get_Type(pic, &type); if(type == PICTYPE_BITMAP){

1 0

Nathan Beckmann : gdiplus: Implement GdipSaveImageToFile via GdipSaveImageToStream.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 7900947ce3e1a9d7db9da2dac4d8d472e293c313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7900947ce3e1a9d7db9da2dac… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Mon Mar 10 08:16:54 2008 -0700 gdiplus: Implement GdipSaveImageToFile via GdipSaveImageToStream. Still need to implement saving the image based on the encoder parameter. Basic tests included. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 23 +++++++++++++++++++++ dlls/gdiplus/tests/image.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e306fb8..4aac0df 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -494,7 +494,7 @@ @ stub GdipSaveAdd @ stub GdipSaveAddImage @ stdcall GdipSaveGraphics(ptr ptr) -@ stub GdipSaveImageToFile +@ stdcall GdipSaveImageToFile(ptr ptr ptr ptr) @ stdcall GdipSaveImageToStream(ptr ptr ptr ptr) @ stub GdipScaleLineTransform @ stdcall GdipScaleMatrix(ptr long long long) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f150637..cf104e9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -811,6 +811,29 @@ GpStatus WINGDIPAPI GdipRemovePropertyItem(GpImage *image, PROPID propId) return NotImplemented; } +GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filename, + GDIPCONST CLSID *clsidEncoder, + GDIPCONST EncoderParameters *encoderParams) +{ + GpStatus stat; + IStream *stream; + + if (!image || !filename|| !clsidEncoder) + return InvalidParameter; + + if (!(image->picture)) + return InvalidParameter; + + stat = GdipCreateStreamOnFile(filename, GENERIC_WRITE, &stream); + if (stat != Ok) + return GenericError; + + stat = GdipSaveImageToStream(image, stream, clsidEncoder, encoderParams); + + IStream_Release(stream); + return stat; +} + GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index d51d94a..489b1a8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -122,6 +122,53 @@ static void test_LoadingImages(void) expect(InvalidParameter, stat); } +static void test_SavingImages(void) +{ + GpStatus stat; + GpBitmap *bm; + UINT n; + UINT s; + ImageCodecInfo *codecs; + static const WCHAR filename[] = { 'a','.','b','m','p',0 }; + + codecs = NULL; + + stat = GdipSaveImageToFile(0, 0, 0, 0); + expect(InvalidParameter, stat); + + bm = NULL; + stat = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat24bppRGB, NULL, &bm); + expect(Ok, stat); + if (!bm) + return; + + /* invalid params */ + stat = GdipSaveImageToFile((GpImage*)bm, 0, 0, 0); + expect(InvalidParameter, stat); + + stat = GdipSaveImageToFile((GpImage*)bm, filename, 0, 0); + expect(InvalidParameter, stat); + + /* this should succeed */ + stat = GdipGetImageEncodersSize(&n, &s); + if (stat != Ok || n == 0) goto cleanup; + + codecs = GdipAlloc(s); + if (!codecs) goto cleanup; + + stat = GdipGetImageEncoders(n, s, codecs); + if (stat != Ok) goto cleanup; + + stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0); + expect(stat, Ok); + + cleanup: + if (codecs) + GdipFree(codecs); + if (bm) + GdipDisposeImage((GpImage*)bm); +} + static void test_encoders(void) { GpStatus stat; @@ -287,6 +334,7 @@ START_TEST(image) test_Scan0(); test_GetImageDimension(); test_LoadingImages(); + test_SavingImages(); test_encoders(); test_LockBits();

1 0

Nathan Beckmann : gdiplus: Implement GdipSaveImageToStream using encoders.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 9475e3f53bf6351c6e27428e5991477cf34b2fa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9475e3f53bf6351c6e27428e5… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Mon Mar 10 08:16:55 2008 -0700 gdiplus: Implement GdipSaveImageToStream using encoders. Add the correct framework for a fully-functional implementation of image encoding (not a hack like before). Currently, only a stub for BMP encoding is supported. New tests added as well. --- dlls/gdiplus/image.c | 87 ++++++++++++++++++++++++++++++++++++++++---- dlls/gdiplus/tests/image.c | 6 ++- 2 files changed, 83 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index cf104e9..ed23b0a 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -834,17 +834,93 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam return stat; } +/************************************************************************* + * Encoding functions - + * These functions encode an image in different image file formats. + */ +static GpStatus encode_image_BMP(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info, + void **output, unsigned int *output_size) +{ + return NotImplemented; +} + +typedef GpStatus encode_image_func(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info, + void **output, unsigned int *output_size); + +typedef enum { + BMP, + NUM_ENCODERS_SUPPORTED +} ImageFormat; + +static const ImageCodecInfo codecs[NUM_ENCODERS_SUPPORTED]; +static encode_image_func *const encode_image_funcs[NUM_ENCODERS_SUPPORTED] = { + encode_image_BMP, +}; + GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { + GpStatus stat; + HRESULT hr; + short type; + HBITMAP hbmp; + HDC hdc; + BITMAPINFO bmp_info; + LPVOID bmp_bits; + encode_image_func* encode_image; + LPVOID output; + unsigned int output_size; + unsigned int dummy; + int i; + + output = NULL; + output_size = 0; + if(!image || !stream) return InvalidParameter; - /* FIXME: CLSID, EncoderParameters not used */ + if (!image->picture) + return GenericError; + + hr = IPicture_get_Type(image->picture, &type); + if (FAILED(hr) || type != PICTYPE_BITMAP) + return GenericError; - IPicture_SaveAsFile(image->picture, stream, FALSE, NULL); + /* select correct encoder */ + encode_image = NULL; + for (i = 0; i < NUM_ENCODERS_SUPPORTED; i++) { + if (IsEqualCLSID(clsid, &codecs[i].Clsid)) + encode_image = encode_image_funcs[i]; + } + if (encode_image == NULL) + return UnknownImageFormat; - return Ok; + /* extract underlying hbitmap representation from the IPicture */ + hr = IPicture_get_Handle(image->picture, (OLE_HANDLE*)&hbmp); + if (FAILED(hr) || !hbmp) + return GenericError; + + /* get bits from HBITMAP */ + hdc = GetDC(0); + bmp_info.bmiHeader.biSize = sizeof(bmp_info.bmiHeader); + GetDIBits(hdc, hbmp, 0, 0, NULL, &bmp_info, DIB_RGB_COLORS); + + bmp_bits = GdipAlloc(bmp_info.bmiHeader.biSizeImage); + if (!bmp_bits) { + ReleaseDC(0, hdc); + return OutOfMemory; + } + GetDIBits(hdc, hbmp, 0, bmp_info.bmiHeader.biHeight, bmp_bits, &bmp_info, DIB_RGB_COLORS); + + stat = encode_image(bmp_bits, &bmp_info, &output, &output_size); + if (stat == Ok) + IStream_Write(stream, output, output_size, &dummy); + + GdipFree(output); + GdipFree(bmp_bits); + ReleaseDC(0, hdc); + + return stat; } GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, @@ -866,11 +942,6 @@ GpStatus WINGDIPAPI GdipSetImagePalette(GpImage *image, * Structures that represent which formats we support for encoding. */ -typedef enum { - BMP, - NUM_ENCODERS_SUPPORTED -} ImageFormat; - /* ImageCodecInfo creation routines taken from libgdiplus */ static const WCHAR bmp_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'B', 'M', 'P', 0}; /* Built-in BMP */ static const WCHAR bmp_extension[] = {'*','.','B', 'M', 'P',';', '*','.', 'D','I', 'B',';', '*','.', 'R', 'L', 'E',0}; /* *.BMP;*.DIB;*.RLE */ diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 489b1a8..05b21b3 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -159,8 +159,10 @@ static void test_SavingImages(void) stat = GdipGetImageEncoders(n, s, codecs); if (stat != Ok) goto cleanup; - stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0); - expect(stat, Ok); + todo_wine { + stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0); + expect(stat, Ok); + } cleanup: if (codecs)

1 0

Nathan Beckmann : gdiplus: Implement BMP encoding.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 75841d83233b1b84f353e2b0870bb9056e4a39a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75841d83233b1b84f353e2b08… Author: Nathan Beckmann <nathan.beckmann(a)gmail.com> Date: Mon Mar 10 08:16:56 2008 -0700 gdiplus: Implement BMP encoding. Implement the encoding function for GDI+ images so that GdipSaveImageToStream can encode images as BMP files. --- dlls/gdiplus/image.c | 46 +++++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/image.c | 6 +--- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ed23b0a..8307938 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -838,10 +838,54 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam * Encoding functions - * These functions encode an image in different image file formats. */ +#define BITMAP_FORMAT_BMP 0x4d42 /* "BM" */ +#define BITMAP_FORMAT_JPEG 0xd8ff +#define BITMAP_FORMAT_GIF 0x4947 +#define BITMAP_FORMAT_PNG 0x5089 +#define BITMAP_FORMAT_APM 0xcdd7 + static GpStatus encode_image_BMP(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info, void **output, unsigned int *output_size) { - return NotImplemented; + int num_palette_entries; + BITMAPFILEHEADER *bmp_file_hdr; + BITMAPINFO *bmp_info_hdr; + + if (bitmap_info->bmiHeader.biClrUsed) { + num_palette_entries = bitmap_info->bmiHeader.biClrUsed; + if (num_palette_entries > 256) num_palette_entries = 256; + } else { + if (bitmap_info->bmiHeader.biBitCount <= 8) + num_palette_entries = 1 << bitmap_info->bmiHeader.biBitCount; + else + num_palette_entries = 0; + } + + *output_size = + sizeof(BITMAPFILEHEADER) + + sizeof(BITMAPINFOHEADER) + + num_palette_entries * sizeof(RGBQUAD) + + bitmap_info->bmiHeader.biSizeImage; + + *output = GdipAlloc(*output_size); + + bmp_file_hdr = (BITMAPFILEHEADER*) *output; + bmp_file_hdr->bfType = BITMAP_FORMAT_BMP; + bmp_file_hdr->bfSize = *output_size; + bmp_file_hdr->bfOffBits = + sizeof(BITMAPFILEHEADER) + + sizeof(BITMAPINFOHEADER) + + num_palette_entries * sizeof (RGBQUAD); + + bmp_info_hdr = (BITMAPINFO*) ((unsigned char*)(*output) + sizeof(BITMAPFILEHEADER)); + memcpy(bmp_info_hdr, bitmap_info, sizeof(BITMAPINFOHEADER) + num_palette_entries * sizeof(RGBQUAD)); + memcpy((unsigned char *)(*output) + + sizeof(BITMAPFILEHEADER) + + sizeof(BITMAPINFOHEADER) + + num_palette_entries * sizeof(RGBQUAD), + bitmap_bits, bitmap_info->bmiHeader.biSizeImage); + + return Ok; } typedef GpStatus encode_image_func(LPVOID bitmap_bits, LPBITMAPINFO bitmap_info, diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 05b21b3..489b1a8 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -159,10 +159,8 @@ static void test_SavingImages(void) stat = GdipGetImageEncoders(n, s, codecs); if (stat != Ok) goto cleanup; - todo_wine { - stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0); - expect(stat, Ok); - } + stat = GdipSaveImageToFile((GpImage*)bm, filename, &codecs[0].Clsid, 0); + expect(stat, Ok); cleanup: if (codecs)

1 0

Maarten Lankhorst : include: Add flag for BSM_ALLDESKTOPS.
by Alexandre Julliard 10 Mar '08

10 Mar '08

Module: wine Branch: master Commit: 619ac152d5479f3c6ad035e0eecaf4e6a16cf26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=619ac152d5479f3c6ad035e0e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Mar 10 11:14:05 2008 -0700 include: Add flag for BSM_ALLDESKTOPS. --- include/winuser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index fa36381..5d8a04b 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1818,6 +1818,7 @@ typedef struct #define BSM_NETDRIVER 0x00000002 #define BSM_INSTALLABLEDRIVERS 0x00000004 #define BSM_APPLICATIONS 0x00000008 +#define BSM_ALLDESKTOPS 0x00000010 #define BSF_QUERY 0x00000001 #define BSF_IGNORECURRENTTASK 0x00000002

1 0