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

Dmitry Timoshkov : oleaut32: Recognize icon and cursor in the being loaded data.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: c1136218e23d0fd480f5c5bf0e5f302b98b2430e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1136218e23d0fd480f5c5bf0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 31 17:32:54 2012 +0900 oleaut32: Recognize icon and cursor in the being loaded data. --- dlls/oleaut32/olepicture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index beb1477..0e3fd21 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1402,6 +1402,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) !memcmp(&(header[0]), "BM", 2) || /* BMP header */ !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ (header[0] == EMR_HEADER) || /* EMF header */ + (header[0] == 0x10000) || /* icon: idReserved 0, idType 1 */ + (header[0] == 0x20000) || /* cursor: idReserved 0, idType 2 */ (header[1] > statstg.cbSize.QuadPart)|| /* invalid size */ (header[1]==0) ) {/* Found start of bitmap data */

1 0

Dmitry Timoshkov : oleaut32: Explicitly initialize idReserved field in the icon directory header.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 4c882397423284e97ff2fab9c1094bb2fc1275c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c882397423284e97ff2fab9c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 15:36:59 2012 +0900 oleaut32: Explicitly initialize idReserved field in the icon directory header. --- dlls/oleaut32/olepicture.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 0e3fd21..246114c 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1642,6 +1642,7 @@ static int serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) pIconDir = (CURSORICONFILEDIR *)pIconData; pIconDir->idType = 1; pIconDir->idCount = 1; + pIconDir->idReserved = 0; /* Fill out the CURSORICONFILEDIRENTRY */ pIconEntry = (CURSORICONFILEDIRENTRY *)(pIconData + 3 * sizeof(WORD));

1 0

Dmitry Timoshkov : oleaut32: Simplify bitmap saving code.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 7493fdcc4d42a2f4922096e8456cea10a0e845bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7493fdcc4d42a2f4922096e84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 15:37:11 2012 +0900 oleaut32: Simplify bitmap saving code. --- dlls/oleaut32/olepicture.c | 46 +++++++++++++++---------------------------- 1 files changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 246114c..d838920 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1749,6 +1749,7 @@ static HRESULT WINAPI OLEPictureImpl_Save( HRESULT hResult = E_NOTIMPL; void * pIconData; unsigned int iDataSize; + DWORD header[2]; ULONG dummy; int iSerializeResult = 0; OLEPictureImpl *This = impl_from_IPersistStream(iface); @@ -1797,38 +1798,23 @@ static HRESULT WINAPI OLEPictureImpl_Save( FIXME("(%p,%p,%d), PICTYPE_BITMAP (format UNKNOWN, using BMP?) not implemented!\n",This,pStm,fClearDirty); break; } - if (iSerializeResult) { - /* - if (This->loadtime_magic != 0xdeadbeef) { - */ - if (1) { - DWORD header[2]; - - header[0] = (This->loadtime_magic != 0xdeadbeef) ? This->loadtime_magic : 0x0000746c; - header[1] = iDataSize; - IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); - } - IStream_Write(pStm, pIconData, iDataSize, &dummy); - - HeapFree(GetProcessHeap(), 0, This->data); - This->data = pIconData; - This->datalen = iDataSize; - hResult = S_OK; - } - } else { - /* - if (This->loadtime_magic != 0xdeadbeef) { - */ - if (1) { - DWORD header[2]; - - header[0] = (This->loadtime_magic != 0xdeadbeef) ? This->loadtime_magic : 0x0000746c; - header[1] = This->datalen; - IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); + + if (!iSerializeResult) + { + hResult = E_FAIL; + break; } - IStream_Write(pStm, This->data, This->datalen, &dummy); - hResult = S_OK; + + HeapFree(GetProcessHeap(), 0, This->data); + This->data = pIconData; + This->datalen = iDataSize; } + + header[0] = (This->loadtime_magic != 0xdeadbeef) ? This->loadtime_magic : 0x0000746c; + header[1] = This->datalen; + IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); + IStream_Write(pStm, This->data, This->datalen, &dummy); + hResult = S_OK; break; case PICTYPE_METAFILE: FIXME("(%p,%p,%d), PICTYPE_METAFILE not implemented!\n",This,pStm,fClearDirty);

1 0

Jacek Caban : wininet: Set correct security flags in InternetErrorDlg for ERROR_INTERNET_SEC_CERT_ERRORS .
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 2ef0676042767e470923e83496e335aca13057f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef0676042767e470923e8349… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 1 16:42:09 2012 +0200 wininet: Set correct security flags in InternetErrorDlg for ERROR_INTERNET_SEC_CERT_ERRORS. --- dlls/wininet/dialogs.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 9674718..68c668e 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -539,13 +539,12 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; break; case ERROR_INTERNET_SEC_CERT_ERRORS: - FIXME("Should only add ignore flags as needed.\n"); - flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID | - SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | - SECURITY_FLAG_IGNORE_UNKNOWN_CA; - /* FIXME: ERROR_INTERNET_SEC_CERT_ERRORS also - * seems to set the corresponding DLG_* flags. - */ + if(flags & _SECURITY_FLAG_CERT_REV_FAILED) + flags |= SECURITY_FLAG_IGNORE_UNKNOWN_CA; + if(flags & _SECURITY_FLAG_CERT_INVALID_CN) + flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + if(flags & _SECURITY_FLAG_CERT_INVALID_DATE) + flags |= SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; break; } res = InternetSetOptionW( params->hRequest, INTERNET_OPTION_SECURITY_FLAGS, &flags, size );

1 0

Dmitry Timoshkov : oleaut32: Always write header to stream when saving an icon.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: de4c297cf79bbeaf39779788479cfeec08d4f034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de4c297cf79bbeaf397797884… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 15:37:29 2012 +0900 oleaut32: Always write header to stream when saving an icon. --- dlls/oleaut32/olepicture.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index d838920..db3b852 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1768,15 +1768,11 @@ static HRESULT WINAPI OLEPictureImpl_Save( This->data = pIconData; This->datalen = iDataSize; } - if (This->loadtime_magic != 0xdeadbeef) { - DWORD header[2]; - header[0] = This->loadtime_magic; - header[1] = This->datalen; - IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); - } + header[0] = (This->loadtime_magic != 0xdeadbeef) ? This->loadtime_magic : 0x0000746c; + header[1] = This->datalen; + IStream_Write(pStm, header, 2 * sizeof(DWORD), &dummy); IStream_Write(pStm, This->data, This->datalen, &dummy); - hResult = S_OK; break; case PICTYPE_BITMAP:

1 0

Dmitry Timoshkov : gdi32/tests: GetGlyphOutline should fail for a bitmap font.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: 4fa2945544e0ee1e00b5a9ae283a527e023dcb5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fa2945544e0ee1e00b5a9ae2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 1 13:49:05 2012 +0900 gdi32/tests: GetGlyphOutline should fail for a bitmap font. --- dlls/gdi32/tests/font.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f50d1bc..e15ba6f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -876,6 +876,7 @@ static void test_bitmap_font_metrics(void) for(bit = 0; bit < 32; bit++) { + GLYPHMETRICS gm; DWORD fs[2]; BOOL bRet; @@ -904,16 +905,11 @@ static void test_bitmap_font_metrics(void) hfont = create_font(lf.lfFaceName, &lf); old_hfont = SelectObject(hdc, hfont); - bRet = GetTextMetrics(hdc, &tm); - ok(bRet, "GetTextMetrics error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetTextFace(hdc, sizeof(face_name), face_name); ok(ret, "GetTextFace error %u\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = GetTextCharset(hdc); - if (lstrcmp(face_name, fd[i].face_name) != 0) { ok(ret != ANSI_CHARSET, "font charset should not be ANSI_CHARSET\n"); @@ -924,6 +920,19 @@ static void test_bitmap_font_metrics(void) continue; } + memset(&gm, 0, sizeof(gm)); + SetLastError(0xdeadbeef); + ret = GetGlyphOutline(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + todo_wine { + ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); + ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); + } + + bRet = GetTextMetrics(hdc, &tm); + ok(bRet, "GetTextMetrics error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetTextCharset(hdc); ok(ret == expected_cs, "got charset %d, expected %d\n", ret, expected_cs); trace("created %s, height %d charset %x dpi %d\n", face_name, tm.tmHeight, tm.tmCharSet, tm.tmDigitizedAspectX);

1 0

Stefan Leichter : setupapi: Add stub for SetupAddToSourceListA.
by Alexandre Julliard June 1, 2012

June 1, 2012

Module: wine Branch: master Commit: b3b78b337ea6ba0cf96ddc37161fe71844440851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b78b337ea6ba0cf96ddc371… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu May 31 23:31:07 2012 +0200 setupapi: Add stub for SetupAddToSourceListA. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6397ab2..f8f8fab 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -248,7 +248,7 @@ @ stub SetupAddSectionToDiskSpaceListW @ stdcall SetupAddToDiskSpaceListA(long str int64 long ptr long) @ stdcall SetupAddToDiskSpaceListW(long wstr int64 long ptr long) -@ stub SetupAddToSourceListA +@ stdcall SetupAddToSourceListA(long str) @ stub SetupAddToSourceListW @ stub SetupAdjustDiskSpaceListA @ stub SetupAdjustDiskSpaceListW diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index f4e6959..db05e64 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -232,6 +232,15 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_bu } /*********************************************************************** + * SetupAddToSourceListA (SETUPAPI.@) + */ +BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) +{ + FIXME("0x%08x %s\n", flags, debugstr_a(source)); + return TRUE; +} + +/*********************************************************************** * SetupSetSourceListA (SETUPAPI.@) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count)

1 0