November 2011 - Wine-Commits

Eric Pouech : expand: Remove extraneous curly braces from switch statements .
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 60460147ee89faae1b3f78dd10a2a3a41f0df1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60460147ee89faae1b3f78dd1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Nov 4 21:13:57 2011 +0100 expand: Remove extraneous curly braces from switch statements. --- programs/expand/expand.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 9c78f96..3107ff6 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -105,7 +105,6 @@ int main(int argc, char *argv[]) switch (comp) { case FILE_COMPRESSION_MSZIP: - { outfile_basename[0] = 0; if (!SetupIterateCabinetA( infile, 0, set_outfile, outfile_basename )) { @@ -116,18 +115,13 @@ int main(int argc, char *argv[]) *basename_index = 0; strcat( outfile, outfile_basename ); break; - } case FILE_COMPRESSION_WINLZA: - { GetExpandedNameA( infile, outfile_basename ); break; - } default: - { fprintf( stderr, "%s: can't determine original\n", argv[0] ); return 1; } - } } else GetFullPathNameA( argv[2], sizeof(outfile), outfile, NULL ); @@ -141,14 +135,12 @@ int main(int argc, char *argv[]) switch (comp) { case FILE_COMPRESSION_MSZIP: - { if (!SetupIterateCabinetA( infile, 0, extract_callback, outfile )) { fprintf( stderr, "%s: cabinet extraction failed\n", argv[0] ); return 1; } break; - } case FILE_COMPRESSION_WINLZA: { INT hin, hout; @@ -179,7 +171,6 @@ int main(int argc, char *argv[]) break; } default: - { if (!CopyFileA( infile, outfile, FALSE )) { fprintf( stderr, "%s: CopyFileA failed\n", argv[0] ); @@ -187,6 +178,5 @@ int main(int argc, char *argv[]) } break; } - } return ret; }

1 0

André Hentschel : apphelp: Add stub for ApphelpCheckInstallShieldPackage.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 8cfbcaf1be59237eae70cb95c0c23d160e975b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cfbcaf1be59237eae70cb95c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 4 17:55:41 2011 +0100 apphelp: Add stub for ApphelpCheckInstallShieldPackage. --- dlls/apphelp/apphelp.c | 6 ++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index bed3f5c..615f8af 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -39,3 +39,9 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +BOOL WINAPI ApphelpCheckInstallShieldPackage( void* ptr, LPCWSTR path ) +{ + FIXME("stub: %p %s\n", ptr, debugstr_w(path)); + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index a6ecf7f..901537f 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -1,6 +1,6 @@ @ stub AllowPermLayer @ stub ApphelpCheckExe -@ stub ApphelpCheckInstallShieldPackage +@ stdcall ApphelpCheckInstallShieldPackage(ptr wstr) @ stub ApphelpCheckMsiPackage @ stub ApphelpCheckRunApp @ stub ApphelpCheckRunAppEx

1 0

André Hentschel : apphelp: Add stub for SdbCreateDatabase.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 090649968706358796e00af4588dd1f0a35adbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=090649968706358796e00af45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 4 17:57:47 2011 +0100 apphelp: Add stub for SdbCreateDatabase. --- dlls/apphelp/apphelp.c | 16 ++++++++++++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index 615f8af..20ff375 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -23,6 +23,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(apphelp); +/* FIXME: don't know where to place that enum */ +typedef enum _PATH_TYPE { + DOS_PATH, + NT_PATH +} PATH_TYPE; + +/* FIXME: don't know where to place that typedef */ +typedef HANDLE PDB; + BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { TRACE("%p, %u, %p\n", hinst, reason, reserved); @@ -45,3 +54,10 @@ BOOL WINAPI ApphelpCheckInstallShieldPackage( void* ptr, LPCWSTR path ) FIXME("stub: %p %s\n", ptr, debugstr_w(path)); return TRUE; } + +PDB WINAPI SdbCreateDatabase( LPCWSTR path, PATH_TYPE type ) +{ + FIXME("stub: %s %u\n", debugstr_w(path), type); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 901537f..005e39d 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -26,7 +26,7 @@ @ stub SdbCloseDatabaseWrite @ stub SdbCloseLocalDatabase @ stub SdbCommitIndexes -@ stub SdbCreateDatabase +@ stdcall SdbCreateDatabase(wstr long) @ stub SdbCreateHelpCenterURL @ stub SdbCreateMsiTransformFile @ stub SdbDeclareIndex

1 0

Stefan Dösinger : wined3d: YUY2 and UYVY are block based.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 7eefed14105544d99e4c3ee22e20675af5db50e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eefed14105544d99e4c3ee22… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 14 16:27:53 2011 +0200 wined3d: YUY2 and UYVY are block based. --- dlls/d3d9/tests/surface.c | 2 + dlls/wined3d/surface.c | 10 ++++---- dlls/wined3d/utils.c | 47 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 35 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7eefed14105544d99e4c3…

1 0

Henri Verbeet : comctl32: Avoid using __FUNCTION__ in ranges_check.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: b99a2a9ff87fc158a462ae44e4248d12117256f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b99a2a9ff87fc158a462ae44e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 6 22:05:57 2011 +0100 comctl32: Avoid using __FUNCTION__ in ranges_check. --- dlls/comctl32/listview.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cc997c1..b0c4646 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3053,14 +3053,14 @@ static INT CALLBACK ranges_cmp(LPVOID range1, LPVOID range2, LPARAM flags) return cmp; } -#define ranges_check(ranges, desc) if (TRACE_ON(listview)) ranges_assert(ranges, desc, __FUNCTION__, __LINE__) +#define ranges_check(ranges, desc) if (TRACE_ON(listview)) ranges_assert(ranges, desc, __FILE__, __LINE__) -static void ranges_assert(RANGES ranges, LPCSTR desc, const char *func, int line) +static void ranges_assert(RANGES ranges, LPCSTR desc, const char *file, int line) { INT i; RANGE *prev, *curr; - TRACE("*** Checking %s:%d:%s ***\n", func, line, desc); + TRACE("*** Checking %s:%d:%s ***\n", file, line, desc); assert (ranges); assert (DPA_GetPtrCount(ranges->hdpa) >= 0); ranges_dump(ranges);

1 0

Alexandre Julliard : advpack: Pass all the specified parameters to do_ocx_reg.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 2d60d9146097c4f8daad27c11891c6a71c439193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d60d9146097c4f8daad27c11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 11:45:18 2011 +0100 advpack: Pass all the specified parameters to do_ocx_reg. --- dlls/advpack/advpack.c | 4 ++-- dlls/advpack/advpack_private.h | 2 +- dlls/advpack/install.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 112d38a..919c0bc 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -452,7 +452,7 @@ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, } /* registers the OCX if do_reg is TRUE, unregisters it otherwise */ -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) { DLLREGISTER reg_func; @@ -519,7 +519,7 @@ HRESULT WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) if (!hm) goto done; - hr = do_ocx_reg(hm, TRUE); + hr = do_ocx_reg(hm, TRUE, str_flags, param); done: FreeLibrary(hm); diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 23babf6..cbbbf48 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,7 +21,7 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg) DECLSPEC_HIDDEN; +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 129ea82..6079625 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -161,7 +161,7 @@ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, const void *arg) hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); if (hm) { - if (do_ocx_reg(hm, TRUE) != S_OK) + if (do_ocx_reg(hm, TRUE, NULL, NULL) != S_OK) hr = E_FAIL; FreeLibrary(hm);

1 0

Andrew Talbot : inetcomm: Remove extraneous braces from switch statements.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: f03c8a19a280bd5b464659e8c874536fe5dc13d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03c8a19a280bd5b464659e8c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:39 2011 +0000 inetcomm: Remove extraneous braces from switch statements. --- dlls/inetcomm/pop3transport.c | 41 +++++++++++------------------------------ 1 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index b0e31df..af7d1bf 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -63,7 +63,6 @@ static HRESULT parse_response(POP3Transport *This) switch (This->state) { case STATE_NONE: - { if (strlen(This->response) < 3) { WARN("parse error\n"); @@ -78,7 +77,7 @@ static HRESULT parse_response(POP3Transport *This) } This->state = STATE_DONE; return S_FALSE; - } + default: return S_OK; } } @@ -92,7 +91,6 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) switch (This->state) { case STATE_OK: - { if (This->type == POP3CMD_GET_POPID) { if ((p = strchr(This->ptr, ' '))) @@ -111,9 +109,8 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) } This->state = STATE_MULTILINE; return S_OK; - } + case STATE_MULTILINE: - { if (This->response[0] == '.' && !This->response[1]) { This->valid_info = FALSE; @@ -128,14 +125,12 @@ static HRESULT parse_uidl_response(POP3Transport *This, POP3UIDL *uidl) This->valid_info = TRUE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) @@ -147,7 +142,6 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) switch (This->state) { case STATE_OK: - { if ((p = strchr(This->ptr, ' '))) { while (*p == ' ') p++; @@ -156,14 +150,12 @@ static HRESULT parse_stat_response(POP3Transport *This, POP3STAT *stat) This->state = STATE_DONE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) @@ -175,7 +167,6 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) switch (This->state) { case STATE_OK: - { if (This->type == POP3CMD_GET_POPID) { if ((p = strchr(This->ptr, ' '))) @@ -189,9 +180,8 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) } This->state = STATE_MULTILINE; return S_OK; - } + case STATE_MULTILINE: - { if (This->response[0] == '.' && !This->response[1]) { This->valid_info = FALSE; @@ -206,14 +196,12 @@ static HRESULT parse_list_response(POP3Transport *This, POP3LIST *list) This->valid_info = TRUE; return S_OK; } - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId) @@ -221,18 +209,15 @@ static HRESULT parse_dele_response(POP3Transport *This, DWORD *dwPopId) switch (This->state) { case STATE_OK: - { *dwPopId = 0; /* FIXME */ This->state = STATE_DONE; return S_OK; - } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) @@ -240,7 +225,6 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) switch (This->state) { case STATE_OK: - { retr->fHeader = FALSE; retr->fBody = FALSE; retr->dwPopId = This->msgid; @@ -251,7 +235,7 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) This->state = STATE_MULTILINE; This->valid_info = FALSE; return S_OK; - } + case STATE_MULTILINE: { int len; @@ -273,13 +257,12 @@ static HRESULT parse_retr_response(POP3Transport *This, POP3RETR *retr) This->valid_info = TRUE; return S_OK; } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) @@ -287,7 +270,6 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) switch (This->state) { case STATE_OK: - { top->fHeader = FALSE; top->fBody = FALSE; top->dwPopId = This->msgid; @@ -299,7 +281,7 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) This->state = STATE_MULTILINE; This->valid_info = FALSE; return S_OK; - } + case STATE_MULTILINE: { int len; @@ -321,13 +303,12 @@ static HRESULT parse_top_response(POP3Transport *This, POP3TOP *top) This->valid_info = TRUE; return S_OK; } + default: - { WARN("parse error\n"); This->state = STATE_DONE; return S_FALSE; } - } } static void init_parser(POP3Transport *This, POP3COMMAND command, POP3CMDTYPE type)

1 0

Andrew Talbot : oledlg: Remove extraneous braces from switch statement.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 47a68bbdbe983ac045029d4fece00eec782b4dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a68bbdbe983ac045029d4fe… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 5 20:53:59 2011 +0000 oledlg: Remove extraneous braces from switch statement. --- dlls/oledlg/insobjdlg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 01d242e..c801fba 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -197,11 +197,9 @@ static LRESULT UIINSOBJDLG_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam) UIINSERTOBJECTDLG_AddControl(pdlgInfo); case IDC_OBJTYPELIST: - { if (wNotifyCode == LBN_SELCHANGE) UIINSERTOBJECTDLG_SelChange(pdlgInfo); break; - } } return 0; }

1 0

Alexandre Julliard : gdi32: Fix positioning of font underlines and strikeouts.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 199409a27bb405774d2837c176098f02c58fea75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=199409a27bb405774d2837c17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 13:41:18 2011 +0100 gdi32: Fix positioning of font underlines and strikeouts. --- dlls/gdi32/font.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 10a7f1d..97cc2b6 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2095,20 +2095,23 @@ done: { otm = HeapAlloc(GetProcessHeap(), 0, size); GetOutlineTextMetricsW(hdc, size, otm); - underlinePos = otm->otmsUnderscorePosition; - underlineWidth = otm->otmsUnderscoreSize; - strikeoutPos = otm->otmsStrikeoutPosition; - strikeoutWidth = otm->otmsStrikeoutSize; + underlinePos = abs( INTERNAL_YWSTODS( dc, otm->otmsUnderscorePosition )); + if (otm->otmsUnderscorePosition < 0) underlinePos = -underlinePos; + underlineWidth = abs( INTERNAL_YWSTODS( dc, otm->otmsUnderscoreSize )); + if (otm->otmsUnderscoreSize < 0) underlineWidth = -underlineWidth; + strikeoutPos = abs( INTERNAL_YWSTODS( dc, otm->otmsStrikeoutPosition )); + if (otm->otmsStrikeoutPosition < 0) strikeoutPos = -strikeoutPos; + strikeoutWidth = abs( INTERNAL_YWSTODS( dc, otm->otmsStrikeoutSize )); HeapFree(GetProcessHeap(), 0, otm); } if (lf.lfUnderline) { - pts[0].x = x - underlinePos * sinEsc; - pts[0].y = y - underlinePos * cosEsc; - pts[1].x = x + width.x - underlinePos * sinEsc; - pts[1].y = y + width.y - underlinePos * cosEsc; + pts[0].x = x - (underlinePos + underlineWidth / 2) * sinEsc; + pts[0].y = y - (underlinePos + underlineWidth / 2) * cosEsc; + pts[1].x = x + width.x - (underlinePos + underlineWidth / 2) * sinEsc; + pts[1].y = y + width.y - (underlinePos + underlineWidth / 2) * cosEsc; pts[2].x = pts[1].x + underlineWidth * sinEsc; pts[2].y = pts[1].y + underlineWidth * cosEsc; pts[3].x = pts[0].x + underlineWidth * sinEsc; @@ -2121,10 +2124,10 @@ done: if (lf.lfStrikeOut) { - pts[0].x = x - strikeoutPos * sinEsc; - pts[0].y = y - strikeoutPos * cosEsc; - pts[1].x = x + width.x - strikeoutPos * sinEsc; - pts[1].y = y + width.y - strikeoutPos * cosEsc; + pts[0].x = x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; + pts[0].y = y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; + pts[1].x = x + width.x - (strikeoutPos + strikeoutWidth / 2) * sinEsc; + pts[1].y = y + width.y - (strikeoutPos + strikeoutWidth / 2) * cosEsc; pts[2].x = pts[1].x + strikeoutWidth * sinEsc; pts[2].y = pts[1].y + strikeoutWidth * cosEsc; pts[3].x = pts[0].x + strikeoutWidth * sinEsc;

1 0

Alexandre Julliard : gdi32: Retrieve the brush pattern bits from the cache for metafiles.
by Alexandre Julliard Nov. 7, 2011

Nov. 7, 2011

Module: wine Branch: master Commit: 7d0b65c4d1b4f070d2c18a7adbba6c6cdec082a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0b65c4d1b4f070d2c18a7ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 1 22:05:16 2011 +0100 gdi32: Retrieve the brush pattern bits from the cache for metafiles. --- dlls/gdi32/brush.c | 29 +++++++++++++++++ dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/mfdrv/objects.c | 76 ++++++++++--------------------------------- 3 files changed, 49 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 59d0bed..19372d1 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -90,6 +90,35 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return TRUE; } +BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) +{ + BRUSHOBJ *brush; + BOOL ret = FALSE; + + if (!(brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) return FALSE; + + if (!brush->info) + { + BITMAPOBJ *bmp = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); + + if (bmp) + { + store_bitmap_bits( brush, bmp ); + GDI_ReleaseObj( brush->bitmap ); + } + } + if (brush->info) + { + memcpy( info, brush->info, bitmap_info_size( brush->info, brush->usage )); + *bits = brush->bits.ptr; + *usage = brush->usage; + ret = TRUE; + } + GDI_ReleaseObj( handle ); + return ret; +} + + /*********************************************************************** * CreateBrushIndirect (GDI32.@) * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0c73a9d..52fb318 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -233,6 +233,8 @@ extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_imag extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN; +extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; + /* clipping.c */ extern int get_clip_box( DC *dc, RECT *rect ) DECLSPEC_HIDDEN; extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 599f226..3745ec7 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -174,86 +174,46 @@ INT16 MFDRV_CreateBrushIndirect(PHYSDEV dev, HBRUSH hBrush ) break; } case BS_PATTERN: + case BS_DIBPATTERN: { char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; - struct gdi_image_bits bits; - COLORREF cref; + DWORD info_size, image_size; + char *dst_ptr; + void *bits; + UINT usage; - if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) goto done; - if (src_info->bmiHeader.biBitCount != 1) - { - FIXME("Trying to store a colour pattern brush\n"); - if (bits.free) bits.free( &bits ); - goto done; - } + if (!get_brush_bitmap_info( hBrush, src_info, &bits, &usage )) goto done; - size = FIELD_OFFSET( METARECORD, rdParm[2] ) + - FIELD_OFFSET( BITMAPINFO, bmiColors[2] ) + src_info->bmiHeader.biSizeImage; + info_size = bitmap_info_size( src_info, usage ); + image_size = get_dib_image_size( src_info ); + size = FIELD_OFFSET( METARECORD, rdParm[2] ) + info_size + image_size; - if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) - { - if (bits.free) bits.free( &bits ); - goto done; - } + if (!(mr = HeapAlloc( GetProcessHeap(), 0, size ))) goto done; mr->rdFunction = META_DIBCREATEPATTERNBRUSH; mr->rdSize = size / 2; - mr->rdParm[0] = BS_PATTERN; - mr->rdParm[1] = DIB_RGB_COLORS; + mr->rdParm[0] = logbrush.lbStyle; + mr->rdParm[1] = usage; dst_info = (BITMAPINFO *)(mr->rdParm + 2); - dst_info->bmiHeader = src_info->bmiHeader; - dst_info->bmiHeader.biClrUsed = 0; - cref = GetTextColor( dev->hdc ); - dst_info->bmiColors[0].rgbRed = GetRValue(cref); - dst_info->bmiColors[0].rgbGreen = GetGValue(cref); - dst_info->bmiColors[0].rgbBlue = GetBValue(cref); - dst_info->bmiColors[0].rgbReserved = 0; - cref = GetBkColor( dev->hdc ); - dst_info->bmiColors[1].rgbRed = GetRValue(cref); - dst_info->bmiColors[1].rgbGreen = GetGValue(cref); - dst_info->bmiColors[1].rgbBlue = GetBValue(cref); - dst_info->bmiColors[1].rgbReserved = 0; + memcpy( dst_info, src_info, info_size ); + if (dst_info->bmiHeader.biClrUsed == 1 << dst_info->bmiHeader.biBitCount) + dst_info->bmiHeader.biClrUsed = 0; + dst_ptr = (char *)dst_info + info_size; /* always return a bottom-up DIB */ if (dst_info->bmiHeader.biHeight < 0) { int i, width_bytes = get_dib_stride( dst_info->bmiHeader.biWidth, dst_info->bmiHeader.biBitCount ); - char *dst_ptr = (char *)&dst_info->bmiColors[2]; dst_info->bmiHeader.biHeight = -dst_info->bmiHeader.biHeight; dst_ptr += (dst_info->bmiHeader.biHeight - 1) * width_bytes; for (i = 0; i < dst_info->bmiHeader.biHeight; i++, dst_ptr -= width_bytes) - memcpy( dst_ptr, (char *)bits.ptr + i * width_bytes, width_bytes ); + memcpy( dst_ptr, (char *)bits + i * width_bytes, width_bytes ); } - else memcpy( &dst_info->bmiColors[2], bits.ptr, dst_info->bmiHeader.biSizeImage ); - if (bits.free) bits.free( &bits ); + else memcpy( dst_ptr, bits, image_size ); break; } - case BS_DIBPATTERN: - { - BITMAPINFO *info = (BITMAPINFO *)logbrush.lbHatch; - DWORD bmSize, biSize; - - if (info->bmiHeader.biCompression) - bmSize = info->bmiHeader.biSizeImage; - else - bmSize = get_dib_image_size( info ); - biSize = bitmap_info_size(info, LOWORD(logbrush.lbColor)); - size = sizeof(METARECORD) + biSize + bmSize + 2; - mr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!mr) - { - GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); - goto done; - } - mr->rdFunction = META_DIBCREATEPATTERNBRUSH; - mr->rdSize = size / 2; - *(mr->rdParm) = logbrush.lbStyle; - *(mr->rdParm + 1) = LOWORD(logbrush.lbColor); - memcpy(mr->rdParm + 2, info, biSize + bmSize); - break; - } default: FIXME("Unkonwn brush style %x\n", logbrush.lbStyle); return 0;

1 0