wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Mikołaj Zalewski : write.exe: Add a new program that calls wordpad.exe.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 2777a94d4eef7dd8f8d422bed1c1363a059f9109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2777a94d4eef7dd8f8d422bed… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 1 20:01:29 2007 -0700 write.exe: Add a new program that calls wordpad.exe. --- .gitignore | 2 + Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + programs/Makefile.in | 2 + programs/write/En.rc | 26 +++++++++++++++++++++ programs/write/Makefile.in | 15 ++++++++++++ programs/write/resources.h | 19 +++++++++++++++ programs/write/rsrc.rc | 24 +++++++++++++++++++ programs/write/write.c | 54 ++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 148 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 2c87b7a..0ddaa04 100644 --- a/.gitignore +++ b/.gitignore @@ -936,6 +936,8 @@ programs/wordpad/rsrc.res programs/wordpad/toolbar.bmp programs/wordpad/wordpad programs/wordpad/wordpad.ico +programs/write/rsrc.res +programs/write/write programs/xcopy/rsrc.res programs/xcopy/xcopy server/wineserver diff --git a/Makefile.in b/Makefile.in index 8174a91..002f425 100644 --- a/Makefile.in +++ b/Makefile.in @@ -493,6 +493,7 @@ ALL_MAKEFILES = \ programs/winhelp/Makefile \ programs/winver/Makefile \ programs/wordpad/Makefile \ + programs/write/Makefile \ programs/xcopy/Makefile \ server/Makefile \ tools/Makefile \ @@ -856,6 +857,7 @@ programs/winevdm/Makefile: programs/winevdm/Makefile.in programs/Makeprog.rules programs/winhelp/Makefile: programs/winhelp/Makefile.in programs/Makeprog.rules programs/winver/Makefile: programs/winver/Makefile.in programs/Makeprog.rules programs/wordpad/Makefile: programs/wordpad/Makefile.in programs/Makeprog.rules +programs/write/Makefile: programs/write/Makefile.in programs/Makeprog.rules programs/xcopy/Makefile: programs/xcopy/Makefile.in programs/Makeprog.rules server/Makefile: server/Makefile.in Make.rules tools/Makefile: tools/Makefile.in Make.rules diff --git a/configure b/configure index 35ec7ff..fdcdbd5 100755 --- a/configure +++ b/configure @@ -20936,6 +20936,8 @@ ac_config_files="$ac_config_files programs/winver/Makefile" ac_config_files="$ac_config_files programs/wordpad/Makefile" +ac_config_files="$ac_config_files programs/write/Makefile" + ac_config_files="$ac_config_files programs/xcopy/Makefile" ac_config_files="$ac_config_files server/Makefile" @@ -21863,6 +21865,7 @@ do "programs/winhelp/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winhelp/Makefile" ;; "programs/winver/Makefile") CONFIG_FILES="$CONFIG_FILES programs/winver/Makefile" ;; "programs/wordpad/Makefile") CONFIG_FILES="$CONFIG_FILES programs/wordpad/Makefile" ;; + "programs/write/Makefile") CONFIG_FILES="$CONFIG_FILES programs/write/Makefile" ;; "programs/xcopy/Makefile") CONFIG_FILES="$CONFIG_FILES programs/xcopy/Makefile" ;; "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; diff --git a/configure.ac b/configure.ac index 780b419..e6088ec 100644 --- a/configure.ac +++ b/configure.ac @@ -1894,6 +1894,7 @@ AC_CONFIG_FILES([programs/winevdm/Makefile]) AC_CONFIG_FILES([programs/winhelp/Makefile]) AC_CONFIG_FILES([programs/winver/Makefile]) AC_CONFIG_FILES([programs/wordpad/Makefile]) +AC_CONFIG_FILES([programs/write/Makefile]) AC_CONFIG_FILES([programs/xcopy/Makefile]) AC_CONFIG_FILES([server/Makefile]) AC_CONFIG_FILES([tools/Makefile]) diff --git a/programs/Makefile.in b/programs/Makefile.in index 9ea131b..1a3d3d5 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -45,6 +45,7 @@ SUBDIRS = \ winhelp \ winver \ wordpad \ + write \ xcopy # Sub-directories to run make install into @@ -85,6 +86,7 @@ INSTALLSUBDIRS = \ winhelp \ winver \ wordpad \ + write \ xcopy # Programs to install in bin directory diff --git a/programs/write/En.rc b/programs/write/En.rc new file mode 100644 index 0000000..5215db5 --- /dev/null +++ b/programs/write/En.rc @@ -0,0 +1,26 @@ +/* + * English language support + * + * Copyright (C) 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_FAILED, "Starting Wordpad failed" +} diff --git a/programs/write/Makefile.in b/programs/write/Makefile.in new file mode 100644 index 0000000..1e877ef --- /dev/null +++ b/programs/write/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = write.exe +APPMODE = -mwindows +IMPORTS = user32 gdi32 kernel32 + +C_SRCS = write.c + +RC_SRCS = rsrc.rc + +@MAKE_PROG_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/write/resources.h b/programs/write/resources.h new file mode 100644 index 0000000..e99e5b1 --- /dev/null +++ b/programs/write/resources.h @@ -0,0 +1,19 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define IDS_FAILED 101 diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc new file mode 100644 index 0000000..06e4040 --- /dev/null +++ b/programs/write/rsrc.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include "resources.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "En.rc" diff --git a/programs/write/write.c b/programs/write/write.c new file mode 100644 index 0000000..0f2aca0 --- /dev/null +++ b/programs/write/write.c @@ -0,0 +1,54 @@ +/* + * Write.exe - this program only calls wordpad.exe + * + * Copyright 2007 by Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN + +#include <stdarg.h> + +#include <windows.h> +#include "resources.h" + +static const WCHAR SZ_BACKSLASH[] = {'\\',0}; +static const WCHAR SZ_WORDPAD[] = {'w','o','r','d','p','a','d','.','e','x','e',0}; + +int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int res) +{ + WCHAR path[MAX_PATH]; + STARTUPINFOW stinf; + PROCESS_INFORMATION info; + + if (!GetSystemDirectoryW(path, MAX_PATH - 1 - lstrlenW(SZ_WORDPAD))) + goto failed; + if (path[lstrlenW(path) - 1] != '\\') + lstrcatW(path, SZ_BACKSLASH); + lstrcatW(path, SZ_WORDPAD); + + stinf.cb = sizeof(STARTUPINFO); + GetStartupInfoW(&stinf); + + if (!CreateProcessW(path, GetCommandLineW(), NULL, NULL, FALSE, 0, NULL, NULL, &stinf, &info)) + goto failed; + return 0; + +failed: + LoadStringW(GetModuleHandle(NULL), IDS_FAILED, path, MAX_PATH); + MessageBoxW(NULL, path, NULL, MB_OK|MB_ICONERROR); + return 1; +}

1 0

Misha Koshelev : urlmon: Do not fill stream buffer on every report_data, native doesn't.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: cb8a0dd70dba0bfaeeaf98d239f4b07760ebd4b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8a0dd70dba0bfaeeaf98d23… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 2 00:15:43 2007 -0500 urlmon: Do not fill stream buffer on every report_data, native doesn't. --- dlls/urlmon/binding.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 0de8a36..0ba4cdb 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -949,8 +949,6 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres This->request_locked = SUCCEEDED(hres); } - fill_stream_buffer(This->stream); - IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &This->stgmed);

1 0

Misha Koshelev : urlmon: Report total data read in this bind operation to OnDataAvailable, not the size of the available buffer.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 55409b2e0459fef0b59fa24841be0158b5c63529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55409b2e0459fef0b59fa2484… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 2 00:12:08 2007 -0500 urlmon: Report total data read in this bind operation to OnDataAvailable, not the size of the available buffer. --- dlls/urlmon/binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index b4541d3..0de8a36 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -951,7 +951,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres fill_stream_buffer(This->stream); - IBindStatusCallback_OnDataAvailable(This->callback, bscf, This->stream->buf_size, + IBindStatusCallback_OnDataAvailable(This->callback, bscf, progress, &formatetc, &This->stgmed); if(end_download) {

1 0

Misha Koshelev : urlmon: Report BINDSTATUS_DOWNLOADINGDATA on BSCF_INTERMEDIATEDATANOTIFICATION.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: b3a660a69cb345d0960d787faa0229f2f25cc11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a660a69cb345d0960d787fa… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 2 00:09:20 2007 -0500 urlmon: Report BINDSTATUS_DOWNLOADINGDATA on BSCF_INTERMEDIATEDATANOTIFICATION. --- dlls/urlmon/binding.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index db61ab2..b4541d3 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -939,6 +939,9 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres end_download = TRUE; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); + } else if(bscf & BSCF_INTERMEDIATEDATANOTIFICATION) { + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + BINDSTATUS_DOWNLOADINGDATA, This->url); } if(!This->request_locked) {

1 0

Misha Koshelev : urlmon: Use BSCF_ values passed to report_data to keep track of download state.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 978f6b98c9a67055f5a0f878a44b3b66c16a6019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978f6b98c9a67055f5a0f878a… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 2 00:05:36 2007 -0500 urlmon: Use BSCF_ values passed to report_data to keep track of download state. --- dlls/urlmon/binding.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 4527aa4..db61ab2 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -67,12 +67,6 @@ typedef struct { HRESULT hres; } ProtocolStream; -typedef enum { - BEFORE_DOWNLOAD, - DOWNLOADING, - END_DOWNLOAD -} download_state_t; - struct Binding { const IBindingVtbl *lpBindingVtbl; const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; @@ -94,7 +88,6 @@ struct Binding { BOOL report_mime; DWORD continue_call; BOOL request_locked; - download_state_t download_state; DWORD apartment_thread; HWND notif_hwnd; @@ -912,12 +905,10 @@ static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progress_max) { FORMATETC formatetc = {0, NULL, 1, -1, TYMED_ISTREAM}; + BOOL end_download = FALSE; TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); - if(This->download_state == END_DOWNLOAD) - return; - if(GetCurrentThreadId() != This->apartment_thread) FIXME("called from worked hread\n"); @@ -935,15 +926,17 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres BINDSTATUS_MIMETYPEAVAILABLE, mime); } - if(This->download_state == BEFORE_DOWNLOAD) { + if(bscf & BSCF_FIRSTDATANOTIFICATION) { fill_stream_buffer(This->stream); - This->download_state = DOWNLOADING; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_BEGINDOWNLOADDATA, This->url); } - if(This->stream->hres == S_FALSE || (bscf & BSCF_LASTDATANOTIFICATION)) { + if((bscf & BSCF_LASTDATANOTIFICATION) || + (bscf & BSCF_DATAFULLYAVAILABLE) || + progress == progress_max) { + end_download = TRUE; IBindStatusCallback_OnProgress(This->callback, progress, progress_max, BINDSTATUS_ENDDOWNLOADDATA, This->url); } @@ -958,8 +951,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres IBindStatusCallback_OnDataAvailable(This->callback, bscf, This->stream->buf_size, &formatetc, &This->stgmed); - if(This->stream->hres == S_FALSE) { - This->download_state = END_DOWNLOAD; + if(end_download) { IBindStatusCallback_OnStopBinding(This->callback, S_OK, NULL); } } @@ -1312,7 +1304,6 @@ static HRESULT Binding_Create(LPCWSTR url, IBindCtx *pbc, REFIID riid, Binding * ret->report_mime = TRUE; ret->continue_call = 0; ret->request_locked = FALSE; - ret->download_state = BEFORE_DOWNLOAD; ret->task_queue_head = ret->task_queue_tail = NULL; memset(&ret->bindinfo, 0, sizeof(BINDINFO));

1 0

Misha Koshelev : urlmon: Set the queue tail to the new task when pushing a task onto the tail of the queue .
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: a63419bc2cc1005f52ba3bfcbdeb5ae3b6b0c45f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63419bc2cc1005f52ba3bfcb… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Thu Aug 2 00:03:31 2007 -0500 urlmon: Set the queue tail to the new task when pushing a task onto the tail of the queue. --- dlls/urlmon/binding.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index aaadbd8..4527aa4 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -122,10 +122,12 @@ static void push_task(Binding *binding, task_header_t *task, task_proc_t proc) EnterCriticalSection(&binding->section); - if(binding->task_queue_tail) + if(binding->task_queue_tail) { binding->task_queue_tail->next = task; - else + binding->task_queue_tail = task; + }else { binding->task_queue_tail = binding->task_queue_head = task; + } LeaveCriticalSection(&binding->section); }

1 0

Dmitry Timoshkov : gdi32: Also print a readable table name in the failure notice.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: 2f71832ac9c5be0929fe0a1e4f6eb6f7905aa0e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f71832ac9c5be0929fe0a1e4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 2 13:47:57 2007 +0900 gdi32: Also print a readable table name in the failure notice. --- dlls/gdi32/freetype.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8615fb7..50e570c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4435,7 +4435,10 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, } #endif if(err) { - TRACE("Can't find table %08x.\n", table); + TRACE("Can't find table %c%c%c%c\n", + /* bytes were reversed */ + HIBYTE(HIWORD(table)), LOBYTE(HIWORD(table)), + HIBYTE(LOWORD(table)), LOBYTE(LOWORD(table))); return GDI_ERROR; } return len;

1 0

Evan Stade : gdiplus: Added GdipSetPathGradientWrapMode.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: f0dbfe959f9ca0e6faa8c87604525732742c64a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dbfe959f9ca0e6faa8c8760… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:56:10 2007 -0700 gdiplus: Added GdipSetPathGradientWrapMode. --- dlls/gdiplus/brush.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + include/gdiplusflat.h | 1 + include/gdiplusgpstubs.h | 1 + 5 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 912bb83..dbe221c 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -67,6 +67,7 @@ GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, (*grad)->brush.gdibrush = CreateSolidBrush(col); (*grad)->brush.bt = BrushTypeSolidColor; (*grad)->centercolor = 0xffffffff; + (*grad)->wrap = WrapModeClamp; return Ok; } @@ -135,6 +136,17 @@ GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient *grad, + GpWrapMode wrap) +{ + if(!grad) + return InvalidParameter; + + grad->wrap = wrap; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) { if(!sf) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index abd7e24..6b79a71 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -560,7 +560,7 @@ @ stub GdipSetPathGradientSigmaBlend @ stub GdipSetPathGradientSurroundColorsWithCount @ stub GdipSetPathGradientTransform -@ stub GdipSetPathGradientWrapMode +@ stdcall GdipSetPathGradientWrapMode(ptr long) @ stub GdipSetPathMarker @ stdcall GdipSetPenBrushFill(ptr ptr) @ stdcall GdipSetPenColor(ptr long) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 1a868cf..3ce92a1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -95,6 +95,7 @@ struct GpSolidFill{ struct GpPathGradient{ GpBrush brush; ARGB centercolor; + GpWrapMode wrap; }; struct GpPath{ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5e2b27a..83aea93 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -95,6 +95,7 @@ GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); +GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient*,GpWrapMode); GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 6ca0073..772edd9 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -66,5 +66,6 @@ typedef DashCap GpDashCap; typedef DashStyle GpDashStyle; typedef MatrixOrder GpMatrixOrder; typedef Point GpPoint; +typedef WrapMode GpWrapMode; #endif

1 0

Evan Stade : gdiplus: Added GdipSetPathGradientCenterColor.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: f2cf5551dbe3453b3701e4a0e20cdb6bb53c251a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2cf5551dbe3453b3701e4a0e… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:56:05 2007 -0700 gdiplus: Added GdipSetPathGradientCenterColor. --- dlls/gdiplus/brush.c | 15 +++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index da432fd..912bb83 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -120,6 +120,21 @@ GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, + ARGB argb) +{ + if(!grad) + return InvalidParameter; + + grad->centercolor = argb; + grad->brush.lb.lbColor = ARGB2COLORREF(argb); + + DeleteObject(grad->brush.gdibrush); + grad->brush.gdibrush = CreateSolidBrush(grad->brush.lb.lbColor); + + return Ok; +} + GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) { if(!sf) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8dcc155..abd7e24 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -549,7 +549,7 @@ @ stdcall GdipSetPageUnit(ptr long) @ stdcall GdipSetPathFillMode(ptr long) @ stub GdipSetPathGradientBlend -@ stub GdipSetPathGradientCenterColor +@ stdcall GdipSetPathGradientCenterColor(ptr long) @ stub GdipSetPathGradientCenterPoint @ stub GdipSetPathGradientCenterPointI @ stub GdipSetPathGradientFocusScales diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index c04fef6..5e2b27a 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -94,6 +94,7 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill*,ARGB*); +GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient*,ARGB); GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL);

1 0

Evan Stade : gdiplus: Added solid-color path gradient brush implementation.
by Alexandre Julliard 02 Aug '07

02 Aug '07

Module: wine Branch: master Commit: f18cdef727d34d4428d2cef01b151e555f5be25a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18cdef727d34d4428d2cef01… Author: Evan Stade <estade(a)gmail.com> Date: Wed Aug 1 17:56:02 2007 -0700 gdiplus: Added solid-color path gradient brush implementation. --- dlls/gdiplus/brush.c | 26 ++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 5 +++++ include/gdiplusflat.h | 2 ++ include/gdiplusgpstubs.h | 4 +++- 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ce01ccb..da432fd 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -23,6 +23,9 @@ #include "gdiplus.h" #include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) { @@ -45,6 +48,29 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) return Ok; } +/* FIXME: path gradient brushes not truly supported (drawn as solid brushes) */ +GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath* path, + GpPathGradient **grad) +{ + COLORREF col = ARGB2COLORREF(0xffffffff); + + if(!path || !grad) + return InvalidParameter; + + *grad = GdipAlloc(sizeof(GpPathGradient)); + if (!*grad) return OutOfMemory; + + (*grad)->brush.lb.lbStyle = BS_SOLID; + (*grad)->brush.lb.lbColor = col; + (*grad)->brush.lb.lbHatch = 0; + + (*grad)->brush.gdibrush = CreateSolidBrush(col); + (*grad)->brush.bt = BrushTypeSolidColor; + (*grad)->centercolor = 0xffffffff; + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) { COLORREF col = ARGB2COLORREF(color); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 871a9c4..8dcc155 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -117,7 +117,7 @@ @ stub GdipCreatePath2I @ stdcall GdipCreatePath(long ptr) @ stub GdipCreatePathGradient -@ stub GdipCreatePathGradientFromPath +@ stdcall GdipCreatePathGradientFromPath(ptr ptr) @ stub GdipCreatePathGradientI @ stdcall GdipCreatePathIter(ptr ptr) @ stdcall GdipCreatePen1(long long long ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 168f6ff..1a868cf 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -92,6 +92,11 @@ struct GpSolidFill{ ARGB color; }; +struct GpPathGradient{ + GpBrush brush; + ARGB centercolor; +}; + struct GpPath{ GpFillMode fill; GpPathData pathdata; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 25b9b1b..c04fef6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -88,6 +88,8 @@ GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics*,GpMatrix*); GpStatus WINGDIPAPI GdipCloneBrush(GpBrush*,GpBrush**); +GpStatus WINGDIPAPI GdipCreatePathGradientFromPath(GDIPCONST GpPath*, + GpPathGradient**); GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index fec691a..6ca0073 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -24,7 +24,7 @@ class GpGraphics {}; class GpGraphics {}; class GpBrush {}; -class GpSolidFill {}; +class GpSolidFill : public GpBrush {}; class GpPath {}; class GpMatrix {}; class GpPathIterator {}; @@ -33,6 +33,7 @@ class GpImage {}; class GpMetafile : public GpImage {}; class GpImageAttributes {}; class GpBitmap : public GpImage {}; +class GpPathGradient : public GpBrush {}; #else /* end of c++ declarations */ @@ -48,6 +49,7 @@ typedef struct GpImage GpImage; typedef struct GpMetafile GpMetafile; typedef struct GpImageAttributes GpImageAttributes; typedef struct GpBitmap GpBitmap; +typedef struct GpPathGradient GpPathGradient; #endif /* end of c declarations */

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 August 2007