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

Misha Koshelev : gdi32: Handle ArcTo in paths as native.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: 859bf44c3389c843cf47866ca8e474e3b0e54146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859bf44c3389c843cf47866ca… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jun 20 17:02:58 2007 -0500 gdi32: Handle ArcTo in paths as native. --- dlls/gdi32/painting.c | 4 +++- dlls/gdi32/path.c | 22 ++++++++++++++++++---- dlls/gdi32/tests/path.c | 6 +++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 838e0e0..ea36421 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -124,7 +124,9 @@ BOOL WINAPI ArcTo( HDC hdc, DC * dc = DC_GetDCUpdate( hdc ); if(!dc) return FALSE; - if(dc->funcs->pArcTo) + if(PATH_IsPathOpen(dc->path)) + result = PATH_Arc(dc,left,top,right,bottom,xstart,ystart,xend,yend,-1); + else if(dc->funcs->pArcTo) result = dc->funcs->pArcTo( dc->physDev, left, top, right, bottom, xstart, ystart, xend, yend ); else /* We'll draw a line from the current position to the starting point of the arc, then draw the arc */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 7999fef..1a37adc 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -725,8 +725,10 @@ BOOL PATH_Ellipse(DC *dc, INT x1, INT y1, INT x2, INT y2) * Should be called when a call to Arc is performed on a DC that has * an open path. This adds up to five Bezier splines representing the arc * to the path. When 'lines' is 1, we add 1 extra line to get a chord, - * and when 'lines' is 2, we add 2 extra lines to get a pie. - * Returns TRUE if successful, else FALSE. + * when 'lines' is 2, we add 2 extra lines to get a pie, and when 'lines' is + * -1 we add 1 extra line from the current DC position to the starting position + * of the arc before drawing the arc itself (arcto). Returns TRUE if successful, + * else FALSE. */ BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines) @@ -736,7 +738,7 @@ BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2, /* Initialize angleEndQuadrant to silence gcc's warning */ double x, y; FLOAT_POINT corners[2], pointStart, pointEnd; - POINT centre; + POINT centre, pointCurPos; BOOL start, end; INT temp; @@ -811,6 +813,18 @@ BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2, corners[1].y--; } + /* arcto: Add a PT_MOVETO only if this is the first entry in a stroke */ + if(lines==-1 && pPath->newStroke) + { + pPath->newStroke=FALSE; + pointCurPos.x = dc->CursPosX; + pointCurPos.y = dc->CursPosY; + if(!LPtoDP(dc->hSelf, &pointCurPos, 1)) + return FALSE; + if(!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO)) + return FALSE; + } + /* Add the arc to the path with one Bezier spline per quadrant that the * arc spans */ start=TRUE; @@ -848,7 +862,7 @@ BOOL PATH_Arc(DC *dc, INT x1, INT y1, INT x2, INT y2, /* Add the Bezier spline to the path */ PATH_DoArcPart(pPath, corners, angleStartQuadrant, angleEndQuadrant, - start ? PT_MOVETO : FALSE); + start ? (lines==-1 ? PT_LINETO : PT_MOVETO) : FALSE); start=FALSE; } while(!end); diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 2a80377..e567106 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -194,7 +194,7 @@ static void ok_path(HDC hdc, const path_test_t *expected, int expected_size, BOO static const path_test_t arcto_path[] = { {0, 0, PT_MOVETO, 0, 0}, /* 0 */ {229, 215, PT_LINETO, 0, 0}, /* 1 */ - {248, 205, PT_BEZIERTO, 1, 0}, /* 2 */ + {248, 205, PT_BEZIERTO, 0, 0}, /* 2 */ {273, 200, PT_BEZIERTO, 0, 0}, /* 3 */ {300, 200, PT_BEZIERTO, 0, 0}, /* 4 */ {355, 200, PT_BEZIERTO, 0, 0}, /* 5 */ @@ -204,7 +204,7 @@ static const path_test_t arcto_path[] = { {389, 275, PT_BEZIERTO, 0, 0}, /* 9 */ {370, 285, PT_BEZIERTO, 0, 0}, /* 10 */ {363, 277, PT_LINETO, 0, 0}, /* 11 */ - {380, 270, PT_BEZIERTO, 1, 0}, /* 12 */ + {380, 270, PT_BEZIERTO, 0, 0}, /* 12 */ {389, 260, PT_BEZIERTO, 0, 0}, /* 13 */ {389, 250, PT_BEZIERTO, 0, 0}, /* 14 */ {389, 228, PT_BEZIERTO, 0, 0}, /* 15 */ @@ -232,7 +232,7 @@ static void test_arcto(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, arcto_path, sizeof(arcto_path)/sizeof(path_test_t), 1); + ok_path(hdc, arcto_path, sizeof(arcto_path)/sizeof(path_test_t), 0); done: ReleaseDC(0, hdc); }

1 0

Kirill K. Smirnov : winhelp: Fix popup window style.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: cd20e11f4ab0e67c4989f2a60830ec62d23250d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd20e11f4ab0e67c4989f2a60… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Jun 18 14:29:48 2007 +0400 winhelp: Fix popup window style. --- programs/winhelp/winhelp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 8905d6e..c61b552 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -214,7 +214,7 @@ static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, HWND wi.origin.x = max(wi.origin.x, 0); wi.style = SW_SHOW; - wi.win_style = WS_POPUPWINDOW; + wi.win_style = WS_POPUP | WS_BORDER; wi.sr_color = wi.sr_color = 0xFFFFFF; return &wi;

1 0

Detlef Riekenberg : ntprint/tests: Add initial test.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: a114483e497432b95ec3557362cbae04fee99c13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a114483e497432b95ec355736… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 21 06:07:10 2007 +0200 ntprint/tests: Add initial test. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/ntprint/tests/Makefile.in | 13 ++++ dlls/ntprint/tests/ntprint.c | 129 ++++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 157 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b70d332..5d2ed28 100644 --- a/.gitignore +++ b/.gitignore @@ -384,6 +384,9 @@ dlls/ntdll/version.res dlls/ntdsapi/libntdsapi.def dlls/ntoskrnl.exe/libntoskrnl.exe.def dlls/ntprint/ntprint.res +dlls/ntprint/tests/*.ok +dlls/ntprint/tests/ntprint_crosstest.exe +dlls/ntprint/tests/testlist.c dlls/objsel/objsel.res dlls/odbc32/libodbc32.def dlls/odbccp32/libodbccp32.def @@ -874,6 +877,7 @@ programs/winetest/msvcrtd_test.exe programs/winetest/msxml3_test.exe programs/winetest/netapi32_test.exe programs/winetest/ntdll_test.exe +programs/winetest/ntprint_test.exe programs/winetest/odbccp32_test.exe programs/winetest/ole32_test.exe programs/winetest/oleaut32_test.exe diff --git a/Makefile.in b/Makefile.in index fe6731b..f0045d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -315,6 +315,7 @@ ALL_MAKEFILES = \ dlls/ntdsapi/Makefile \ dlls/ntoskrnl.exe/Makefile \ dlls/ntprint/Makefile \ + dlls/ntprint/tests/Makefile \ dlls/objsel/Makefile \ dlls/odbc32/Makefile \ dlls/odbccp32/Makefile \ @@ -671,6 +672,7 @@ dlls/ntdll/tests/Makefile: dlls/ntdll/tests/Makefile.in dlls/Maketest.rules dlls/ntdsapi/Makefile: dlls/ntdsapi/Makefile.in dlls/Makedll.rules dlls/ntoskrnl.exe/Makefile: dlls/ntoskrnl.exe/Makefile.in dlls/Makedll.rules dlls/ntprint/Makefile: dlls/ntprint/Makefile.in dlls/Makedll.rules +dlls/ntprint/tests/Makefile: dlls/ntprint/tests/Makefile.in dlls/Maketest.rules dlls/objsel/Makefile: dlls/objsel/Makefile.in dlls/Makedll.rules dlls/odbc32/Makefile: dlls/odbc32/Makefile.in dlls/Makedll.rules dlls/odbccp32/Makefile: dlls/odbccp32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 88b8eb8..06b92fc 100755 --- a/configure +++ b/configure @@ -20700,6 +20700,8 @@ ac_config_files="$ac_config_files dlls/ntoskrnl.exe/Makefile" ac_config_files="$ac_config_files dlls/ntprint/Makefile" +ac_config_files="$ac_config_files dlls/ntprint/tests/Makefile" + ac_config_files="$ac_config_files dlls/objsel/Makefile" ac_config_files="$ac_config_files dlls/odbc32/Makefile" @@ -21791,6 +21793,7 @@ do "dlls/ntdsapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntdsapi/Makefile" ;; "dlls/ntoskrnl.exe/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntoskrnl.exe/Makefile" ;; "dlls/ntprint/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntprint/Makefile" ;; + "dlls/ntprint/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ntprint/tests/Makefile" ;; "dlls/objsel/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/objsel/Makefile" ;; "dlls/odbc32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbc32/Makefile" ;; "dlls/odbccp32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/Makefile" ;; diff --git a/configure.ac b/configure.ac index b5bffb8..d28be8c 100644 --- a/configure.ac +++ b/configure.ac @@ -1602,6 +1602,7 @@ AC_CONFIG_FILES([dlls/ntdll/tests/Makefile]) AC_CONFIG_FILES([dlls/ntdsapi/Makefile]) AC_CONFIG_FILES([dlls/ntoskrnl.exe/Makefile]) AC_CONFIG_FILES([dlls/ntprint/Makefile]) +AC_CONFIG_FILES([dlls/ntprint/tests/Makefile]) AC_CONFIG_FILES([dlls/objsel/Makefile]) AC_CONFIG_FILES([dlls/odbc32/Makefile]) AC_CONFIG_FILES([dlls/odbccp32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 265b541..89e5b33 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -269,6 +269,7 @@ TESTSUBDIRS = \ msxml3/tests \ netapi32/tests \ ntdll/tests \ + ntprint/tests \ odbccp32/tests \ ole32/tests \ oleaut32/tests \ diff --git a/dlls/ntprint/tests/Makefile.in b/dlls/ntprint/tests/Makefile.in new file mode 100644 index 0000000..65febfe --- /dev/null +++ b/dlls/ntprint/tests/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +TESTDLL = ntprint.dll +IMPORTS = kernel32 + +CTESTS = \ + ntprint.c + +(a)MAKE_TEST_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c new file mode 100644 index 0000000..280876b --- /dev/null +++ b/dlls/ntprint/tests/ntprint.c @@ -0,0 +1,129 @@ +/* + * Unit test suite for the Spooler Setup API (Printing) + * + * Copyright 2007 Detlef Riekenberg + * + * 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 <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "wingdi.h" +#include "wine/test.h" + + +/* ##### */ + +static HMODULE hdll; +static HANDLE (WINAPI *pPSetupCreateMonitorInfo)(LPVOID, LPVOID, LPVOID); +static VOID (WINAPI *pPSetupDestroyMonitorInfo)(HANDLE); + +/* ########################### */ + +static LPCSTR load_functions(void) +{ + LPCSTR ptr; + + ptr = "ntprint.dll"; + hdll = LoadLibraryA(ptr); + if (!hdll) return ptr; + + ptr = "PSetupCreateMonitorInfo"; + pPSetupCreateMonitorInfo = (VOID *) GetProcAddress(hdll, ptr); + if (!pPSetupCreateMonitorInfo) return ptr; + + ptr = "PSetupDestroyMonitorInfo"; + pPSetupDestroyMonitorInfo = (VOID *) GetProcAddress(hdll, ptr); + if (!pPSetupDestroyMonitorInfo) return ptr; + + + return NULL; +} + +/* ########################### */ + +static void test_PSetupCreateMonitorInfo(VOID) +{ + HANDLE mi; + BYTE buffer[1024] ; + + SetLastError(0xdeadbeef); + mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + if (mi) pPSetupDestroyMonitorInfo(mi); + + + memset(buffer, 0, sizeof(buffer)); + SetLastError(0xdeadbeef); + mi = pPSetupCreateMonitorInfo(buffer, NULL, NULL); + ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + if (mi) pPSetupDestroyMonitorInfo(mi); + +} + +/* ########################### */ + +static void test_PSetupDestroyMonitorInfo(VOID) +{ + HANDLE mi; + + + SetLastError(0xdeadbeef); + pPSetupDestroyMonitorInfo(NULL); + /* lasterror is returned */ + trace("returned with %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); + + if (!mi) return; + + SetLastError(0xdeadbeef); + pPSetupDestroyMonitorInfo(mi); + /* lasterror is returned */ + trace("returned with %u\n", GetLastError()); + + /* Try to destroy the handle twice crash with native ntprint.dll */ + if (0) { + SetLastError(0xdeadbeef); + pPSetupDestroyMonitorInfo(mi); + trace(" with %u\n", GetLastError()); + } + +} + +/* ########################### */ + +START_TEST(ntprint) +{ + LPCSTR ptr; + + /* ntprint.dll does not exist on win9x */ + ptr = load_functions(); + if (ptr) { + skip("%s not found\n", ptr); + return; + } + + test_PSetupCreateMonitorInfo(); + test_PSetupDestroyMonitorInfo(); + +} diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index bf2fd4a..3b85ea9 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -60,6 +60,7 @@ TESTBINS = \ msxml3_test.exe \ netapi32_test.exe \ ntdll_test.exe \ + ntprint_test.exe \ odbccp32_test.exe \ ole32_test.exe \ oleaut32_test.exe \ @@ -162,6 +163,8 @@ netapi32_test.exe: $(DLLDIR)/netapi32/tests/netapi32_test.exe$(DLLEXT) cp $(DLLDIR)/netapi32/tests/netapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ ntdll_test.exe: $(DLLDIR)/ntdll/tests/ntdll_test.exe$(DLLEXT) cp $(DLLDIR)/ntdll/tests/ntdll_test.exe$(DLLEXT) $@ && $(STRIP) $@ +ntprint_test.exe: $(DLLDIR)/ntprint/tests/ntprint_test.exe$(DLLEXT) + cp $(DLLDIR)/ntprint/tests/ntprint_test.exe$(DLLEXT) $@ && $(STRIP) $@ odbccp32_test.exe: $(DLLDIR)/odbccp32/tests/odbccp32_test.exe$(DLLEXT) cp $(DLLDIR)/odbccp32/tests/odbccp32_test.exe$(DLLEXT) $@ && $(STRIP) $@ ole32_test.exe: $(DLLDIR)/ole32/tests/ole32_test.exe$(DLLEXT) diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index e8a0772..d6d0c0d 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -183,6 +183,7 @@ msvcrtd_test.exe TESTRES "msvcrtd_test.exe" msxml3_test.exe TESTRES "msxml3_test.exe" netapi32_test.exe TESTRES "netapi32_test.exe" ntdll_test.exe TESTRES "ntdll_test.exe" +ntprint_test.exe TESTRES "ntprint_test.exe" odbccp32_test.exe TESTRES "odbccp32_test.exe" ole32_test.exe TESTRES "ole32_test.exe" oleaut32_test.exe TESTRES "oleaut32_test.exe"

1 0

Francois Gouget : gdi32/tests: Run the GetTextMetricsA() tests on Windows 9x too.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: dddbd3cbdb2ae812c0772ba7dd7cb16fc01e6c9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dddbd3cbdb2ae812c0772ba7d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 21 11:10:42 2007 +0200 gdi32/tests: Run the GetTextMetricsA() tests on Windows 9x too. --- dlls/gdi32/tests/font.c | 100 +++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 50 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bfe2a47..b51c89b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1552,63 +1552,71 @@ static void test_text_metrics(const LOGFONTA *lf) SetLastError(0xdeadbeef); ret = GetTextMetricsA(hdc, &tmA); ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - trace("A: first %x, last %x, default %x, break %x\n", tmA.tmFirstChar, tmA.tmLastChar, tmA.tmDefaultChar, tmA.tmBreakChar); - SetLastError(0xdeadbeef); - ret = GetTextMetricsW(hdc, &tmW); - ok(ret, "GetTextMetricsA error %u\n", GetLastError()); - - trace("W: first %x, last %x, default %x, break %x\n", - tmW.tmFirstChar, tmW.tmLastChar, tmW.tmDefaultChar, tmW.tmBreakChar); - +#if 0 /* FIXME: This doesn't appear to be what Windows does */ + test_char = min(first_unicode_char - 1, 255); + ok(tmA.tmFirstChar == test_char, "A: tmFirstChar for %s %02x != %02x\n", + font_name, tmA.tmFirstChar, test_char); +#endif if (lf->lfCharSet == SYMBOL_CHARSET) { test_char = min(last_unicode_char - 0xf000, 255); ok(tmA.tmLastChar == test_char, "A: tmLastChar for %s %02x != %02x\n", font_name, tmA.tmLastChar, test_char); - - /* It appears that for fonts with SYMBOL_CHARSET Windows always sets - * symbol range to 0 - f0ff - */ - ok(tmW.tmFirstChar == 0, "W: tmFirstChar for %s %02x != 0\n", - font_name, tmW.tmFirstChar); - /* FIXME: Windows returns f0ff here, while Wine f0xx */ - ok(tmW.tmLastChar >= 0xf000, "W: tmLastChar for %s %02x != 0xf0ff\n", - font_name, tmW.tmLastChar); - - ok(tmA.tmDefaultChar == 0x1f, "A: tmDefaultChar for %s %02x != 0\n", - font_name, tmW.tmDefaultChar); - ok(tmA.tmBreakChar == 0x20, "A: tmBreakChar for %s %02x != 0xf0ff\n", - font_name, tmW.tmBreakChar); - ok(tmW.tmDefaultChar == 0x1f, "W: tmDefaultChar for %s %02x != 0\n", - font_name, tmW.tmDefaultChar); - ok(tmW.tmBreakChar == 0x20, "W: tmBreakChar for %s %02x != 0xf0ff\n", - font_name, tmW.tmBreakChar); } else { - test_char = min(tmW.tmLastChar, 255); + test_char = min(last_unicode_char, 255); ok(tmA.tmLastChar == test_char, "A: tmLastChar for %s %02x != %02x\n", font_name, tmA.tmLastChar, test_char); + ok(tmA.tmDefaultChar == 0x1f, "A: tmDefaultChar for %s %02x != 0x1f\n", + font_name, tmA.tmDefaultChar); + ok(tmA.tmBreakChar == 0x20, "A: tmBreakChar for %s %02x != 0x20\n", + font_name, tmA.tmBreakChar); + } + + SetLastError(0xdeadbeef); + ret = GetTextMetricsW(hdc, &tmW); + ok(ret || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, + "GetTextMetricsW error %u\n", GetLastError()); + if (ret) + { + trace("W: first %x, last %x, default %x, break %x\n", + tmW.tmFirstChar, tmW.tmLastChar, tmW.tmDefaultChar, + tmW.tmBreakChar); - ok(tmW.tmFirstChar == first_unicode_char, "W: tmFirstChar for %s %02x != %02x\n", - font_name, tmW.tmFirstChar, first_unicode_char); - ok(tmW.tmLastChar == last_unicode_char, "W: tmLastChar for %s %02x != %02x\n", - font_name, tmW.tmLastChar, last_unicode_char); + if (lf->lfCharSet == SYMBOL_CHARSET) + { + /* It appears that for fonts with SYMBOL_CHARSET Windows always + * sets symbol range to 0 - f0ff + */ + ok(tmW.tmFirstChar == 0, "W: tmFirstChar for %s %02x != 0\n", + font_name, tmW.tmFirstChar); + /* FIXME: Windows returns f0ff here, while Wine f0xx */ + ok(tmW.tmLastChar >= 0xf000, "W: tmLastChar for %s %02x < 0xf000\n", + font_name, tmW.tmLastChar); + + ok(tmW.tmDefaultChar == 0x1f, "W: tmDefaultChar for %s %02x != 0x1f\n", + font_name, tmW.tmDefaultChar); + ok(tmW.tmBreakChar == 0x20, "W: tmBreakChar for %s %02x != 0x20\n", + font_name, tmW.tmBreakChar); + } + else + { + ok(tmW.tmFirstChar == first_unicode_char, "W: tmFirstChar for %s %02x != %02x\n", + font_name, tmW.tmFirstChar, first_unicode_char); + ok(tmW.tmLastChar == last_unicode_char, "W: tmLastChar for %s %02x != %02x\n", + font_name, tmW.tmLastChar, last_unicode_char); + } + ret = GetDeviceCaps(hdc, LOGPIXELSX); + ok(tmW.tmDigitizedAspectX == ret, "W: tmDigitizedAspectX %u != %u\n", + tmW.tmDigitizedAspectX, ret); + ret = GetDeviceCaps(hdc, LOGPIXELSY); + ok(tmW.tmDigitizedAspectX == ret, "W: tmDigitizedAspectY %u != %u\n", + tmW.tmDigitizedAspectX, ret); } -#if 0 /* FIXME: This doesn't appear to be what Windows does */ - test_char = min(tmW.tmFirstChar - 1, 255); - ok(tmA.tmFirstChar == test_char, "A: tmFirstChar for %s %02x != %02x\n", - font_name, tmA.tmFirstChar, test_char); -#endif - ret = GetDeviceCaps(hdc, LOGPIXELSX); - ok(tmW.tmDigitizedAspectX == ret, "tmDigitizedAspectX %u != %u\n", - tmW.tmDigitizedAspectX, ret); - ret = GetDeviceCaps(hdc, LOGPIXELSY); - ok(tmW.tmDigitizedAspectX == ret, "tmDigitizedAspectY %u != %u\n", - tmW.tmDigitizedAspectX, ret); end_of_test: SelectObject(hdc, hfont_old); @@ -1635,14 +1643,6 @@ static void test_GetTextMetrics(void) HDC hdc; INT enumed; - SetLastError(0xdeadbeef); - GetTextMetricsW(0, NULL); - if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - skip("Skipping GetTextMetrics test on a Win9x platform\n"); - return; - } - hdc = GetDC(0); memset(&lf, 0, sizeof(lf));

1 0

Paul Vriens : user32/tests: Only do the GetProcAddress once.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: 027afb495a8784b59a9d67d856b05b36b43c7d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027afb495a8784b59a9d67d85… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jun 21 14:38:21 2007 +0200 user32/tests: Only do the GetProcAddress once. --- dlls/user32/tests/msg.c | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a896696..19af1e3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -55,6 +55,9 @@ static BOOL test_DestroyWindow_flag; static HWINEVENTHOOK hEvent_hook; static HWND (WINAPI *pGetAncestor)(HWND,UINT); +static void (WINAPI *pNotifyWinEvent)(DWORD, HWND, LONG, LONG); +static HWINEVENTHOOK (WINAPI *pSetWinEventHook)(DWORD, DWORD, HMODULE, WINEVENTPROC, DWORD, DWORD, DWORD); +static BOOL (WINAPI *pUnhookWinEvent)(HWINEVENTHOOK); static void dump_winpos_flags(UINT flags); @@ -1392,6 +1395,24 @@ static int sequence_cnt, sequence_size; static struct message* sequence; static int log_all_parent_messages; +static void init_procs(void) +{ + HMODULE user32 = GetModuleHandleA("user32.dll"); + +#define USER32_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(user32, #func); \ + if(!p ## func) { \ + trace("GetProcAddress(%s) failed\n", #func); \ + } + + USER32_GET_PROC(GetAncestor) + USER32_GET_PROC(NotifyWinEvent) + USER32_GET_PROC(SetWinEventHook) + USER32_GET_PROC(UnhookWinEvent) + +#undef USER32_GET_PROC +} + static void add_message(const struct message *msg) { if (!sequence) @@ -6896,8 +6917,6 @@ static DWORD WINAPI win_event_global_thread_proc(void *param) HWND hwnd; MSG msg; HANDLE hevent = *(HANDLE *)param; - HMODULE user32 = GetModuleHandleA("user32.dll"); - FARPROC pNotifyWinEvent = GetProcAddress(user32, "NotifyWinEvent"); assert(pNotifyWinEvent); @@ -6999,10 +7018,6 @@ static void test_winevents(void) DWORD tid; HWINEVENTHOOK hhook; const struct message *events = WmWinEventsSeq; - HMODULE user32 = GetModuleHandleA("user32.dll"); - FARPROC pSetWinEventHook = GetProcAddress(user32, "SetWinEventHook"); - FARPROC pUnhookWinEvent = GetProcAddress(user32, "UnhookWinEvent"); - FARPROC pNotifyWinEvent = GetProcAddress(user32, "NotifyWinEvent"); hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, @@ -7200,9 +7215,6 @@ static void test_set_hook(void) BOOL ret; HHOOK hhook; HWINEVENTHOOK hwinevent_hook; - HMODULE user32 = GetModuleHandleA("user32.dll"); - FARPROC pSetWinEventHook = GetProcAddress(user32, "SetWinEventHook"); - FARPROC pUnhookWinEvent = GetProcAddress(user32, "UnhookWinEvent"); hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, GetModuleHandleA(0), GetCurrentThreadId()); ok(hhook != 0, "local hook does not require hModule set to 0\n"); @@ -9242,11 +9254,9 @@ static void test_SetForegroundWindow(void) START_TEST(msg) { BOOL ret; - HMODULE user32 = GetModuleHandleA("user32.dll"); - FARPROC pSetWinEventHook = GetProcAddress(user32, "SetWinEventHook"); - FARPROC pUnhookWinEvent = GetProcAddress(user32, "UnhookWinEvent"); FARPROC pIsWinEventHookInstalled = 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ - pGetAncestor = (void*) GetProcAddress(user32, "GetAncestor"); + + init_procs(); if (!RegisterWindowClasses()) assert(0);

1 0

Kovács András : Add dwmapi.dll stub.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: c0ddd5e33e2f88d173b78dcb27c081c3238e89b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ddd5e33e2f88d173b78dcb2… Author: Kovács András <andras(a)csevego.net> Date: Tue Jun 19 09:36:14 2007 +0200 Add dwmapi.dll stub. --- .gitignore | 2 + Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + dlls/Makefile.in | 5 ++++ dlls/dwmapi/Makefile.in | 16 ++++++++++++++ dlls/dwmapi/dwmapi.spec | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/dwmapi/dwmapi_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dwmapi/version.rc | 26 +++++++++++++++++++++++ 9 files changed, 148 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 5d2ed28..7c7ccff 100644 --- a/.gitignore +++ b/.gitignore @@ -231,6 +231,8 @@ dlls/dsound/tests/dsound_crosstest.exe dlls/dsound/tests/testlist.c dlls/dsound/version.res dlls/dswave/version.res +dlls/dwmapi/libdwmapi.def +dlls/dwmapi/version.res dlls/dxdiagn/version.res dlls/gdi.exe16 dlls/gdi32/libgdi32.def diff --git a/Makefile.in b/Makefile.in index f0045d3..1963967 100644 --- a/Makefile.in +++ b/Makefile.in @@ -227,6 +227,7 @@ ALL_MAKEFILES = \ dlls/dsound/Makefile \ dlls/dsound/tests/Makefile \ dlls/dswave/Makefile \ + dlls/dwmapi/Makefile \ dlls/dxdiagn/Makefile \ dlls/dxerr8/Makefile \ dlls/dxerr9/Makefile \ @@ -584,6 +585,7 @@ dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules dlls/dsound/tests/Makefile: dlls/dsound/tests/Makefile.in dlls/Maketest.rules dlls/dswave/Makefile: dlls/dswave/Makefile.in dlls/Makedll.rules +dlls/dwmapi/Makefile: dlls/dwmapi/Makefile.in dlls/Makedll.rules dlls/dxdiagn/Makefile: dlls/dxdiagn/Makefile.in dlls/Makedll.rules dlls/dxerr8/Makefile: dlls/dxerr8/Makefile.in dlls/Makeimplib.rules dlls/dxerr9/Makefile: dlls/dxerr9/Makefile.in dlls/Makeimplib.rules diff --git a/configure b/configure index 06b92fc..a86bd86 100755 --- a/configure +++ b/configure @@ -20524,6 +20524,8 @@ ac_config_files="$ac_config_files dlls/dsound/tests/Makefile" ac_config_files="$ac_config_files dlls/dswave/Makefile" +ac_config_files="$ac_config_files dlls/dwmapi/Makefile" + ac_config_files="$ac_config_files dlls/dxdiagn/Makefile" ac_config_files="$ac_config_files dlls/dxerr8/Makefile" @@ -21705,6 +21707,7 @@ do "dlls/dsound/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/Makefile" ;; "dlls/dsound/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/tests/Makefile" ;; "dlls/dswave/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dswave/Makefile" ;; + "dlls/dwmapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dwmapi/Makefile" ;; "dlls/dxdiagn/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxdiagn/Makefile" ;; "dlls/dxerr8/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr8/Makefile" ;; "dlls/dxerr9/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxerr9/Makefile" ;; diff --git a/configure.ac b/configure.ac index d28be8c..59f5e50 100644 --- a/configure.ac +++ b/configure.ac @@ -1514,6 +1514,7 @@ AC_CONFIG_FILES([dlls/dpnhpast/Makefile]) AC_CONFIG_FILES([dlls/dsound/Makefile]) AC_CONFIG_FILES([dlls/dsound/tests/Makefile]) AC_CONFIG_FILES([dlls/dswave/Makefile]) +AC_CONFIG_FILES([dlls/dwmapi/Makefile]) AC_CONFIG_FILES([dlls/dxdiagn/Makefile]) AC_CONFIG_FILES([dlls/dxerr8/Makefile]) AC_CONFIG_FILES([dlls/dxerr9/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 89e5b33..56412cf 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -70,6 +70,7 @@ BASEDIRS = \ dpnhpast \ dsound \ dswave \ + dwmapi \ dxdiagn \ gdi32 \ gdiplus \ @@ -505,6 +506,7 @@ IMPORT_LIBS = \ dplayx/libdplayx.$(IMPLIBEXT) \ dpnet/libdpnet.$(IMPLIBEXT) \ dsound/libdsound.$(IMPLIBEXT) \ + dwmapi/libdwmapi.$(IMPLIBEXT) \ gdi32/libgdi32.$(IMPLIBEXT) \ gdiplus/libgdiplus.$(IMPLIBEXT) \ glu32/libglu32.$(IMPLIBEXT) \ @@ -706,6 +708,9 @@ dpnet/libdpnet.$(IMPLIBEXT): dpnet/dpnet.spec $(WINEBUILD) dsound/libdsound.$(IMPLIBEXT): dsound/dsound.spec $(WINEBUILD) @cd dsound && $(MAKE) libdsound.$(IMPLIBEXT) +dwmapi/libdwmapi.$(IMPLIBEXT): dwmapi/dwmapi.spec $(WINEBUILD) + @cd dwmapi && $(MAKE) libdwmapi.$(IMPLIBEXT) + gdi32/libgdi32.$(IMPLIBEXT): gdi32/gdi32.spec $(WINEBUILD) @cd gdi32 && $(MAKE) libgdi32.$(IMPLIBEXT) diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in new file mode 100644 index 0000000..9db8589 --- /dev/null +++ b/dlls/dwmapi/Makefile.in @@ -0,0 +1,16 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dwmapi.dll +IMPORTLIB = libdwmapi.$(IMPLIBEXT) +IMPORTS = user32 kernel32 + +C_SRCS = \ + dwmapi_main.c + +RC_SRCS = version.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec new file mode 100644 index 0000000..1f21b69 --- /dev/null +++ b/dlls/dwmapi/dwmapi.spec @@ -0,0 +1,44 @@ +100 stub @ +101 stub @ +102 stub DwmEnableComposition +103 stub @ +104 stub @ +105 stub @ +106 stub @ +107 stub @ +108 stub @ +109 stub @ +110 stub @ +111 stub @ +112 stub @ +113 stub @ + +115 stub @ +116 stub @ +117 stub @ +118 stub @ +119 stub @ +120 stub @ + +@ stub DwmAttachMilContent +@ stub DwmDefWindowProc +@ stub DwmDetachMilContent +@ stub DwmEnableBlurBehindWindow +@ stub DwmEnableMMCSS +@ stub DwmExtendFrameIntoClientArea +@ stub DwmFlush +@ stub DwmGetColorizationColor +@ stub DwmGetCompositionTimingInfo +@ stub DwmGetGraphicsStreamClient +@ stub DwmGetGraphicsStreamTransformHint +@ stub DwmGetTransportAttributes +@ stub DwmGetWindowAttribute +@ stub DwmIsCompositionEnabled +@ stub DwmModifyPreviousDxFrameDuration +@ stub DwmQueryThumbnailSourceSize +@ stub DwmRegisterThumbnail +@ stub DwmSetDxFrameDuration +@ stub DwmSetPresentParameters +@ stub DwmSetWindowAttribute +@ stub DwmUnregisterThumbnail +@ stub DwmUpdateThumbnailProperties diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c new file mode 100644 index 0000000..4bee74d --- /dev/null +++ b/dlls/dwmapi/dwmapi_main.c @@ -0,0 +1,49 @@ +/* + * Dwmapi + * + * Copyright 2007 Andras Kovacs + * + * 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 "config.h" +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwmapi); + + +/* At process attach */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hInstDLL ); + break; + } + return TRUE; +} diff --git a/dlls/dwmapi/version.rc b/dlls/dwmapi/version.rc new file mode 100644 index 0000000..b76f194 --- /dev/null +++ b/dlls/dwmapi/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2007 Andras Kovacs + * + * 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 WINE_FILEDESCRIPTION_STR "Desktop Window Manager API" +#define WINE_FILENAME_STR "dwmapi.dll" +#define WINE_FILEVERSION 6,0,6000,16386 +#define WINE_FILEVERSION_STR "6.0.6000.16386" +#define WINE_PRODUCTVERSION 6,0,6000,16386 +#define WINE_PRODUCTVERSION_STR "6.0.6000.16386" + +#include "wine/wine_common_ver.rc"

1 0

Misha Koshelev : gdi32: Set current position properly after ArcTo.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: 80b7134bb801bbe4994d12712a5eceedf9248519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b7134bb801bbe4994d12712… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Wed Jun 20 17:02:41 2007 -0500 gdi32: Set current position properly after ArcTo. --- dlls/gdi32/painting.c | 46 ++++++++++++++++------------------------------ dlls/gdi32/tests/path.c | 2 +- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 807fee4..838e0e0 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -113,6 +113,13 @@ BOOL WINAPI ArcTo( HDC hdc, INT xstart, INT ystart, INT xend, INT yend ) { + double width = fabs(right-left), + height = fabs(bottom-top), + xradius = width/2, + yradius = height/2, + xcenter = right > left ? left+xradius : right+xradius, + ycenter = bottom > top ? top+yradius : bottom+yradius, + angle; BOOL result; DC * dc = DC_GetDCUpdate( hdc ); if(!dc) return FALSE; @@ -120,40 +127,19 @@ BOOL WINAPI ArcTo( HDC hdc, if(dc->funcs->pArcTo) result = dc->funcs->pArcTo( dc->physDev, left, top, right, bottom, xstart, ystart, xend, yend ); - else + else /* We'll draw a line from the current position to the starting point of the arc, then draw the arc */ { - double width = fabs(right-left), - height = fabs(bottom-top), - xradius = width/2, - yradius = height/2, - xcenter = right > left ? left+xradius : right+xradius, - ycenter = bottom > top ? top+yradius : bottom+yradius; - /* - * Else emulate it. - * According to the documentation, a line is drawn from the current - * position to the starting point of the arc. - */ - double angle = atan2( - ((ystart-ycenter)/height), - ((xstart-xcenter)/width)); + angle = atan2(((ystart-ycenter)/height), + ((xstart-xcenter)/width)); LineTo(hdc, GDI_ROUND(xcenter+(cos(angle)*xradius)), GDI_ROUND(ycenter+(sin(angle)*yradius))); - /* - * Then the arc is drawn. - */ result = Arc(hdc, left, top, right, bottom, xstart, ystart, xend, yend); - /* - * If no error occurred, the current position is moved to the ending - * point of the arc. - */ - if (result) - { - angle = atan2( - ((yend-ycenter)/height), - ((xend-xcenter)/width)); - MoveToEx(hdc, GDI_ROUND(xcenter+(cos(angle)*xradius)), - GDI_ROUND(ycenter+(sin(angle)*yradius)), NULL); - } + } + if (result) { + angle = atan2(((yend-ycenter)/height), + ((xend-xcenter)/width)); + dc->CursPosX = GDI_ROUND(xcenter+(cos(angle)*xradius)); + dc->CursPosY = GDI_ROUND(ycenter+(sin(angle)*yradius)); } GDI_ReleaseObj( hdc ); return result; diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index bd7c12c..2a80377 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -203,7 +203,7 @@ static const path_test_t arcto_path[] = { {399, 263, PT_BEZIERTO, 0, 0}, /* 8 */ {389, 275, PT_BEZIERTO, 0, 0}, /* 9 */ {370, 285, PT_BEZIERTO, 0, 0}, /* 10 */ - {363, 277, PT_LINETO, 1, 0}, /* 11 */ + {363, 277, PT_LINETO, 0, 0}, /* 11 */ {380, 270, PT_BEZIERTO, 1, 0}, /* 12 */ {389, 260, PT_BEZIERTO, 0, 0}, /* 13 */ {389, 250, PT_BEZIERTO, 0, 0}, /* 14 */

1 0

Michael Stefaniuc : shlwapi: Do not use wide character constants.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: 9acd67ec5b644d2dd64aaa6f378a2cc610f0c690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acd67ec5b644d2dd64aaa6f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 20 23:34:50 2007 +0200 shlwapi: Do not use wide character constants. --- dlls/shlwapi/reg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index bdfea24..1f52883 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -703,7 +703,7 @@ BOOL WINAPI SHRegGetBoolUSValueW( /* process returned data via type into bool */ switch (type) { case REG_SZ: - data[9] = L'\0'; /* set end of string */ + data[9] = '\0'; /* set end of string */ if (lstrcmpiW(data, wYES)==0 || lstrcmpiW(data, wTRUE)==0) ret = TRUE; else if (lstrcmpiW(data, wNO)==0 || lstrcmpiW(data, wFALSE)==0) @@ -715,7 +715,7 @@ BOOL WINAPI SHRegGetBoolUSValueW( break; case REG_BINARY: if (datalen == 1) { - ret = (data[0] != L'\0'); + ret = (data[0] != '\0'); break; } default:

1 0

Michael Stefaniuc : winspool.drv/tests: Specify the arguments of the function in the function.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: 1a3689fdc287b2a583e336bba444ea00ab4b22a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a3689fdc287b2a583e336bba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 20 15:27:00 2007 +0200 winspool.drv/tests: Specify the arguments of the function in the function. --- dlls/winspool.drv/tests/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index c743768..6586278 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -65,8 +65,8 @@ static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; static WCHAR portname_lpt2W[] = {'L','P','T','2',':',0}; static HANDLE hwinspool; -static FARPROC pGetDefaultPrinterA; -static FARPROC pSetDefaultPrinterA; +static BOOL (WINAPI * pGetDefaultPrinterA)(LPSTR, LPDWORD); +static BOOL (WINAPI * pSetDefaultPrinterA)(LPCSTR); static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); static BOOL (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR);

1 0

Detlef Riekenberg : ntprint: Implement PSetupCreateMonitorInfo.
by Alexandre Julliard 21 Jun '07

21 Jun '07

Module: wine Branch: master Commit: f7bd46a49d9bc9a1f53b7ea405339ef5b6ff569f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bd46a49d9bc9a1f53b7ea40… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 21 06:09:58 2007 +0200 ntprint: Implement PSetupCreateMonitorInfo. --- dlls/ntprint/Makefile.in | 2 +- dlls/ntprint/ntprint.c | 68 ++++++++++++++++++++++++++++++++++++++++++++- dlls/ntprint/ntprint.spec | 4 +- 3 files changed, 70 insertions(+), 4 deletions(-) diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index b60b06b..b3ecad8 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = ntprint.dll -IMPORTS = kernel32 +IMPORTS = winspool kernel32 C_SRCS = \ ntprint.c diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index d3f8503..7363b9c 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -25,8 +25,11 @@ #include "windef.h" #include "winbase.h" -#include "winver.h" +#include "winerror.h" +#include "wingdi.h" #include "winnls.h" +#include "winver.h" +#include "winspool.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -35,6 +38,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntprint); HINSTANCE NTPRINT_hInstance = NULL; +typedef struct { + LPMONITOR_INFO_2W mi2; /* Buffer for installed Monitors */ + DWORD installed; /* Number of installed Monitors */ +} monitorinfo_t; + /***************************************************** * DllMain */ @@ -54,3 +62,61 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } + +/***************************************************** + * PSetupCreateMonitorInfo [NTPRINT.@] + * + * + */ + +HANDLE WINAPI PSetupCreateMonitorInfo(LPVOID unknown1, LPVOID unknown2,LPVOID unknown3) +{ + monitorinfo_t * mi=NULL; + DWORD needed; + DWORD res; + + TRACE("(%p, %p, %p)\n", unknown1, unknown2, unknown3); + + if ((unknown2 != NULL) || (unknown3 != NULL)) { + FIXME("got unknown parameter: (%p, %p, %p)\n", unknown1, unknown2, unknown3); + return NULL; + } + + mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t)); + if (!mi) { + /* FIXME: SetLastError() needed? */ + return NULL; + } + + /* Get the needed size for all Monitors */ + res = EnumMonitorsW(NULL, 2, NULL, 0, &needed, &mi->installed); + if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + mi->mi2 = HeapAlloc(GetProcessHeap(), 0, needed); + res = EnumMonitorsW(NULL, 2, (LPBYTE) mi->mi2, needed, &needed, &mi->installed); + } + + if (!res) { + HeapFree(GetProcessHeap(), 0, mi); + /* FIXME: SetLastError() needed? */ + return NULL; + } + + TRACE("=> %p (%u monitors installed)\n", mi, mi->installed); + return (HANDLE) mi; +} + +/***************************************************** + * PSetupDestroyMonitorInfo [NTPRINT.@] + * + */ + +VOID WINAPI PSetupDestroyMonitorInfo(HANDLE monitorinfo) +{ + monitorinfo_t * mi = (monitorinfo_t *) monitorinfo; + + TRACE("(%p)\n", mi); + if (mi) { + if (mi->installed) HeapFree(GetProcessHeap(), 0, mi->mi2); + HeapFree(GetProcessHeap(), 0, mi); + } +} diff --git a/dlls/ntprint/ntprint.spec b/dlls/ntprint/ntprint.spec index f703e96..348ab69 100644 --- a/dlls/ntprint/ntprint.spec +++ b/dlls/ntprint/ntprint.spec @@ -2,10 +2,10 @@ @ stub PSetupAssociateICMProfiles @ stub PSetupBuildDriversFromPath @ stub PSetupCreateDrvSetupPage -@ stub PSetupCreateMonitorInfo +@ stdcall PSetupCreateMonitorInfo(long ptr ptr) @ stub PSetupCreatePrinterDeviceInfoList @ stub PSetupDestroyDriverInfo3 -@ stub PSetupDestroyMonitorInfo +@ stdcall PSetupDestroyMonitorInfo(long) @ stub PSetupDestroyPrinterDeviceInfoList @ stub PSetupDestroySelectedDriverInfo @ stub PSetupDriverInfoFromName

1 0