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

Nikolay Sivov : gdiplus: GdipGetPathLastPoint implementation.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 5863eabdfa7fe0af78b9154d073f09faf4b3e8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5863eabdfa7fe0af78b9154d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 29 13:02:20 2008 +0400 gdiplus: GdipGetPathLastPoint implementation. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 14 ++++++++++++++ dlls/gdiplus/tests/graphicspath.c | 26 ++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5cbc5ba..8b23d2d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -342,7 +342,7 @@ @ stdcall GdipGetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipGetPathGradientTransform @ stub GdipGetPathGradientWrapMode -@ stub GdipGetPathLastPoint +@ stdcall GdipGetPathLastPoint(ptr ptr) @ stdcall GdipGetPathPoints(ptr ptr long) @ stdcall GdipGetPathPointsI(ptr ptr long) @ stdcall GdipGetPathTypes(ptr ptr long) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 1da6866..6e5747f 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -551,6 +551,20 @@ GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath *path, GpFillMode *fillmode) return Ok; } +GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath* path, GpPointF* lastPoint) +{ + INT count; + + if(!path || !lastPoint) + return InvalidParameter; + + count = path->pathdata.Count; + if(count > 0) + *lastPoint = path->pathdata.Points[count-1]; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count) { if(!path) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 286cba6..9f9af9c 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -671,6 +671,31 @@ static void test_rect(void) GdipDeletePath(path); } +static void test_lastpoint(void) +{ + GpStatus status; + GpPath *path; + GpPointF ptf; + + GdipCreatePath(FillModeAlternate, &path); + status = GdipAddPathRectangle(path, 5.0, 5.0, 100.0, 50.0); + expect(Ok, status); + + /* invalid args */ + status = GdipGetPathLastPoint(NULL, &ptf); + expect(InvalidParameter, status); + status = GdipGetPathLastPoint(path, NULL); + expect(InvalidParameter, status); + status = GdipGetPathLastPoint(NULL, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathLastPoint(path, &ptf); + expect(Ok, status); + expect(TRUE, (ptf.X == 5.0) && (ptf.Y == 55.0)); + + GdipDeletePath(path); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -693,6 +718,7 @@ START_TEST(graphicspath) test_linei(); test_rect(); test_polygon(); + test_lastpoint(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 87135e3..5caeb72 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -238,6 +238,7 @@ GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint*,GDIPCONST BYTE*,INT,GpFi GpStatus WINGDIPAPI GdipDeletePath(GpPath*); GpStatus WINGDIPAPI GdipGetPathData(GpPath*,GpPathData*); GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath*,GpFillMode*); +GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath*,GpPointF*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath*,GpPoint*,INT); GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT);

1 0

Nikolay Sivov : gdiplus: GdipGetPathGradientWrapMode implementation.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 58901f10f5c66466cefd8a5044fda27531437b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58901f10f5c66466cefd8a504… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jun 29 13:02:27 2008 +0400 gdiplus: GdipGetPathGradientWrapMode implementation. --- dlls/gdiplus/brush.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 50ba7ca..328f02c 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -555,6 +555,17 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPathGradientWrapMode(GpPathGradient *brush, + GpWrapMode *wrapmode) +{ + if(!brush || !wrapmode) + return InvalidParameter; + + *wrapmode = brush->wrap; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) { if(!sf || !argb) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8b23d2d..61cc2de 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -341,7 +341,7 @@ @ stub GdipGetPathGradientSurroundColorCount @ stdcall GdipGetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipGetPathGradientTransform -@ stub GdipGetPathGradientWrapMode +@ stdcall GdipGetPathGradientWrapMode(ptr ptr) @ stdcall GdipGetPathLastPoint(ptr ptr) @ stdcall GdipGetPathPoints(ptr ptr long) @ stdcall GdipGetPathPointsI(ptr ptr long)

1 0

Alexander Dorofeyev : Revert "quartz: Only enumerate renderers if bRender is set in filtermapper.".
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: dcc9032ed0e8008466b8948f083e79d3396a681c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc9032ed0e8008466b8948f0… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Jun 29 15:07:08 2008 +0300 Revert "quartz: Only enumerate renderers if bRender is set in filtermapper.". This reverts commit b157969d49bd81d23b542b19d55a8c1f8bd004d8. --- dlls/quartz/filtermapper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index da6d59f..7f7e688 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1070,7 +1070,7 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters( const REGFILTERPINS2 * rfp2 = rf2.u.s1.rgPins2 + i; bInputMatch = bInputMatch || (!(rfp2->dwFlags & REG_PINFLAG_B_OUTPUT) && - (!bRender == !(rfp2->dwFlags & REG_PINFLAG_B_RENDERER)) && + (!bRender || (rfp2->dwFlags & REG_PINFLAG_B_RENDERER)) && MatchTypes(bExactMatch, rfp2->nMediaTypes, rfp2->lpMediaType, cInputTypes, pInputTypes)); bOutputMatch = bOutputMatch || ((rfp2->dwFlags & REG_PINFLAG_B_OUTPUT) && MatchTypes(bExactMatch, rfp2->nMediaTypes, rfp2->lpMediaType, cOutputTypes, pOutputTypes));

1 0

Zac Brown : ntdll: Implement checking for control characters in RtlIsTextUnicode.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 8f3ae2011c39d092b0c8e2e6a9aabddbd2596748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f3ae2011c39d092b0c8e2e6a… Author: Zac Brown <zac(a)zacbrown.org> Date: Mon Jun 30 09:46:38 2008 -0700 ntdll: Implement checking for control characters in RtlIsTextUnicode. --- dlls/ntdll/rtlstr.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/tests/rtlstr.c | 21 +++++---------------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 608857a..60cd888 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -1592,6 +1592,8 @@ NTSTATUS WINAPI RtlFindCharInUnicodeString( */ BOOLEAN WINAPI RtlIsTextUnicode( LPCVOID buf, INT len, INT *pf ) { + static const WCHAR std_control_chars[] = {'\r','\n','\t',' ',0x3000,0}; + static const WCHAR byterev_control_chars[] = {0x0d00,0x0a00,0x0900,0x2000,0x0030,0}; const WCHAR *s = buf; int i; unsigned int flags = ~0U, out_flags = 0; @@ -1651,6 +1653,30 @@ BOOLEAN WINAPI RtlIsTextUnicode( LPCVOID buf, INT len, INT *pf ) } } + if (flags & IS_TEXT_UNICODE_CONTROLS) + { + for (i = 0; i < len; i++) + { + if (strchrW(std_control_chars, s[i])) + { + out_flags |= IS_TEXT_UNICODE_CONTROLS; + break; + } + } + } + + if (flags & IS_TEXT_UNICODE_REVERSE_CONTROLS) + { + for (i = 0; i < len; i++) + { + if (strchrW(byterev_control_chars, s[i])) + { + out_flags |= IS_TEXT_UNICODE_REVERSE_CONTROLS; + break; + } + } + } + if (pf) { out_flags &= *pf; diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 74ba8ea..d5d8839 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1693,7 +1693,6 @@ static void test_RtlIsTextUnicode(void) flags = IS_TEXT_UNICODE_UNICODE_MASK; ok(pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Text should not pass a Unicode\n"); - todo_wine ok(flags == (IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_CONTROLS), "Expected flags 0x6, obtained %x\n", flags); @@ -1712,7 +1711,7 @@ static void test_RtlIsTextUnicode(void) be_unicode[i + 1] = (unicode[i] >> 8) | ((unicode[i] & 0xff) << 8); } ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, NULL), "Reverse endian should not be Unicode\n"); - todo_wine ok(!pRtlIsTextUnicode(&be_unicode[1], sizeof(unicode), NULL), "Reverse endian should not be Unicode\n"); + ok(!pRtlIsTextUnicode(&be_unicode[1], sizeof(unicode), NULL), "Reverse endian should not be Unicode\n"); flags = IS_TEXT_UNICODE_REVERSE_MASK; ok(!pRtlIsTextUnicode(&be_unicode[1], sizeof(unicode), &flags), "Reverse endian should be Unicode\n"); @@ -1722,7 +1721,6 @@ static void test_RtlIsTextUnicode(void) flags = IS_TEXT_UNICODE_REVERSE_MASK; ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, &flags), "Reverse endian should be Unicode\n"); - todo_wine ok(flags == (IS_TEXT_UNICODE_REVERSE_CONTROLS | IS_TEXT_UNICODE_REVERSE_SIGNATURE), "Expected flags 0xc0, obtained %x\n", flags); @@ -1750,11 +1748,8 @@ static void test_RtlIsTextUnicode(void) ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); flags = IS_TEXT_UNICODE_CONTROLS; - todo_wine - { - ok(pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Test should pass on Unicode string lacking control characters.\n"); - ok(flags == IS_TEXT_UNICODE_CONTROLS, "Expected flags 0x04, obtained %x\n", flags); - } + ok(pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Test should pass on Unicode string lacking control characters.\n"); + ok(flags == IS_TEXT_UNICODE_CONTROLS, "Expected flags 0x04, obtained %x\n", flags); flags = IS_TEXT_UNICODE_CONTROLS; ok(!pRtlIsTextUnicode(be_unicode_no_controls, sizeof(unicode_no_controls) + 2, &flags), @@ -1762,11 +1757,8 @@ static void test_RtlIsTextUnicode(void) ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); flags = IS_TEXT_UNICODE_CONTROLS; - todo_wine - { - ok(pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on a string containing control characters.\n"); - ok(flags == IS_TEXT_UNICODE_CONTROLS, "Expected flags 0x04, obtained %x\n", flags); - } + ok(pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on a string containing control characters.\n"); + ok(flags == IS_TEXT_UNICODE_CONTROLS, "Expected flags 0x04, obtained %x\n", flags); /* Test IS_TEXT_UNICODE_REVERSE_CONTROLS flag */ flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; @@ -1784,18 +1776,15 @@ static void test_RtlIsTextUnicode(void) flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, &flags), "Test should pass with byte-reversed Unicode string containing control characters.\n"); - todo_wine ok(flags == IS_TEXT_UNICODE_REVERSE_CONTROLS, "Expected flags 0x40, obtained %x\n", flags); flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; ok(!pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on a string containing byte-reversed control characters.\n"); - todo_wine ok(flags == IS_TEXT_UNICODE_REVERSE_CONTROLS, "Expected flags 0x40, obtained %x\n", flags); /* Test with flags for both byte-reverse and standard Unicode characters */ flags = IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_REVERSE_CONTROLS; ok(!pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on string containing both byte-reversed and standard control characters.\n"); - todo_wine ok(flags == (IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_REVERSE_CONTROLS), "Expected flags 0x44, obtained %x\n", flags); HeapFree(GetProcessHeap(), 0, be_unicode);

1 0

Alistair Leslie-Hughes : gdi32: Stop crash in font tests.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 641d6aa5c2ad4ccc2c58ad1bca007ea60daafe1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=641d6aa5c2ad4ccc2c58ad1bc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 27 22:56:02 2008 +1000 gdi32: Stop crash in font tests. --- dlls/gdi32/tests/font.c | 98 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 80 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 868661c..eef7f36 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1532,6 +1532,12 @@ struct enum_font_data LOGFONT lf[MAX_ENUM_FONTS]; }; +struct enum_font_dataW +{ + int total; + LOGFONTW lf[MAX_ENUM_FONTS]; +}; + static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWORD type, LPARAM lParam) { struct enum_font_data *efd = (struct enum_font_data *)lParam; @@ -1547,6 +1553,18 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO return 1; } +static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, DWORD type, LPARAM lParam) +{ + struct enum_font_dataW *efd = (struct enum_font_dataW *)lParam; + + if (type != TRUETYPE_FONTTYPE) return 1; + + if (efd->total < MAX_ENUM_FONTS) + efd->lf[efd->total++] = *lf; + + return 1; +} + static void get_charset_stats(struct enum_font_data *efd, int *ansi_charset, int *symbol_charset, int *russian_charset) @@ -1574,9 +1592,37 @@ static void get_charset_stats(struct enum_font_data *efd, } } +static void get_charset_statsW(struct enum_font_dataW *efd, + int *ansi_charset, int *symbol_charset, + int *russian_charset) +{ + int i; + + *ansi_charset = 0; + *symbol_charset = 0; + *russian_charset = 0; + + for (i = 0; i < efd->total; i++) + { + switch (efd->lf[i].lfCharSet) + { + case ANSI_CHARSET: + (*ansi_charset)++; + break; + case SYMBOL_CHARSET: + (*symbol_charset)++; + break; + case RUSSIAN_CHARSET: + (*russian_charset)++; + break; + } + } +} + static void test_EnumFontFamilies(const char *font_name, INT font_charset) { struct enum_font_data efd; + struct enum_font_dataW efdw; LOGFONT lf; HDC hdc; int i, ret, ansi_charset, symbol_charset, russian_charset; @@ -1596,29 +1642,39 @@ static void test_EnumFontFamilies(const char *font_name, INT font_charset) */ if (!*font_name && font_charset == DEFAULT_CHARSET) /* do it only once */ { + /* + * Use EnumFontFamiliesW since win98 crashes when the + * second parameter is NULL using EnumFontFamilies + */ efd.total = 0; SetLastError(0xdeadbeef); - ret = EnumFontFamilies(hdc, NULL, arial_enum_proc, (LPARAM)&efd); - ok(ret, "EnumFontFamilies error %u\n", GetLastError()); - get_charset_stats(&efd, &ansi_charset, &symbol_charset, &russian_charset); - trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", - ansi_charset, symbol_charset, russian_charset); - ok(efd.total > 0, "no fonts enumerated: NULL\n"); - ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); - ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); - ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); + ret = EnumFontFamiliesW(hdc, NULL, arial_enum_procw, (LPARAM)&efdw); + ok(ret || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, "EnumFontFamiliesW error %u\n", GetLastError()); + if(ret) + { + get_charset_statsW(&efdw, &ansi_charset, &symbol_charset, &russian_charset); + trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", + ansi_charset, symbol_charset, russian_charset); + ok(efd.total > 0, "no fonts enumerated: NULL\n"); + ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); + ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); + ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); + } efd.total = 0; SetLastError(0xdeadbeef); - ret = EnumFontFamiliesEx(hdc, NULL, arial_enum_proc, (LPARAM)&efd, 0); - ok(ret, "EnumFontFamiliesEx error %u\n", GetLastError()); - get_charset_stats(&efd, &ansi_charset, &symbol_charset, &russian_charset); - trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", - ansi_charset, symbol_charset, russian_charset); - ok(efd.total > 0, "no fonts enumerated: NULL\n"); - ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); - ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); - ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); + ret = EnumFontFamiliesExW(hdc, NULL, arial_enum_procw, (LPARAM)&efdw, 0); + ok(ret || GetLastError() == ERROR_CALL_NOT_IMPLEMENTED, "EnumFontFamiliesExW error %u\n", GetLastError()); + if(ret) + { + get_charset_statsW(&efdw, &ansi_charset, &symbol_charset, &russian_charset); + trace("enumerated ansi %d, symbol %d, russian %d fonts for NULL\n", + ansi_charset, symbol_charset, russian_charset); + ok(efd.total > 0, "no fonts enumerated: NULL\n"); + ok(ansi_charset > 0, "NULL family should enumerate ANSI_CHARSET\n"); + ok(symbol_charset > 0, "NULL family should enumerate SYMBOL_CHARSET\n"); + ok(russian_charset > 0, "NULL family should enumerate RUSSIAN_CHARSET\n"); + } } efd.total = 0; @@ -1780,6 +1836,12 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) WORD idx; MAT2 mat = { {0,1}, {0,0}, {0,0}, {0,1} }; + if(!pGetGlyphIndicesA) + { + skip("GetGlyphIndicesA is unavailable\n"); + return; + } + /* negative widths are handled just as positive ones */ lf2.lfWidth = -lf->lfWidth;

1 0

Rob Shearman : include: Add uuids to interfaces in sensevts.idl.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: c94a142eb1f5e8df9cf369fe0d1828880e2c0116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94a142eb1f5e8df9cf369fe0… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 30 23:07:40 2008 +0100 include: Add uuids to interfaces in sensevts.idl. --- include/sensevts.idl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/sensevts.idl b/include/sensevts.idl index ec018a9..1ecb9f7 100644 --- a/include/sensevts.idl +++ b/include/sensevts.idl @@ -28,6 +28,7 @@ typedef struct SENS_QOCINFO [ object, + uuid(d597bab1-5b9f-11d1-8dd2-00aa004abd5e), pointer_default(unique) ] interface ISensNetwork : IDispatch @@ -55,6 +56,7 @@ interface ISensNetwork : IDispatch [ object, + uuid(d597bab2-5b9f-11d1-8dd2-00aa004abd5e), pointer_default(unique) ] interface ISensOnNow : IDispatch @@ -68,6 +70,7 @@ interface ISensOnNow : IDispatch [ object, + uuid(d597bab3-5b9f-11d1-8dd2-00aa004abd5e), pointer_default(unique) ] interface ISensLogon : IDispatch @@ -90,6 +93,7 @@ interface ISensLogon : IDispatch [ object, + uuid(d597bab4-5b9f-11d1-8dd2-00aa004abd5e), pointer_default(unique) ] interface ISensLogon2 : IDispatch

1 0

Rob Shearman : rpcrt4: Add a comment in NdrSendReceive explaining why we change the BufferLength.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 456326281d3da078e2e804d305ea1cc59c60bcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=456326281d3da078e2e804d30… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Jul 1 08:08:55 2008 +0100 rpcrt4: Add a comment in NdrSendReceive explaining why we change the BufferLength. --- dlls/rpcrt4/ndr_clientserver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 9af736a..968ea61 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -209,6 +209,7 @@ unsigned char *WINAPI NdrSendReceive( PMIDL_STUB_MESSAGE stubmsg, unsigned char return NULL; } + /* avoid sending uninitialised parts of the buffer on the wire */ stubmsg->RpcMsg->BufferLength = buffer - (unsigned char *)stubmsg->RpcMsg->Buffer; status = I_RpcSendReceive(stubmsg->RpcMsg); if (status != RPC_S_OK)

1 0

Rob Shearman : include: Add uuids to interfaces in amvideo.idl.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: be8e13fc03f56828b7bfb7038f40dedc8e891488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be8e13fc03f56828b7bfb7038… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 30 23:07:33 2008 +0100 include: Add uuids to interfaces in amvideo.idl. --- include/amvideo.idl | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/amvideo.idl b/include/amvideo.idl index 5e6cdd6..3750958 100644 --- a/include/amvideo.idl +++ b/include/amvideo.idl @@ -61,6 +61,7 @@ cpp_quote("#define AMDSS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)") [ object, + uuid(36d39eb0-dd75-11ce-bf0e-00aa0055595a), pointer_default(unique), local ] @@ -86,6 +87,7 @@ interface IDirectDrawVideo : IUnknown [ object, + uuid(1bd0ecb0-f8e2-11ce-aac6-0020af0b99a3), pointer_default(unique), local ] @@ -101,6 +103,7 @@ interface IQualProp : IUnknown [ object, + uuid(dd1d7110-7836-11cf-bf47-00aa0055595a), pointer_default(unique) ] interface IFullScreenVideo : IUnknown @@ -126,6 +129,7 @@ interface IFullScreenVideo : IUnknown [ object, + uuid(53479470-f1dd-11cf-bc42-00aa00ac74f6), pointer_default(unique), local ] @@ -140,6 +144,7 @@ interface IFullScreenVideoEx : IFullScreenVideo [ object, + uuid(61ded640-e912-11ce-a099-00aa00479a58), pointer_default(unique), local ]

1 0

Rob Shearman : include: Add uuid to interfaces in pstore.idl.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: c94799f9e20ee13e2ea1d1c9fcfaa76e45defd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94799f9e20ee13e2ea1d1c9f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 30 23:07:13 2008 +0100 include: Add uuid to interfaces in pstore.idl. --- include/pstore.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/pstore.idl b/include/pstore.idl index ee184d4..62ce00b 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -77,6 +77,7 @@ typedef struct { [ object, + uuid(5a6f1ec1-2db1-11d0-8c39-00c04fd9126b), pointer_default(unique) ] interface IEnumPStoreItems : IUnknown @@ -97,6 +98,7 @@ interface IEnumPStoreItems : IUnknown [ object, + uuid(789c1cbf-31ee-11d0-8c39-00c04fd9126b), pointer_default(unique) ] interface IEnumPStoreTypes : IUnknown @@ -120,6 +122,7 @@ interface IEnumPStoreTypes : IUnknown */ [ object, + uuid(5a6f1ec0-2db1-11d0-8c39-00c04fd9126b), pointer_default(unique) ] interface IPStore : IUnknown

1 0

Rob Shearman : oleaut32: Dump symbolic names for VT_LPSTR and VT_LPWSTR in dump_TypeDesc.
by Alexandre Julliard 01 Jul '08

01 Jul '08

Module: wine Branch: master Commit: 501da4fa2a01b0775305ad9c3220a80745a86452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=501da4fa2a01b0775305ad9c3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 30 23:05:54 2008 +0100 oleaut32: Dump symbolic names for VT_LPSTR and VT_LPWSTR in dump_TypeDesc. --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index dae9ff1..bbdae10 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1084,6 +1084,8 @@ static void dump_TypeDesc(const TYPEDESC *pTD,char *szVarType) { case VT_HRESULT: sprintf(szVarType, "VT_HRESULT"); break; case VT_USERDEFINED: sprintf(szVarType, "VT_USERDEFINED ref = %x", pTD->u.hreftype); break; + case VT_LPSTR: sprintf(szVarType, "VT_LPSTR"); break; + case VT_LPWSTR: sprintf(szVarType, "VT_LPWSTR"); break; case VT_PTR: sprintf(szVarType, "ptr to "); dump_TypeDesc(pTD->u.lptdesc, szVarType + 7); break;

1 0