January 2009 - Wine-commits

Alexandre Julliard : advapi32/tests: Improve error reporting in the service test. Don' t check last error on success.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: df671256f856cb49d8fd0d174590006774d6b8a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df671256f856cb49d8fd0d174… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 20 17:50:11 2009 +0100 advapi32/tests: Improve error reporting in the service test. Don't check last error on success. --- dlls/advapi32/tests/service.c | 133 ++++++++-------------------------------- 1 files changed, 27 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df671256f856cb49d8fd0…

1 0

Alexandre Julliard : advapi32/tests: Add some more tests for GetServiceKeyName.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: fe3ba1295bb563439874a49b95d45532cf6b2baf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3ba1295bb563439874a49b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 20 19:51:08 2009 +0100 advapi32/tests: Add some more tests for GetServiceKeyName. --- dlls/advapi32/tests/service.c | 49 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index fe3a3f6..c198cd7 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -625,6 +625,7 @@ static void test_get_servicekeyname(void) BOOL ret; static const CHAR deadbeef[] = "Deadbeef"; static const WCHAR deadbeefW[] = {'D','e','a','d','b','e','e','f',0}; + static const WCHAR abcW[] = {'A','B','C',0}; /* Having NULL for the size of the buffer will crash on W2K3 */ @@ -667,13 +668,17 @@ static void test_get_servicekeyname(void) strcpy(servicename, "ABC"); ret = GetServiceKeyNameA(scm_handle, deadbeef, servicename, &servicesize); ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); todo_wine ok(servicesize == 15, "Service size expected 15, got %d\n", servicesize); ok(servicename[0] == 0, "Service name not empty\n"); servicesize = 15; - servicenameW[0] = 'A'; + lstrcpyW( servicenameW, abcW ); ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize); ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); todo_wine ok(servicesize == 15, "Service size expected 15, got %d\n", servicesize); ok(servicenameW[0] == 0, "Service name not empty\n"); @@ -681,16 +686,56 @@ static void test_get_servicekeyname(void) strcpy(servicename, "ABC"); ret = GetServiceKeyNameA(scm_handle, deadbeef, servicename, &servicesize); ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); todo_wine ok(servicesize == 1, "Service size expected 1, got %d\n", servicesize); ok(servicename[0] == 'A', "Service name changed\n"); servicesize = 0; - servicenameW[0] = 'A'; + lstrcpyW( servicenameW, abcW ); ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize); ok(!ret, "Expected failure\n"); todo_wine ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); ok(servicenameW[0] == 'A', "Service name changed\n"); + servicesize = 1; + strcpy(servicename, "ABC"); + ret = GetServiceKeyNameA(scm_handle, deadbeef, servicename, &servicesize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + todo_wine ok(servicesize == 1, "Service size expected 1, got %d\n", servicesize); + ok(servicename[0] == 0, "Service name not empty\n"); + + servicesize = 1; + lstrcpyW( servicenameW, abcW ); + ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize); + ok(!ret, "Expected failure\n"); + todo_wine ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + todo_wine ok(servicenameW[0] == 'A', "Service name changed\n"); + + servicesize = 2; + strcpy(servicename, "ABC"); + ret = GetServiceKeyNameA(scm_handle, deadbeef, servicename, &servicesize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); + ok(servicename[0] == 0, "Service name not empty\n"); + + servicesize = 2; + lstrcpyW( servicenameW, abcW ); + ret = GetServiceKeyNameW(scm_handle, deadbeefW, servicenameW, &servicesize); + ok(!ret, "Expected failure\n"); + todo_wine ok(servicesize == 2, "Service size expected 2, got %d\n", servicesize); + ok(GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST, + "Expected ERROR_SERVICE_DOES_NOT_EXIST, got %d\n", GetLastError()); + ok(servicenameW[0] == 0, "Service name not empty\n"); + /* Check if 'Spooler' exists */ svc_handle = OpenServiceA(scm_handle, spooler, GENERIC_READ); if (!svc_handle)

1 0

Hans Leidekker : wininet: Strip trailing slashes from filename in CreateUrlCacheEntryW.
by Alexandre Julliard 21 Jan '09

21 Jan '09

Module: wine Branch: master Commit: 34d4466342868e5423c1c2aedf58244a019a0785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d4466342868e5423c1c2aed… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 20 14:49:17 2009 +0100 wininet: Strip trailing slashes from filename in CreateUrlCacheEntryW. --- dlls/wininet/urlcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 687290c..11361d0 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2258,6 +2258,8 @@ BOOL WINAPI CreateUrlCacheEntryW( if (!len) return FALSE; szFile[len] = '\0'; + while(len && szFile[--len] == '/') szFile[len] = '\0'; + /* FIXME: get rid of illegal characters like \, / and : */ } else

1 0

Alexandre Julliard : kernel32/nls: Use a codepage 950 encoding that round trips correctly for Unicode char 0x5341 .
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 6d0a0fb1820d80cd2b3fd643973329561848e8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0a0fb1820d80cd2b3fd6439… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 20 16:43:08 2009 +0100 kernel32/nls: Use a codepage 950 encoding that round trips correctly for Unicode char 0x5341. --- dlls/kernel32/nls/cht.nls | 12 ++++++------ dlls/kernel32/nls/zhm.nls | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/nls/cht.nls b/dlls/kernel32/nls/cht.nls index 7b6edbe..b99fe42 100644 --- a/dlls/kernel32/nls/cht.nls +++ b/dlls/kernel32/nls/cht.nls @@ -80,9 +80,9 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL LOCALE_SABBREVMONTHNAME7 "�C��" LOCALE_SABBREVMONTHNAME8 "�K��" LOCALE_SABBREVMONTHNAME9 "�E��" - LOCALE_SABBREVMONTHNAME10 "�̤�" - LOCALE_SABBREVMONTHNAME11 "�̤@��" - LOCALE_SABBREVMONTHNAME12 "�̤G��" + LOCALE_SABBREVMONTHNAME10 "�Q��" + LOCALE_SABBREVMONTHNAME11 "�Q�@��" + LOCALE_SABBREVMONTHNAME12 "�Q�G��" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Taiwan" LOCALE_SCURRENCY "NT$" @@ -116,9 +116,9 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL LOCALE_SMONTHNAME7 "�C��" LOCALE_SMONTHNAME8 "�K��" LOCALE_SMONTHNAME9 "�E��" - LOCALE_SMONTHNAME10 "�̤�" - LOCALE_SMONTHNAME11 "�̤@��" - LOCALE_SMONTHNAME12 "�̤G��" + LOCALE_SMONTHNAME10 "�Q��" + LOCALE_SMONTHNAME11 "�Q�@��" + LOCALE_SMONTHNAME12 "�Q�G��" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "zh-TW" diff --git a/dlls/kernel32/nls/zhm.nls b/dlls/kernel32/nls/zhm.nls index a9a226a..8893ab2 100644 --- a/dlls/kernel32/nls/zhm.nls +++ b/dlls/kernel32/nls/zhm.nls @@ -80,9 +80,9 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_SABBREVMONTHNAME7 "�C��" LOCALE_SABBREVMONTHNAME8 "�K��" LOCALE_SABBREVMONTHNAME9 "�E��" - LOCALE_SABBREVMONTHNAME10 "�̤�" - LOCALE_SABBREVMONTHNAME11 "�̤@��" - LOCALE_SABBREVMONTHNAME12 "�̤G��" + LOCALE_SABBREVMONTHNAME10 "�Q��" + LOCALE_SABBREVMONTHNAME11 "�Q�@��" + LOCALE_SABBREVMONTHNAME12 "�Q�G��" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Macau S.A.R." LOCALE_SCURRENCY "P" @@ -116,9 +116,9 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_MACAU LOCALE_SMONTHNAME7 "�C��" LOCALE_SMONTHNAME8 "�K��" LOCALE_SMONTHNAME9 "�E��" - LOCALE_SMONTHNAME10 "�̤�" - LOCALE_SMONTHNAME11 "�̤@��" - LOCALE_SMONTHNAME12 "�̤G��" + LOCALE_SMONTHNAME10 "�Q��" + LOCALE_SMONTHNAME11 "�Q�@��" + LOCALE_SMONTHNAME12 "�Q�G��" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "zh-MO"

1 0

Anders Jonsson : write: Add Swedish translation.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: e9d8c9f572998054b1f9c386ea81a3570c65f2d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d8c9f572998054b1f9c386e… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Jan 20 11:36:37 2009 +0100 write: Add Swedish translation. --- programs/write/Sv.rc | 26 ++++++++++++++++++++++++++ programs/write/rsrc.rc | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/programs/write/Sv.rc b/programs/write/Sv.rc new file mode 100644 index 0000000..dea6521 --- /dev/null +++ b/programs/write/Sv.rc @@ -0,0 +1,26 @@ +/* + * Swedish language support + * + * Copyright (C) 2009 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_FAILED, "Kunde inte starta Wordpad" +} diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc index 7ec9e31..6c22aa5 100644 --- a/programs/write/rsrc.rc +++ b/programs/write/rsrc.rc @@ -34,3 +34,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Ro.rc" #include "Ru.rc" #include "Si.rc" +#include "Sv.rc"

1 0

Michael Stefaniuc : oleview: Remove superfluous pointer casts.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 0a51e54fce5c7d7b0b1384d0e89ad0bbcbaf97a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a51e54fce5c7d7b0b1384d0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 20 11:21:34 2009 +0100 oleview: Remove superfluous pointer casts. --- programs/oleview/details.c | 12 ++++++------ programs/oleview/oleview.c | 2 +- programs/oleview/tree.c | 14 +++++++------- programs/oleview/typelib.c | 18 +++++++++--------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index da43de9..ae8e1ba 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -46,7 +46,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad U(tvis).item.mask = TVIF_TEXT; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszTree; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = parent; while(TRUE) @@ -61,7 +61,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad { if(!i && lstrlenW(wszKeyName) > 1) { - U(tvis).item.pszText = (LPWSTR)wszKeyName; + U(tvis).item.pszText = wszKeyName; addPlace = TreeView_InsertItem(details.hReg, &tvis); U(tvis).item.pszText = wszTree; } @@ -213,7 +213,7 @@ static void CreateReg(WCHAR *buffer) U(tvis).item.mask = TVIF_TEXT; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszTree; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = TVI_ROOT; path = buffer; @@ -225,7 +225,7 @@ static void CreateReg(WCHAR *buffer) { *path = '\0'; - if(RegOpenKey(HKEY_CLASSES_ROOT, (LPWSTR)buffer, &hKey) != ERROR_SUCCESS) + if(RegOpenKey(HKEY_CLASSES_ROOT, buffer, &hKey) != ERROR_SUCCESS) return; lastLenBuffer = lenBuffer+1; @@ -259,9 +259,9 @@ static void CreateReg(WCHAR *buffer) else break; } - if(RegOpenKey(HKEY_CLASSES_ROOT, (LPWSTR)buffer, &hKey) != ERROR_SUCCESS) return; + if(RegOpenKey(HKEY_CLASSES_ROOT, buffer, &hKey) != ERROR_SUCCESS) return; - CreateRegRec(hKey, addPlace, (LPWSTR)&buffer[lenBuffer+1], TRUE); + CreateRegRec(hKey, addPlace, &buffer[lenBuffer+1], TRUE); RegCloseKey(hKey); diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 592fa0b..096a625 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -515,7 +515,7 @@ static BOOL InitInstance(HINSTANCE hInst, int nCmdShow) if(!hWnd) return FALSE; globals.hStatusBar = CreateStatusWindow(WS_VISIBLE|WS_CHILD, - (LPWSTR)wszTitle, hWnd, 0); + wszTitle, hWnd, 0); globals.hToolBar = CreateToolbarEx(hWnd, WS_CHILD|WS_VISIBLE, 0, 1, hInst, IDB_TOOLBAR, tB, 10, 16, 16, 16, 16, sizeof(TBBUTTON)); diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 3c9ee5a..394c99b 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -77,7 +77,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) memset(&tvis, 0, sizeof(TVINSERTSTRUCT)); U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; U(tvis).item.pszText = tvi.pszText; tvis.hParent = item; tvis.hInsertAfter = TVI_LAST; @@ -263,7 +263,7 @@ static void AddCOMandAll(void) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_CHILDREN; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.cChildren = 1; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; if(RegOpenKey(HKEY_CLASSES_ROOT, wszCLSID, &hKey) != ERROR_SUCCESS) return; @@ -346,7 +346,7 @@ static void AddApplicationID(void) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; tvis.hParent = tree.hAID; if(RegOpenKey(HKEY_CLASSES_ROOT, wszAppID, &hKey) != ERROR_SUCCESS) return; @@ -391,7 +391,7 @@ static void AddTypeLib(void) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; tvis.hParent = tree.hTL; if(RegOpenKey(HKEY_CLASSES_ROOT, wszTypeLib, &hKey) != ERROR_SUCCESS) return; @@ -457,7 +457,7 @@ static void AddInterfaces(void) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; tvis.hParent = tree.hI; if(RegOpenKey(HKEY_CLASSES_ROOT, wszInterface, &hKey) != ERROR_SUCCESS) return; @@ -499,7 +499,7 @@ static void AddComponentCategories(void) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_CHILDREN; U(tvis).item.cchTextMax = MAX_LOAD_STRING; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; if(tree.hGBCC) tvis.hParent = tree.hGBCC; else tvis.hParent = TVI_ROOT; U(tvis).item.cChildren = 1; @@ -546,7 +546,7 @@ static void AddBaseEntries(void) U(tvis).item.pszText = name; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.cChildren = 1; - tvis.hInsertAfter = (HTREEITEM)TVI_FIRST; + tvis.hInsertAfter = TVI_FIRST; tvis.hParent = TVI_ROOT; LoadString(globals.hMainInst, IDS_TREE_I, U(tvis).item.pszText, diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 4861c50..236a670 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -209,7 +209,7 @@ static void AddToTLDataStrWithTabsW(TYPELIB_DATA *pTLData, WCHAR *wszSource) { int lineLen = lstrlenW(wszSource); int newLinesNo = 0; - WCHAR *pSourcePos = (WCHAR *)wszSource; + WCHAR *pSourcePos = wszSource; WCHAR *pSourceBeg; if(!lineLen) return; @@ -223,8 +223,8 @@ static void AddToTLDataStrWithTabsW(TYPELIB_DATA *pTLData, WCHAR *wszSource) pTLData->idl = HeapReAlloc(GetProcessHeap(), 0, pTLData->idl, sizeof(WCHAR)*(pTLData->idlLen+lineLen+4*newLinesNo+1)); - pSourcePos = (WCHAR *)wszSource; - pSourceBeg = (WCHAR *)wszSource; + pSourcePos = wszSource; + pSourceBeg = wszSource; while(newLinesNo) { if(*pSourcePos != *wszNewLine && *pSourcePos) @@ -379,7 +379,7 @@ static int EnumVars(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = hParent; for(i=0; i<cVars; i++) @@ -443,7 +443,7 @@ static int EnumEnums(ITypeInfo *pTypeInfo, int cVars, HTREEITEM hParent) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = hParent; for(i=0; i<cVars; i++) @@ -507,7 +507,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen BOOL bFirst; U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = hParent; cFuncs = pTypeAttr->cFuncs; @@ -736,7 +736,7 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent U(tvis).item.mask = TVIF_TEXT; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszInheritedInterfaces; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = hParent; tvis.hParent = TreeView_InsertItem(typelib.hTree, &tvis); @@ -1182,7 +1182,7 @@ static int PopulateTree(void) U(tvis).item.mask = TVIF_TEXT|TVIF_PARAM; U(tvis).item.cchTextMax = MAX_LOAD_STRING; U(tvis).item.pszText = wszText; - tvis.hInsertAfter = (HTREEITEM)TVI_LAST; + tvis.hInsertAfter = TVI_LAST; tvis.hParent = TVI_ROOT; if(FAILED((hRes = LoadTypeLib(typelib.wszFileName, &pTypeLib)))) @@ -1635,7 +1635,7 @@ BOOL CreateTypeLibWindow(HINSTANCE hInst, WCHAR *wszFileName) if(!globals.hTypeLibWnd) return FALSE; typelib.hStatusBar = CreateStatusWindow(WS_VISIBLE|WS_CHILD, - (LPWSTR)wszTitle, globals.hTypeLibWnd, 0); + wszTitle, globals.hTypeLibWnd, 0); TypeLibResizeChild(); return TRUE;

1 0

Anders Jonsson : wordpad: Add Swedish translation.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: fed3c945f0beb78dd2d90fd9f0c737f4f044b271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed3c945f0beb78dd2d90fd9f… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Jan 20 11:35:17 2009 +0100 wordpad: Add Swedish translation. --- programs/wordpad/Sv.rc | 247 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/rsrc.rc | 1 + 2 files changed, 248 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Sv.rc b/programs/wordpad/Sv.rc new file mode 100644 index 0000000..565f9f7 --- /dev/null +++ b/programs/wordpad/Sv.rc @@ -0,0 +1,247 @@ +/* + * Copyright 2009 by Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDM_MAINMENU MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "&Nytt...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Öppna...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Spara\tCtrl+S", ID_FILE_SAVE + MENUITEM "Spara s&om...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "Skriv &ut...\tCtrl+P", ID_PRINT + MENUITEM "&Förhandsgranskning...", ID_PREVIEW + MENUITEM "U&tskriftsformat...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Avsluta", ID_FILE_EXIT + END + POPUP "&Redigera" + BEGIN + MENUITEM "&Ångra\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "Å&terställ\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "Klipp &ut\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopiera\tCtrl+C", ID_EDIT_COPY + MENUITEM "Klistra &in\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Ta &bort\tDEL", ID_EDIT_CLEAR + MENUITEM "&Markera allt\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "&Sök...\tCrtl+F", ID_FIND + MENUITEM "Sök &nästa\tF3", ID_FIND_NEXT + MENUITEM "&Ersätt...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Sk&rivskyddat", ID_EDIT_READONLY + MENUITEM "&Ändrat", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "E&xtra" + BEGIN + MENUITEM "&Information om markerad text", ID_EDIT_SELECTIONINFO + MENUITEM "&Teckenformat", ID_EDIT_CHARFORMAT + MENUITEM "&Standardteckenformat", ID_EDIT_DEFCHARFORMAT + MENUITEM "Stycke&format", ID_EDIT_PARAFORMAT + MENUITEM "&Hämta text", ID_EDIT_GETTEXT + END + END + POPUP "&Visa" + BEGIN + MENUITEM "&Verktygsfält", ID_TOGGLE_TOOLBAR + MENUITEM "&Formatfält", ID_TOGGLE_FORMATBAR + MENUITEM "&Linjal", ID_TOGGLE_RULER + MENUITEM "&Statusfält", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Alternativ...", ID_VIEWPROPERTIES + END + POPUP "&Infoga" + BEGIN + MENUITEM "&Datum och tid...", ID_DATETIME + END + POPUP "F&ormat" + BEGIN + MENUITEM "T&ecken...", ID_FONTSETTINGS + MENUITEM "&Punktuppställning" ID_BULLET + MENUITEM "&Stycke..." ID_PARAFORMAT + MENUITEM "&Tabulatorer..." ID_TABSTOPS + POPUP "&Bakgrund" + BEGIN + MENUITEM "&System\tCtrl+1", ID_BACK_1 + MENUITEM "Anteckningslapps-&gult\tCtrl+2", ID_BACK_2 + END + END + POPUP "&Hjälp" + BEGIN + MENUITEM "&Om Wine Wordpad" ID_ABOUT + END +END + +IDM_POPUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Klipp &ut", ID_EDIT_CUT + MENUITEM "&Kopiera", ID_EDIT_COPY + MENUITEM "Klistra &in", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Punktuppställning" ID_BULLET + MENUITEM "&Stycke..." ID_PARAFORMAT + END +END + +IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Datum och tid" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Tillgängliga format",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + PUSHBUTTON "&OK",IDOK,87,12,40,12 + PUSHBUTTON "&Avbryt",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ny" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Ny dokumenttyp",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&OK",IDOK,97,12,40,12 + PUSHBUTTON "&Avbryt",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Formatera stycke" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Indrag", -1, 10, 10, 120, 68 + LTEXT "Vänster", -1, 15, 22, 40, 13 + EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13 + LTEXT "Höger", -1, 15, 40, 40, 13 + EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13 + LTEXT "Första rad", -1, 15, 58, 40, 13 + EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13 + LTEXT "Justering", -1, 15, 87, 40, 13 + COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 60, CBS_DROPDOWNLIST + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 +END + +IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +Caption "Tabulatorer" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT + DEFPUSHBUTTON "Lägg &till", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "Ta &bort", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15 + PUSHBUTTON "&Avbryt", IDCANCEL, 137, 33, 50, 15 + PUSHBUTTON "Ta bort a&lla", ID_TAB_EMPTY, 137, 51, 50, 15 +END + +IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110 +STYLE DS_SYSMODAL +Caption "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Radbrytning", -1, 10, 10, 130, 85 + RADIOBUTTON "&Ingen radbrytning", IDC_PAGEFMT_WN, 18, 25, 117, 15 + RADIOBUTTON "&Bryt text vid fönsterkanten", IDC_PAGEFMT_WW, 18, 45, 117, 15 + RADIOBUTTON "Bryt text vid &marginalen", IDC_PAGEFMT_WM, 18, 65, 117, 15 + GROUPBOX "Verktygsrader", -1, 150, 10, 120, 85 + CHECKBOX "&Verktygsrad", IDC_PAGEFMT_TB, 160, 20, 80, 15 + CHECKBOX "&Formatrad", IDC_PAGEFMT_FB, 160, 38, 80, 15 + CHECKBOX "&Linjal", IDC_PAGEFMT_RU, 160, 56, 80, 15 + CHECKBOX "&Statusrad", IDC_PAGEFMT_SB, 160, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "Rich text-format (*.rtf)" + STRING_TEXT_FILES_TXT, "Textdokument (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode-textdokument (*.txt)" + STRING_ALL_FILES, "Alla filer (*.*)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_ALIGN_LEFT, "Vänsterställt" + STRING_ALIGN_RIGHT, "Högerställt" + STRING_ALIGN_CENTER, "Centrerat" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_NEWFILE_RICHTEXT, "Rich text-dokument" + STRING_NEWFILE_TXT, "Textdokument" + STRING_NEWFILE_TXT_UNICODE, "Textdokument (Unicode)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PRINTER_FILES_PRN, "Skrivarfiler (*.PRN)" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Alternativ" + STRING_VIEWPROPS_TEXT, "Text" + STRING_VIEWPROPS_RICHTEXT, "Rich text" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_PREVIEW_PRINT, "Skriv ut" + STRING_PREVIEW_NEXTPAGE, "Nästa sida" + STRING_PREVIEW_PREVPAGE, "Föregående sida" + STRING_PREVIEW_TWOPAGES, "Två sidor" + STRING_PREVIEW_ONEPAGE, "En sida" + STRING_PREVIEW_CLOSE, "Stäng" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_UNITS_CM, "cm" +END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Spara ändringar i '%s'?" + STRING_SEARCH_FINISHED, "Sökningen i dokumentet har slutförts." + STRING_LOAD_RICHED_FAILED, "Misslyckades att ladda RichEdit-biblioteket." + STRING_SAVE_LOSEFORMATTING, "Du har valt att spara i rent textformat, " \ + "vilket kommer leda till att all formatering förloras. " \ + "Är du säker att du vill göra detta?" + STRING_INVALID_NUMBER, "Ogiltigt talformat" + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" + STRING_WRITE_FAILED, "Kunde inte spara filen." + STRING_WRITE_ACCESS_DENIED, "Du har inte tillgång till att spara filen." + STRING_OPEN_FAILED, "Kunde inte öppna filen." + STRING_OPEN_ACCESS_DENIED, "Du har inte tillgång till att öppna filen." + STRING_PRINTING_NOT_IMPLEMENTED, "Utskrift ej implementerat." +END + +#pragma code_page(default) diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc index 4839e2b..1a77fe2 100644 --- a/programs/wordpad/rsrc.rc +++ b/programs/wordpad/rsrc.rc @@ -77,5 +77,6 @@ IDI_TXT ICON "txt.ico" #include "Pt.rc" #include "Ru.rc" #include "Si.rc" +#include "Sv.rc" #include "Tr.rc" #include "Zh.rc"

1 0

Shunichi Fuji : configure: Set default libs if ***-config is missing.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 4bf77d6cf7e397400e128e8f2f907aaa83a0090b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bf77d6cf7e397400e128e8f2… Author: Shunichi Fuji <palglowr(a)gmail.com> Date: Tue Jan 20 15:24:46 2009 +0900 configure: Set default libs if ***-config is missing. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure b/configure index cc46abe..ead0c3d 100755 --- a/configure +++ b/configure @@ -14116,6 +14116,7 @@ fi done CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl" fi + ac_gphoto2_libs=${ac_gphoto2_libs:-"-lgphoto2"} if test "${ac_cv_header_gphoto2_camera_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for gphoto2-camera.h" >&5 $as_echo_n "checking for gphoto2-camera.h... " >&6; } @@ -14551,6 +14552,7 @@ test -n "$ft_devel" || ft_devel="no" ac_freetype_incl=`$ft_devel --cflags` ac_freetype_libs=`$ft_devel --libs` fi + ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"} { $as_echo "$as_me:$LINENO: checking for -lfreetype" >&5 $as_echo_n "checking for -lfreetype... " >&6; } if test "${ac_cv_lib_soname_freetype+set}" = set; then @@ -15443,6 +15445,7 @@ fi ac_esd_libs=`$ESDCONFIG --libs` CFLAGS="$CFLAGS $ac_esd_incl" fi + ac_esd_libs=${ac_esd_libs:-"-lesd"} if test "${ac_cv_header_esd_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for esd.h" >&5 $as_echo_n "checking for esd.h... " >&6; } diff --git a/configure.ac b/configure.ac index 72f93b7..8c7dfab 100644 --- a/configure.ac +++ b/configure.ac @@ -1013,6 +1013,7 @@ then done CPPFLAGS="$CPPFLAGS $ac_gphoto2_incl" fi + ac_gphoto2_libs=${ac_gphoto2_libs:-"-lgphoto2"} AC_CHECK_HEADER(gphoto2-camera.h, [AC_CHECK_LIB(gphoto2,gp_camera_new, [AC_DEFINE(HAVE_GPHOTO2, 1, [Define if we have libgphoto2 development environment]) @@ -1060,6 +1061,7 @@ then ac_freetype_incl=`$ft_devel --cflags` ac_freetype_libs=`$ft_devel --libs` fi + ac_freetype_libs=${ac_freetype_libs:-"-lfreetype"} WINE_CHECK_SONAME(freetype,FT_Init_FreeType,[ft_lib=yes],[ft_lib=no],[$ac_freetype_libs]) if test "$ft_lib" = "yes" then @@ -1141,6 +1143,7 @@ then ac_esd_libs=`$ESDCONFIG --libs` CFLAGS="$CFLAGS $ac_esd_incl" fi + ac_esd_libs=${ac_esd_libs:-"-lesd"} AC_CHECK_HEADER(esd.h, [AC_CHECK_LIB(esd,esd_open_sound, [AC_SUBST(ESDINCL, "$ac_esd_incl")

1 0

Ge van Geldorp : urlmon/tests: Fix protocol tests when proxy is configured.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: f0f6225906f9132fd010855fc81b4d1986e05eec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0f6225906f9132fd010855fc… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Jan 20 02:56:46 2009 +0100 urlmon/tests: Fix protocol tests when proxy is configured. --- dlls/urlmon/tests/protocol.c | 39 ++++++++++++++++++--------------------- 1 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 1fff2e4..eb42282 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -76,6 +76,7 @@ DEFINE_EXPECT(ReportProgress_COOKIE_SENT); DEFINE_EXPECT(ReportProgress_REDIRECTING); DEFINE_EXPECT(ReportProgress_ENCODING); DEFINE_EXPECT(ReportProgress_ACCEPTRANGES); +DEFINE_EXPECT(ReportProgress_PROXYDETECTING); DEFINE_EXPECT(ReportData); DEFINE_EXPECT(ReportResult); DEFINE_EXPECT(GetBindString_ACCEPT_MIMES); @@ -356,8 +357,9 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL if (!state) { if (http_is_first) { - CHECK_CALLED(ReportProgress_FINDINGRESOURCE); - CHECK_CALLED(ReportProgress_CONNECTING); + CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); + CLEAR_CALLED(ReportProgress_CONNECTING); + CLEAR_CALLED(ReportProgress_PROXYDETECTING); } else todo_wine { CHECK_NOT_CALLED(ReportProgress_FINDINGRESOURCE); /* IE7 does call this */ @@ -398,9 +400,6 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, static const WCHAR null_guid[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0','0','}',0}; static const WCHAR text_plain[] = {'t','e','x','t','/','p','l','a','i','n',0}; - static const WCHAR wszCrossoverIP[] = - {'2','0','9','.','4','6','.','2','5','.','1','3','2',0}; - /* I'm not sure if it's a good idea to hardcode here the IP address... */ switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: @@ -446,23 +445,10 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, case BINDSTATUS_FINDINGRESOURCE: CHECK_EXPECT(ReportProgress_FINDINGRESOURCE); ok(szStatusText != NULL, "szStatusText == NULL\n"); - if(szStatusText) - { - if(tested_protocol == HTTPS_TEST) - ok(!strcmp_wa(szStatusText, "www.codeweavers.com"), "szStatustext = %s\n", debugstr_w(szStatusText)); - else if(!http_post_test) - ok(!strcmp_wa(szStatusText, "www.winehq.org"), "szStatustext != \"www.winehq.org\"\n"); - else - ok(!strcmp_wa(szStatusText, "crossover.codeweavers.com"), - "szStatustext != \"crossover.codeweavers.com\"\n"); - } break; case BINDSTATUS_CONNECTING: CHECK_EXPECT(ReportProgress_CONNECTING); ok(szStatusText != NULL, "szStatusText == NULL\n"); - if(szStatusText) - ok(!lstrcmpW(szStatusText, http_post_test || tested_protocol == HTTPS_TEST ? wszCrossoverIP : winehq_ipW), - "Unexpected szStatusText %s\n", debugstr_w(szStatusText)); break; case BINDSTATUS_SENDINGREQUEST: CHECK_EXPECT(ReportProgress_SENDINGREQUEST); @@ -499,6 +485,11 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, CHECK_EXPECT(ReportProgress_ACCEPTRANGES); ok(!szStatusText, "szStatusText = %s\n", debugstr_w(szStatusText)); break; + case BINDSTATUS_PROXYDETECTING: + CHECK_EXPECT(ReportProgress_PROXYDETECTING); + SET_EXPECT(ReportProgress_CONNECTING); + ok(!szStatusText, "szStatusText = %s\n", debugstr_w(szStatusText)); + break; default: ok(0, "Unexpected status %d\n", ulStatusCode); }; @@ -518,7 +509,7 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION | BSCF_LASTDATANOTIFICATION), "grcfBSCF = %08x\n", grfBSCF); }else if(!binding_test && (tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST)) { - if(!(grfBSCF & BSCF_LASTDATANOTIFICATION)) + if(!(grfBSCF & BSCF_LASTDATANOTIFICATION) || (grfBSCF & BSCF_DATAFULLYAVAILABLE)) CHECK_EXPECT(ReportData); else if (http_post_test) ok(ulProgress == 13, "Read %u bytes instead of 13\n", ulProgress); @@ -526,11 +517,14 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR ok(ulProgress, "ulProgress == 0\n"); if(first_data_notif) { - ok(grfBSCF == BSCF_FIRSTDATANOTIFICATION, "grcfBSCF = %08x\n", grfBSCF); + ok(grfBSCF == BSCF_FIRSTDATANOTIFICATION + || grfBSCF == (BSCF_LASTDATANOTIFICATION|BSCF_DATAFULLYAVAILABLE), + "grcfBSCF = %08x\n", grfBSCF); first_data_notif = FALSE; } else { ok(grfBSCF == BSCF_INTERMEDIATEDATANOTIFICATION - || grfBSCF == (BSCF_LASTDATANOTIFICATION|BSCF_INTERMEDIATEDATANOTIFICATION), + || grfBSCF == (BSCF_LASTDATANOTIFICATION|BSCF_INTERMEDIATEDATANOTIFICATION) + || broken(grfBSCF == (BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION)), "grcfBSCF = %08x\n", grfBSCF); } @@ -1605,6 +1599,9 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) SET_EXPECT(ReportProgress_FINDINGRESOURCE); SET_EXPECT(ReportProgress_CONNECTING); SET_EXPECT(ReportProgress_SENDINGREQUEST); + SET_EXPECT(ReportProgress_PROXYDETECTING); + if(! is_https) + SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); if(!(bindf & BINDF_FROMURLMON)) { SET_EXPECT(OnResponse); SET_EXPECT(ReportProgress_RAWMIMETYPE);

1 0

Ge van Geldorp : msi/tests: EstimatedSize is not set consistently between Windows Installer versions.
by Alexandre Julliard 20 Jan '09

20 Jan '09

Module: wine Branch: master Commit: 78457300aa0a5b157d941eccbcc96bcdf984e24d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78457300aa0a5b157d941eccb… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Jan 20 02:57:07 2009 +0100 msi/tests: EstimatedSize is not set consistently between Windows Installer versions. --- dlls/msi/tests/install.c | 69 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 59 insertions(+), 10 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 8bc50c5..95dd03a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -2395,6 +2395,41 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin ok_(__FILE__, line)(val == expected, "Expected %d, got %d\n", expected, val); } +static void check_reg_dword2(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD line) +{ + DWORD val, size, type; + LONG res; + + size = sizeof(DWORD); + res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); + + if (res != ERROR_SUCCESS || type != REG_DWORD) + { + ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); + return; + } + + ok_(__FILE__, line)(val == expected1 || val == expected2, "Expected %d or %d, got %d\n", expected1, expected2, val); +} + +static void check_reg_dword3(HKEY prodkey, LPCSTR name, DWORD expected1, DWORD expected2, DWORD expected3, DWORD line) +{ + DWORD val, size, type; + LONG res; + + size = sizeof(DWORD); + res = RegQueryValueExA(prodkey, name, NULL, &type, (LPBYTE)&val, &size); + + if (res != ERROR_SUCCESS || type != REG_DWORD) + { + ok_(__FILE__, line)(FALSE, "Key doesn't exist or wrong type\n"); + return; + } + + ok_(__FILE__, line)(val == expected1 || val == expected2 || val == expected3, + "Expected %d, %d or %d, got %d\n", expected1, expected2, expected3, val); +} + #define CHECK_REG_STR(prodkey, name, expected) \ check_reg_str(prodkey, name, expected, TRUE, __LINE__); @@ -2416,6 +2451,20 @@ static void check_reg_dword(HKEY prodkey, LPCSTR name, DWORD expected, DWORD lin check_reg_dword(prodkey, name, expected, __LINE__); \ RegDeleteValueA(prodkey, name); +#define CHECK_REG_DWORD2(prodkey, name, expected1, expected2) \ + check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); + +#define CHECK_DEL_REG_DWORD2(prodkey, name, expected1, expected2) \ + check_reg_dword2(prodkey, name, expected1, expected2, __LINE__); \ + RegDeleteValueA(prodkey, name); + +#define CHECK_REG_DWORD3(prodkey, name, expected1, expected2, expected3) \ + check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); + +#define CHECK_DEL_REG_DWORD3(prodkey, name, expected1, expected2, expected3) \ + check_reg_dword3(prodkey, name, expected1, expected2, expected3, __LINE__); \ + RegDeleteValueA(prodkey, name); + static void get_date_str(LPSTR date) { SYSTEMTIME systime; @@ -2498,7 +2547,7 @@ static void test_publish_registerproduct(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", 12); + CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4); } RegDeleteKeyA(hkey, ""); @@ -2536,7 +2585,7 @@ static void test_publish_registerproduct(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD(props, "EstimatedSize", 12); + CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4); } RegDeleteKeyA(props, ""); @@ -2597,7 +2646,7 @@ static void test_publish_registerproduct(void) CHECK_DEL_REG_DWORD(hkey, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD(hkey, "EstimatedSize", 12); + CHECK_DEL_REG_DWORD3(hkey, "EstimatedSize", 12, -12, 4); } RegDeleteKeyA(hkey, ""); @@ -2635,7 +2684,7 @@ static void test_publish_registerproduct(void) CHECK_DEL_REG_DWORD(props, "WindowsInstaller", 1); todo_wine { - CHECK_DEL_REG_DWORD(props, "EstimatedSize", 12); + CHECK_DEL_REG_DWORD3(props, "EstimatedSize", 12, -12, 4); } RegDeleteKeyA(props, ""); @@ -3360,7 +3409,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD(prodkey, "EstimatedSize", 12); + CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); } RegCloseKey(prodkey); @@ -3434,7 +3483,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD(prodkey, "EstimatedSize", 12); + CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); } RegCloseKey(prodkey); @@ -3512,7 +3561,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD(prodkey, "EstimatedSize", 12); + CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); } RegCloseKey(prodkey); @@ -3564,7 +3613,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD(prodkey, "EstimatedSize", 12); + CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); } RegCloseKey(prodkey); @@ -3616,7 +3665,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD(prodkey, "EstimatedSize", 12); + CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -20); } RegCloseKey(prodkey); @@ -3694,7 +3743,7 @@ static void test_publish(void) CHECK_REG_DWORD(prodkey, "WindowsInstaller", 1); todo_wine { - CHECK_REG_DWORD(prodkey, "EstimatedSize", 12); + CHECK_REG_DWORD2(prodkey, "EstimatedSize", 12, -12); } RegCloseKey(prodkey);

1 0