March 2007 - Wine-commits - list.winehq.org

Tag wine-0.9.32 : Alexandre Julliard : Release 0.9.32
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: refs/tags/wine-0.9.32 Tag: 41338b3f7f6241e72fd705ec8271da4b124c52df URL: http://source.winehq.org/git/wine.git/?a=tag;h=41338b3f7f6241e72fd705ec8271… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 17:12:44 2007 +0100 Release 0.9.32

1 0

Alexandre Julliard : Release 0.9.32.
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: a08c3e04ed57f3eb2124d1fa642f57388d738566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08c3e04ed57f3eb2124d1fa6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 2 17:12:43 2007 +0100 Release 0.9.32. --- ANNOUNCE | 1089 +++++++++++++++++----------------------- ChangeLog | 1689 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2167 insertions(+), 631 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a08c3e04ed57f3eb2124d…

1 0

Marcus Meissner : netapi32: Fixed array overflow (spotted by Coverity).
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: d0e8d6a7babc8e5137bc4dd7e35c680073589bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e8d6a7babc8e5137bc4dd7e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 2 08:40:34 2007 +0100 netapi32: Fixed array overflow (spotted by Coverity). --- dlls/netapi32/netbios.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index a221671..c104cea 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -179,7 +179,7 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *data) data); for (i = 0; i < gNumTransports && gTransports[i].id != transport; i++) ; - if (gTransports[i].id == transport) + if ((i < gNumTransports) && gTransports[i].id == transport) { NetBIOSTransport *transportPtr = &gTransports[i].transport;

1 0

Aric Stewart : gdi32: Don't fail replacement on no localized family name.
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: 2967524bdb55835a612720da9d512e5dddd6184e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2967524bdb55835a612720da9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 2 11:04:12 2007 +0900 gdi32: Don't fail replacement on no localized family name. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f3676af..0e3ecb5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1013,7 +1013,7 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, const WCHAR * if (target_family) { localised_family = get_familyname(ft_face); - if (lstrcmpW(localised_family,target_family)!=0) + if (localised_family && lstrcmpW(localised_family,target_family)!=0) { TRACE("Skipping Index %i: Incorrect Family name for replacement\n",(INT)face_index); HeapFree(GetProcessHeap(), 0, localised_family);

1 0

Paul Vriens : advapi32/tests: Make use of skip.
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: 6bf1a6c5d2ff63270095e8475f594661da00300e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf1a6c5d2ff63270095e8475… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Mar 2 09:59:26 2007 +0100 advapi32/tests: Make use of skip. --- dlls/advapi32/tests/crypt_md5.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/crypt_md5.c b/dlls/advapi32/tests/crypt_md5.c index 1916ac8..596184d 100644 --- a/dlls/advapi32/tests/crypt_md5.c +++ b/dlls/advapi32/tests/crypt_md5.c @@ -77,13 +77,17 @@ static void test_md5_ctx(void) { 0x43, 0x03, 0xdd, 0x8c, 0x60, 0xd9, 0x3a, 0x22, 0x0b, 0x28, 0xd0, 0xb2, 0x65, 0x93, 0xd0, 0x36 }; - if (!(module = LoadLibrary( "advapi32.dll" ))) return; + if (!(module = GetModuleHandleA( "advapi32.dll" ))) return; pMD5Init = (fnMD5Init)GetProcAddress( module, "MD5Init" ); pMD5Update = (fnMD5Update)GetProcAddress( module, "MD5Update" ); pMD5Final = (fnMD5Final)GetProcAddress( module, "MD5Final" ); - if (!pMD5Init || !pMD5Update || !pMD5Final) goto out; + if (!pMD5Init || !pMD5Update || !pMD5Final) + { + skip("Needed functions are not available\n"); + goto out; + } memset( &ctx, 0, sizeof(ctx) ); pMD5Init( &ctx );

1 0

Marcus Meissner : uxtheme: Fixed wrong index in draw.c.
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: 3f726d316758b7a7a38109f64f8fae0f538c2707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f726d316758b7a7a38109f64… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 2 08:11:04 2007 +0100 uxtheme: Fixed wrong index in draw.c. --- dlls/uxtheme/draw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index bad4471..003cf20 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -1389,7 +1389,7 @@ static HRESULT draw_rect_edge (HDC hdc, HTHEME theme, int part, int state, LTInnerI = RBInnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)]; LTOuterI = RBOuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)]; - if( LTInnerI != -1 ) LTInnerI = RBInnerI = COLOR_BTNFACE; + if( LTInnerI != -1 ) LTInnerI = RBInnerI = EDGE_FILL; } else if(uFlags & BF_SOFT) {

1 0

Marcus Meissner : mlang/tests: Protect from 1 byte static buffer overflow.
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: efe2ee560e26d43ddfdefee752021693aaa46958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efe2ee560e26d43ddfdefee75… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 2 08:22:21 2007 +0100 mlang/tests: Protect from 1 byte static buffer overflow. --- dlls/mlang/tests/mlang.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 69e8c50..471f54a 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -86,8 +86,11 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) ok(ret == S_OK, "IMultiLanguage2_ConvertStringToUnicode failed: %08x\n", ret); ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA); ok(lenW == lstrlenW(stringW), "expected lenW %u, got %u\n", lstrlenW(stringW), lenW); - ok(bufW[lenW] != 0, "buf should not be 0 terminated\n"); - bufW[lenW] = 0; /* -1 doesn't include 0 terminator */ + if (lenW < sizeof(bufW)/sizeof(bufW[0])) { + /* can only happen if the convert call fails */ + ok(bufW[lenW] != 0, "buf should not be 0 terminated\n"); + bufW[lenW] = 0; /* -1 doesn't include 0 terminator */ + } ok(!lstrcmpW(bufW, stringW), "bufW/stringW mismatch\n"); memset(bufW, 'x', sizeof(bufW));

1 0

Clinton Stimpson : user32: Add another test for GetUpdateRect().
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: b878ad24c4ccac233ef8b700d39374b7c7068ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b878ad24c4ccac233ef8b700d… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Thu Mar 1 17:34:09 2007 -0700 user32: Add another test for GetUpdateRect(). --- dlls/user32/tests/win.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 9d07306..b0f7bf9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4171,10 +4171,13 @@ void test_gettext(void) UnregisterClass( clsname, NULL ); } + static void test_GetUpdateRect(void) { RECT rc1, rc2; HWND hgrandparent, hparent, hchild; + WNDCLASSA cls; + const char* classNameA = "GetUpdateRectClass"; hgrandparent = CreateWindowA("static", "grandparent", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, 0, NULL); @@ -4205,6 +4208,52 @@ static void test_GetUpdateRect(void) rc2.left, rc2.top, rc2.right, rc2.bottom); DestroyWindow(hgrandparent); + + cls.style = 0; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = classNameA; + + if(!RegisterClassA(&cls)) { + trace("Register failed %d\n", GetLastError()); + return; + } + + hgrandparent = CreateWindowA("static", "grandparent", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, NULL, NULL, 0, NULL); + + hparent = CreateWindowA(classNameA, "parent", WS_CHILD|WS_VISIBLE, + 0, 0, 100, 100, hgrandparent, NULL, 0, NULL); + + hchild = CreateWindowA(classNameA, "child", WS_CHILD|WS_VISIBLE, + 10, 10, 30, 30, hparent, NULL, 0, NULL); + + ShowWindow(hgrandparent, SW_SHOW); + UpdateWindow(hgrandparent); + + ShowWindow(hchild, SW_HIDE); + SetRect(&rc2, 0, 0, 0, 0); + GetUpdateRect(hgrandparent, &rc1, FALSE); + todo_wine + { + ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", + rc1.left, rc1.top, rc1.right, rc1.bottom, + rc2.left, rc2.top, rc2.right, rc2.bottom); + } + + SetRect(&rc2, 10, 10, 40, 40); + GetUpdateRect(hparent, &rc1, FALSE); + ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d,%d,%d) / (%d,%d,%d,%d)\n", + rc1.left, rc1.top, rc1.right, rc1.bottom, + rc2.left, rc2.top, rc2.right, rc2.bottom); + + DestroyWindow(hgrandparent); } START_TEST(win)

1 0

Lei Zhang : regedit: Updated English resources to remove shortcut conflicts .
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: 8f05d80aa966ad40db6aab37dc26527d8c8cd7fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f05d80aa966ad40db6aab37d… Author: Lei Zhang <thestig(a)google.com> Date: Thu Mar 1 14:48:51 2007 -0800 regedit: Updated English resources to remove shortcut conflicts. --- programs/regedit/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index 376e670..078af00 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -200,9 +200,9 @@ STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Export registry", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP + GROUPBOX "Export registry", IDC_EXPORT_BASE, 6, 6, 266, 42, WS_GROUP AUTORADIOBUTTON "&All", IDC_EXPORT_ALL, 12, 15, 244, 12 - AUTORADIOBUTTON "&Selected branch:", IDC_EXPORT_SELECTED, 12, 30, 70, 12 + AUTORADIOBUTTON "S&elected branch:", IDC_EXPORT_SELECTED, 12, 30, 70, 12 EDITTEXT IDC_EXPORT_PATH, 82, 30, 184, 12 END

1 0

Lei Zhang : regedit: Removed dead code from regproc.c.
by Alexandre Julliard 02 Mar '07

02 Mar '07

Module: wine Branch: master Commit: 1a54a89b8bc4ce4d3cb09bae846f8ac5903f552d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a54a89b8bc4ce4d3cb09bae8… Author: Lei Zhang <thestig(a)google.com> Date: Thu Mar 1 15:47:14 2007 -0800 regedit: Removed dead code from regproc.c. --- programs/regedit/regproc.c | 221 +------------------------------------------- programs/regedit/regproc.h | 8 -- 2 files changed, 1 insertions(+), 228 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2cd187b..fe6fa8a 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -30,14 +30,11 @@ #define REG_VAL_BUF_SIZE 4096 -/* Delimiters used to parse the "value" to query queryValue*/ -#define QUERY_VALUE_MAX_ARGS 1 - /* maximal number of characters in hexadecimal data line, not including '\' character */ #define REG_FILE_HEX_LINE_LEN 76 -/* Globals used by the api setValue, queryValue */ +/* Globals used by the api setValue */ static LPSTR currentKeyName = NULL; static HKEY currentKeyClass = 0; static HKEY currentKeyHandle = 0; @@ -176,55 +173,6 @@ DWORD convertHexToDWord(char *str, BYTE *buf) } /****************************************************************************** - * Converts a hex buffer into a hex comma separated values - */ -char* convertHexToHexCSV(BYTE *buf, ULONG bufLen) -{ - char* str; - char* ptrStr; - BYTE* ptrBuf; - - ULONG current = 0; - - str = HeapAlloc(GetProcessHeap(), 0, (bufLen+1)*2); - memset(str, 0, (bufLen+1)*2); - ptrStr = str; /* Pointer to result */ - ptrBuf = buf; /* Pointer to current */ - - while (current < bufLen) { - BYTE bCur = ptrBuf[current++]; - char res[3]; - - sprintf(res, "%02x", (unsigned int)*&bCur); - strcat(str, res); - strcat(str, ","); - } - - /* Get rid of the last comma */ - str[strlen(str)-1] = '\0'; - return str; -} - -/****************************************************************************** - * Converts a hex buffer into a DWORD string - */ -char* convertHexToDWORDStr(BYTE *buf, ULONG bufLen) -{ - char* str; - DWORD dw; - - if ( bufLen != sizeof(DWORD) ) return NULL; - - str = HeapAlloc(GetProcessHeap(), 0, (bufLen*2)+1); - - memcpy(&dw,buf,sizeof(DWORD)); - sprintf(str, "%08x", dw); - - /* Get rid of the last comma */ - return str; -} - -/****************************************************************************** * Converts a hex comma separated values list into a hex list. * The Hex input string must be in exactly the correct form. */ @@ -612,44 +560,6 @@ void doSetValue(LPSTR stdInput) } /****************************************************************************** - * This function is the main entry point to the queryValue type of action. It - * receives the currently read line and dispatch the work depending on the - * context. - */ -void doQueryValue(LPSTR stdInput) -{ - /* - * We encountered the end of the file, make sure we - * close the opened key and exit - */ - if (stdInput == NULL) { - if (bTheKeyIsOpen != FALSE) - closeKey(); - - return; - } - - if ( stdInput[0] == '[') /* We are reading a new key */ - { - if ( bTheKeyIsOpen != FALSE ) - closeKey(); /* Close the previous key before */ - - if ( openKey(stdInput) != ERROR_SUCCESS ) - fprintf(stderr,"%s: queryValue failed to open key %s\n", - getAppName(), stdInput); - } else if( ( bTheKeyIsOpen ) && - (( stdInput[0] == '@') || /* reading a default @=data pair */ - ( stdInput[0] == '\"'))) /* reading a new value=data pair */ - { - processQueryValue(stdInput); - } else /* since we are assuming that the */ - { /* file format is valid we must */ - if ( bTheKeyIsOpen ) /* be reading a blank line which */ - closeKey(); /* indicate end of this key processing */ - } -} - -/****************************************************************************** * This function is the main entry point to the deleteValue type of action. It * receives the currently read line and dispatch the work depending on the * context. @@ -741,135 +651,6 @@ void processSetValue(LPSTR line) } /****************************************************************************** - * This function is a wrapper for the queryValue function. It prepares the - * land and clean the area once completed. - */ -void processQueryValue(LPSTR cmdline) -{ - fprintf(stderr,"ERROR!!! - temporary disabled"); - exit(1); -#if 0 - LPSTR argv[QUERY_VALUE_MAX_ARGS];/* args storage */ - LPSTR token = NULL; /* current token analyzed */ - ULONG argCounter = 0; /* counter of args */ - INT counter; - HRESULT hRes = 0; - LPSTR keyValue = NULL; - LPSTR lpsRes = NULL; - - /* - * Init storage and parse the line - */ - for (counter=0; counter<QUERY_VALUE_MAX_ARGS; counter++) - argv[counter]=NULL; - - while( (token = getToken(&cmdline, queryValueDelim[argCounter])) != NULL ) { - argv[argCounter++] = getArg(token); - - if (argCounter == QUERY_VALUE_MAX_ARGS) - break; /* Stop processing args no matter what */ - } - - /* The value we look for is the first token on the line */ - if ( argv[0] == NULL ) - return; /* SHOULD NOT HAPPEN */ - else - keyValue = argv[0]; - - if( (keyValue[0] == '@') && (strlen(keyValue) == 1) ) { - LONG lLen = KEY_MAX_LEN; - CHAR* lpsData=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,KEY_MAX_LEN); - /* - * We need to query the key default value - */ - hRes = RegQueryValue( - currentKeyHandle, - currentKeyName, - (LPBYTE)lpsData, - &lLen); - - if (hRes==ERROR_MORE_DATA) { - lpsData=HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,lpsData,lLen); - hRes = RegQueryValue(currentKeyHandle,currentKeyName,(LPBYTE)lpsData,&lLen); - } - - if (hRes == ERROR_SUCCESS) { - lpsRes = HeapAlloc( GetProcessHeap(), 0, lLen); - lstrcpynA(lpsRes, lpsData, lLen); - } - } else { - DWORD dwLen = KEY_MAX_LEN; - BYTE* lpbData=HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,KEY_MAX_LEN); - DWORD dwType; - /* - * We need to query a specific value for the key - */ - hRes = RegQueryValueEx( - currentKeyHandle, - keyValue, - 0, - &dwType, - (LPBYTE)lpbData, - &dwLen); - - if (hRes==ERROR_MORE_DATA) { - lpbData=HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,lpbData,dwLen); - hRes = RegQueryValueEx(currentKeyHandle,keyValue,NULL,&dwType,(LPBYTE)lpbData,&dwLen); - } - - if (hRes == ERROR_SUCCESS) { - /* - * Convert the returned data to a displayable format - */ - switch ( dwType ) { - case REG_SZ: - case REG_EXPAND_SZ: { - lpsRes = HeapAlloc( GetProcessHeap(), 0, dwLen); - lstrcpynA(lpsRes, lpbData, dwLen); - break; - } - case REG_DWORD: { - lpsRes = convertHexToDWORDStr(lpbData, dwLen); - break; - } - default: { - lpsRes = convertHexToHexCSV(lpbData, dwLen); - break; - } - } - } - - HeapFree(GetProcessHeap(), 0, lpbData); - } - - - if ( hRes == ERROR_SUCCESS ) - fprintf(stderr, - "%s: Value \"%s\" = \"%s\" in key [%s]\n", - getAppName(), - keyValue, - lpsRes, - currentKeyName); - - else - fprintf(stderr,"%s: ERROR Value \"%s\" not found for key \"%s\".\n", - getAppName(), - keyValue, - currentKeyName); - - /* - * Do some cleanup - */ - for (counter=0; counter<argCounter; counter++) - if (argv[counter] != NULL) - HeapFree(GetProcessHeap(), 0, argv[counter]); - - if (lpsRes != NULL) - HeapFree(GetProcessHeap(), 0, lpsRes); -#endif -} - -/****************************************************************************** * Calls command for each line of a registry file. * Correctly processes comments (in # form), line continuation. * diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index f9ed71f..9a39951 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -32,7 +32,6 @@ void doSetValue(LPSTR lpsLine); void doDeleteValue(LPSTR lpsLine); void doCreateKey(LPSTR lpsLine); void doDeleteKey(LPSTR lpsLine); -void doQueryValue(LPSTR lpsLine); void doRegisterDLL(LPSTR lpsLine); void doUnregisterDLL(LPSTR lpsLine); @@ -66,10 +65,3 @@ void closeKey(void); */ void processSetValue(LPSTR cmdline); HRESULT setValue(LPSTR val_name, LPSTR val_data); - -/* - * api queryValue prototypes - */ -void processQueryValue(LPSTR cmdline); - -extern BOOL ProcessCmdLine(LPSTR lpCmdLine);

1 0