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

Lei Zhang : regedit: Allow entering - for a key in a . reg file to delete that key.
by Alexandre Julliard March 2, 2007

March 2, 2007

Module: wine Branch: master Commit: 054fd8cb42fb3b3b13fee48a7747f0063d853f09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054fd8cb42fb3b3b13fee48a7… Author: Lei Zhang <thestig(a)google.com> Date: Thu Mar 1 16:25:08 2007 -0800 regedit: Allow entering - for a key in a .reg file to delete that key. --- programs/regedit/regproc.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index fe6fa8a..6c8e3a5 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -283,6 +283,7 @@ LPSTR getArg( LPSTR arg) if( arg[0] == '\"' ) arg++; tmp = HeapAlloc(GetProcessHeap(), 0, strlen(arg)+1); + CHECK_ENOUGH_MEMORY(tmp); strcpy(tmp, arg); return tmp; @@ -544,6 +545,18 @@ void doSetValue(LPSTR stdInput) if ( bTheKeyIsOpen != FALSE ) closeKey(); /* Close the previous key before */ + /* delete the key if we encounter '-' at the start of reg key */ + if ( stdInput[1] == '-') + { + int last_chr = strlen(stdInput) - 1; + + /* skip leading "[-" and get rid of trailing "]" */ + if (stdInput[last_chr] == ']') + stdInput[last_chr] = '\0'; + delete_registry_key(stdInput+2); + return; + } + if ( openKey(stdInput) != ERROR_SUCCESS ) fprintf(stderr,"%s: setValue failed to open key %s\n", getAppName(), stdInput);

1 0

Lei Zhang : regedit: Removed dead code from regproc.c.
by Alexandre Julliard March 2, 2007

March 2, 2007

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

Jacek Caban : urlmon: Fix FindMimeFromData tests on IE7.
by Alexandre Julliard March 2, 2007

March 2, 2007

Module: wine Branch: master Commit: 74d49757c74b4b1ec0355a4b5c49f519fa2273a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d49757c74b4b1ec0355a4b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 1 20:21:55 2007 +0100 urlmon: Fix FindMimeFromData tests on IE7. --- dlls/urlmon/tests/misc.c | 19 +++++++++++-------- dlls/urlmon/urlmon_main.c | 4 ++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 8774410..67e0d3d 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -367,14 +367,15 @@ static const WCHAR mimeAppXMSDownload[] = static const struct { LPCWSTR url; LPCWSTR mime; + HRESULT hres; } mime_tests[] = { - {url1, mimeTextHtml}, - {url2, mimeTextHtml}, - {url3, mimeTextHtml}, - {url4, NULL}, - {url5, NULL}, - {url6, NULL}, - {url7, NULL} + {url1, mimeTextHtml, S_OK}, + {url2, mimeTextHtml, S_OK}, + {url3, mimeTextHtml, S_OK}, + {url4, NULL, E_FAIL}, + {url5, NULL, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, + {url6, NULL, E_FAIL}, + {url7, NULL, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} }; static BYTE data1[] = "test data\n"; @@ -539,7 +540,9 @@ static void test_FindMimeFromData(void) ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime\n", i); CoTaskMemFree(mime); }else { - ok(hres == E_FAIL, "[%d] FindMimeFromData failed: %08x, expected E_FAIL\n", i, hres); + ok(hres == E_FAIL || hres == mime_tests[i].hres, + "[%d] FindMimeFromData failed: %08x, expected %08x\n", + i, hres, mime_tests[i].hres); ok(mime == (LPWSTR)0xf0f0f0f0, "[%d] mime != 0xf0f0f0f0\n", i); } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 7cee585..3d29feb 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -647,13 +647,13 @@ HRESULT WINAPI FindMimeFromData(LPBC pBC, LPCWSTR pwzUrl, LPVOID pBuffer, res = RegOpenKeyW(HKEY_CLASSES_ROOT, ptr, &hkey); if(res != ERROR_SUCCESS) - return E_FAIL; + return HRESULT_FROM_WIN32(res); size = sizeof(mime); res = RegQueryValueExW(hkey, wszContentType, NULL, NULL, (LPBYTE)mime, &size); RegCloseKey(hkey); if(res != ERROR_SUCCESS) - return E_FAIL; + return HRESULT_FROM_WIN32(res); *ppwzMimeOut = CoTaskMemAlloc(size); memcpy(*ppwzMimeOut, mime, size);

1 0

Jacek Caban : mshtml: Added more tests.
by Alexandre Julliard March 2, 2007

March 2, 2007

Module: wine Branch: master Commit: b3cad3268b56737a96a21748743ea79cfcf0469d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3cad3268b56737a96a217487… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 2 02:20:48 2007 +0100 mshtml: Added more tests. --- dlls/mshtml/tests/htmldoc.c | 443 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 417 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3cad3268b56737a96a21…

1 0

Jacek Caban : mshtml: Always read data in OnDataAvailable.
by Alexandre Julliard March 2, 2007

March 2, 2007

Module: wine Branch: master Commit: ff3b2780ec11873a54d6dd3be5c8460a87dd3486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff3b2780ec11873a54d6dd3be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 2 02:20:08 2007 +0100 mshtml: Always read data in OnDataAvailable. --- dlls/mshtml/navigate.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a665ff0..44d74c9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -424,6 +424,13 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if This->readed += This->nsstream->buf_size; }while(hres == S_OK); + }else { + BYTE buf[1024]; + DWORD read; + do { + read = 0; + hres = IStream_Read(pstgmed->u.pstm, buf, sizeof(buf), &read); + }while(hres == S_OK && read); } return S_OK;

1 0

Hans Leidekker : gdi32: Implement GetFontUnicodeRanges.
by Alexandre Julliard March 2, 2007

March 2, 2007

Module: wine Branch: master Commit: 748032e0fb1f5a3e0345d38615d4ea06a919d337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=748032e0fb1f5a3e0345d3861… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Mar 1 20:30:12 2007 +0100 gdi32: Implement GetFontUnicodeRanges. --- dlls/gdi32/font.c | 14 ++++++- dlls/gdi32/freetype.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/tests/font.c | 38 +++++++++++++++++++ 4 files changed, 142 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f237612..2578f33 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3326,9 +3326,19 @@ BOOL WINAPI GetCharWidthI(HDC hdc, UINT first, UINT count, LPWORD glyphs, LPINT /*********************************************************************** * GetFontUnicodeRanges (GDI32.@) + * + * Retrieve a list of supported Unicode characters in a font. + * + * PARAMS + * hdc [I] Handle to a device context. + * lpgs [O] GLYPHSET structure specifying supported character ranges. + * + * RETURNS + * Success: Number of bytes written to the buffer pointed to by lpgs. + * Failure: 0 + * */ DWORD WINAPI GetFontUnicodeRanges(HDC hdc, LPGLYPHSET lpgs) { - FIXME("(%p, %p): stub\n", hdc, lpgs); - return 0; + return WineEngGetFontUnicodeRanges(hdc, lpgs); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index abcc0e6..f3676af 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4398,6 +4398,91 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) return ret; } +/* Retrieve a list of supported Unicode ranges for a given font. + * Can be called with NULL gs to calculate the buffer size. Returns + * the number of ranges found. + */ +static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) +{ + DWORD num_ranges = 0; + + if (face->charmap->encoding == FT_ENCODING_UNICODE && pFT_Get_First_Char) + { + FT_UInt glyph_code; + FT_ULong char_code, char_code_prev; + + glyph_code = 0; + char_code_prev = char_code = pFT_Get_First_Char(face, &glyph_code); + + TRACE("face encoding FT_ENCODING_UNICODE, number of glyphs %ld, first glyph %u, first char %04lx\n", + face->num_glyphs, glyph_code, char_code); + + if (!glyph_code) return 0; + + if (gs) + { + gs->ranges[0].wcLow = (USHORT)char_code; + gs->ranges[0].cGlyphs = 0; + gs->cGlyphsSupported = 0; + } + + num_ranges = 1; + while (glyph_code) + { + if (char_code < char_code_prev) + { + ERR("expected increasing char code from FT_Get_Next_Char\n"); + return 0; + } + if (char_code - char_code_prev > 1) + { + num_ranges++; + if (gs) + { + gs->ranges[num_ranges - 1].wcLow = (USHORT)char_code; + gs->ranges[num_ranges - 1].cGlyphs = 1; + gs->cGlyphsSupported++; + } + } + else if (gs) + { + gs->ranges[num_ranges - 1].cGlyphs++; + gs->cGlyphsSupported++; + } + char_code_prev = char_code; + char_code = pFT_Get_Next_Char(face, char_code, &glyph_code); + } + } + else + FIXME("encoding %u not supported\n", face->charmap->encoding); + + return num_ranges; +} + +DWORD WineEngGetFontUnicodeRanges(HDC hdc, LPGLYPHSET glyphset) +{ + DWORD size = 0; + DC *dc = DC_GetDCPtr(hdc); + + TRACE("(%p, %p)\n", hdc, glyphset); + + if (!dc) return 0; + + if (dc->gdiFont) + { + DWORD num_ranges = get_font_unicode_ranges(dc->gdiFont->ft_face, glyphset); + + size = sizeof(GLYPHSET) + sizeof(WCRANGE) * (num_ranges - 1); + if (glyphset) + { + glyphset->cbThis = size; + glyphset->cRanges = num_ranges; + } + } + + GDI_ReleaseObj(hdc); + return size; +} /************************************************************* * FontIsLinked @@ -4813,6 +4898,12 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) return FALSE; } +DWORD WineEngGetFontUnicodeRanges(HDC hdc, LPGLYPHSET glyphset) +{ + FIXME("(%p, %p): stub\n", hdc, glyphset); + return 0; +} + BOOL WINAPI FontIsLinked(HDC hdc) { return FALSE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 07e9d49..e43ac30 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -423,6 +423,7 @@ extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer); extern BOOL WineEngGetCharWidth(GdiFont*, UINT, UINT, LPINT); extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD); +extern DWORD WineEngGetFontUnicodeRanges(HDC, LPGLYPHSET); extern DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); extern DWORD WineEngGetGlyphOutline(GdiFont*, UINT glyph, UINT format, diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0a9f8d3..405d4bd 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1088,6 +1088,43 @@ static void test_font_charset(void) skip("Symbol or Wingdings is not installed\n"); } +static void test_GetFontUnicodeRanges(void) +{ + LOGFONTA lf; + HDC hdc; + HFONT hfont, hfont_old; + DWORD size, i; + GLYPHSET *gs; + + memset(&lf, 0, sizeof(lf)); + lstrcpyA(lf.lfFaceName, "Arial"); + hfont = create_font("Arial", &lf); + + hdc = GetDC(0); + hfont_old = SelectObject(hdc, hfont); + + size = GetFontUnicodeRanges(NULL, NULL); + ok(!size, "GetFontUnicodeRanges succeeded unexpectedly\n"); + + size = GetFontUnicodeRanges(hdc, NULL); + ok(size, "GetFontUnicodeRanges failed unexpectedly\n"); + + gs = HeapAlloc(GetProcessHeap(), 0, size); + + size = GetFontUnicodeRanges(hdc, gs); + ok(size, "GetFontUnicodeRanges failed\n"); + + for (i = 0; i < gs->cRanges; i++) + trace("%03d wcLow %04x cGlyphs %u\n", i, gs->ranges[i].wcLow, gs->ranges[i].cGlyphs); + trace("found %u ranges\n", gs->cRanges); + + HeapFree(GetProcessHeap(), 0, gs); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + START_TEST(font) { test_logfont(); @@ -1101,4 +1138,5 @@ START_TEST(font) test_GetOutlineTextMetrics(); test_SetTextJustification(); test_font_charset(); + test_GetFontUnicodeRanges(); }

1 0

Jacek Caban : hhctrl.ocx: Store full chm paths to solve problems with relative paths.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: abe3428f8b944e5e36bb7bcb6bb0ae030fda7b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe3428f8b944e5e36bb7bcb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 1 18:28:09 2007 +0100 hhctrl.ocx: Store full chm paths to solve problems with relative paths. --- dlls/hhctrl.ocx/Makefile.in | 2 +- dlls/hhctrl.ocx/chm.c | 32 ++++++++++++++++++++++++++------ dlls/hhctrl.ocx/content.c | 30 +++++++++++++++--------------- dlls/hhctrl.ocx/hhctrl.h | 2 +- 4 files changed, 43 insertions(+), 23 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 6324282..98bdad8 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = hhctrl.ocx -IMPORTS = advapi32 comctl32 shell32 ole32 oleaut32 user32 gdi32 kernel32 +IMPORTS = advapi32 comctl32 shell32 shlwapi ole32 oleaut32 user32 gdi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 991a13c..493ed5b 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -21,6 +21,8 @@ #include "hhctrl.h" +#include "winreg.h" +#include "shlwapi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); @@ -247,23 +249,38 @@ done: return SUCCEEDED(hr); } -void SetChmPath(ChmPath *file, LPCWSTR path) +void SetChmPath(ChmPath *file, LPCWSTR base_file, LPCWSTR path) { LPCWSTR ptr; static const WCHAR separatorW[] = {':',':',0}; ptr = strstrW(path, separatorW); if(ptr) { - file->chm_file = hhctrl_alloc((ptr-path+1)*sizeof(WCHAR)); - memcpy(file->chm_file, path, (ptr-path)*sizeof(WCHAR)); - file->chm_file[ptr-path] = 0; + WCHAR chm_file[MAX_PATH]; + WCHAR rel_path[MAX_PATH]; + WCHAR base_path[MAX_PATH]; + LPWSTR p; + + strcpyW(base_path, base_file); + p = strrchrW(base_path, '\\'); + if(p) + *p = 0; + + memcpy(rel_path, path, (ptr-path)*sizeof(WCHAR)); + rel_path[ptr-path] = 0; + + PathCombineW(chm_file, base_path, rel_path); + + file->chm_file = strdupW(chm_file); ptr += 2; }else { - file->chm_file = NULL; + file->chm_file = strdupW(base_file); ptr = path; } file->chm_index = strdupW(ptr); + + TRACE("ChmFile = {%s %s}\n", debugstr_w(file->chm_file), debugstr_w(file->chm_index)); } IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) @@ -299,13 +316,16 @@ IStream *GetChmStream(CHMInfo *info, LPCWSTR parent_chm, ChmPath *chm_file) /* Opens the CHM file for reading */ CHMInfo *OpenCHM(LPCWSTR szFile) { + WCHAR file[MAX_PATH] = {0}; + DWORD res; HRESULT hres; static const WCHAR wszSTRINGS[] = {'#','S','T','R','I','N','G','S',0}; CHMInfo *ret = hhctrl_alloc_zero(sizeof(CHMInfo)); - ret->szFile = strdupW(szFile); + res = GetFullPathNameW(szFile, sizeof(file), file, NULL); + ret->szFile = strdupW(file); hres = CoCreateInstance(&CLSID_ITStorage, NULL, CLSCTX_INPROC_SERVER, &IID_IITStorage, (void **) &ret->pITStorage) ; diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 093e6cd..c572baf 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -160,7 +160,7 @@ static const char *get_attr(const char *node, const char *name, int *len) return ptr; } -static void parse_obj_node_param(ContentItem *item, const char *text) +static void parse_obj_node_param(ContentItem *item, ContentItem *hhc_root, const char *text) { const char *ptr; LPWSTR *param, merge; @@ -195,12 +195,12 @@ static void parse_obj_node_param(ContentItem *item, const char *text) (*param)[wlen] = 0; if(param == &merge) { - SetChmPath(&item->merge, merge); + SetChmPath(&item->merge, hhc_root->merge.chm_file, merge); hhctrl_free(merge); } } -static ContentItem *parse_hhc(HHInfo*,IStream*,insert_type_t*); +static ContentItem *parse_hhc(HHInfo*,IStream*,ContentItem*,insert_type_t*); static ContentItem *insert_item(ContentItem *item, ContentItem *new_item, insert_type_t insert_type) { @@ -226,7 +226,8 @@ static ContentItem *insert_item(ContentItem *item, ContentItem *new_item, insert return NULL; } -static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, insert_type_t *insert_type) +static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, ContentItem *hhc_root, + insert_type_t *insert_type) { strbuf_t node, node_name; ContentItem *item; @@ -246,7 +247,7 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, insert_ if(!strcasecmp(node_name.buf, "/object")) break; if(!strcasecmp(node_name.buf, "param")) - parse_obj_node_param(item, node.buf); + parse_obj_node_param(item, hhc_root, node.buf); strbuf_zero(&node); } @@ -259,7 +260,7 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, insert_ merge_stream = GetChmStream(info->pCHMInfo, item->merge.chm_file, &item->merge); if(merge_stream) { - item->child = parse_hhc(info, merge_stream, insert_type); + item->child = parse_hhc(info, merge_stream, hhc_root, insert_type); IStream_Release(merge_stream); }else { WARN("Could not get %s::%s stream\n", debugstr_w(item->merge.chm_file), @@ -271,7 +272,7 @@ static ContentItem *parse_sitemap_object(HHInfo *info, stream_t *stream, insert_ return item; } -static ContentItem *parse_ul(HHInfo *info, stream_t *stream) +static ContentItem *parse_ul(HHInfo *info, stream_t *stream, ContentItem *hhc_root) { strbuf_t node, node_name; ContentItem *ret = NULL, *prev = NULL, *new_item = NULL; @@ -295,13 +296,13 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream) if(ptr && len == sizeof(sz_text_sitemap)-1 && !memcmp(ptr, sz_text_sitemap, len)) { - new_item = parse_sitemap_object(info, stream, &it); + new_item = parse_sitemap_object(info, stream, hhc_root, &it); prev = insert_item(prev, new_item, it); if(!ret) ret = prev; } }else if(!strcasecmp(node_name.buf, "ul")) { - new_item = parse_ul(info, stream); + new_item = parse_ul(info, stream, hhc_root); insert_item(prev, new_item, INSERT_CHILD); }else if(!strcasecmp(node_name.buf, "/ul")) { break; @@ -316,7 +317,8 @@ static ContentItem *parse_ul(HHInfo *info, stream_t *stream) return ret; } -static ContentItem *parse_hhc(HHInfo *info, IStream *str, insert_type_t *insert_type) +static ContentItem *parse_hhc(HHInfo *info, IStream *str, ContentItem *hhc_root, + insert_type_t *insert_type) { stream_t stream; strbuf_t node, node_name; @@ -335,7 +337,7 @@ static ContentItem *parse_hhc(HHInfo *info, IStream *str, insert_type_t *insert_ TRACE("%s\n", node.buf); if(!strcasecmp(node_name.buf, "ul")) { - ContentItem *item = parse_ul(info, &stream); + ContentItem *item = parse_ul(info, &stream, hhc_root); prev = insert_item(prev, item, INSERT_CHILD); if(!ret) ret = prev; @@ -394,9 +396,7 @@ void InitContent(HHInfo *info) insert_type_t insert_type; info->content = hhctrl_alloc_zero(sizeof(ContentItem)); - SetChmPath(&info->content->merge, info->WinType.pszToc); - if(!info->content->merge.chm_file) - info->content->merge.chm_file = strdupW(info->pCHMInfo->szFile); + SetChmPath(&info->content->merge, info->pCHMInfo->szFile, info->WinType.pszToc); stream = GetChmStream(info->pCHMInfo, info->pCHMInfo->szFile, &info->content->merge); if(!stream) { @@ -404,7 +404,7 @@ void InitContent(HHInfo *info) return; } - info->content->child = parse_hhc(info, stream, &insert_type); + info->content->child = parse_hhc(info, stream, info->content, &insert_type); IStream_Release(stream); set_item_parents(NULL, info->content); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 3e97903..7c76fe5 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -113,7 +113,7 @@ void ReleaseContent(HHInfo*); CHMInfo *OpenCHM(LPCWSTR szFile); BOOL LoadWinTypeFromCHM(CHMInfo *pCHMInfo, HH_WINTYPEW *pHHWinType); CHMInfo *CloseCHM(CHMInfo *pCHMInfo); -void SetChmPath(ChmPath*,LPCWSTR); +void SetChmPath(ChmPath*,LPCWSTR,LPCWSTR); IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*); LPWSTR FindContextAlias(CHMInfo*,DWORD);

1 0

Rob Shearman : rpcrt4: Use IPPROTO_TCP for SOL_TCP if SOL_TCP isn't defined .
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 55a103ca5cc7604f979ed8e9919a5f95d233d58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55a103ca5cc7604f979ed8e99… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 1 17:17:54 2007 +0000 rpcrt4: Use IPPROTO_TCP for SOL_TCP if SOL_TCP isn't defined. Fixes compilation on *BSD systems. --- dlls/rpcrt4/rpc_transport.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4d83670..5f3966f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -74,6 +74,10 @@ #include "rpc_server.h" #include "epm_towers.h" +#ifndef SOL_TCP +# define SOL_TCP IPPROTO_TCP +#endif + WINE_DEFAULT_DEBUG_CHANNEL(rpc); static CRITICAL_SECTION connection_pool_cs;

1 0

Huw Davies : wineps.drv: Many MacOSX generated ppd files don' t include a *ColorDevice line. Treat these as if they were colour.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: 9222ec3cced71bbef25876324ed207de1645e2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9222ec3cced71bbef25876324… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 1 14:29:47 2007 +0000 wineps.drv: Many MacOSX generated ppd files don't include a *ColorDevice line. Treat these as if they were colour. --- dlls/wineps.drv/color.c | 4 ++-- dlls/wineps.drv/driver.c | 2 +- dlls/wineps.drv/init.c | 4 ++-- dlls/wineps.drv/ppd.c | 8 ++++++-- dlls/wineps.drv/psdrv.h | 11 ++++++++++- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/wineps.drv/color.c b/dlls/wineps.drv/color.c index 9a7cdb7..3dbbe20 100644 --- a/dlls/wineps.drv/color.c +++ b/dlls/wineps.drv/color.c @@ -84,7 +84,7 @@ BOOL PSDRV_CopyColor(PSCOLOR *col1, PSCOLOR *col2) * PSDRV_CreateColor * * Creates a PostScript colour from a COLORREF. - * Result is grey scale if ColorDevice field of ppd is FALSE else an + * Result is grey scale if ColorDevice field of ppd is CD_False else an * rgb colour is produced. */ void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor, @@ -100,7 +100,7 @@ void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor, g = ((wincolor >> 8) & 0xff) / 256.0; b = ((wincolor >> 16) & 0xff) / 256.0; - if(physDev->pi->ppd->ColorDevice) { + if(physDev->pi->ppd->ColorDevice != CD_False) { pscolor->type = PSCOLOR_RGB; pscolor->value.rgb.r = r; pscolor->value.rgb.g = g; diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index fececd7..124070e 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -632,7 +632,7 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP /* Printer supports colour printing - 1 if yes, 0 if no (Win2k/XP only) */ case DC_COLORDEVICE: - return pi->ppd->ColorDevice; + return (pi->ppd->ColorDevice != CD_False) ? TRUE : FALSE; /* Identification number of the printer manufacturer for use with ICM (Win9x only) */ case DC_MANUFACTURER: diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 1bd56ca..bd9c16c 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -430,7 +430,7 @@ INT PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) case VERTRES: return physDev->vertRes; case BITSPIXEL: - return physDev->pi->ppd->ColorDevice ? 8 : 1; + return (physDev->pi->ppd->ColorDevice != CD_False) ? 8 : 1; case PLANES: return 1; case NUMBRUSHES: @@ -442,7 +442,7 @@ INT PSDRV_GetDeviceCaps( PSDRV_PDEVICE *physDev, INT cap ) case NUMFONTS: return 39; case NUMCOLORS: - return (physDev->pi->ppd->ColorDevice ? 256 : -1); + return (physDev->pi->ppd->ColorDevice != CD_False) ? 256 : -1; case PDEVICESIZE: return sizeof(PSDRV_PDEVICE); case CURVECAPS: diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 9b7169b..a5aea3b 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -572,6 +572,8 @@ PPD *PSDRV_ParsePPD(char *fname) return NULL; } + ppd->ColorDevice = CD_NotSpecified; + /* * The Windows PostScript drivers create the following "virtual bin" for * every PostScript printer @@ -599,8 +601,10 @@ PPD *PSDRV_ParsePPD(char *fname) else if(!strcmp("*ColorDevice", tuple.key)) { if(!strcasecmp(tuple.value, "true")) - ppd->ColorDevice = TRUE; - TRACE("ColorDevice = %d\n", (int)ppd->ColorDevice); + ppd->ColorDevice = CD_True; + else + ppd->ColorDevice = CD_False; + TRACE("ColorDevice = %s\n", ppd->ColorDevice == CD_True ? "True" : "False"); } else if((!strcmp("*DefaultResolution", tuple.key)) || diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 74abe39..7794a89 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -191,10 +191,19 @@ typedef struct _tagDUPLEX { struct _tagDUPLEX *next; } DUPLEX; +/* Many MacOSX based ppd files don't include a *ColorDevice line, so + we use a tristate here rather than a boolean. Code that + cares is expected to treat these as if they were colour. */ +typedef enum { + CD_NotSpecified, + CD_False, + CD_True +} COLORDEVICE; + typedef struct { char *NickName; int LanguageLevel; - BOOL ColorDevice; + COLORDEVICE ColorDevice; int DefaultResolution; signed int LandscapeOrientation; char *JCLBegin;

1 0

Mikołaj Zalewski : comctl32: header tests: Support different window border width.
by Alexandre Julliard March 1, 2007

March 1, 2007

Module: wine Branch: master Commit: beff84c1d3b96961f1ce5848ee0bf221e98decb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beff84c1d3b96961f1ce5848e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Mar 1 13:45:09 2007 +0100 comctl32: header tests: Support different window border width. --- dlls/comctl32/tests/header.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 29ef9aa..5b1234d 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1052,7 +1052,9 @@ static void init(void) { RegisterClassA(&wc); hHeaderParentWnd = CreateWindowExA(0, "HeaderTestClass", "Header test", WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); + CW_USEDEFAULT, CW_USEDEFAULT, 672+2*GetSystemMetrics(SM_CXSIZEFRAME), + 226+GetSystemMetrics(SM_CYCAPTION)+2*GetSystemMetrics(SM_CYSIZEFRAME), + NULL, NULL, GetModuleHandleA(NULL), 0); assert(hHeaderParentWnd != NULL); ShowWindow(hHeaderParentWnd, SW_SHOW); }

1 0