June 2007 - Wine-Commits - list.winehq.org

Maarten Lankhorst : dsound: Give rougher estimates for fraglen to satisfy alsa.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 95912460021f5891b2a1ebf2c41e364f42fdbcd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95912460021f5891b2a1ebf2c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jun 8 13:57:51 2007 +0200 dsound: Give rougher estimates for fraglen to satisfy alsa. --- dlls/dsound/primary.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f229757..3e3fce4 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -44,8 +44,20 @@ static void DSOUND_RecalcPrimary(DirectSoundDevice *device) nBlockAlign = device->pwfx->nBlockAlign; if (device->hwbuf) { DWORD fraglen; - /* let fragment size approximate the timer delay */ - fraglen = (device->pwfx->nSamplesPerSec * DS_TIME_DEL / 1000) * nBlockAlign; + /* Alsa doesn't have continuous buffers, instead it has buffers with power of 2, + * If DS_TIME_DEL is about 10 ms, 512 * nBlockAlign is roughly correct */ + fraglen = 512 * nBlockAlign; + + /* Compensate for only being rougly accurate */ + if (device->pwfx->nSamplesPerSec <= 26000) + fraglen /= 2; + + if (device->pwfx->nSamplesPerSec <= 12000) + fraglen /= 2; + + if (device->pwfx->nSamplesPerSec >= 80000) + fraglen *= 2; + /* reduce fragment size until an integer number of them fits in the buffer */ /* (FIXME: this may or may not be a good idea) */ while (device->buflen % fraglen) fraglen -= nBlockAlign;

1 0

Evan Stade : gdiplus: Implemented GdipDrawLines.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: f6f04f6e0ede8f7add6db6874a2c294fc993e900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6f04f6e0ede8f7add6db6874… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jun 21 16:15:13 2007 -0700 gdiplus: Implemented GdipDrawLines. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 775bde3..db9dd46 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -176,7 +176,7 @@ @ stub GdipDrawImageRectRectI @ stub GdipDrawLine @ stdcall GdipDrawLineI(ptr ptr long long long long) -@ stub GdipDrawLines +@ stdcall GdipDrawLines(ptr ptr ptr long) @ stub GdipDrawLinesI @ stub GdipDrawPath @ stdcall GdipDrawPie(ptr ptr long long long long long long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f917b65..beba700 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -259,6 +259,27 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, return Ok; } +GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST + GpPointF *points, INT count) +{ + HGDIOBJ old_obj; + INT i; + + if(!pen || !graphics || (count < 2)) + return InvalidParameter; + + old_obj = SelectObject(graphics->hdc, pen->gdipen); + MoveToEx(graphics->hdc, roundr(points[0].X), roundr(points[0].Y), NULL); + + for(i = 1; i < count; i++){ + LineTo(graphics->hdc, roundr(points[i].X), roundr(points[i].Y)); + } + + SelectObject(graphics->hdc, old_obj); + + return Ok; +} + GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e5c46b3..93905fd 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -38,6 +38,7 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT); +GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL);

1 0

Evan Stade : gdiplus: Implemented GdipCreatePath and GdipDeletePath.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 14802872b876581fc895f5310e120f83b88b58dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=14802872b876581fc895f5310… Author: Evan Stade <estade(a)gmail.com> Date: Thu Jun 21 16:15:17 2007 -0700 gdiplus: Implemented GdipCreatePath and GdipDeletePath. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 7 ++++ dlls/gdiplus/graphicspath.c | 69 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 7 ++++ include/gdiplusflat.h | 3 ++ include/gdiplusgpstubs.h | 4 ++ include/gdiplustypes.h | 40 +++++++++++++++++++++++ 8 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index b2bd0c4..1194fc0 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ brush.c \ gdiplus.c \ graphics.c \ + graphicspath.c \ pen.c @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index db9dd46..5ca2b0f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -106,7 +106,7 @@ @ stub GdipCreateMetafileFromWmfFile @ stub GdipCreatePath2 @ stub GdipCreatePath2I -@ stub GdipCreatePath +@ stdcall GdipCreatePath(long ptr) @ stub GdipCreatePathGradient @ stub GdipCreatePathGradientFromPath @ stub GdipCreatePathGradientI @@ -134,7 +134,7 @@ @ stub GdipDeleteFontFamily @ stdcall GdipDeleteGraphics(ptr) @ stub GdipDeleteMatrix -@ stub GdipDeletePath +@ stdcall GdipDeletePath(ptr) @ stub GdipDeletePathIter @ stdcall GdipDeletePen(ptr) @ stub GdipDeletePrivateFontCollection diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 6cb2e43..e221044 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -49,4 +49,11 @@ struct GpSolidFill{ GpBrush brush; }; +struct GpPath{ + GpFillMode fill; + GpGraphics* graphics; + GpPathData pathdata; + BOOL newfigure; /* whether the next drawing action starts a new figure */ +}; + #endif diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c new file mode 100644 index 0000000..13a14cf --- /dev/null +++ b/dlls/gdiplus/graphicspath.c @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * 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 <stdarg.h> +#include <math.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "gdiplus.h" +#include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); + +GpStatus WINGDIPAPI GdipCreatePath(GpFillMode fill, GpPath **path) +{ + HDC hdc; + GpStatus ret; + + if(!path) + return InvalidParameter; + + *path = GdipAlloc(sizeof(GpSolidFill)); + if(!*path) return OutOfMemory; + + hdc = GetDC(0); + + (*path)->fill = fill; + (*path)->newfigure = TRUE; + + ret = GdipCreateFromHDC(hdc, &((*path)->graphics)); + + if(ret != Ok){ + ReleaseDC(0, hdc); + GdipFree(*path); + } + + return ret; +} + +GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) +{ + if(!path || !(path->graphics)) + return InvalidParameter; + + ReleaseDC(0, path->graphics->hdc); + GdipDeleteGraphics(path->graphics); + GdipFree(path); + + return Ok; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index d3cc5d2..c6b5f15 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -39,10 +39,17 @@ enum BrushType BrushTypeLinearGradient = 4 }; +enum FillMode +{ + FillModeAlternate = 0, + FillModeWinding = 1 +}; + #ifndef __cplusplus typedef enum Unit Unit; typedef enum BrushType BrushType; +typedef enum FillMode FillMode; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 93905fd..78db330 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -47,6 +47,9 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB,GpSolidFill**); GpStatus WINGDIPAPI GdipGetBrushType(GpBrush*,GpBrushType*); GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush*); +GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); +GpStatus WINGDIPAPI GdipDeletePath(GpPath*); + #ifdef __cplusplus } #endif diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 727ca06..6e283d8 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -25,6 +25,7 @@ class GpGraphics {}; class GpGraphics {}; class GpBrush {}; class GpSolidFill {}; +class GpPath {}; #else /* end of c++ declarations */ @@ -32,6 +33,7 @@ typedef struct GpGraphics GpGraphics; typedef struct GpPen GpPen; typedef struct GpBrush GpBrush; typedef struct GpSolidFill GpSolidFill; +typedef struct GpPath GpPath; #endif /* end of c declarations */ @@ -39,5 +41,7 @@ typedef Status GpStatus; typedef Unit GpUnit; typedef BrushType GpBrushType; typedef PointF GpPointF; +typedef FillMode GpFillMode; +typedef PathData GpPathData; #endif diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 38fdf58..5810412 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -89,6 +89,39 @@ public: REAL Y; }; +class PathData +{ +public: + PathData() + { + Count = 0; + Points = NULL; + Types = NULL; + } + + ~PathData() + { + if (Points != NULL) + { + delete Points; + } + + if (Types != NULL) + { + delete Types; + } + } + +private: + PathData(const PathData &); + PathData& operator=(const PathData &); + +public: + INT Count; + PointF* Points; + BYTE* Types; +}; + #else /* end of c++ typedefs */ typedef struct PointF @@ -97,6 +130,13 @@ typedef struct PointF REAL Y; } PointF; +typedef struct PathData +{ + INT Count; + PointF* Points; + BYTE* Types; +} PathData; + typedef enum Status Status; #endif /* end of c typedefs */

1 0

Lei Zhang : winex11.drv: Reset focus if application does not want to be activated.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: e20625e5c95a1852c6ce9e38334f2a187114d602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e20625e5c95a1852c6ce9e383… Author: Lei Zhang <thestig(a)google.com> Date: Thu Jun 21 15:38:00 2007 -0700 winex11.drv: Reset focus if application does not want to be activated. --- dlls/winex11.drv/event.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f13e079..aad09c6 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -445,17 +445,18 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); - if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) set_focus( hwnd, event_time ); - else TRACE( "not setting focus to %p (%lx), ma=%ld\n", hwnd, event->window, ma ); - } - else - { - hwnd = GetFocus(); - if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); - if (!hwnd) hwnd = GetActiveWindow(); - if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( hwnd, event_time ); + if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) + { + set_focus( hwnd, event_time ); + return; + } } + /* try to find some other window to give the focus to */ + hwnd = GetFocus(); + if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); + if (!hwnd) hwnd = GetActiveWindow(); + if (!hwnd) hwnd = last_focus; + if (hwnd && can_activate_window(hwnd)) set_focus( hwnd, event_time ); } else if (protocol == x11drv_atom(_NET_WM_PING)) {

1 0

Maarten Lankhorst : dsound: Tune some parameters for alsa waveout.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: e28da99e4c8a3350d957e1e3a97fda1536e7f8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28da99e4c8a3350d957e1e3a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 21 20:29:59 2007 +0200 dsound: Tune some parameters for alsa waveout. --- dlls/dsound/dsound_main.c | 4 ++-- dlls/dsound/dsound_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 1f6dd26..483d51b 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -61,9 +61,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); /* some stuff may get more responsive with lower values though... */ #define DS_EMULDRIVER 0 /* some games (Quake 2, UT) refuse to accept emulated dsound devices. set to 0 ! */ -#define DS_HEL_MARGIN 5 /* HEL only: number of waveOut fragments ahead to mix in new buffers +#define DS_HEL_MARGIN 2 /* HEL only: number of waveOut fragments ahead to mix in new buffers * (keep this close or equal to DS_HEL_QUEUE for best results) */ -#define DS_HEL_QUEUE 5 /* HEL only: number of waveOut fragments ahead to queue to driver +#define DS_HEL_QUEUE 2 /* HEL only: number of waveOut fragments ahead to queue to driver * (this will affect HEL sound reliability and latency) */ #define DS_SND_QUEUE_MAX 10 /* max number of fragments to prebuffer */ diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index ee2c9ec..42437a2 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -24,7 +24,7 @@ #define DS_TIME_DEL 10 /* Delay of multimedia timer callback, and duration of HEL fragment */ #define DS_HEL_BUFLEN 0x8000 /* HEL: The buffer length of the emulated buffer */ -#define DS_HEL_FRAGS 0x40 /* HEL only: number of waveOut fragments in primary buffer +#define DS_HEL_FRAGS 0x10 /* HEL only: number of waveOut fragments in primary buffer * (changing this won't help you) */ /* direct sound hardware acceleration levels */

1 0

Nigel Liang : winex11.drv: Remove call to XCreateFontSet.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 2f3a02ea2fd66514c59edd7ed95bb2e0df581350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3a02ea2fd66514c59edd7ed… Author: Nigel Liang <ncliang(a)gmail.com> Date: Thu Jun 21 13:29:13 2007 -0700 winex11.drv: Remove call to XCreateFontSet. --- dlls/winex11.drv/xim.c | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 2be9dd2..7b31986 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -456,9 +456,6 @@ err: XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) { - XFontSet fontSet = NULL; - char **list; - int count; XPoint spot = {0}; XVaNestedList preedit = NULL; XVaNestedList status = NULL; @@ -485,29 +482,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) return xic; } - - if (((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) || - ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0)) - { - fontSet = XCreateFontSet(display, - "*", /*FIXME*/ - &list, &count, NULL); - - TRACE("ximFontSet = %p\n", fontSet); - TRACE("list = %p, count = %d\n", list, count); - - if (list != NULL) - { - int i; - - for (i = 0; i < count; ++i) - { - TRACE("list[%d] = %s\n", i, list[i]); - } - XFreeStringList(list); - } - } - /* create callbacks */ P_StartCB.client_data = NULL; P_StartCB.callback = (XIMProc)XIMPreEditStartCallback; @@ -521,7 +495,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) { preedit = XVaCreateNestedList(0, - XNFontSet, fontSet, XNSpotLocation, &spot, XNPreeditStartCallback, &P_StartCB, XNPreeditDoneCallback, &P_DoneCB, @@ -545,7 +518,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) if ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0) { status = XVaCreateNestedList(0, - XNFontSet, fontSet, NULL); TRACE("status = %p\n", status); }

1 0

Maarten Lankhorst : winealsa: Finally get rid of the thread in alsa directsound acceleration.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 65b40f7f7fd48ed50f26791aec4e08f29055901c URL: http://source.winehq.org/git/wine.git/?a=commit;h=65b40f7f7fd48ed50f26791ae… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jun 21 20:30:46 2007 +0200 winealsa: Finally get rid of the thread in alsa directsound acceleration. --- dlls/winealsa.drv/dsoutput.c | 396 ++++++++++++++++++------------------------ 1 files changed, 173 insertions(+), 223 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65b40f7f7fd48ed50f267…

1 0

Jacek Caban : mshtml: Don't check out VT in exec_fontsize.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 893eec9ff7991f92dcc190fc4217682d257eb72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=893eec9ff7991f92dcc190fc4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 03:06:02 2007 +0200 mshtml: Don't check out VT in exec_fontsize. --- dlls/mshtml/editor.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index b727e55..42df6cc 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -662,18 +662,9 @@ static HRESULT exec_fontsize(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if(out) { WCHAR val[10] = {0}; - switch(V_VT(out)) { - case VT_I4: - get_font_size(This, val); - V_I4(out) = strtolW(val, NULL, 10); - break; - case VT_BSTR: - get_font_size(This, val); - V_BSTR(out) = SysAllocString(val); - break; - default: - FIXME("unsupported vt %d\n", V_VT(out)); - } + get_font_size(This, val); + V_VT(out) = VT_I4; + V_I4(out) = strtolW(val, NULL, 10); } if(in) {

1 0

Detlef Riekenberg : ntprint: Implement PSetupEnumMonitor.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: f6e1dbf77169c70a6bc994912c81845b00cd62b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e1dbf77169c70a6bc994912… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 22 00:31:29 2007 +0200 ntprint: Implement PSetupEnumMonitor. --- dlls/ntprint/ntprint.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ntprint/ntprint.spec | 2 +- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 7363b9c..ece26ef 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -120,3 +120,48 @@ VOID WINAPI PSetupDestroyMonitorInfo(HANDLE monitorinfo) HeapFree(GetProcessHeap(), 0, mi); } } + +/***************************************************** + * PSetupEnumMonitor [NTPRINT.@] + * + * Copy the selected Monitorname to a buffer + * + * PARAMS + * monitorinfo [I] HANDLE from PSetupCreateMonitorInfo + * index [I] Nr. of the Monitorname to copy + * buffer [I] Target, that receive the Monitorname + * psize [IO] PTR to a DWORD that hold the size of the buffer and receive + * the needed size, when the buffer is to small + * + * RETURNS + * Success: TRUE + * Failure: FALSE + * + * NOTES + * size is in Bytes on w2k and WCHAR on XP + * + */ + +BOOL WINAPI PSetupEnumMonitor(HANDLE monitorinfo, DWORD index, LPWSTR buffer, LPDWORD psize) +{ + monitorinfo_t * mi = (monitorinfo_t *) monitorinfo; + LPWSTR nameW; + DWORD len; + + TRACE("(%p, %u, %p, %p) => %d\n", mi, index, buffer, psize, psize ? *psize : 0); + + if (index < mi->installed) { + nameW = mi->mi2[index].pName; + len = lstrlenW(nameW) + 1; + if (len <= *psize) { + memcpy(buffer, nameW, len * sizeof(WCHAR)); + TRACE("#%u: %s\n", index, debugstr_w(buffer)); + return TRUE; + } + *psize = len; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + SetLastError(ERROR_NO_MORE_ITEMS); + return FALSE; +} diff --git a/dlls/ntprint/ntprint.spec b/dlls/ntprint/ntprint.spec index 348ab69..8869776 100644 --- a/dlls/ntprint/ntprint.spec +++ b/dlls/ntprint/ntprint.spec @@ -9,7 +9,7 @@ @ stub PSetupDestroyPrinterDeviceInfoList @ stub PSetupDestroySelectedDriverInfo @ stub PSetupDriverInfoFromName -@ stub PSetupEnumMonitor +@ stdcall PSetupEnumMonitor(long long ptr ptr) @ stub PSetupFreeDrvField @ stub PSetupGetDriverInfForPrinter @ stub PSetupGetDriverInfo3

1 0

Detlef Riekenberg : ntprint/tests: Add tests for PSetupEnumMonitor.
by Alexandre Julliard June 22, 2007

June 22, 2007

Module: wine Branch: master Commit: 955d5247baf656437b5dd2efc50e781a7f0b7f8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=955d5247baf656437b5dd2efc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 22 00:31:55 2007 +0200 ntprint/tests: Add tests for PSetupEnumMonitor. --- dlls/ntprint/tests/ntprint.c | 101 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index 280876b..fca7b8d 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -34,6 +34,7 @@ static HMODULE hdll; static HANDLE (WINAPI *pPSetupCreateMonitorInfo)(LPVOID, LPVOID, LPVOID); static VOID (WINAPI *pPSetupDestroyMonitorInfo)(HANDLE); +static BOOL (WINAPI *pPSetupEnumMonitor)(HANDLE, DWORD, LPWSTR, LPDWORD); /* ########################### */ @@ -53,6 +54,9 @@ static LPCSTR load_functions(void) pPSetupDestroyMonitorInfo = (VOID *) GetProcAddress(hdll, ptr); if (!pPSetupDestroyMonitorInfo) return ptr; + ptr = "PSetupEnumMonitor"; + pPSetupEnumMonitor = (VOID *) GetProcAddress(hdll, ptr); + if (!pPSetupEnumMonitor) return ptr; return NULL; } @@ -112,6 +116,102 @@ static void test_PSetupDestroyMonitorInfo(VOID) /* ########################### */ +static void test_PSetupEnumMonitor(VOID) +{ + HANDLE mi; + WCHAR buffer[MAX_PATH+2]; + DWORD minsize = 0; + DWORD size; + DWORD res; + DWORD index=0; + + SetLastError(0xdeadbeef); + mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + if (!mi) { + skip("PSetupCreateMonitorInfo\n"); + return; + } + + minsize = 0; + SetLastError(0xdeadbeef); + res = pPSetupEnumMonitor(mi, 0, NULL, &minsize); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER) && (minsize > 0), + "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER " + "and '> 0')\n", res, GetLastError(), minsize); + + + size = sizeof(buffer) / sizeof(buffer[0]); + if ((minsize + 1) > size) { + skip("overflow: %u\n", minsize); + pPSetupDestroyMonitorInfo(mi); + return; + } + + if (0) { + /* XP: ERROR_INVALID_PARAMETER, w2k: Crash */ + SetLastError(0xdeadbeef); + size = sizeof(buffer) / sizeof(buffer[0]); + res = pPSetupEnumMonitor(NULL, 0, buffer, &size); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + } + + if (0) { + /* XP: Crash, w2k: Success (how can that work?) */ + SetLastError(0xdeadbeef); + size = sizeof(buffer) / sizeof(buffer[0]); + res = pPSetupEnumMonitor(mi, 0, NULL, &size); + trace("got %u with %u and %u\n", res, GetLastError(), size); + } + + if (0) { + /* XP: ERROR_INVALID_PARAMETER, w2k: Crash */ + SetLastError(0xdeadbeef); + res = pPSetupEnumMonitor(mi, 0, buffer, NULL); + ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), + "got %u with %u (expected '0' with ERROR_INVALID_PARAMETER)\n", + res, GetLastError()); + } + + SetLastError(0xdeadbeef); + size = minsize - 1; + res = pPSetupEnumMonitor(mi, 0, buffer, &size); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "got %u with %u and %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + res, GetLastError(), size); + + + SetLastError(0xdeadbeef); + size = minsize; + res = pPSetupEnumMonitor(mi, 0, buffer, &size); + ok( res, "got %u with %u and %u (expected '!= 0')\n", + res, GetLastError(), size); + + SetLastError(0xdeadbeef); + size = minsize + 1; + res = pPSetupEnumMonitor(mi, 0, buffer, &size); + ok( res, "got %u with %u and %u (expected '!= 0')\n", + res, GetLastError(), size); + + /* try max. 20 monitors */ + while (res && (index < 20)) { + SetLastError(0xdeadbeef); + buffer[0] = '\0'; + size = sizeof(buffer) / sizeof(buffer[0]); + res = pPSetupEnumMonitor(mi, index, buffer, &size); + ok( res || (GetLastError() == ERROR_NO_MORE_ITEMS), + "(%u) got %u with %u and %u (expected '!=0' or: '0' with " + "ERROR_NO_MORE_ITEMS)\n", index, res, GetLastError(), size); + + if (res) index++; + } + pPSetupDestroyMonitorInfo(mi); + +} + +/* ########################### */ + START_TEST(ntprint) { LPCSTR ptr; @@ -125,5 +225,6 @@ START_TEST(ntprint) test_PSetupCreateMonitorInfo(); test_PSetupDestroyMonitorInfo(); + test_PSetupEnumMonitor(); }

1 0