January 2013 - Wine-commits

Alexandre Julliard : winex11: Handle Expose events on top-level client windows.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 8373f8b6f65e5570a3bbaba2424b71634452a448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8373f8b6f65e5570a3bbaba24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 23 19:09:29 2013 +0100 winex11: Handle Expose events on top-level client windows. --- dlls/winex11.drv/event.c | 23 +++++++++++++---------- dlls/winex11.drv/window.c | 5 +++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 90b2068..5e5b19e 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -829,21 +829,24 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) rect.right = event->x + event->width; rect.bottom = event->y + event->height; - if (data->surface) + if (event->window != data->client_window) { - surface_region = expose_surface( data->surface, &rect ); - if (!surface_region) flags = 0; - if (data->vis.visualid != default_visual.visualid) - data->surface->funcs->flush( data->surface ); - } + if (data->surface) + { + surface_region = expose_surface( data->surface, &rect ); + if (!surface_region) flags = 0; + else OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); - if (event->window != root_window) - { + if (data->vis.visualid != default_visual.visualid) + data->surface->funcs->flush( data->surface ); + } OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, data->whole_rect.top - data->client_rect.top ); - if (surface_region) OffsetRgn( surface_region, data->whole_rect.left - data->client_rect.left, - data->whole_rect.top - data->client_rect.top ); + } + if (event->window != root_window) + { if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) mirror_rect( &data->client_rect, &rect ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d45e9a1..7f97330 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1383,11 +1383,12 @@ Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *vi attr.bit_gravity = NorthWestGravity; attr.win_gravity = NorthWestGravity; attr.backing_store = NotUseful; + attr.event_mask = ExposureMask; data->client_window = XCreateWindow( data->display, data->whole_window, x, y, cx, cy, 0, default_visual.depth, InputOutput, visual->visual, - CWBitGravity | CWWinGravity | CWBackingStore | CWColormap, - &attr ); + CWBitGravity | CWWinGravity | CWBackingStore | + CWColormap | CWEventMask, &attr ); if (!data->client_window) return 0; XSaveContext( data->display, data->client_window, winContext, (char *)data->hwnd );

1 0

Stefan Dösinger : wined3d: Ignore clears if count = 0 and rects != NULL.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: aaa11492db5af6a77ec8c1977e80a9634ca9b80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa11492db5af6a77ec8c1977… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 23 15:02:45 2013 +0100 wined3d: Ignore clears if count = 0 and rects != NULL. --- dlls/d3d8/tests/visual.c | 27 +++++++++++++++++ dlls/d3d9/tests/visual.c | 27 +++++++++++++++++ dlls/ddraw/tests/ddraw1.c | 66 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 44 ++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 45 +++++++++++++++++++++++++++++ dlls/ddraw/viewport.c | 12 ++++++++ dlls/wined3d/device.c | 6 ++++ 8 files changed, 296 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aaa11492db5af6a77ec8c…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 534f5e5dd001c2dd20ff067672a5d1e50f34c08c URL: http://source.winehq.org/git/wine.git/?a=commit;h=534f5e5dd001c2dd20ff06767… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jan 23 20:02:26 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 48 +++++++++++++++--------------------------------- 1 files changed, 15 insertions(+), 33 deletions(-) diff --git a/po/lt.po b/po/lt.po index 02996e0..f28206a 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-01-08 22:47+0300\n" +"PO-Revision-Date: 2013-01-23 20:00+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -10435,77 +10435,59 @@ msgstr "Nežinomi protokolai" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "IPv4 TCP statistika" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" -msgstr "Aktyvūs ryšiai" +msgstr "Aktyvūs atvėrimai" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Pasyvūs atvėrimai" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "Aktyvūs ryšiai" +msgstr "Nepavykę bandymai susijungti" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "Aktyvūs ryšiai" +msgstr "Panaikinti ryšiai" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "Aktyvūs ryšiai" +msgstr "Dabartiniai ryšiai" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segmentas užblokuotas.\n" +msgstr "Gauti segmentai" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segmentas užblokuotas.\n" +msgstr "Išsiųsti segmentai" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Pakartotinai perduoti segmentai" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "IPv4 UDP statistika" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segmentas užblokuotas.\n" +msgstr "Gauti duomenų paketai" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Vietinis prievadas" +msgstr "Be prievadų" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Dekodavimo klaida" +msgstr "Gavimo klaidos" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Išsiųsti duomenų paketai" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Jacek Caban : mshtml: Get rid of PTInt64 type.
by Alexandre Julliard 23 Jan '13

23 Jan '13

Module: wine Branch: master Commit: 9bd6b9e537847136e7588f21b9e6fc7e80b1fc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bd6b9e537847136e7588f21b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 23 18:43:25 2013 +0100 mshtml: Get rid of PTInt64 type. --- dlls/mshtml/nsiface.idl | 3 +-- dlls/mshtml/nsio.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 8973701..8a359d9 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -46,7 +46,6 @@ typedef WCHAR PRUnichar; typedef ULONG PRUint32; typedef WORD PRUint16; typedef BYTE PRUint8; -typedef LONGLONG PRInt64; typedef ULONGLONG PRUint64; /* @@ -56,7 +55,7 @@ typedef ULONGLONG PRUint64; */ #define int16_t short #define int32_t LONG -#define int64_t PRInt64 +#define int64_t INT64 #define uint8_t PRUint8 #define uint16_t PRUint16 diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index af57750..9e35921 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1463,7 +1463,7 @@ static nsrefcnt NSAPI nsUploadChannel_Release(nsIUploadChannel *iface) } static nsresult NSAPI nsUploadChannel_SetUploadStream(nsIUploadChannel *iface, - nsIInputStream *aStream, const nsACString *aContentType, PRInt64 aContentLength) + nsIInputStream *aStream, const nsACString *aContentType, INT64 aContentLength) { nsChannel *This = impl_from_nsIUploadChannel(iface); const char *content_type;

1 0

André Hentschel : netstat: Implement the UDP stats output.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: b372044c398c74af562e2489e8ca0a2140895d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b372044c398c74af562e2489e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 21 21:12:47 2013 +0100 netstat: Implement the UDP stats output. --- po/ar.po | 20 ++++++++++++++++++++ po/bg.po | 24 ++++++++++++++++++++++++ po/ca.po | 26 ++++++++++++++++++++++++++ po/cs.po | 22 ++++++++++++++++++++++ po/da.po | 26 ++++++++++++++++++++++++++ po/de.po | 26 ++++++++++++++++++++++++++ po/el.po | 22 ++++++++++++++++++++++ po/en.po | 20 ++++++++++++++++++++ po/en_US.po | 20 ++++++++++++++++++++ po/eo.po | 24 ++++++++++++++++++++++++ po/es.po | 26 ++++++++++++++++++++++++++ po/fa.po | 20 ++++++++++++++++++++ po/fi.po | 26 ++++++++++++++++++++++++++ po/fr.po | 26 ++++++++++++++++++++++++++ po/he.po | 24 ++++++++++++++++++++++++ po/hi.po | 20 ++++++++++++++++++++ po/hu.po | 26 ++++++++++++++++++++++++++ po/it.po | 26 ++++++++++++++++++++++++++ po/ja.po | 26 ++++++++++++++++++++++++++ po/ko.po | 26 ++++++++++++++++++++++++++ po/lt.po | 26 ++++++++++++++++++++++++++ po/ml.po | 20 ++++++++++++++++++++ po/nb_NO.po | 26 ++++++++++++++++++++++++++ po/nl.po | 26 ++++++++++++++++++++++++++ po/or.po | 20 ++++++++++++++++++++ po/pa.po | 20 ++++++++++++++++++++ po/pl.po | 26 ++++++++++++++++++++++++++ po/pt_BR.po | 26 ++++++++++++++++++++++++++ po/pt_PT.po | 26 ++++++++++++++++++++++++++ po/rm.po | 20 ++++++++++++++++++++ po/ro.po | 24 ++++++++++++++++++++++++ po/ru.po | 26 ++++++++++++++++++++++++++ po/sk.po | 22 ++++++++++++++++++++++ po/sl.po | 26 ++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 24 ++++++++++++++++++++++++ po/sr_RS(a)latin.po | 24 ++++++++++++++++++++++++ po/sv.po | 26 ++++++++++++++++++++++++++ po/te.po | 20 ++++++++++++++++++++ po/th.po | 22 ++++++++++++++++++++++ po/tr.po | 24 ++++++++++++++++++++++++ po/uk.po | 26 ++++++++++++++++++++++++++ po/wa.po | 20 ++++++++++++++++++++ po/wine.pot | 20 ++++++++++++++++++++ po/zh_CN.po | 24 ++++++++++++++++++++++++ po/zh_TW.po | 26 ++++++++++++++++++++++++++ programs/netstat/netstat.c | 25 +++++++++++++++++++++++++ programs/netstat/netstat.h | 5 +++++ programs/netstat/netstat.rc | 5 +++++ 48 files changed, 1101 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b372044c398c74af562e2…

1 0

Piotr Caban : vbscript: Fixed typo in vbsregexp55.idl.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 2cb3df606f5659b0fac648fe4da0410b0e4e8cc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb3df606f5659b0fac648fe4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 22 13:55:54 2013 +0100 vbscript: Fixed typo in vbsregexp55.idl. --- dlls/vbscript/vbsregexp55.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/vbsregexp55.idl b/dlls/vbscript/vbsregexp55.idl index 0e016b2..c0cf683 100644 --- a/dlls/vbscript/vbsregexp55.idl +++ b/dlls/vbscript/vbsregexp55.idl @@ -122,7 +122,7 @@ library VBScript_RegExp_55 [id(DISPID_REGEXP_REPLACE)] HRESULT Replace( [in] BSTR sourceString, - [in] VARIANT *replaceVar, + [in] VARIANT replaceVar, [out, retval] BSTR *pDestString); }

1 0

Huw Davies : riched20: Avoid an unnecessary string duplication.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 7a27ffb28ccadb611e623bf0e7c20595a48ee7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a27ffb28ccadb611e623bf0e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 22 14:04:08 2013 +0000 riched20: Avoid an unnecessary string duplication. --- dlls/riched20/caret.c | 25 ++++++++----------------- dlls/riched20/undo.c | 2 +- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 7decff2..490f39c 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -361,6 +361,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, else { ME_Cursor cursor; + ME_UndoItem *undo; int nCharsToDelete = min(nChars, c.nOffset); int i; @@ -378,25 +379,15 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, nCharsToDelete, nChars, c.nOffset, debugstr_w(run->strText->szData), run->strText->nLen); - if (!c.nOffset && run->strText->nLen == nCharsToDelete) + undo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); + if (undo) { - /* undo = reinsert whole run */ - /* nOfs is a character offset (from the start of the document - to the current (deleted) run */ - ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); - if (pUndo) - pUndo->di.member.run.nCharOfs = nOfs+nChars; - } - else - { - /* undo = reinsert partial run */ - ME_UndoItem *pUndo = ME_AddUndoItem(editor, diUndoInsertRun, c.pRun); - if (pUndo) { - ME_DestroyString(pUndo->di.member.run.strText); - pUndo->di.member.run.nCharOfs = nOfs+nChars; - pUndo->di.member.run.strText = ME_MakeStringN(run->strText->szData+c.nOffset, nCharsToDelete); - } + /* nOfs is a character offset (from the start of the document + to the current (deleted) run */ + undo->di.member.run.nCharOfs = nOfs + nChars; + undo->di.member.run.strText = ME_MakeStringN(run->strText->szData + c.nOffset, nCharsToDelete); } + TRACE("Post deletion string: %s (%d)\n", debugstr_w(run->strText->szData), run->strText->nLen); TRACE("Shift value: %d\n", shift); ME_StrDeleteV(run->strText, c.nOffset, nCharsToDelete); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index a101cc1..af27238 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -73,7 +73,7 @@ ME_UndoItem *ME_AddUndoItem(ME_TextEditor *editor, ME_DIType type, const ME_Disp case diUndoInsertRun: assert(pdi); pItem->member.run = pdi->member.run; - pItem->member.run.strText = ME_StrDup(pItem->member.run.strText); + pItem->member.run.strText = NULL; ME_AddRefStyle(pItem->member.run.style); if (pdi->member.run.ole_obj) {

1 0

Hans Leidekker : wbemprox: Add a stub implementation of IWbemQualifierSet.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: 2797cd8ec1b2af0f96c4c58d155aa20b482eca42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2797cd8ec1b2af0f96c4c58d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 22 16:28:36 2013 +0100 wbemprox: Add a stub implementation of IWbemQualifierSet. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/class.c | 2 +- dlls/wbemprox/qualifier.c | 183 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 1 + include/wbemcli.idl | 38 ++++++++ 5 files changed, 224 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 31d83cf..613f3ff 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -6,6 +6,7 @@ C_SRCS = \ class.c \ main.c \ process.c \ + qualifier.c \ query.c \ reg.c \ service.c \ diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 4e27c5c..616c521 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -547,7 +547,7 @@ static HRESULT WINAPI class_object_GetPropertyQualifierSet( IWbemQualifierSet **ppQualSet ) { FIXME("%p, %s, %p\n", iface, debugstr_w(wszProperty), ppQualSet); - return E_NOTIMPL; + return WbemQualifierSet_create( NULL, (void **)ppQualSet ); } static HRESULT WINAPI class_object_Clone( diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c new file mode 100644 index 0000000..b73bf1d --- /dev/null +++ b/dlls/wbemprox/qualifier.c @@ -0,0 +1,183 @@ +/* + * Copyright 2013 Hans Leidekker for CodeWeavers + * + * 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 COBJMACROS + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wbemcli.h" + +#include "wine/debug.h" +#include "wbemprox_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); + +struct qualifier_set +{ + IWbemQualifierSet IWbemQualifierSet_iface; + LONG refs; +}; + +static inline struct qualifier_set *impl_from_IWbemQualifierSet( + IWbemQualifierSet *iface ) +{ + return CONTAINING_RECORD(iface, struct qualifier_set, IWbemQualifierSet_iface); +} + +static ULONG WINAPI qualifier_set_AddRef( + IWbemQualifierSet *iface ) +{ + struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); + return InterlockedIncrement( &set->refs ); +} + +static ULONG WINAPI qualifier_set_Release( + IWbemQualifierSet *iface ) +{ + struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); + LONG refs = InterlockedDecrement( &set->refs ); + if (!refs) + { + TRACE("destroying %p\n", set); + heap_free( set ); + } + return refs; +} + +static HRESULT WINAPI qualifier_set_QueryInterface( + IWbemQualifierSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct qualifier_set *set = impl_from_IWbemQualifierSet( iface ); + + TRACE("%p, %s, %p\n", set, debugstr_guid( riid ), ppvObject ); + + if ( IsEqualGUID( riid, &IID_IWbemQualifierSet ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = set; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + IWbemQualifierSet_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI qualifier_set_Get( + IWbemQualifierSet *iface, + LPCWSTR wszName, + LONG lFlags, + VARIANT *pVal, + LONG *plFlavor ) +{ + FIXME("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, plFlavor); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_Put( + IWbemQualifierSet *iface, + LPCWSTR wszName, + VARIANT *pVal, + LONG lFlavor ) +{ + FIXME("%p, %s, %p, %d\n", iface, debugstr_w(wszName), pVal, lFlavor); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_Delete( + IWbemQualifierSet *iface, + LPCWSTR wszName ) +{ + FIXME("%p, %s\n", iface, debugstr_w(wszName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_GetNames( + IWbemQualifierSet *iface, + LONG lFlags, + SAFEARRAY **pNames ) +{ + FIXME("%p, %08x, %p\n", iface, lFlags, pNames); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_BeginEnumeration( + IWbemQualifierSet *iface, + LONG lFlags ) +{ + FIXME("%p, %08x\n", iface, lFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_Next( + IWbemQualifierSet *iface, + LONG lFlags, + BSTR *pstrName, + VARIANT *pVal, + LONG *plFlavor ) +{ + FIXME("%p, %08x, %p, %p, %p\n", iface, lFlags, pstrName, pVal, plFlavor); + return E_NOTIMPL; +} + +static HRESULT WINAPI qualifier_set_EndEnumeration( + IWbemQualifierSet *iface ) +{ + FIXME("%p\n", iface); + return E_NOTIMPL; +} + +static const IWbemQualifierSetVtbl qualifier_set_vtbl = +{ + qualifier_set_QueryInterface, + qualifier_set_AddRef, + qualifier_set_Release, + qualifier_set_Get, + qualifier_set_Put, + qualifier_set_Delete, + qualifier_set_GetNames, + qualifier_set_BeginEnumeration, + qualifier_set_Next, + qualifier_set_EndEnumeration +}; + +HRESULT WbemQualifierSet_create( + IUnknown *pUnkOuter, LPVOID *ppObj ) +{ + struct qualifier_set *set; + + TRACE("%p, %p\n", pUnkOuter, ppObj); + + if (!(set = heap_alloc( sizeof(*set) ))) return E_OUTOFMEMORY; + + set->IWbemQualifierSet_iface.lpVtbl = &qualifier_set_vtbl; + set->refs = 1; + + *ppObj = &set->IWbemQualifierSet_iface; + + TRACE("returning iface %p\n", *ppObj); + return S_OK; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 54cb84e..621603d 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -197,6 +197,7 @@ HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemQualifierSet_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT process_get_owner(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index c76d465..af5e5bc 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -597,3 +597,41 @@ interface IWbemClassObject : IUnknown [in,string] LPCWSTR wszMethodName, [out] BSTR *pstrClassName); } + +[ + object, + restricted, + local, + uuid(dc12a680-737f-11cf-884d-00aa004b2e24) +] +interface IWbemQualifierSet : IUnknown +{ + HRESULT Get( + [in,string] LPCWSTR wszName, + [in] long lFlags, + [out] VARIANT *pVal, + [out] long *plFlavor); + + HRESULT Put( + [in,string] LPCWSTR wszName, + [in] VARIANT *pVal, + [in] long lFlavor); + + HRESULT Delete( + [in,string] LPCWSTR wszName); + + HRESULT GetNames( + [in] long lFlags, + [out] SAFEARRAY **pNames); + + HRESULT BeginEnumeration( + [in] long lFlags); + + HRESULT Next( + [in] long lFlags, + [out] BSTR *pstrName, + [out] VARIANT *pVal, + [out] long *plFlavor); + + HRESULT EndEnumeration(); +};

1 0

Huw Davies : wineps: Use a file mapping to read the ppd file.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: c22be15a98ce763199752a59ac664c465d50b387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22be15a98ce763199752a59a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 22 15:51:47 2013 +0000 wineps: Use a file mapping to read the ppd file. --- dlls/wineps.drv/init.c | 16 +++--- dlls/wineps.drv/ppd.c | 144 +++++++++++++++++++++++++++++++--------------- dlls/wineps.drv/psdrv.h | 2 +- 3 files changed, 106 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c22be15a98ce763199752…

1 0

Huw Davies : wineps: Cope with '\r'-only end-of-line markers.
by Alexandre Julliard 22 Jan '13

22 Jan '13

Module: wine Branch: master Commit: cb3815aead2588030f002616ffbb03ab5eea760e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb3815aead2588030f002616f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 22 15:51:48 2013 +0000 wineps: Cope with '\r'-only end-of-line markers. --- dlls/wineps.drv/ppd.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index a18c42c..adb6a21 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -266,7 +266,15 @@ static BOOL get_line( char *buf, int size, struct map_context *ctx ) { if (ctx->pos > ctx->end) break; buf[i] = *ctx->pos++; - if (buf[i] == '\n') + + /* \r\n -> \n */ + if (buf[i] == '\r' && ctx->pos <= ctx->end && *ctx->pos == '\n') + { + ctx->pos++; + buf[i] = '\n'; + } + + if (buf[i] == '\n' || buf[i] == '\r') { i++; break; @@ -394,9 +402,11 @@ static BOOL PSDRV_PPDGetNextTuple(struct map_context *ctx, PPDTuple *tuple) break; } while(1); - if(line[strlen(line)-1] != '\n') { + cp = line + strlen(line) - 1; + if (*cp != '\n' && *cp != '\r') + { ERR("Line too long.\n"); - goto start; + goto start; } for(cp = line; !isspace(*cp) && *cp != ':'; cp++)

1 0