wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Evan Stade : gdiplus: Draw custom dashes.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 1f61f4821fb7cd1004b04355306d341a4fc7f216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f61f4821fb7cd1004b043553… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jul 27 16:07:39 2007 -0700 gdiplus: Draw custom dashes. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 20 ++++++++++++++++++-- dlls/gdiplus/pen.c | 8 ++------ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f20ea3d..b9420a3 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -26,6 +26,7 @@ #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) +#define MAX_DASHLEN (16) /* this is a limitation of gdi */ COLORREF ARGB2COLORREF(ARGB color); extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3836476..cb56c73 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -98,8 +98,9 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) { HPEN gdipen; REAL width; - INT save_state = SaveDC(graphics->hdc); + INT save_state = SaveDC(graphics->hdc), i, numdashes; GpPointF pt[2]; + DWORD dash_array[MAX_DASHLEN]; EndPath(graphics->hdc); @@ -116,7 +117,22 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) width *= pen->width * convert_unit(graphics->hdc, pen->unit == UnitWorld ? graphics->unit : pen->unit); - gdipen = ExtCreatePen(pen->style, roundr(width), &pen->brush->lb, 0, NULL); + if(pen->dash == DashStyleCustom){ + numdashes = min(pen->numdashes, MAX_DASHLEN); + + TRACE("dashes are: "); + for(i = 0; i < numdashes; i++){ + dash_array[i] = roundr(width * pen->dashes[i]); + TRACE("%d, ", dash_array[i]); + } + TRACE("\n and the pen style is %x\n", pen->style); + + gdipen = ExtCreatePen(pen->style, roundr(width), &pen->brush->lb, + numdashes, dash_array); + } + else + gdipen = ExtCreatePen(pen->style, roundr(width), &pen->brush->lb, 0, NULL); + SelectObject(graphics->hdc, gdipen); return save_state; diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index e582f76..7d7237b 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -29,8 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static DWORD gdip_to_gdi_dash(GpDashStyle dash) { - static int calls; - switch(dash){ case DashStyleSolid: return PS_SOLID; @@ -43,9 +41,7 @@ static DWORD gdip_to_gdi_dash(GpDashStyle dash) case DashStyleDashDotDot: return PS_DASHDOTDOT; case DashStyleCustom: - if(!(calls++)) - FIXME("DashStyleCustom not implemented\n"); - return PS_SOLID; + return PS_USERSTYLE; default: ERR("Not a member of GpDashStyle enumeration\n"); return 0; @@ -240,7 +236,7 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash, return OutOfMemory; } - pen->dash = DashStyleCustom; + GdipSetPenDashStyle(pen, DashStyleCustom); memcpy(pen->dashes, dash, count * sizeof(REAL)); pen->numdashes = count;

1 0

Alexandre Julliard : ntdll: Avoid activation context leak for dlls with no imports.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 4e4c150bede97661345c67d3ae15eb81f80feefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e4c150bede97661345c67d3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 23:37:39 2007 +0200 ntdll: Avoid activation context leak for dlls with no imports. --- dlls/ntdll/loader.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 09516f6..a37394d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -625,8 +625,6 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) if (!(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) return STATUS_SUCCESS; /* already done */ wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; - if (!create_module_activation_context( &wm->ldr )) - RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); if (!(imports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size ))) @@ -637,6 +635,9 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) if (!nb_imports) return STATUS_SUCCESS; /* no imports */ + if (!create_module_activation_context( &wm->ldr )) + RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); + /* Allocate module dependency list */ wm->nDeps = nb_imports; wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, nb_imports*sizeof(WINE_MODREF *) );

1 0

Alexandre Julliard : ntdll: Allow optional elements in the comClass element .
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: f9c9f237635c229750bae29caf0af2eb19308c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9c9f237635c229750bae29ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 20:25:33 2007 +0200 ntdll: Allow optional elements in the comClass element. --- dlls/ntdll/actctx.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index e0ebd15..eb4cb71 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -885,8 +885,8 @@ static BOOL parse_assembly_identity_elem(xmlbuf_t* xmlbuf, ACTIVATION_CONTEXT* a static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) { - xmlstr_t attr_name, attr_value; - BOOL end = FALSE, error; + xmlstr_t elem, attr_name, attr_value; + BOOL ret, end = FALSE, error; struct entity* entity; if (!(entity = add_entity(&dll->entities, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION))) @@ -905,7 +905,21 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) } if (error || end) return end; - return parse_expect_end_elem(xmlbuf, comClassW); + + while ((ret = next_xml_elem(xmlbuf, &elem))) + { + if (xmlstr_cmp_end(&elem, comClassW)) + { + ret = parse_end_element(xmlbuf); + break; + } + else + { + WARN("unknown elem %s\n", debugstr_xmlstr(&elem)); + ret = parse_unknown_elem(xmlbuf, &elem); + } + } + return ret; } static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll)

1 0

Alexandre Julliard : ntdll: Use the exact size of the manifest file.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 53285e2462d2c57e0a590e96ea355983f01751cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=53285e2462d2c57e0a590e96e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 20:25:12 2007 +0200 ntdll: Use the exact size of the manifest file. --- dlls/ntdll/actctx.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 15b0c59..e0ebd15 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -1652,6 +1652,8 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct assembly_identity* ai, LPCWSTR filename, LPCWSTR directory, HANDLE file ) { + FILE_END_OF_FILE_INFORMATION info; + IO_STATUS_BLOCK io; HANDLE mapping; OBJECT_ATTRIBUTES attr; LARGE_INTEGER size; @@ -1682,7 +1684,9 @@ static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct NtClose( mapping ); if (status != STATUS_SUCCESS) return status; - status = parse_manifest(acl, ai, filename, directory, base, count); + status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileEndOfFileInformation ); + if (status == STATUS_SUCCESS) + status = parse_manifest(acl, ai, filename, directory, base, info.EndOfFile.QuadPart); NtUnmapViewOfSection( GetCurrentProcess(), base ); return status;

1 0

Alexandre Julliard : ntdll: Fixed the null bytes check in RtlIsTextUnicode.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 43519e415d8712850e51672a189d8a687b5e6c05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43519e415d8712850e51672a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 20:17:24 2007 +0200 ntdll: Fixed the null bytes check in RtlIsTextUnicode. --- dlls/ntdll/rtlstr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 2a54223..1b13f12 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1636,7 +1636,7 @@ BOOLEAN WINAPI RtlIsTextUnicode( LPCVOID buf, INT len, INT *pf ) { for (i = 0; i < len; i++) { - if (!s[i]) + if (!(s[i] & 0xff) || !(s[i] >> 8)) { out_flags |= IS_TEXT_UNICODE_NULL_BYTES; break;

1 0

Alexandre Julliard : ntdll: Convert the XML parser to Unicode to support UCS-16 manifests.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: db72af98b556660a699cd6563f9348bd9f86c33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db72af98b556660a699cd6563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 30 18:20:24 2007 +0200 ntdll: Convert the XML parser to Unicode to support UCS-16 manifests. --- dlls/ntdll/actctx.c | 369 ++++++++++++++++++++++++++++---------------------- 1 files changed, 207 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db72af98b556660a699cd…

1 0

lostwages/templates/en status.template status_ ...
by Jeremy Newman 30 Jul '07

30 Jul '07

ChangeSet ID: 31290 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2007/07/30 10:44:07 Modified files: templates/en : status.template status_changelog.template status_directx.template status_multimedia.template status_options.template status_todo.template status_ui.template Log message: Tom Wickline <twickline(a)gmail.com> Status Update Patch: http://cvs.winehq.org/patch.py?id=31290 Old revision New revision Changes Path 1.48 1.49 +1 -1 lostwages/templates/en/status.template 1.53 1.54 +31 -283 lostwages/templates/en/status_changelog.template 1.23 1.24 +68 -44 lostwages/templates/en/status_directx.template 1.21 1.22 +16 -22 lostwages/templates/en/status_multimedia.template 1.6 1.7 +1 -1 lostwages/templates/en/status_options.template 1.20 1.21 +4 -6 lostwages/templates/en/status_todo.template 1.25 1.26 +16 -15 lostwages/templates/en/status_ui.template

1 0

Tim Schwartz : lmuse.h: Add structures needed by NetUseAdd().
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 2908dab7840d045efb0e959cdc393f3a808fa6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2908dab7840d045efb0e959cd… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Fri Jul 27 17:43:16 2007 -0500 lmuse.h: Add structures needed by NetUseAdd(). --- include/Makefile.in | 1 + include/lm.h | 1 + include/lmuse.h | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 44ef893..a79ae12 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -200,6 +200,7 @@ SRCDIR_INCLUDES = \ lmserver.h \ lmshare.h \ lmstats.h \ + lmuse.h \ lmwksta.h \ lzexpand.h \ mapi.h \ diff --git a/include/lm.h b/include/lm.h index 6151fd5..429ca9f 100644 --- a/include/lm.h +++ b/include/lm.h @@ -32,5 +32,6 @@ #include <lmstats.h> #include <lmjoin.h> #include <lmmsg.h> +#include <lmuse.h> #endif diff --git a/include/lmuse.h b/include/lmuse.h new file mode 100644 index 0000000..786fb01 --- /dev/null +++ b/include/lmuse.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2007 Tim Schwartz + * + * 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 + */ +#ifndef _LMUSE_H +#define _LMUSE_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _USE_INFO_1 { + LMSTR ui1_local, ui1_remote, ui1_password; + DWORD ui1_status, ui1_asg_type, ui1_refcount, ui1_usecount; +} USE_INFO_1, *PUSE_INFO_1, *LPUSE_INFO_1; + +typedef struct _USE_INFO_2 { + LMSTR ui2_local, ui2_remote, ui2_password; + DWORD ui2_status, ui2_asg_type, ui2_refcount, ui2_usecount; + LPWSTR ui2_username; + LMSTR ui2_domainname; +} USE_INFO_2, *PUSE_INFO_2, *LPUSE_INFO_2; + +#ifdef __cplusplus +} +#endif + +#endif /* ndef _LMUSE_H */

1 0

Clinton Stimpson : user32: Also test parent messages when hiding child window.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: f4af6455a8a446bb56c33d269e23c6f6b9133dea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4af6455a8a446bb56c33d269… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Thu Jul 26 19:27:53 2007 -0600 user32: Also test parent messages when hiding child window. --- dlls/user32/tests/msg.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 799c891..04dca3f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -727,6 +727,15 @@ static const struct message WmHideChildSeq[] = { { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; +/* ShowWindow(SW_HIDE) for a visible child window checking all parent events*/ +static const struct message WmHideChildSeq2[] = { + { WM_SHOWWINDOW, sent|wparam, 0 }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { WM_ERASEBKGND, sent|parent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { 0 } +}; /* SetWindowPos(SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE) * for a not visible child window */ @@ -3982,6 +3991,15 @@ static void test_messages(void) ShowWindow(hchild, SW_SHOW); ok_sequence(WmShowChildSeq, "ShowWindow(SW_SHOW):child", FALSE); + /* check parent messages too */ + log_all_parent_messages++; + ShowWindow(hchild, SW_HIDE); + ok_sequence(WmHideChildSeq2, "ShowWindow(SW_HIDE):child", TRUE); + log_all_parent_messages--; + + ShowWindow(hchild, SW_SHOW); + ok_sequence(WmShowChildSeq, "ShowWindow(SW_SHOW):child", FALSE); + ShowWindow(hchild, SW_HIDE); ok_sequence(WmHideChildSeq, "ShowWindow(SW_HIDE):child", FALSE);

1 0

Lei Zhang : ntdll: Add Bolivian time zone info.
by Alexandre Julliard 30 Jul '07

30 Jul '07

Module: wine Branch: master Commit: 9ee4d8509bcc5a8b675c8e0712bf320180b9c757 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ee4d8509bcc5a8b675c8e071… Author: Lei Zhang <thestig(a)google.com> Date: Sun Jul 29 22:01:56 2007 -0700 ntdll: Add Bolivian time zone info. --- dlls/ntdll/time.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 497087c..9f1cef2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -417,6 +417,8 @@ static const struct tagTZ_INFO TZ_INFO[] = {"NOVST", {'N','o','v','o','s','i','b','i','r','s','k',' ','S','u','m','m','e','r', ' ','T','i','m','e','\0'}, -420, 1}, + {"BOT", + {'B','o','l','i','v','i','a','n',' ','T','i','m','e','\0'}, 240, 0}, {"UZT", {'U','z','b','e','k','i','s','t','h','a','n',' ','T','i','m','e','\0'}, -300, 0} };

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
96
Older →

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