July 2011 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use CreateURLMonikerEx2 in SuperNavigate.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: e325be79dc485c6189a8aef994763e0a9d94d62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e325be79dc485c6189a8aef99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:50:32 2011 +0200 mshtml: Use CreateURLMonikerEx2 in SuperNavigate. --- dlls/mshtml/htmlwindow.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 89702b1..377825d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1676,6 +1676,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, nsChannelBSC *bsc; IMoniker *mon; BSTR new_url; + IUri *uri; HRESULT hres; TRACE("(%p)->(%s %s %s %s %s %s %x)\n", This, debugstr_w(url), debugstr_w(arg2), debugstr_w(arg3), debugstr_w(arg4), @@ -1710,15 +1711,20 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, } } - /* FIXME: Why not set_ready_state? */ - This->readystate = READYSTATE_UNINITIALIZED; - - hres = CreateURLMoniker(NULL, new_url, &mon); + hres = CreateUri(new_url, 0, 0, &uri); if(new_url != url) SysFreeString(new_url); if(FAILED(hres)) return hres; + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + /* FIXME: Why not set_ready_state? */ + This->readystate = READYSTATE_UNINITIALIZED; + if(post_data_var) { if(V_VT(post_data_var) == (VT_ARRAY|VT_UI1)) { SafeArrayAccessData(V_ARRAY(post_data_var), (void**)&post_data);

1 0

Jacek Caban : mshtml: Moved OLECMDID_SETDOWNLOADSTATE call to separated function.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: 402c87569969493bc4a3533d9973c3b3de86bb10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=402c87569969493bc4a3533d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:50:49 2011 +0200 mshtml: Moved OLECMDID_SETDOWNLOADSTATE call to separated function. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsevents.c | 45 ++++++++++++++++++++--------------------- dlls/mshtml/persist.c | 42 +++++++++++++++++++++++--------------- 3 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6344b0e..dfa627b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -692,6 +692,7 @@ void set_current_mon(HTMLWindow*,IMoniker*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLWindow*,HTMLDocumentNode*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN; HRESULT async_start_doc_binding(HTMLWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; void abort_document_bindings(HTMLDocumentNode*) DECLSPEC_HIDDEN; +void set_download_state(HTMLDocumentObj*,int) DECLSPEC_HIDDEN; HRESULT bind_mon_to_buffer(HTMLDocumentNode*,IMoniker*,void**,DWORD*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index bd6faf6..c3b6e95 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -184,6 +184,7 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, static void handle_docobj_load(HTMLDocumentObj *doc) { + IOleCommandTarget *olecmd = NULL; HRESULT hres; if(doc->nscontainer->editor_controller) { @@ -195,33 +196,31 @@ static void handle_docobj_load(HTMLDocumentObj *doc) handle_edit_load(&doc->basedoc); if(doc->client) { - IOleCommandTarget *olecmd = NULL; - hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); - if(SUCCEEDED(hres)) { - if(doc->download_state) { - VARIANT state, progress; - - V_VT(&progress) = VT_I4; - V_I4(&progress) = 0; - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, - OLECMDEXECOPT_DONTPROMPTUSER, &progress, NULL); - - V_VT(&state) = VT_I4; - V_I4(&state) = 0; - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, - OLECMDEXECOPT_DONTPROMPTUSER, &state, NULL); - } - - IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); - IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); - - IOleCommandTarget_Release(olecmd); + if(FAILED(hres)) + olecmd = NULL; + } + + if(doc->download_state) { + if(olecmd) { + VARIANT progress; + + V_VT(&progress) = VT_I4; + V_I4(&progress) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, + OLECMDEXECOPT_DONTPROMPTUSER, &progress, NULL); } + + set_download_state(doc, 0); } - doc->download_state = 0; + if(olecmd) { + IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + + IOleCommandTarget_Release(olecmd); + } } static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 64e27ed..0907810 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -94,6 +94,28 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } +void set_download_state(HTMLDocumentObj *doc, int state) +{ + if(doc->client) { + IOleCommandTarget *olecmd; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = state; + + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, + OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); + IOleCommandTarget_Release(olecmd); + } + } + + doc->download_state = state; +} + static void set_progress_proc(task_t *_task) { docobj_task_t *task = (docobj_task_t*)_task; @@ -139,7 +161,6 @@ static void set_downloading_proc(task_t *_task) { download_proc_task_t *task = (download_proc_task_t*)_task; HTMLDocumentObj *doc = task->doc; - IOleCommandTarget *olecmd; HRESULT hres; TRACE("(%p)\n", doc); @@ -147,25 +168,12 @@ static void set_downloading_proc(task_t *_task) set_statustext(doc, IDS_STATUS_DOWNLOADINGFROM, task->url); CoTaskMemFree(task->url); + if(task->set_download) + set_download_state(doc, 1); + if(!doc->client) return; - if(task->set_download) { - hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); - if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_I4; - V_I4(&var) = 1; - - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, - OLECMDEXECOPT_DONTPROMPTUSER, &var, NULL); - IOleCommandTarget_Release(olecmd); - } - - doc->download_state = 1; - } - if(doc->view_sink) IAdviseSink_OnViewChange(doc->view_sink, DVASPECT_CONTENT, -1);

1 0

Jacek Caban : mshtml: Moved script mode out of get_script_host to allow exec_script calls in Gecko script mode .
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: wine Branch: master Commit: ddf46bbe9f86996a37a46e743cfe339b85ef79f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf46bbe9f86996a37a46e743… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:51:06 2011 +0200 mshtml: Moved script mode out of get_script_host to allow exec_script calls in Gecko script mode. --- dlls/mshtml/script.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 01a849c..003413e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -795,11 +795,6 @@ static ScriptHost *get_script_host(HTMLWindow *window, const GUID *guid) { ScriptHost *iter; - if(IsEqualGUID(&CLSID_JScript, guid) && window->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { - TRACE("Ignoring JScript\n"); - return NULL; - } - LIST_FOR_EACH_ENTRY(iter, &window->script_hosts, ScriptHost, entry) { if(IsEqualGUID(guid, &iter->guid)) return iter; @@ -818,6 +813,11 @@ void doc_insert_script(HTMLWindow *window, nsIDOMHTMLScriptElement *nsscript) return; } + if(IsEqualGUID(&CLSID_JScript, &guid) && window->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { + TRACE("Ignoring JScript\n"); + return; + } + script_host = get_script_host(window, &guid); if(!script_host) return; @@ -859,6 +859,11 @@ IDispatch *script_parse_event(HTMLWindow *window, LPCWSTR text) ptr = text; } + if(IsEqualGUID(&CLSID_JScript, &guid) && window->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { + TRACE("Ignoring JScript\n"); + return NULL; + } + script_host = get_script_host(window, &guid); if(!script_host || !script_host->parse_proc) return NULL;

1 0

André Hentschel : Wine 1.3.25 freigegeben
by Jeremy Newman 25 Jul '11

25 Jul '11

Module: website Branch: master Commit: 8255ede666a56130999de688e2f180d2710f1293 URL: http://source.winehq.org/git/website.git/?a=commit;h=8255ede666a56130999de6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 22 19:51:23 2011 +0200 Wine 1.3.25 freigegeben --- news/de/2011072201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2011072201.xml b/news/de/2011072201.xml new file mode 100644 index 0000000..ca891c0 --- /dev/null +++ b/news/de/2011072201.xml @@ -0,0 +1,18 @@ +<news> +<date>22. Juli 2011</date> +<title>Wine 1.3.25 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.25 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.25">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Audio Unterstützung auf Basis der Win7 Architektur umgeschrieben.</li> + <li>Old-Style Audiotreiber für Jack, NAS und ESD wurden entfernt.</li> + <li>Grafiktreiber Architektur für die DIB Enginge geändert.</li> + <li>Verbessertes Handling des Shell Papierkorbs.</li> + <li>Bessere Joystick Unterstützung in DirectInput.</li> + <li>Anfägliche Basis für VBScript Unterstützung.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.25.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.25
by Jeremy Newman 25 Jul '11

25 Jul '11

Module: website Branch: master Commit: 59d3f00a464961d550b9218d7fcb58bc9251ba2c URL: http://source.winehq.org/git/website.git/?a=commit;h=59d3f00a464961d550b921… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 22 20:00:18 2011 +0200 French translation for release 1.3.25 --- news/fr/2011072201.xml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/news/fr/2011072201.xml b/news/fr/2011072201.xml new file mode 100644 index 0000000..acaab47 --- /dev/null +++ b/news/fr/2011072201.xml @@ -0,0 +1,21 @@ +<news> +<date>22 juillet 2011</date> +<title>Sortie de Wine 1.3.25</title> +<body> + La version de développement 1.3.25 de Wine est disponible. + <a href="{$root}/announce/1.3.25">Nouveautés</a> de cette version : +<ul> + <li>Réécriture du support audio, en utilisant l'architecture Win7.</li> + <li>Suppression des pilotes son "ancien style" Jack, NAS et ESD.</li> + <li>Modifications architecturale du pilote graphique pour le moteur DIB.</li> + <li>Gestion améliorée de la corbeille.</li> + <li>Meilleure prise en charge des joysticks dans DirectInput.</li> + <li>Première ébauche de prise en charge de VBScript.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.25.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : winetest: Create separate groups for the different Wine hosts.
by Alexandre Julliard 25 Jul '11

25 Jul '11

Module: tools Branch: master Commit: 00706cbcb7f473524d043abb49392f469c21b552 URL: http://source.winehq.org/git/tools.git/?a=commit;h=00706cbcb7f473524d043abb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 25 14:30:07 2011 +0200 winetest: Create separate groups for the different Wine hosts. --- winetest/build-index | 7 ++++++- winetest/gather | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 4e2f42f..9a1c97c 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -29,10 +29,15 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %unknown = (name => "Other"); +my %linux = (name => "Linux"); +my %mac = (name => "Mac"); +my %bsd = (name => "BSD"); +my %solaris = (name => "Solaris"); my %wine = (name => "Wine"); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, + \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); diff --git a/winetest/gather b/winetest/gather index 3ce627a..24fee0e 100755 --- a/winetest/gather +++ b/winetest/gather @@ -96,15 +96,20 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %unknown = (name => "Other"); +my %linux = (name => "Linux"); +my %mac = (name => "Mac"); +my %bsd = (name => "BSD"); +my %solaris = (name => "Solaris"); my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, unknown=>\%unknown, - wine=>\%wine, linux=>\%wine, mac=>\%wine, bsd=>\%wine, solaris=>\%wine); + wine=>\%wine, linux=>\%linux, mac=>\%mac, bsd=>\%bsd, solaris=>\%solaris); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, + \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); my ($outdated,undef) = glob "$datadir/*/outdated"; exit 2 unless defined $outdated;

1 0

Alexandre Julliard : Wine release 1.3.25
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: website Branch: master Commit: 33ac47e0a551d8c9fa3f2e2925b5c1bed3d7a7a5 URL: http://source.winehq.org/git/website.git/?a=commit;h=33ac47e0a551d8c9fa3f2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 19:42:53 2011 +0200 Wine release 1.3.25 --- news/en/2011072201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2011072201.xml b/news/en/2011072201.xml new file mode 100644 index 0000000..9a2a42f --- /dev/null +++ b/news/en/2011072201.xml @@ -0,0 +1,18 @@ +<news> +<date>July 22, 2011</date> +<title>Wine 1.3.25 Released</title> +<body> + The Wine development release 1.3.25 is now available. + <a href="{$root}/announce/1.3.25">What's new</a> in this release: +<ul> + <li>Rewrite of the audio support, using the Win7 architecture.</li> + <li>Old-style sound drivers for Jack, NAS and ESD are removed.</li> + <li>Graphics driver architecture changes for the DIB engine.</li> + <li>Improved handling of the shell recycle bin.</li> + <li>Better joystick support in DirectInput.</li> + <li>Initial stub for VBScript support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.25.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.25.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 8c850a82d440786ca4f83e5e061d6b3d323f5161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c850a82d440786ca4f83e5e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 19:32:43 2011 +0200 Release 1.3.25. --- ANNOUNCE | 1027 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 540 insertions(+), 507 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c850a82d440786ca4f83…

1 0

Tag wine-1.3.25 : Alexandre Julliard : Release 1.3.25
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: refs/tags/wine-1.3.25 Tag: 07a07effa9a7e8db91519a2d620c83570684dd8c URL: http://source.winehq.org/git/wine.git/?a=tag;h=07a07effa9a7e8db91519a2d620c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 22 19:32:44 2011 +0200 Release 1.3.25

1 0

Huw Davies : gdi32: Add a helper to sanitize a BITMAPINFO structure.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Module: wine Branch: master Commit: 6ce6f890bef2257af50a78e7deee86bdce052189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce6f890bef2257af50a78e7d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 22 15:09:58 2011 +0100 gdi32: Add a helper to sanitize a BITMAPINFO structure. --- dlls/gdi32/dib.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 7e5354b..85a8992 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -136,6 +136,79 @@ int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, return -1; } +/******************************************************************************************* + * Fill out a true BITMAPINFO from a variable sized BITMAPINFO / BITMAPCOREINFO. + */ +static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *info, UINT coloruse ) +{ + LONG width, height; + WORD planes, bpp; + DWORD compr, size; + void *src_colors = (char *)info + info->bmiHeader.biSize; + unsigned int colors; + int bitmap_type = DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, &planes, &bpp, &compr, &size ); + + if (bitmap_type == -1) return FALSE; + + colors = (bpp > 8) ? 0 : 1 << bpp; + + if (bitmap_type == 1) + { + dst->bmiHeader = info->bmiHeader; + dst->bmiHeader.biSize = sizeof(dst->bmiHeader); + + if (info->bmiHeader.biClrUsed) colors = info->bmiHeader.biClrUsed; + + if (info->bmiHeader.biCompression == BI_BITFIELDS) + /* bitfields are always at bmiColors even in larger structures */ + memcpy( dst->bmiColors, info->bmiColors, 3 * sizeof(DWORD) ); + else if (colors) + { + unsigned int size; + + if (coloruse == DIB_PAL_COLORS) + size = colors * sizeof(WORD); + else + size = colors * sizeof(RGBQUAD); + memcpy( dst->bmiColors, src_colors, size ); + } + } + else + { + dst->bmiHeader.biSize = sizeof(dst->bmiHeader); + dst->bmiHeader.biWidth = width; + dst->bmiHeader.biHeight = height; + dst->bmiHeader.biPlanes = planes; + dst->bmiHeader.biBitCount = bpp; + dst->bmiHeader.biCompression = compr; + dst->bmiHeader.biSizeImage = size; + dst->bmiHeader.biXPelsPerMeter = 0; + dst->bmiHeader.biYPelsPerMeter = 0; + dst->bmiHeader.biClrUsed = 0; + dst->bmiHeader.biClrImportant = 0; + + if (colors) + { + if (coloruse == DIB_PAL_COLORS) + memcpy( dst->bmiColors, src_colors, colors * sizeof(WORD) ); + else + { + unsigned int i; + RGBTRIPLE *triple = (RGBTRIPLE *)src_colors; + for (i = 0; i < colors; i++) + { + dst->bmiColors[i].rgbRed = triple[i].rgbtRed; + dst->bmiColors[i].rgbGreen = triple[i].rgbtGreen; + dst->bmiColors[i].rgbBlue = triple[i].rgbtBlue; + dst->bmiColors[i].rgbReserved = 0; + } + } + } + } + + return TRUE; +} + /* nulldrv fallback implementation using SetDIBits/StretchBlt */ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT heightDst, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, const void *bits, @@ -256,6 +329,8 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, BOOL delete_hdc = FALSE; PHYSDEV physdev; BITMAPOBJ *bitmap; + char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; INT result = 0; if (coloruse == DIB_RGB_COLORS && !dc) @@ -276,10 +351,14 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, return 0; } + if (!bitmapinfo_from_user_bitmapinfo( src_info, info, coloruse )) goto done; + physdev = GET_DC_PHYSDEV( dc, pSetDIBits ); - if (BITMAP_SetOwnerDC( hbitmap, physdev )) - result = physdev->funcs->pSetDIBits( physdev, hbitmap, startscan, lines, bits, info, coloruse ); + if (!BITMAP_SetOwnerDC( hbitmap, physdev )) goto done; + result = physdev->funcs->pSetDIBits( physdev, hbitmap, startscan, lines, bits, src_info, coloruse ); + +done: GDI_ReleaseObj( hbitmap ); release_dc_ptr( dc ); if (delete_hdc) DeleteDC(hdc);

1 0