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

Piotr Caban : msxml3/tests: Added test for ISAXXMLReader_parseURL.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 742eb4ba08bdfb8286fb1fedca10846578eeb8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=742eb4ba08bdfb8286fb1fedc… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 27 19:54:55 2008 +0200 msxml3/tests: Added test for ISAXXMLReader_parseURL. --- dlls/msxml3/tests/saxreader.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index dd69e0f..0ff0fdf 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -476,6 +476,9 @@ static void test_saxreader(void) ULARGE_INTEGER liSize; LARGE_INTEGER liPos; ULONG bytesWritten; + HANDLE file; + + static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (LPVOID*)&reader); @@ -561,6 +564,18 @@ static void test_saxreader(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_expect_call(CH_ENDTEST); + file = CreateFileW(testXmlW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); + WriteFile(file, szTestXML, sizeof(szTestXML)-1, &bytesWritten, NULL); + CloseHandle(file); + + expectCall = contentHandlerTest1; + hr = ISAXXMLReader_parseURL(reader, testXmlW); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + + DeleteFileW(testXmlW); + ISAXXMLReader_Release(reader); }

1 0

Francois Gouget : mscoree: Fix the ND_WI8() prototype.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: e59ef5658b3d725bbedfcf936d7e82cb7fa0b549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59ef5658b3d725bbedfcf936… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:13:22 2008 +0200 mscoree: Fix the ND_WI8() prototype. --- dlls/mscoree/mscoree.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 0a75722..0195b62 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -80,7 +80,7 @@ @ stdcall ND_RU1(ptr long) @ stdcall ND_WI2(ptr long long) @ stdcall ND_WI4(ptr long long) -@ stdcall ND_WI8(ptr long long long) +@ stdcall ND_WI8(ptr long double) @ stdcall ND_WU1(ptr long long) @ stub OpenCtrs @ stub ReOpenMetaDataWithMemoryEx

1 0

Francois Gouget : Add some API documentation stubs to make winapi_check happy.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: eb16f43bdfa2c742d94e846f9d3ffaeeb310faa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb16f43bdfa2c742d94e846f9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:20:33 2008 +0200 Add some API documentation stubs to make winapi_check happy. --- dlls/d3dx9_36/font.c | 6 ++++++ dlls/gdi32/font.c | 10 +++++----- dlls/gdiplus/font.c | 35 ++++++++++++++++++++++++++++++++++- dlls/gdiplus/image.c | 22 ++++++++++++++++++++++ dlls/gdiplus/region.c | 6 ++++++ dlls/inetmib1/main.c | 9 +++++++++ dlls/rpcrt4/rpc_epmap.c | 3 +++ dlls/shell32/shellpath.c | 9 +++------ dlls/wininet/urlcache.c | 3 +++ 9 files changed, 91 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb16f43bdfa2c742d94e8…

1 0

Piotr Caban : msxml3: Generalize bsc_t implementation.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 6b2e7a18ba56c1cf585604ea4f45eb0f3d4a6e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2e7a18ba56c1cf585604ea4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sun Jul 27 19:54:38 2008 +0200 msxml3: Generalize bsc_t implementation. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/bsc.c | 310 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/domdoc.c | 299 +++-------------------------------------- dlls/msxml3/msxml_private.h | 5 + 4 files changed, 339 insertions(+), 276 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b2e7a18ba56c1cf58560…

1 0

Francois Gouget : winex11.drv: Fix the SysCommand() and ImeGetRegisterWordStyle() prototypes.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: c5acad84a8dcc51a09c9ec8bfcabe062499b1f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5acad84a8dcc51a09c9ec8bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:12:46 2008 +0200 winex11.drv: Fix the SysCommand() and ImeGetRegisterWordStyle() prototypes. --- dlls/winex11.drv/winex11.drv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 459ea9e..5dbe40f 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -111,7 +111,7 @@ @ cdecl SetWindowRgn(long long long) X11DRV_SetWindowRgn @ cdecl SetWindowStyle(ptr long) X11DRV_SetWindowStyle @ cdecl SetWindowText(long wstr) X11DRV_SetWindowText -@ cdecl SysCommand(long long) X11DRV_SysCommand +@ cdecl SysCommand(long long long) X11DRV_SysCommand @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr) X11DRV_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr) X11DRV_WindowPosChanged @@ -163,5 +163,5 @@ @ stdcall ImeSetCompositionString(long long ptr long ptr long) @ stdcall ImeConversionList(long wstr ptr long long) @ stdcall ImeProcessKey(long long long ptr) -@ stdcall ImeGetRegisterWordStyle(wstr long wstr) +@ stdcall ImeGetRegisterWordStyle(long ptr) @ stdcall ImeGetImeMenuItems(long long long ptr ptr long)

1 0

Francois Gouget : quartz: assert.h is not a local include.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: a516f27c2f5bc4d3c5bf90765a08e078813ed5bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a516f27c2f5bc4d3c5bf90765… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:12:32 2008 +0200 quartz: assert.h is not a local include. --- dlls/quartz/videorenderer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 629ad1d..c7d6582 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -37,7 +37,7 @@ #include "ddraw.h" #include "dvdmedia.h" -#include "assert.h" +#include <assert.h> #include "wine/unicode.h" #include "wine/debug.h"

1 0

Francois Gouget : gdi32: Include config.h before using HAVE_XXX.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 56aab13ecc8e8cb2cb75fa6972a72583fabfe2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=56aab13ecc8e8cb2cb75fa697… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:12:15 2008 +0200 gdi32: Include config.h before using HAVE_XXX. --- dlls/gdi32/bitblt.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index f446e26..cff45be 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #include <stdarg.h> #include <math.h>

1 0

Francois Gouget : appwiz.cpl: Fix the CPlApplet() prototype.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: 4627e86046d8ba4f10003f8c14e2418483a97ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4627e86046d8ba4f10003f8c1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:13:27 2008 +0200 appwiz.cpl: Fix the CPlApplet() prototype. --- dlls/appwiz.cpl/appwiz.cpl.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.cpl.spec b/dlls/appwiz.cpl/appwiz.cpl.spec index 7ae3a01..3896019 100644 --- a/dlls/appwiz.cpl/appwiz.cpl.spec +++ b/dlls/appwiz.cpl/appwiz.cpl.spec @@ -1 +1 @@ -1 stdcall CPlApplet() +1 stdcall CPlApplet(long long long long)

1 0

Francois Gouget : appwiz.cpl: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: a5ef61e0d312bcb12655ebff0d4793503a05c353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ef61e0d312bcb12655ebff0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 26 19:11:37 2008 +0200 appwiz.cpl: Fix compilation on systems that don't support nameless unions. --- dlls/appwiz.cpl/appwiz.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index e06d810..6da1a77 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -23,6 +23,8 @@ * */ +#define NONAMELESSUNION + #include "config.h" #include "wine/port.h" #include "wine/unicode.h" @@ -708,8 +710,8 @@ static void StartApplet(HWND hWnd) psp.dwSize = sizeof (PROPSHEETPAGEW); psp.dwFlags = PSP_USETITLE; psp.hInstance = hInst; - psp.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN); - psp.pszIcon = NULL; + psp.u.pszTemplate = MAKEINTRESOURCEW (IDD_MAIN); + psp.u2.pszIcon = NULL; psp.pfnDlgProc = (DLGPROC) MainDlgProc; psp.pszTitle = tab_title; psp.lParam = 0; @@ -719,12 +721,12 @@ static void StartApplet(HWND hWnd) psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USEICONID; psh.hwndParent = hWnd; psh.hInstance = hInst; - psh.pszIcon = NULL; + psh.u.pszIcon = NULL; psh.pszCaption = app_title; psh.nPages = 1; - psh.ppsp = &psp; + psh.u3.ppsp = &psp; psh.pfnCallback = NULL; - psh.nStartPage = 0; + psh.u2.nStartPage = 0; /* Display the property sheet */ PropertySheetW (&psh);

1 0

Nikolay Sivov : gdiplus: Implemented GdipGetCustomLineCapWidthScale with some tests.
by Alexandre Julliard 28 Jul '08

28 Jul '08

Module: wine Branch: master Commit: ce2aee48597aed7da93e5a1a7298a298a3cc2b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce2aee48597aed7da93e5a1a7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 26 12:48:16 2008 +0400 gdiplus: Implemented GdipGetCustomLineCapWidthScale with some tests. --- dlls/gdiplus/customlinecap.c | 12 ++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/tests/customlinecap.c | 33 +++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 5 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index d6af063..48a20df 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -101,6 +101,7 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath (*customCap)->inset = baseInset; (*customCap)->cap = baseCap; (*customCap)->join = LineJoinMiter; + (*customCap)->scale = 1.0; return Ok; } @@ -128,6 +129,17 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap* customCap, return Ok; } +GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap* custom, + REAL* widthScale) +{ + if(!custom || !widthScale) + return InvalidParameter; + + *widthScale = custom->scale; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, GpLineCap start, GpLineCap end) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5a1a7a7..2b54ec1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -254,7 +254,7 @@ @ stub GdipGetCustomLineCapStrokeCaps @ stdcall GdipGetCustomLineCapStrokeJoin(ptr ptr) @ stub GdipGetCustomLineCapType -@ stub GdipGetCustomLineCapWidthScale +@ stdcall GdipGetCustomLineCapWidthScale(ptr ptr) @ stdcall GdipGetDC(ptr ptr) @ stdcall GdipGetDpiX(ptr ptr) @ stdcall GdipGetDpiY(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index aa03727..56df458 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -150,6 +150,7 @@ struct GpCustomLineCap{ GpLineCap cap; /* as far as I can tell, this value is ignored */ REAL inset; /* how much to adjust the end of the line */ GpLineJoin join; + REAL scale; }; struct GpImage{ diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 26b9645..78a8c70 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -149,6 +149,38 @@ static void test_inset(void) GdipDeletePath(path); } +static void test_scale(void) +{ + GpCustomLineCap *custom; + GpPath *path; + REAL scale; + GpStatus stat; + + stat = GdipCreatePath(FillModeAlternate, &path); + expect(Ok, stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + expect(Ok, stat); + + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &custom); + expect(Ok, stat); + + /* NULL args */ + stat = GdipGetCustomLineCapWidthScale(NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipGetCustomLineCapWidthScale(NULL, &scale); + expect(InvalidParameter, stat); + stat = GdipGetCustomLineCapWidthScale(custom, NULL); + expect(InvalidParameter, stat); + /* valid args */ + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(1.0, scale); + + GdipDeleteCustomLineCap(custom); + GdipDeletePath(path); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -164,6 +196,7 @@ START_TEST(customlinecap) test_constructor_destructor(); test_linejoin(); test_inset(); + test_scale(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0138c8b..8b83c8e 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -329,6 +329,7 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap*,GpLineCap*); GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap*,REAL*); GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin*); GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap*,GpLineJoin); +GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap*,REAL*); GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap*,INT,INT,ARGB);

1 0