wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Frédéric Delanoy : po: Remove English strings from the French translation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 273b88100ca9af7e2cdb606ac4689ea065bbabce URL: http://source.winehq.org/git/wine.git/?a=commit;h=273b88100ca9af7e2cdb606ac… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 19 17:22:45 2012 +0100 po: Remove English strings from the French translation. --- po/fr.po | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 35e1c8c..02e308e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1324,9 +1324,8 @@ msgid "Certificate Type" msgstr "Type de certificat" #: crypt32.rc:59 -#, fuzzy msgid "Certificate Manifold" -msgstr "Certificate Manifold" +msgstr "" #: crypt32.rc:60 msgid "Netscape Cert Type"

1 0

Alexandre Julliard : winetest: Avoid Unicode macros.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 7175324992f250eca138e2a8b2397920333866e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7175324992f250eca138e2a8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 21:05:28 2012 +0100 winetest: Avoid Unicode macros. --- programs/winetest/Makefile.in | 1 + programs/winetest/gui.c | 57 ++++++++++++++++++----------------------- programs/winetest/main.c | 57 ++++++++++++++++++++--------------------- programs/winetest/send.c | 2 +- programs/winetest/util.c | 2 +- programs/winetest/winetest.rc | 8 +++--- 6 files changed, 60 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7175324992f250eca138e…

1 0

Alexandre Julliard : winemine: Convert to Unicode.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 020faceaae650fd899ae0c11a78bae20f029ce72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020faceaae650fd899ae0c11a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 20:24:31 2012 +0100 winemine: Convert to Unicode. --- programs/winemine/Makefile.in | 3 +- programs/winemine/dialog.c | 11 ++-- programs/winemine/main.c | 135 ++++++++++++++++++++++------------------- programs/winemine/main.h | 2 +- programs/winemine/resource.h | 11 +++ programs/winemine/winemine.rc | 10 ++-- 6 files changed, 96 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=020faceaae650fd899ae0…

1 0

Alexandre Julliard : view: Convert to Unicode.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: be91790988e49a003eb6c5ab214d2b620e4fdc9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=be91790988e49a003eb6c5ab2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 19 20:04:00 2012 +0100 view: Convert to Unicode. --- programs/view/Makefile.in | 3 +- programs/view/view.c | 162 +++++++++++++++++++++++---------------------- 2 files changed, 85 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be91790988e49a003eb6c…

1 0

Alistair Leslie-Hughes : gdi32: Add EnhMetafile PolyBezier, PolyBezierTo support.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: c5235eeab020394b7431d5c6233b59f59c790492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5235eeab020394b7431d5c62… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 17 14:38:15 2012 +1100 gdi32: Add EnhMetafile PolyBezier, PolyBezierTo support. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 + dlls/gdi32/enhmfdrv/graphics.c | 20 ++++++ dlls/gdi32/enhmfdrv/init.c | 4 +- dlls/gdi32/tests/metafile.c | 119 ++++++++++++++++++++++++++++++++-- 4 files changed, 137 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index a1cead5..53d69bc 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -94,6 +94,8 @@ extern BOOL EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 71fd118..553801c 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -451,6 +451,26 @@ BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) return EMFDRV_Polylinegon( dev, pt, count, EMR_POLYGON ); } +/********************************************************************** + * EMFDRV_PolyBezier + */ +BOOL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) +{ + if(EMFDRV_Polylinegon16( dev, pts, count, EMR_POLYBEZIER16 )) + return TRUE; + return EMFDRV_Polylinegon( dev, pts, count, EMR_POLYBEZIER ); +} + +/********************************************************************** + * EMFDRV_PolyBezierTo + */ +BOOL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) +{ + if(EMFDRV_Polylinegon16( dev, pts, count, EMR_POLYBEZIERTO16 )) + return TRUE; + return EMFDRV_Polylinegon( dev, pts, count, EMR_POLYBEZIERTO ); +} + /********************************************************************** * EMFDRV_PolyPolylinegon diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index f988ebd..d254cba 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -109,8 +109,8 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = EMFDRV_PaintRgn, /* pPaintRgn */ EMFDRV_PatBlt, /* pPatBlt */ EMFDRV_Pie, /* pPie */ - NULL, /* pPolyBezier */ - NULL, /* pPolyBezierTo */ + EMFDRV_PolyBezier, /* pPolyBezier */ + EMFDRV_PolyBezierTo, /* pPolyBezierTo */ NULL, /* pPolyDraw */ EMFDRV_PolyPolygon, /* pPolyPolygon */ EMFDRV_PolyPolyline, /* pPolyPolyline */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 206e15a..0bbf9c3 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1321,6 +1321,51 @@ static const unsigned char EMF_DCBRUSH_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_BEZIER_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1a, 0x2a, 0x0d, 0x00, 0x1a, 0x2f, 0x0d, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x44, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x51, 0x01, 0x00, 0x00, 0x0e, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x68, 0x24, 0x05, 0x00, + 0xb0, 0x1e, 0x04, 0x00, 0x58, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x0f, 0x00, 0x0f, 0x00, 0x55, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, + 0x19, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x0f, 0x00, 0x0f, 0x00, 0x19, 0x00, 0x19, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, + 0x19, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x34, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -1588,6 +1633,28 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr HeapFree(GetProcessHeap(), 0, emr_nt4); } } + else if (emr1->iType == EMR_POLYBEZIERTO16 || emr1->iType == EMR_POLYBEZIER16) + { + EMRPOLYBEZIER16 *eto1, *eto2; + + eto1 = (EMRPOLYBEZIER16*)emr1; + eto2 = (EMRPOLYBEZIER16*)emr2; + + diff = eto1->cpts != eto1->cpts; + if(!diff) + diff = memcmp(eto1->apts, eto2->apts, eto1->cpts * sizeof(POINTS)); + } + else if (emr1->iType == EMR_POLYBEZIERTO || emr1->iType == EMR_POLYBEZIER) + { + EMRPOLYBEZIER *eto1, *eto2; + + eto1 = (EMRPOLYBEZIER*)emr1; + eto2 = (EMRPOLYBEZIER*)emr2; + + diff = eto1->cptl != eto1->cptl; + if(!diff) + diff = memcmp(eto1->aptl, eto2->aptl, eto1->cptl * sizeof(POINTL)); + } else diff = memcmp(emr1, emr2, emr1->nSize); @@ -1658,17 +1725,17 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, offset2 = emh2->nSize; /* Needed for Win9x/WinME/NT4 */ while (offset1 < emh1->nBytes) { - const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); - const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); + const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); + const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); - trace("%s: EMF record %u, size %u/record %u, size %u\n", + trace("%s: EMF record %u, size %u/record %u, size %u\n", desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; /* We have already bailed out if iType or nSize don't match */ - offset1 += emr1->nSize; - offset2 += emr2->nSize; + offset1 += emr1->nSize; + offset2 += emr2->nSize; } return 0; } @@ -2250,7 +2317,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, { if (emr->iType == EMR_EXTSELECTCLIPRGN) { - const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)emr; + const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)emr; union _rgn { RGNDATA data; @@ -3089,6 +3156,45 @@ static void test_SetEnhMetaFileBits(void) DeleteEnhMetaFile(hemf); } +static void test_emf_polybezier(void) +{ + HDC hdcMetafile; + HENHMETAFILE hemf; + POINT pts[4]; + BOOL ret; + + SetLastError(0xdeadbeef); + hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + pts[0].x = pts[0].y = 10; + pts[1].x = pts[1].y = 20; + pts[2].x = pts[2].y = 15; + pts[3].x = pts[3].y = 25; + ret = PolyBezierTo(hdcMetafile, pts, 3); /* EMR_POLYBEZIERTO16 */ + ok( ret, "PolyBezierTo failed\n" ); + ret = PolyBezier(hdcMetafile, pts, 4); /* EMR_POLYBEZIER16 */ + ok( ret, "PolyBezier failed\n" ); + + pts[0].x = pts[0].y = 32769; + ret = PolyBezier(hdcMetafile, pts, 4); /* EMR_POLYBEZIER */ + ok( ret, "PolyBezier failed\n" ); + ret = PolyBezierTo(hdcMetafile, pts, 3); /* EMR_POLYBEZIERTO */ + ok( ret, "PolyBezierTo failed\n" ); + + hemf = CloseEnhMetaFile(hdcMetafile); + ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if(compare_emf_bits(hemf, EMF_BEZIER_BITS, sizeof(EMF_BEZIER_BITS), + "emf_Bezier", FALSE) != 0) + { + dump_emf_bits(hemf, "emf_Bezier"); + dump_emf_records(hemf, "emf_Bezier"); + } + + DeleteEnhMetaFile(hemf); +} + START_TEST(metafile) { init_function_pointers(); @@ -3111,6 +3217,7 @@ START_TEST(metafile) test_mf_ExtTextOut_on_path(); test_emf_ExtTextOut_on_path(); test_emf_clipping(); + test_emf_polybezier(); /* For metafile conversions */ test_mf_conversions();

1 0

Austin English : ntoskrnl.exe: Add a stub for IoCreateSynchronizationEvent.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: a4ee9f2d20f10792c9c01e5fa8ce3928a44125c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee9f2d20f10792c9c01e5fa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 02:36:43 2012 -0600 ntoskrnl.exe: Add a stub for IoCreateSynchronizationEvent. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4dbab40..89f5b17 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1751,3 +1751,12 @@ BOOLEAN WINAPI Ke386SetIoAccessMap(ULONG flag, PVOID buffer) FIXME("(%d %p) stub\n", flag, buffer); return FALSE; } + +/***************************************************** + * IoCreateSynchronizationEvent (NTOSKRNL.EXE.@) + */ +PKEVENT WINAPI IoCreateSynchronizationEvent(PUNICODE_STRING name, PHANDLE handle) +{ + FIXME("(%p %p) stub\n", name, handle); + return NULL; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2982d8b..da3d38e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -346,7 +346,7 @@ @ stub IoCreateStreamFileObjectEx @ stub IoCreateStreamFileObjectLite @ stdcall IoCreateSymbolicLink(ptr ptr) -@ stub IoCreateSynchronizationEvent +@ stdcall IoCreateSynchronizationEvent(ptr ptr) @ stub IoCreateUnprotectedSymbolicLink @ stub IoCsqInitialize @ stub IoCsqInsertIrp

1 0

Austin English : kernel32: Add stubs for GetConsoleCommandHistoryLengthA/W.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 2bc08d7f35228cd2dcbb552fdce2f941a4ac6e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc08d7f35228cd2dcbb552fd… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 02:27:33 2012 -0600 kernel32: Add stubs for GetConsoleCommandHistoryLengthA/W. --- dlls/kernel32/console.c | 20 ++++++++++++++++++-- dlls/kernel32/kernel32.spec | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index fdc4552..b50bce1 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2934,8 +2934,6 @@ BOOL WINAPI SetConsoleDisplayMode(HANDLE hConsoleOutput, DWORD dwFlags, /* some missing functions... * FIXME: those are likely to be defined as undocumented function in kernel32 (or part of them) * should get the right API and implement them - * GetConsoleCommandHistory[AW] (dword dword dword) - * GetConsoleCommandHistoryLength[AW] * SetConsoleCommandHistoryMode * SetConsoleNumberOfCommands[AW] */ @@ -3141,3 +3139,21 @@ BOOL CONSOLE_Exit(void) /* the console is in raw mode, put it back in cooked mode */ return restore_console_mode(GetStdHandle(STD_INPUT_HANDLE)); } + +/* Undocumented, called by native doskey.exe */ +/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ +DWORD WINAPI GetConsoleCommandHistoryA(DWORD unknown1, DWORD unknown2, DWORD unknown3) +{ + FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* Undocumented, called by native doskey.exe */ +/* FIXME: Should use CONSOLE_GetHistory() above for full implementation */ +DWORD WINAPI GetConsoleCommandHistoryW(DWORD unknown1, DWORD unknown2, DWORD unknown3) +{ + FIXME(": (0x%x, 0x%x, 0x%x) stub!\n", unknown1, unknown2, unknown3); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f1ec4f3..9be4f00 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -465,10 +465,10 @@ @ stub GetConsoleAliasesW @ stdcall GetConsoleCP() @ stub GetConsoleCharType -@ stub GetConsoleCommandHistoryA +@ stdcall GetConsoleCommandHistoryA(long long long) @ stub GetConsoleCommandHistoryLengthA @ stub GetConsoleCommandHistoryLengthW -@ stub GetConsoleCommandHistoryW +@ stdcall GetConsoleCommandHistoryW(long long long) @ stdcall GetConsoleCursorInfo(long ptr) @ stub GetConsoleCursorMode @ stdcall GetConsoleDisplayMode(ptr)

1 0

Frédéric Delanoy : setupapi: Correctly handle errors in fake_dlls_callback (Coverity).
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: edd9066d5b676104c036cb621574f36ea055951b URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd9066d5b676104c036cb621… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 19 17:14:21 2012 +0100 setupapi: Correctly handle errors in fake_dlls_callback (Coverity). --- dlls/setupapi/install.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 947a512..96eb914 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -701,7 +701,6 @@ static BOOL register_dlls_callback( HINF hinf, PCWSTR field, void *arg ) static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) { INFCONTEXT context; - BOOL ret = TRUE; BOOL ok = SetupFindFirstLineW( hinf, field, NULL, &context ); for (; ok; ok = SetupFindNextLine( &context, &context )) @@ -730,9 +729,8 @@ static BOOL fake_dlls_callback( HINF hinf, PCWSTR field, void *arg ) done: HeapFree( GetProcessHeap(), 0, path ); - if (!ret) break; } - return ret; + return TRUE; } /***********************************************************************

1 0

Jacek Caban : mshtml: Added IOleContainer::EnumObjects tests.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 882d126dbaed7cd1a3d698e17a15d35cb339f7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=882d126dbaed7cd1a3d698e17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:51 2012 +0100 mshtml: Added IOleContainer::EnumObjects tests. --- dlls/mshtml/tests/htmldoc.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 0fb115a..a79e50e 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6184,6 +6184,35 @@ static void test_external(IHTMLDocument2 *doc, BOOL initialized) IHTMLWindow2_Release(htmlwin); } +static void test_enum_objects(IOleContainer *container) +{ + IEnumUnknown *enum_unknown; + IUnknown *buf[100] = {(void*)0xdeadbeef}; + ULONG fetched; + HRESULT hres; + + enum_unknown = NULL; + hres = IOleContainer_EnumObjects(container, OLECONTF_EMBEDDINGS, &enum_unknown); + ok(hres == S_OK, "EnumObjects failed: %08x\n", hres); + ok(enum_unknown != NULL, "enum_unknown == NULL\n"); + + fetched = 0xdeadbeef; + hres = IEnumUnknown_Next(enum_unknown, sizeof(buf)/sizeof(*buf), buf, &fetched); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + ok(buf[0] == (void*)0xdeadbeef, "buf[0] = %p\n", buf[0]); + + fetched = 0xdeadbeef; + hres = IEnumUnknown_Next(enum_unknown, 1, buf, &fetched); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + ok(!fetched, "fetched = %d\n", fetched); + + hres = IEnumUnknown_Next(enum_unknown, 1, buf, NULL); + ok(hres == S_FALSE, "Next returned %08x\n", hres); + + IEnumUnknown_Release(enum_unknown); +} + static void test_target_container(IHTMLDocument2 *doc) { IOleContainer *ole_container, *doc_ole_container; @@ -6201,6 +6230,7 @@ static void test_target_container(IHTMLDocument2 *doc) ok(hres == S_OK, "GetFramesContainer failed: %08x\n", hres); ok(ole_container != NULL, "ole_container == NULL\n"); ok(iface_cmp((IUnknown*)ole_container, (IUnknown*)doc_ole_container), "ole_container != doc_ole_container\n"); + test_enum_objects(ole_container); IOleContainer_Release(ole_container); ITargetContainer_Release(target_container);

1 0

Jacek Caban : mshtml: Added IOleContainer::EnumObjects implementation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 3b80784b63f4ad72f077c44a79b6b8b3bd1b1b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b80784b63f4ad72f077c44a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 17:03:37 2012 +0100 mshtml: Added IOleContainer::EnumObjects implementation. --- dlls/mshtml/oleobj.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 9f3d75a..261eda3 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -40,6 +40,102 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define DOCHOST_DOCCANNAVIGATE 0 +typedef struct { + IEnumUnknown IEnumUnknown_iface; + LONG ref; +} EnumUnknown; + +static inline EnumUnknown *impl_from_IEnumUnknown(IEnumUnknown *iface) +{ + return CONTAINING_RECORD(iface, EnumUnknown, IEnumUnknown_iface); +} + +static HRESULT WINAPI EnumUnknown_QueryInterface(IEnumUnknown *iface, REFIID riid, void **ppv) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IEnumUnknown_iface; + }else if(IsEqualGUID(&IID_IEnumUnknown, riid)) { + TRACE("(%p)->(IID_IEnumUnknown %p)\n", This, ppv); + *ppv = &This->IEnumUnknown_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI EnumUnknown_AddRef(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI EnumUnknown_Release(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI EnumUnknown_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + + TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + + /* FIXME: It's not clear if we should ever return something here */ + if(pceltFetched) + *pceltFetched = 0; + return S_FALSE; +} + +static HRESULT WINAPI EnumUnknown_Skip(IEnumUnknown *iface, ULONG celt) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)->(%u)\n", This, celt); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUnknown_Reset(IEnumUnknown *iface) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI EnumUnknown_Clone(IEnumUnknown *iface, IEnumUnknown **ppenum) +{ + EnumUnknown *This = impl_from_IEnumUnknown(iface); + FIXME("(%p)->(%p)\n", This, ppenum); + return E_NOTIMPL; +} + +static const IEnumUnknownVtbl EnumUnknownVtbl = { + EnumUnknown_QueryInterface, + EnumUnknown_AddRef, + EnumUnknown_Release, + EnumUnknown_Next, + EnumUnknown_Skip, + EnumUnknown_Reset, + EnumUnknown_Clone +}; + /********************************************************** * IOleObject implementation */ @@ -871,8 +967,19 @@ static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindC static HRESULT WINAPI OleContainer_EnumObjects(IOleContainer *iface, DWORD grfFlags, IEnumUnknown **ppenum) { HTMLDocument *This = impl_from_IOleContainer(iface); - FIXME("(%p)->(%x %p)\n", This, grfFlags, ppenum); - return E_NOTIMPL; + EnumUnknown *ret; + + TRACE("(%p)->(%x %p)\n", This, grfFlags, ppenum); + + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IEnumUnknown_iface.lpVtbl = &EnumUnknownVtbl; + ret->ref = 1; + + *ppenum = &ret->IEnumUnknown_iface; + return S_OK; } static HRESULT WINAPI OleContainer_LockContainer(IOleContainer *iface, BOOL fLock)

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012