December 2010 - Wine-Commits

Greg Geldorp : gdi32/tests: Skip test that crashes on 64-bit.
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: 0b6e5c55353c94f697db898588639db7a71f6a62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b6e5c55353c94f697db89858… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Fri Dec 31 01:11:17 2010 +0100 gdi32/tests: Skip test that crashes on 64-bit. --- dlls/gdi32/tests/metafile.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 9ce3ece..791714b 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1664,6 +1664,7 @@ static void test_SetMetaFileBits(void) ret = DeleteMetaFile(hmf); ok(ret, "DeleteMetaFile(%p) error %d\n", hmf, GetLastError()); +#ifndef _WIN64 /* Generates access violation on XP x64 and Win2003 x64 */ /* Now with zeroed out mtSize field */ memcpy(buf, MF_GRAPHICS_BITS, sizeof(MF_GRAPHICS_BITS)); mh = (METAHEADER *)buf; @@ -1681,6 +1682,7 @@ static void test_SetMetaFileBits(void) ret = DeleteMetaFile(hmf); ok(ret, "DeleteMetaFile(%p) error %d\n", hmf, GetLastError()); +#endif } /* Simple APIs from mfdrv/graphics.c

1 0

Nikolay Sivov : oleaut32: Update variable description and typeinfo size in ICreateTypeInfo2:: SetVarHelpContext().
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: 8c8b5da9fc4d97479d916d1c6c74b6cbe0e33237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c8b5da9fc4d97479d916d1c6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 30 23:06:44 2010 +0300 oleaut32: Update variable description and typeinfo size in ICreateTypeInfo2::SetVarHelpContext(). --- dlls/oleaut32/typelib.c | 4 ++-- dlls/oleaut32/typelib.h | 2 +- dlls/oleaut32/typelib2.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 8482afe..88f3345 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2108,8 +2108,8 @@ static void MSFT_DoVars(TLBContext *pcx, ITypeInfoImpl *pTI, int cFuncs, if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpContext)) (*pptvd)->HelpContext = pVarRec->HelpContext; - if(reclength > FIELD_OFFSET(MSFT_VarRecord, oHelpString)) - (*pptvd)->HelpString = MSFT_ReadString(pcx, pVarRec->oHelpString); + if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpString)) + (*pptvd)->HelpString = MSFT_ReadString(pcx, pVarRec->HelpString); if(reclength > FIELD_OFFSET(MSFT_VarRecord, HelpStringContext)) (*pptvd)->HelpStringContext = pVarRec->HelpStringContext; diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 6649407..dfa3809 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -244,7 +244,7 @@ typedef struct { /* optional attribute fields, the number of them is variable */ /* controlled by record length */ INT HelpContext; - INT oHelpString; + INT HelpString; INT res9; /* unknown (-1) */ INT oCustData; /* custom data for variable */ INT HelpStringContext; diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 504d442..6e36d69 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -245,6 +245,23 @@ static inline INT ctl2_get_record_size(const CyclicList *iter) return iter->u.data[0] & 0xFFFF; } +static void ctl2_update_var_size(const ICreateTypeInfo2Impl *This, CyclicList *var, int size) +{ + int old = ctl2_get_record_size(var), i; + + if (old >= size) return; + + /* initialize fields included in size but currently unused */ + for (i = old/sizeof(int); i < (size/sizeof(int) - 1); i++) + { + /* HelpContext/HelpStringContext being 0 means it's not set */ + var->u.data[i] = (i == 5 || i == 9) ? 0 : -1; + } + + var->u.data[0] += size - old; + This->typedata->next->u.val += size - old; +} + /* NOTE: entry always assumed to be a function */ static inline INVOKEKIND ctl2_get_invokekind(const CyclicList *func) { @@ -2543,6 +2560,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarHelpContext( { if (index-- == 0) { + ctl2_update_var_size(This, iter, FIELD_OFFSET(MSFT_VarRecord, HelpString)); iter->u.data[5] = context; return S_OK; }

1 0

Jacek Caban : mshtml: Added moz-safe-about to the list of Gecko internal protocols.
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: b7e78af4de0559b2802ff10ab0414799155ada77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e78af4de0559b2802ff10ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 30 23:29:11 2010 +0100 mshtml: Added moz-safe-about to the list of Gecko internal protocols. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7f1cad0..30185dd 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2677,7 +2677,7 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch static BOOL is_gecko_special_uri(const char *spec) { - static const char *special_schemes[] = {"chrome:", "jar:", "resource:", "javascript:", "wyciwyg:"}; + static const char *special_schemes[] = {"chrome:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; int i; for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) {

1 0

André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: cbf967d6005d5b0c856abac73d5e1e0a4c93bfec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf967d6005d5b0c856abac73… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 20:06:53 2010 +0100 user32/tests: Don't test function directly when reporting GetLastError(). --- dlls/user32/tests/win.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ab06687..ca55c80 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2586,7 +2586,8 @@ static void test_SetForegroundWindow(HWND hwnd) hwnd2 = GetForegroundWindow(); ok(hwnd2 == hwnd, "Wrong foreground window %p\n", hwnd2); - ok(SetForegroundWindow( GetDesktopWindow() ), "SetForegroundWindow(desktop) error: %d\n", GetLastError()); + ret = SetForegroundWindow( GetDesktopWindow() ); + ok(ret, "SetForegroundWindow(desktop) error: %d\n", GetLastError()); hwnd2 = GetForegroundWindow(); ok(hwnd2 != hwnd, "Wrong foreground window %p\n", hwnd2); @@ -4529,10 +4530,12 @@ static void test_CreateWindow(void) HMENU hmenu; RECT rc, rc_minmax; MINMAXINFO minmax; + BOOL res; #define expect_menu(window, menu) \ SetLastError(0xdeadbeef); \ - ok(GetMenu(window) == (HMENU)menu, "GetMenu error %d\n", GetLastError()) + res = (GetMenu(window) == (HMENU)menu); \ + ok(res, "GetMenu error %d\n", GetLastError()) #define expect_style(window, style)\ ok((ULONG)GetWindowLong(window, GWL_STYLE) == (style), "expected style %x != %x\n", (LONG)(style), GetWindowLong(window, GWL_STYLE)) @@ -4551,7 +4554,8 @@ static void test_CreateWindow(void) assert(parent != 0); SetLastError(0xdeadbeef); - ok(IsMenu(hmenu), "IsMenu error %d\n", GetLastError()); + res = IsMenu(hmenu); + ok(res, "IsMenu error %d\n", GetLastError()); /* WS_CHILD */ SetLastError(0xdeadbeef); @@ -6051,7 +6055,8 @@ static void test_thick_child_size(HWND parentWindow) cls.lpszMenuName = NULL; cls.lpszClassName = className; SetLastError(0xdeadbeef); - ok(RegisterClassA(&cls),"RegisterClassA failed, error: %u\n", GetLastError()); + success = RegisterClassA(&cls); + ok(success,"RegisterClassA failed, error: %u\n", GetLastError()); for(i = 0; i < NUMBER_OF_THICK_CHILD_TESTS; i++) {

1 0

André Hentschel : mscms/tests: Fix test message.
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: 39c4aa116885397293d6e800a3aae4063a2cc996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c4aa116885397293d6e800a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 19:52:34 2010 +0100 mscms/tests: Fix test message. --- dlls/mscms/tests/profile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 49634e0..7cbface 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -1348,10 +1348,10 @@ START_TEST(profile) ret = GetSystemDirectoryA( profilefile1, sizeof(profilefile1) ); ok( ret > 0, "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); ok( lstrlenA(profilefile1) > 0 && lstrlenA(profilefile1) < MAX_PATH, - "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenA(profilefile1)); MultiByteToWideChar(CP_ACP, 0, profilefile1, -1, profilefile1W, MAX_PATH); ok( lstrlenW(profilefile1W) > 0 && lstrlenW(profilefile1W) < MAX_PATH, - "GetSystemDirectoryA() returns %d, LastError = %d\n", ret, GetLastError()); + "Expected length between 0 and MAX_PATH, got %d\n", lstrlenW(profilefile1W)); lstrcpyA(profilefile2, profilefile1); lstrcpyW(profilefile2W, profilefile1W);

1 0

André Hentschel : shell32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: 2c20270d24143d31be5d30ba750d5add6eea336d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c20270d24143d31be5d30ba7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 20:18:16 2010 +0100 shell32/tests: Don't test function directly when reporting GetLastError(). --- dlls/shell32/tests/shlfolder.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 0bf2ec7..990ec0c 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2061,6 +2061,7 @@ static void test_LocalizedNames(void) DWORD res; HANDLE file; STRRET strret; + BOOL ret; static const char desktopini_contents1[] = "[.ShellClassInfo]\r\n" @@ -2080,10 +2081,10 @@ static void test_LocalizedNames(void) file = CreateFileA(".\\testfolder\\desktop.ini", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %i\n", GetLastError()); - ok(WriteFile(file, desktopini_contents1, strlen(desktopini_contents1), &res, NULL) && - WriteFile(file, resourcefile, strlen(resourcefile), &res, NULL) && - WriteFile(file, desktopini_contents2, strlen(desktopini_contents2), &res, NULL), - "WriteFile failed %i\n", GetLastError()); + ret = WriteFile(file, desktopini_contents1, strlen(desktopini_contents1), &res, NULL) && + WriteFile(file, resourcefile, strlen(resourcefile), &res, NULL) && + WriteFile(file, desktopini_contents2, strlen(desktopini_contents2), &res, NULL); + ok(ret, "WriteFile failed %i\n", GetLastError()); CloseHandle(file); /* get IShellFolder for parent */

1 0

André Hentschel : imagehlp/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: 9571e4f29fb8bfffa5e77238e90062a982358964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9571e4f29fb8bfffa5e77238e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 19:59:42 2010 +0100 imagehlp/tests: Don't test function directly when reporting GetLastError(). --- dlls/imagehlp/tests/integrity.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 6f297dc..10af9fa 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -141,6 +141,7 @@ static void test_add_certificate(char *cert_data, int len) LPWIN_CERTIFICATE cert; DWORD cert_len; DWORD index; + BOOL ret; hFile = CreateFileA(test_dll_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -165,7 +166,8 @@ static void test_add_certificate(char *cert_data, int len) cert->wCertificateType = WIN_CERT_TYPE_PKCS_SIGNED_DATA; CopyMemory(cert->bCertificate, cert_data, len); - ok(pImageAddCertificate(hFile, cert, &index), "Unable to add certificate to image, error %x\n", GetLastError()); + ret = pImageAddCertificate(hFile, cert, &index); + ok(ret, "Unable to add certificate to image, error %x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); @@ -211,6 +213,7 @@ static void test_remove_certificate(int index) { DWORD orig_count = 0, count = 0; HANDLE hFile; + BOOL ret; hFile = CreateFileA(test_dll_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -220,9 +223,10 @@ static void test_remove_certificate(int index) return; } - ok (pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &orig_count, NULL, 0), "Unable to enumerate certificates in file; err=%x\n", GetLastError()); - - ok (pImageRemoveCertificate(hFile, index), "Unable to remove certificate from file; err=%x\n", GetLastError()); + ret = pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &orig_count, NULL, 0); + ok (ret, "Unable to enumerate certificates in file; err=%x\n", GetLastError()); + ret = pImageRemoveCertificate(hFile, index); + ok (ret, "Unable to remove certificate from file; err=%x\n", GetLastError()); /* Test to see if the certificate has actually been removed */ pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &count, NULL, 0);

1 0

Frédéric Delanoy : appwiz.cpl: Update French translation.
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: fad634d368e663643c3ccbf2d58317874df81119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad634d368e663643c3ccbf2d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 30 22:33:56 2010 +0100 appwiz.cpl: Update French translation. --- dlls/appwiz.cpl/Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index fc67d96..eb997c9 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -50,6 +50,7 @@ STRINGTABLE { IDS_DOWNLOADING "Téléchargement..." IDS_INSTALLING "Installation..." + IDS_INVALID_SHA "Somme de contrôle du fichier téléchargé inattendue. Abandon de l'installation d'un fichier corrompu." } IDD_MAIN DIALOG 0, 0, 320, 220

1 0

André Hentschel : ole32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: 0fb2994fdc6cc590a88f625df06f50dfeed6f28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb2994fdc6cc590a88f625df… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 20:02:00 2010 +0100 ole32/tests: Don't test function directly when reporting GetLastError(). --- dlls/ole32/tests/marshal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 5563085..25253d3 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2644,6 +2644,7 @@ static HANDLE create_target_process(const char *arg) { char **argv; char cmdline[MAX_PATH]; + BOOL ret; PROCESS_INFORMATION pi; STARTUPINFO si = { 0 }; si.cb = sizeof(si); @@ -2652,8 +2653,8 @@ static HANDLE create_target_process(const char *arg) pi.hProcess = NULL; winetest_get_mainargs( &argv ); sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); - ok(CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, - &si, &pi) != 0, "CreateProcess failed with error: %u\n", GetLastError()); + ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed with error: %u\n", GetLastError()); if (pi.hThread) CloseHandle(pi.hThread); return pi.hProcess; }

1 0

André Hentschel : riched32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard Dec. 31, 2010

Dec. 31, 2010

Module: wine Branch: master Commit: 04374ab6d5f2ba717871596ffb157c2cde14f5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04374ab6d5f2ba717871596ff… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 30 19:53:09 2010 +0100 riched32/tests: Don't test function directly when reporting GetLastError(). --- dlls/riched32/tests/editor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index f11e3b5..66005d0 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1063,6 +1063,7 @@ START_TEST( editor ) { MSG msg; time_t end; + BOOL ret; /* Must explicitly LoadLibrary(). The test has no references to functions in * RICHED32.DLL, so the linker doesn't actually link to it. */ @@ -1101,5 +1102,6 @@ START_TEST( editor ) } OleFlushClipboard(); - ok(FreeLibrary(hmoduleRichEdit) != 0, "error: %d\n", (int) GetLastError()); + ret = FreeLibrary(hmoduleRichEdit); + ok(ret, "error: %u\n", GetLastError()); }

1 0