August 2008 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Implement CTL decoding.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: ff0760dcd39adae42cfa8bd3dca460de1e099eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0760dcd39adae42cfa8bd3d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 27 14:15:57 2008 -0700 crypt32: Implement CTL decoding. --- dlls/crypt32/decode.c | 118 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 16 +----- 2 files changed, 121 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff0760dcd39adae42cfa8…

1 0

Adam Petaccia : gdiplus: Stub GdipGetFontStyle.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: 6dc67fd0d01f9eb8514e53ca974748cc34ee613a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc67fd0d01f9eb8514e53ca9… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:21:39 2008 -0400 gdiplus: Stub GdipGetFontStyle. --- dlls/gdiplus/font.c | 7 +++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6ed18ae..a38fb0b 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -295,6 +295,13 @@ GpStatus WINGDIPAPI GdipGetFontSize(GpFont *font, REAL *size) return Ok; } +GpStatus WINGDIPAPI GdipGetFontStyle(GpFont *font, INT *style) +{ + FIXME("stub: %p %p\n", font, style); + + return NotImplemented; +} + /******************************************************************************* * GdipGetFontUnit [GDIPLUS.@] * diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3cf9544..3766dc1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -270,7 +270,7 @@ @ stub GdipGetFontHeight @ stdcall GdipGetFontHeightGivenDPI(ptr long ptr) @ stdcall GdipGetFontSize(ptr ptr) -@ stub GdipGetFontStyle +@ stdcall GdipGetFontStyle(ptr ptr) @ stdcall GdipGetFontUnit(ptr ptr) @ stdcall GdipGetGenericFontFamilyMonospace(ptr) @ stdcall GdipGetGenericFontFamilySansSerif(ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 37476d8..320f02d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -437,6 +437,7 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**); GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*); GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*); +GpStatus WINGDIPAPI GdipGetFontStyle(GpFont*, INT*); GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*); GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*,

1 0

Adam Petaccia : gdiplus: Stub GdipGetFamily.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: cb39d787e41177c62f3ca3a8704eab6350e06a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb39d787e41177c62f3ca3a87… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:21:34 2008 -0400 gdiplus: Stub GdipGetFamily. --- dlls/gdiplus/font.c | 20 ++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 70f7bb0..6ed18ae 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -250,6 +250,26 @@ GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC hdc, GpFont **font) return GdipCreateFontFromLogfontW(hdc, &lfw, font); } +/******************************************************************************* + * GdipGetFamily [GDIPLUS.@] + * + * Returns the FontFamily for the specified Font + * + * PARAMS + * font [I] Font to request from + * family [O] Resulting FontFamily object + * + * RETURNS + * SUCCESS: Ok + * FAILURE: An element of GpStatus + */ +GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) +{ + FIXME("stub: %p %p\n", font, family); + + return NotImplemented; +} + /****************************************************************************** * GdipGetFontSize [GDIPLUS.@] * diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b45f917..3cf9544 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -263,7 +263,7 @@ @ stdcall GdipGetEmHeight(ptr long ptr) @ stub GdipGetEncoderParameterList @ stub GdipGetEncoderParameterListSize -@ stub GdipGetFamily +@ stdcall GdipGetFamily(ptr ptr) @ stdcall GdipGetFamilyName(ptr ptr long) @ stdcall GdipGetFontCollectionFamilyCount(ptr ptr) @ stdcall GdipGetFontCollectionFamilyList(ptr long ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ec72087..37476d8 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -434,6 +434,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC,GDIPCONST LOGFONTW*,GpFont**) GpStatus WINGDIPAPI GdipDeleteFont(GpFont*); GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); +GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**); GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*); GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*); GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*);

1 0

Juan Lang : crypt32: Implement encoding CTLs.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: a96361361d03601377fff8fe32b8c01523c3b5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a96361361d03601377fff8fe3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 27 13:21:50 2008 -0700 crypt32: Implement encoding CTLs. --- dlls/crypt32/encode.c | 198 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 11 --- 2 files changed, 198 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a96361361d03601377fff…

1 0

Juan Lang : crypt32: Add tests for encoding/decoding CTLs.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: 26d643d3e5adb747d4f2780452316415a1ac1dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d643d3e5adb747d4f278045… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 27 11:06:48 2008 -0700 crypt32: Add tests for encoding/decoding CTLs. --- dlls/crypt32/tests/encode.c | 531 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 531 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26d643d3e5adb747d4f27…

1 0

Alexander Nicolaysen Sørnes : regedit: Use Unicode strings when updating listview.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: 4aabdecd67814991a1372dc05273bc680fe3cd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aabdecd67814991a1372dc05… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 27 20:40:31 2008 +0200 regedit: Use Unicode strings when updating listview. --- programs/regedit/childwnd.c | 5 ++- programs/regedit/framewnd.c | 32 +++++++++++++++------- programs/regedit/listview.c | 63 +++++++++++++++++++++++++++++------------- programs/regedit/main.h | 4 +- 4 files changed, 70 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4aabdecd67814991a1372…

1 0

Alexander Nicolaysen Sørnes : regedit: Avoid conversion to ANSI when importing hex values.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: f7ff9e76f9b32759d8d1f79ce440762debfad4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ff9e76f9b32759d8d1f79ce… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Aug 27 23:29:08 2008 +0200 regedit: Avoid conversion to ANSI when importing hex values. --- programs/regedit/regproc.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b65595e..eb724be 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -113,28 +113,28 @@ static BOOL convertHexToDWord(WCHAR* str, DWORD *dw) /****************************************************************************** * Converts a hex comma separated values list into a binary string. */ -static BYTE* convertHexCSVToHex(WCHAR *strW, DWORD *size) +static BYTE* convertHexCSVToHex(WCHAR *str, DWORD *size) { - char *s; + WCHAR *s; BYTE *d, *data; - char* strA = GetMultiByteString(strW); /* The worst case is 1 digit + 1 comma per byte */ - *size=(strlen(strA)+1)/2; + *size=(lstrlenW(str)+1)/2; data=HeapAlloc(GetProcessHeap(), 0, *size); CHECK_ENOUGH_MEMORY(data); - s = strA; + s = str; d = data; *size=0; while (*s != '\0') { UINT wc; - char *end; + WCHAR *end; - wc = strtoul(s,&end,16); + wc = strtoulW(s,&end,16); if (end == s || wc > 0xff || (*end && *end != ',')) { + char* strA = GetMultiByteString(s); fprintf(stderr,"%s: ERROR converting CSV hex stream. Invalid value at '%s'\n", - getAppName(), s); + getAppName(), strA); HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, strA); return NULL; @@ -145,8 +145,6 @@ static BYTE* convertHexCSVToHex(WCHAR *strW, DWORD *size) s = end; } - HeapFree(GetProcessHeap(), 0, strA); - return data; }

1 0

Alexander Nicolaysen Sørnes : regedit: Fix concat handling for ANSI files.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: b058648ae3be6f4bb8cbace3ad63be2777b50b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b058648ae3be6f4bb8cbace3a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Aug 25 23:38:53 2008 +0200 regedit: Fix concat handling for ANSI files. --- programs/regedit/regproc.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 8f05a2d..b65595e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -666,13 +666,22 @@ void processRegLinesA(FILE *in) if (s_eol > line && *(s_eol-1) == '\\') { int c; s = s_eol-1; - /* The following error protection could be made more self- - * correcting but I thought it not worth trying. - */ - if ((c = fgetc (in)) == EOF || c != ' ' || - (c = fgetc (in)) == EOF || c != ' ') + + do + { + c = fgetc(in); + } while(c == ' ' || c == '\t'); + + if(c == EOF) + { fprintf(stderr,"%s: ERROR - invalid continuation.\n", getAppName()); + } + else + { + *s = c; + s++; + } continue; }

1 0

Lei Zhang : wininet: Remove redundant CrLf variables.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: f7e56d19c45f5b87bade0c4ecca3aa24d0264360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e56d19c45f5b87bade0c4ec… Author: Lei Zhang <thestig(a)google.com> Date: Wed Aug 27 17:03:13 2008 -0700 wininet: Remove redundant CrLf variables. --- dlls/wininet/http.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b8ecb47..00dfa0f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -74,6 +74,7 @@ static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u',' static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 }; static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0}; static const WCHAR szGET[] = { 'G','E','T', 0 }; +static const WCHAR szCrLf[] = {'\r','\n', 0}; #define MAXHOSTNAME 100 #define MAX_FIELD_VALUE_LEN 256 @@ -256,7 +257,6 @@ static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR ve LPWSTR p; static const WCHAR szSpace[] = { ' ',0 }; - static const WCHAR szcrlf[] = {'\r','\n', 0}; static const WCHAR szColon[] = { ':',' ',0 }; static const WCHAR sztwocrlf[] = {'\r','\n','\r','\n', 0}; @@ -277,7 +277,7 @@ static LPWSTR HTTP_BuildHeaderRequestString( LPWININETHTTPREQW lpwhr, LPCWSTR ve { if (lpwhr->pCustHeaders[i].wFlags & HDR_ISREQUEST) { - req[n++] = szcrlf; + req[n++] = szCrLf; req[n++] = lpwhr->pCustHeaders[i].lpszField; req[n++] = szColon; req[n++] = lpwhr->pCustHeaders[i].lpszValue; @@ -2189,7 +2189,6 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev LPWSTR headers; DWORD len = 0; BOOL ret = FALSE; - static const WCHAR CRLF[] = {'\r','\n',0}; if (request_only) headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion); @@ -2211,8 +2210,8 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev memcpy(lpBuffer, headers, len + sizeof(WCHAR)); else { - len = strlenW(CRLF) * sizeof(WCHAR); - memcpy(lpBuffer, CRLF, sizeof(CRLF)); + len = strlenW(szCrLf) * sizeof(WCHAR); + memcpy(lpBuffer, szCrLf, sizeof(szCrLf)); } TRACE("returning data: %s\n", debugstr_wn(lpBuffer, len / sizeof(WCHAR))); ret = TRUE; @@ -2225,7 +2224,6 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev } case HTTP_QUERY_RAW_HEADERS: { - static const WCHAR szCrLf[] = {'\r','\n',0}; LPWSTR * ppszRawHeaderLines = HTTP_Tokenize(lpwhr->lpszRawHeaders, szCrLf); DWORD i, size = 0; LPWSTR pszString = (WCHAR*)lpBuffer; @@ -3145,14 +3143,13 @@ static void HTTP_InsertCookies(LPWININETHTTPREQW lpwhr) { int cnt = 0; static const WCHAR szCookie[] = {'C','o','o','k','i','e',':',' ',0}; - static const WCHAR szcrlf[] = {'\r','\n',0}; - size = sizeof(szCookie) + nCookieSize * sizeof(WCHAR) + sizeof(szcrlf); + size = sizeof(szCookie) + nCookieSize * sizeof(WCHAR) + sizeof(szCrLf); if ((lpszCookies = HeapAlloc(GetProcessHeap(), 0, size))) { cnt += sprintfW(lpszCookies, szCookie); InternetGetCookieW(lpszUrl, NULL, lpszCookies + cnt, &nCookieSize); - strcatW(lpszCookies, szcrlf); + strcatW(lpszCookies, szCrLf); HTTP_HttpAddRequestHeadersW(lpwhr, lpszCookies, strlenW(lpszCookies), HTTP_ADDREQ_FLAG_ADD); HeapFree(GetProcessHeap(), 0, lpszCookies); @@ -3722,7 +3719,6 @@ static INT HTTP_GetResponseHeaders(LPWININETHTTPREQW lpwhr, BOOL clear) DWORD buflen = MAX_REPLY_LEN; BOOL bSuccess = FALSE; INT rc = 0; - static const WCHAR szCrLf[] = {'\r','\n',0}; static const WCHAR szHundred[] = {'1','0','0',0}; char bufferA[MAX_REPLY_LEN]; LPWSTR status_code, status_text;

1 0

Lei Zhang : wininet: Work around NULL headers when handling HTTP_QUERY_RAW_HEADERS_CRLF.
by Alexandre Julliard Aug. 28, 2008

Aug. 28, 2008

Module: wine Branch: master Commit: bc9e214f6fb2ea68c9fcd7f635c47f3e85fc695c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9e214f6fb2ea68c9fcd7f63… Author: Lei Zhang <thestig(a)google.com> Date: Wed Aug 27 16:54:17 2008 -0700 wininet: Work around NULL headers when handling HTTP_QUERY_RAW_HEADERS_CRLF. --- dlls/wininet/http.c | 15 ++++++++++++--- dlls/wininet/tests/http.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4630f3b..b8ecb47 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2187,15 +2187,18 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev case HTTP_QUERY_RAW_HEADERS_CRLF: { LPWSTR headers; - DWORD len; + DWORD len = 0; BOOL ret = FALSE; + static const WCHAR CRLF[] = {'\r','\n',0}; if (request_only) headers = HTTP_BuildHeaderRequestString(lpwhr, lpwhr->lpszVerb, lpwhr->lpszPath, lpwhr->lpszVersion); else headers = lpwhr->lpszRawHeaders; - len = strlenW(headers) * sizeof(WCHAR); + if (headers) + len = strlenW(headers) * sizeof(WCHAR); + if (len + sizeof(WCHAR) > *lpdwBufferLength) { len += sizeof(WCHAR); @@ -2204,7 +2207,13 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev } else if (lpBuffer) { - memcpy(lpBuffer, headers, len + sizeof(WCHAR)); + if (headers) + memcpy(lpBuffer, headers, len + sizeof(WCHAR)); + else + { + len = strlenW(CRLF) * sizeof(WCHAR); + memcpy(lpBuffer, CRLF, sizeof(CRLF)); + } TRACE("returning data: %s\n", debugstr_wn(lpBuffer, len / sizeof(WCHAR))); ret = TRUE; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 9ad6274..1c52f27 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1208,6 +1208,16 @@ static void HttpHeaders_test(void) /* end of W version tests */ + /* Without HTTP_QUERY_FLAG_REQUEST_HEADERS */ + index = 0; + len = sizeof(buffer); + memset(buffer, 'x', sizeof(buffer)); + ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF, + buffer,&len,&index) == TRUE,"Query failed\n"); + ok(len == 2, "Expected 2, got %d\n", len); + ok(strcmp(buffer, "\r\n") == 0, "Expected CRLF, got '%s'\n", buffer); + ok(index == 0, "Index was incremented\n"); + ok(HttpAddRequestHeaders(hRequest,"Warning:test2",-1,HTTP_ADDREQ_FLAG_ADD), "Failed to add duplicate header using HTTP_ADDREQ_FLAG_ADD\n");

1 0