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

Colin Finck : kernel32: Add a lot of new tests for the actual WideCharToMultiByte string conversion as well .
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: c2c1a55f1c08f35ae02b811d1141acd6ec76fca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c1a55f1c08f35ae02b811d1… Author: Colin Finck <mail(a)colinfinck.de> Date: Sun Jul 27 21:16:59 2008 +0200 kernel32: Add a lot of new tests for the actual WideCharToMultiByte string conversion as well. --- dlls/kernel32/tests/codepage.c | 134 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 134 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index e8908f7..a20a306 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -2,6 +2,7 @@ * Unit tests for code page to/from unicode translations * * Copyright (c) 2002 Dmitry Timoshkov + * Copyright (c) 2008 Colin Finck * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -203,17 +204,150 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; + SetLastError(0xdeadbeef); memcpy((WCHAR *)(buf + 1), strW, sizeof(strW)); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); +} + +static void test_string_conversion(LPBOOL bUsedDefaultChar) +{ + char mbc; + char mbs[5]; + int ret; + WCHAR wc1 = 228; /* Western Windows-1252 character */ + WCHAR wc2 = 1088; /* Russian Windows-1251 character not displayable for Windows-1252 */ + WCHAR wcs[5] = {'T', 'h', 1088, 'i', 0}; /* String with ASCII characters and a Russian character */ + WCHAR dbwcs[3] = {28953, 25152, 0}; /* String with Chinese (codepage 950) characters */ + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + ok(ret == 1, "ret is %d\n", ret); + ok(mbc == -28, "mbc is %d\n", mbc); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + ok(ret == 1, "ret is %d\n", ret); + ok(mbc == 63, "mbc is %d\n", mbc); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1251, 0, &wc2, 1, &mbc, 1, NULL, bUsedDefaultChar); + ok(ret == 1, "ret is %d\n", ret); + ok(mbc == -16, "mbc is %d\n", mbc); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1251, 0, &wc1, 1, &mbc, 1, NULL, bUsedDefaultChar); + ok(ret == 1, "ret is %d\n", ret); + ok(mbc == 97, "mbc is %d\n", mbc); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + /* This call triggers the last Win32 error */ + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, wcs, -1, &mbc, 1, NULL, bUsedDefaultChar); + ok(ret == 0, "ret is %d\n", ret); + ok(mbc == 84, "mbc is %d\n", mbc); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, wcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ok(ret == 5, "ret is %d\n", ret); + ok(!strcmp(mbs, "Th?i"), "mbs is %s\n", mbs); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + mbs[0] = 0; + + /* WideCharToMultiByte mustn't add any null character automatically. + So in this case, we should get the same string again, even if we only copied the first three bytes. */ + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ok(ret == 3, "ret is %d\n", ret); + ok(!strcmp(mbs, "Th?i"), "mbs is %s\n", mbs); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + ZeroMemory(mbs, 5); + + /* Now this shouldn't be the case like above as we zeroed the complete string buffer. */ + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, wcs, 3, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ok(ret == 3, "ret is %d\n", ret); + ok(!strcmp(mbs, "Th?"), "mbs is %s\n", mbs); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + /* Double-byte tests */ + ret = WideCharToMultiByte(1252, 0, dbwcs, 5, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ok(ret == 5, "ret is %d\n", ret); + ok(!strcmp(mbs, "??"), "mbs is %s\n", mbs); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(950, 0, dbwcs, -1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ok(ret == 5, "ret is %d\n", ret); + ok(!strcmp(mbs, "�H��"), "mbs is %s\n", mbs); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(950, 0, dbwcs, 1, &mbc, 1, NULL, bUsedDefaultChar); + ok(ret == 0, "ret is %d\n", ret); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() is %u\n", GetLastError()); + ZeroMemory(mbs, 5); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(950, 0, dbwcs, 1, mbs, sizeof(mbs), NULL, bUsedDefaultChar); + ok(ret == 2, "ret is %d\n", ret); + ok(!strcmp(mbs, "�H"), "mbs is %s\n", mbs); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + /* Length-only tests */ + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, &wc2, 1, NULL, 0, NULL, bUsedDefaultChar); + ok(ret == 1, "ret is %d\n", ret); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(1252, 0, wcs, -1, NULL, 0, NULL, bUsedDefaultChar); + ok(ret == 5, "ret is %d\n", ret); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == TRUE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(950, 0, dbwcs, 1, NULL, 0, NULL, bUsedDefaultChar); + ok(ret == 2, "ret is %d\n", ret); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WideCharToMultiByte(950, 0, dbwcs, -1, NULL, 0, NULL, bUsedDefaultChar); + ok(ret == 5, "ret is %d\n", ret); + if(bUsedDefaultChar) ok(*bUsedDefaultChar == FALSE, "bUsedDefaultChar is %d\n", *bUsedDefaultChar); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } START_TEST(codepage) { + BOOL bUsedDefaultChar; + test_destination_buffer(); test_null_source(); test_negative_source_length(); test_negative_dest_length(); test_overlapped_buffers(); + + /* WideCharToMultiByte has two code pathes, test both here */ + test_string_conversion(NULL); + test_string_conversion(&bUsedDefaultChar); }

1 0

Colin Finck : Fix some hackish usages of WideCharToMultiByte.
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: a33d7fc8c9e8fd68219100acc6595799e6725233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33d7fc8c9e8fd68219100acc… Author: Colin Finck <mail(a)colinfinck.de> Date: Tue Jul 29 14:35:25 2008 +0200 Fix some hackish usages of WideCharToMultiByte. --- dlls/comdlg32/fontdlg.c | 2 +- dlls/wininet/urlcache.c | 2 +- programs/winecfg/theme.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 2532f2f..9174ce0 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1072,7 +1072,7 @@ static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam, LPCHOOSEFO LF_FACESIZE, lpcfa->lpLogFont->lfFaceName, LF_FACESIZE, 0, 0); if((lpcfw->Flags & CF_USESTYLE) && lpcfw->lpszStyle) { - len = WideCharToMultiByte(CP_ACP, 0, lpcfw->lpszStyle, -1, NULL, -1, 0, 0); + len = WideCharToMultiByte(CP_ACP, 0, lpcfw->lpszStyle, -1, NULL, 0, 0, 0); WideCharToMultiByte(CP_ACP, 0, lpcfw->lpszStyle, -1, lpcfa->lpszStyle, len, 0, 0); HeapFree(GetProcessHeap(), 0, lpcfw->lpszStyle); } diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index e175a7b..1cfa8de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2339,7 +2339,7 @@ static BOOL WINAPI CommitUrlCacheEntryInternal( /* skip container path prefix */ lpszLocalFileName += lstrlenW(pContainer->path); - WideCharToMultiByte(CP_ACP, 0, lpszLocalFileName, -1, achFile, -1, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, lpszLocalFileName, -1, achFile, MAX_PATH, NULL, NULL); pchLocalFileName = achFile; for (cDirectory = 0; cDirectory < pHeader->DirectoryCount; cDirectory++) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index abd016d..cdab531 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -554,7 +554,7 @@ static void set_color_from_theme(WCHAR *keyName, COLORREF color) keyNameSize = WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, 0, NULL, NULL); keyNameA = HeapAlloc(GetProcessHeap(), 0, keyNameSize); - WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, -1, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, keyName, -1, keyNameA, keyNameSize, NULL, NULL); for (i=0; i<sizeof(metrics)/sizeof(metrics[0]); i++) { @@ -593,7 +593,7 @@ static void do_parse_theme(WCHAR *file) keyNameValueSize = WideCharToMultiByte(CP_ACP, 0, keyNameValue, -1, keyNameValueA, 0, NULL, NULL); keyNameValueA = HeapAlloc(GetProcessHeap(), 0, keyNameValueSize); - WideCharToMultiByte(CP_ACP, 0, keyNameValue, -1, keyNameValueA, -1, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, keyNameValue, -1, keyNameValueA, keyNameValueSize, NULL, NULL); WINE_TRACE("parsing key: %s with value: %s\n", wine_dbgstr_w(keyNamePtr), wine_dbgstr_w(keyNameValue));

1 0

Dan Kegel : wininet: HTTP_QUERY_RAW_HEADERS_CRLF length shouldn' t include nul.
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: 1e7f89194cec6693cea3c4fdec5702d8ccaa7eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7f89194cec6693cea3c4fde… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Jul 30 06:49:04 2008 -0700 wininet: HTTP_QUERY_RAW_HEADERS_CRLF length shouldn't include nul. --- dlls/wininet/http.c | 7 ++++--- dlls/wininet/tests/http.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2a78670..ba82a84 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2195,15 +2195,16 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPWININETHTTPREQW lpwhr, DWORD dwInfoLev else headers = lpwhr->lpszRawHeaders; - len = (strlenW(headers) + 1) * sizeof(WCHAR); - if (len > *lpdwBufferLength) + len = strlenW(headers) * sizeof(WCHAR); + if (len + sizeof(WCHAR) > *lpdwBufferLength) { + len += sizeof(WCHAR); INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); ret = FALSE; } else if (lpBuffer) { - memcpy(lpBuffer, headers, len); + memcpy(lpBuffer, headers, len + sizeof(WCHAR)); 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 8209b22..0c4483b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1072,7 +1072,9 @@ static void HttpHeaders_test(void) HINTERNET hConnect; HINTERNET hRequest; CHAR buffer[256]; + WCHAR wbuffer[256]; DWORD len = 256; + DWORD oldlen; DWORD index = 0; hSession = InternetOpen("Wine Regression Test", @@ -1150,19 +1152,47 @@ static void HttpHeaders_test(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); ok(len > 40, "Invalid length (exp. more than 40, got %d)\n", len); ok(index == 0, "Index was incremented\n"); + oldlen = len; /* bytes; at least long enough to hold buffer & nul */ /* a working query */ index = 0; len = sizeof(buffer); + memset(buffer, 'x', sizeof(buffer)); ok(HttpQueryInfo(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index),"Unable to query header\n"); + ok(len + sizeof(CHAR) <= oldlen, "Result longer than advertised\n"); + ok((len < sizeof(buffer)-sizeof(CHAR)) && (buffer[len/sizeof(CHAR)] == 0),"No NUL at end\n"); + ok(len == strlen(buffer) * sizeof(CHAR), "Length wrong\n"); /* what's in the middle differs between Wine and Windows so currently we check only the beginning and the end */ ok(strncmp(buffer, "POST /posttest.php HTTP/1", 25)==0, "Invalid beginning of headers string\n"); ok(strcmp(buffer + strlen(buffer) - 4, "\r\n\r\n")==0, "Invalid end of headers string\n"); ok(index == 0, "Index was incremented\n"); + /* Like above two tests, but for W version */ + index = 0; + len = 0; + SetLastError(0xdeadbeef); + ok(HttpQueryInfoW(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + NULL,&len,&index) == FALSE,"Query worked\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Unexpected last error: %d\n", GetLastError()); + ok(len > 80, "Invalid length (exp. more than 80, got %d)\n", len); + ok(index == 0, "Index was incremented\n"); + oldlen = len; /* bytes; at least long enough to hold buffer & nul */ + + /* a working query */ + index = 0; + len = sizeof(wbuffer); + memset(wbuffer, 'x', sizeof(wbuffer)); + ok(HttpQueryInfoW(hRequest,HTTP_QUERY_RAW_HEADERS_CRLF|HTTP_QUERY_FLAG_REQUEST_HEADERS, + wbuffer,&len,&index),"Unable to query header\n"); + ok(len + sizeof(WCHAR) <= oldlen, "Result longer than advertised\n"); + ok(len == lstrlenW(wbuffer) * sizeof(WCHAR), "Length wrong\n"); + ok((len < sizeof(wbuffer)-sizeof(WCHAR)) && (wbuffer[len/sizeof(WCHAR)] == 0),"No NUL at end\n"); + ok(index == 0, "Index was incremented\n"); + + /* end of W version tests */ ok(HttpAddRequestHeaders(hRequest,"Warning:test2",-1,HTTP_ADDREQ_FLAG_ADD), "Failed to add duplicate header using HTTP_ADDREQ_FLAG_ADD\n");

1 0

Vladimir Pankratov : netapi32: Add stub for NetGroupEnum.
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: ae71af004b103e3fdd29fadfdf4d4031fe563262 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae71af004b103e3fdd29fadfd… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Thu Jul 31 12:00:31 2008 +0500 netapi32: Add stub for NetGroupEnum. --- dlls/netapi32/access.c | 12 ++++++++++++ dlls/netapi32/netapi32.spec | 2 +- include/lmaccess.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 4fdf60a..5da07a6 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -689,6 +689,18 @@ NetGetDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr) return NERR_DCNotFound; /* say we can't find a domain controller */ } +/************************************************************ + * NetGroupEnum (NETAPI32.@) + * + */ +NET_API_STATUS WINAPI +NetGroupEnum(LPCWSTR servername, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen, + LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) +{ + FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), + level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); + return ERROR_ACCESS_DENIED; +} /****************************************************************************** * NetUserModalsGet (NETAPI32.@) diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 4b53e79..8f1a544 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -98,7 +98,7 @@ @ stub NetGroupAddUser @ stub NetGroupDel @ stub NetGroupDelUser -@ stub NetGroupEnum +@ stdcall NetGroupEnum(wstr long ptr long ptr ptr ptr) @ stub NetGroupGetInfo @ stub NetGroupGetUsers @ stub NetGroupSetInfo diff --git a/include/lmaccess.h b/include/lmaccess.h index b3372d7..c29a40c 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -449,6 +449,7 @@ typedef struct _LOCALGROUP_USERS_INFO_0 { #define LOCALGROUP_COMMENT_PARMNUM 2 NET_API_STATUS WINAPI NetGetDCName(LPCWSTR,LPCWSTR,LPBYTE*); +NET_API_STATUS WINAPI NetGroupEnum(LPCWSTR,DWORD,LPBYTE*,DWORD,LPDWORD,LPDWORD,LPDWORD); NET_API_STATUS WINAPI NetLocalGroupAdd(LPCWSTR,DWORD,LPBYTE,LPDWORD); NET_API_STATUS WINAPI NetLocalGroupAddMember(LPCWSTR,LPCWSTR,PSID); NET_API_STATUS WINAPI NetLocalGroupAddMembers(LPCWSTR,LPCWSTR,DWORD,LPBYTE,DWORD);

1 0

Andrew Talbot : d3dxof: Sign-compare warning fix.
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: d835bc333d7c372d3657f3390fe230d8bba308d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d835bc333d7c372d3657f3390… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 28 22:37:29 2008 +0100 d3dxof: Sign-compare warning fix. --- dlls/d3dxof/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index 432109a..e347d9e 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -184,9 +184,9 @@ HRESULT WINAPI DirectXFileCreate(LPDIRECTXFILE* lplpDirectXFile) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - int i; + unsigned int i; IClassFactoryImpl *factory; - + TRACE("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if ( !IsEqualGUID( &IID_IClassFactory, riid )

1 0

Aric Stewart : wined3d: Rework surface Blt a bit to only lock the part of the destination surface being drawn to .
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: eb4ee4f4ada6d02aeb26b0e12964b208ecc68b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb4ee4f4ada6d02aeb26b0e12… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 30 10:01:08 2008 -0500 wined3d: Rework surface Blt a bit to only lock the part of the destination surface being drawn to. --- dlls/wined3d/surface_base.c | 122 +++++++++++++++++++++++-------------------- 1 files changed, 65 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 916a3a4..400c7a7 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -891,45 +891,7 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, (SrcRect->left >= (int) Src->currentDesc.Width)) )) { TRACE("Nothing to be done !\n"); - return WINED3D_OK; - } - - if (Src == This) - { - IWineD3DSurface_LockRect(iface, &dlock, NULL, 0); - dfmt = This->resource.format; - slock = dlock; - sfmt = dfmt; - sEntry = getFormatDescEntry(sfmt, NULL, NULL); - dEntry = sEntry; - } - else - { - dfmt = This->resource.format; - dEntry = getFormatDescEntry(dfmt, NULL, NULL); - if (Src) - { - if(This->resource.format != Src->resource.format) { - Src = surface_convert_format(Src, dfmt); - if(!Src) { - /* The conv function writes a FIXME */ - WARN("Cannot convert source surface format to dest format\n"); - goto release; - } - } - IWineD3DSurface_LockRect((IWineD3DSurface *) Src, &slock, NULL, WINED3DLOCK_READONLY); - sfmt = Src->resource.format; - } - sEntry = getFormatDescEntry(sfmt, NULL, NULL); - IWineD3DSurface_LockRect(iface, &dlock,NULL,0); - } - - if (!DDBltFx || !(DDBltFx->dwDDFX)) Flags &= ~WINEDDBLT_DDFX; - - if (sEntry->isFourcc && dEntry->isFourcc) - { - memcpy(dlock.pBits, slock.pBits, This->resource.size); - goto release; + return WINED3D_OK; } if (DestRect) @@ -963,9 +925,8 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, } } - /* The easy case : the source-less blits.... */ - if (Src == NULL) + if (Src == NULL && DestRect) { RECT full_rect; RECT temp_rect; /* No idea if intersect rect can be the same as one of the source rect */ @@ -974,44 +935,44 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, full_rect.top = 0; full_rect.right = This->currentDesc.Width; full_rect.bottom = This->currentDesc.Height; - IntersectRect(&temp_rect, &full_rect, &xdst); + IntersectRect(&temp_rect, &full_rect, DestRect); xdst = temp_rect; } - else + else if (DestRect) { /* Only handle clipping on the destination rectangle */ - int clip_horiz = (xdst.left < 0) || (xdst.right > (int) This->currentDesc.Width ); - int clip_vert = (xdst.top < 0) || (xdst.bottom > (int) This->currentDesc.Height); + int clip_horiz = (DestRect->left < 0) || (DestRect->right > (int) This->currentDesc.Width ); + int clip_vert = (DestRect->top < 0) || (DestRect->bottom > (int) This->currentDesc.Height); if (clip_vert || clip_horiz) { /* Now check if this is a special case or not... */ - if ((((xdst.bottom - xdst.top ) != (xsrc.bottom - xsrc.top )) && clip_vert ) || - (((xdst.right - xdst.left) != (xsrc.right - xsrc.left)) && clip_horiz) || + if ((((DestRect->bottom - DestRect->top ) != (xsrc.bottom - xsrc.top )) && clip_vert ) || + (((DestRect->right - DestRect->left) != (xsrc.right - xsrc.left)) && clip_horiz) || (Flags & WINEDDBLT_DDFX)) { WARN("Out of screen rectangle in special case. Not handled right now.\n"); - goto release; + return WINED3D_OK; } if (clip_horiz) { - if (xdst.left < 0) { xsrc.left -= xdst.left; xdst.left = 0; } - if (xdst.right > This->currentDesc.Width) + if (DestRect->left < 0) { xsrc.left -= DestRect->left; xdst.left = 0; } + if (DestRect->right > This->currentDesc.Width) { - xsrc.right -= (xdst.right - (int) This->currentDesc.Width); + xsrc.right -= (DestRect->right - (int) This->currentDesc.Width); xdst.right = (int) This->currentDesc.Width; } } if (clip_vert) { - if (xdst.top < 0) + if (DestRect->top < 0) { - xsrc.top -= xdst.top; + xsrc.top -= DestRect->top; xdst.top = 0; } - if (xdst.bottom > This->currentDesc.Height) + if (DestRect->bottom > This->currentDesc.Height) { - xsrc.bottom -= (xdst.bottom - (int) This->currentDesc.Height); + xsrc.bottom -= (DestRect->bottom - (int) This->currentDesc.Height); xdst.bottom = (int) This->currentDesc.Height; } } @@ -1024,8 +985,52 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, (xsrc.left >= (int) Src->currentDesc.Width)) { TRACE("Nothing to be done after clipping !\n"); - goto release; + return WINED3D_OK; + } + } + } + + if (Src == This) + { + IWineD3DSurface_LockRect(iface, &dlock, NULL, 0); + dfmt = This->resource.format; + slock = dlock; + sfmt = dfmt; + sEntry = getFormatDescEntry(sfmt, NULL, NULL); + dEntry = sEntry; + } + else + { + dfmt = This->resource.format; + dEntry = getFormatDescEntry(dfmt, NULL, NULL); + if (Src) + { + if(This->resource.format != Src->resource.format) { + Src = surface_convert_format(Src, dfmt); + if(!Src) { + /* The conv function writes a FIXME */ + WARN("Cannot convert source surface format to dest format\n"); + goto release; + } } + IWineD3DSurface_LockRect((IWineD3DSurface *) Src, &slock, NULL, WINED3DLOCK_READONLY); + sfmt = Src->resource.format; + } + sEntry = getFormatDescEntry(sfmt, NULL, NULL); + if (DestRect) + IWineD3DSurface_LockRect(iface, &dlock, &xdst, 0); + else + IWineD3DSurface_LockRect(iface, &dlock, NULL, 0); + } + + if (!DDBltFx || !(DDBltFx->dwDDFX)) Flags &= ~WINEDDBLT_DDFX; + + if (sEntry->isFourcc && dEntry->isFourcc) + { + if (!DestRect || Src == This) + { + memcpy(dlock.pBits, slock.pBits, This->resource.size); + goto release; } } @@ -1038,7 +1043,10 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, assert(width <= dlock.Pitch); - dbuf = (BYTE*)dlock.pBits+(xdst.top*dlock.Pitch)+(xdst.left*bpp); + if (DestRect && Src != This) + dbuf = (BYTE*)dlock.pBits; + else + dbuf = (BYTE*)dlock.pBits+(xdst.top*dlock.Pitch)+(xdst.left*bpp); if (Flags & WINEDDBLT_WAIT) {

1 0

Aric Stewart : wined3d: Check validity of rects before locking surface in Blt.
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: c08e4927f957c37e424778a0a77c6f9c19f70600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08e4927f957c37e424778a0a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 30 10:00:54 2008 -0500 wined3d: Check validity of rects before locking surface in Blt. --- dlls/wined3d/surface_base.c | 89 +++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 57809e1..916a3a4 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -850,6 +850,50 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, FIXME("Filters not supported in software blit\n"); } + /* First check for the validity of source / destination rectangles. This was + * verified using a test application + by MSDN. + */ + if ((Src != NULL) && (SrcRect != NULL) && + ((SrcRect->bottom > Src->currentDesc.Height)||(SrcRect->bottom < 0) || + (SrcRect->top > Src->currentDesc.Height)||(SrcRect->top < 0) || + (SrcRect->left > Src->currentDesc.Width) ||(SrcRect->left < 0) || + (SrcRect->right > Src->currentDesc.Width) ||(SrcRect->right < 0) || + (SrcRect->right < SrcRect->left) ||(SrcRect->bottom < SrcRect->top))) + { + WARN("Application gave us bad source rectangle for Blt.\n"); + return WINEDDERR_INVALIDRECT; + } + /* For the Destination rect, it can be out of bounds on the condition that a clipper + * is set for the given surface. + */ + if ((/*This->clipper == NULL*/ TRUE) && (DestRect) && + ((DestRect->bottom > This->currentDesc.Height)||(DestRect->bottom < 0) || + (DestRect->top > This->currentDesc.Height)||(DestRect->top < 0) || + (DestRect->left > This->currentDesc.Width) ||(DestRect->left < 0) || + (DestRect->right > This->currentDesc.Width) ||(DestRect->right < 0) || + (DestRect->right < DestRect->left) ||(DestRect->bottom < DestRect->top))) + { + WARN("Application gave us bad destination rectangle for Blt without a clipper set.\n"); + return WINEDDERR_INVALIDRECT; + } + + /* Now handle negative values in the rectangles. Warning: only supported for now + in the 'simple' cases (ie not in any stretching / rotation cases). + + First, the case where nothing is to be done. + */ + if ((DestRect && ((DestRect->bottom <= 0) || (DestRect->right <= 0) || + (DestRect->top >= (int) This->currentDesc.Height) || + (DestRect->left >= (int) This->currentDesc.Width))) || + ((Src != NULL) && (SrcRect != NULL) && + ((SrcRect->bottom <= 0) || (SrcRect->right <= 0) || + (SrcRect->top >= (int) Src->currentDesc.Height) || + (SrcRect->left >= (int) Src->currentDesc.Width)) )) + { + TRACE("Nothing to be done !\n"); + return WINED3D_OK; + } + if (Src == This) { IWineD3DSurface_LockRect(iface, &dlock, NULL, 0); @@ -919,51 +963,6 @@ IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, } } - /* First check for the validity of source / destination rectangles. This was - * verified using a test application + by MSDN. - */ - if ((Src != NULL) && - ((xsrc.bottom > Src->currentDesc.Height) || (xsrc.bottom < 0) || - (xsrc.top > Src->currentDesc.Height) || (xsrc.top < 0) || - (xsrc.left > Src->currentDesc.Width) || (xsrc.left < 0) || - (xsrc.right > Src->currentDesc.Width) || (xsrc.right < 0) || - (xsrc.right < xsrc.left) || (xsrc.bottom < xsrc.top))) - { - WARN("Application gave us bad source rectangle for Blt.\n"); - ret = WINEDDERR_INVALIDRECT; - goto release; - } - /* For the Destination rect, it can be out of bounds on the condition that a clipper - * is set for the given surface. - */ - if ((/*This->clipper == NULL*/ TRUE) && - ((xdst.bottom > This->currentDesc.Height) || (xdst.bottom < 0) || - (xdst.top > This->currentDesc.Height) || (xdst.top < 0) || - (xdst.left > This->currentDesc.Width) || (xdst.left < 0) || - (xdst.right > This->currentDesc.Width) || (xdst.right < 0) || - (xdst.right < xdst.left) || (xdst.bottom < xdst.top))) - { - WARN("Application gave us bad destination rectangle for Blt without a clipper set.\n"); - ret = WINEDDERR_INVALIDRECT; - goto release; - } - - /* Now handle negative values in the rectangles. Warning: only supported for now - in the 'simple' cases (ie not in any stretching / rotation cases). - - First, the case where nothing is to be done. - */ - if (((xdst.bottom <= 0) || (xdst.right <= 0) || - (xdst.top >= (int) This->currentDesc.Height) || - (xdst.left >= (int) This->currentDesc.Width)) || - ((Src != NULL) && - ((xsrc.bottom <= 0) || (xsrc.right <= 0) || - (xsrc.top >= (int) Src->currentDesc.Height) || - (xsrc.left >= (int) Src->currentDesc.Width)) )) - { - TRACE("Nothing to be done !\n"); - goto release; - } /* The easy case : the source-less blits.... */ if (Src == NULL)

1 0

Andrew Talbot : dmscript: Sign-compare warning fix.
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: 4a5787442bc67de68d90905cbfef76938347c23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5787442bc67de68d90905cb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 30 22:35:56 2008 +0100 dmscript: Sign-compare warning fix. --- dlls/dmscript/dmscript_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index 6b6bbcd..c211aa7 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -977,7 +977,8 @@ const char *debugstr_dmreturn (DWORD code) { /* generic flag-dumping function */ const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); + unsigned int i; + int size = sizeof(buffer); for (i=0; i < num_names; i++) {

1 0

Andrew Talbot : dmloader: Sign-compare warning fix.
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: 7b24ee7d1bf53332f597a23bf1479cc4f484f71d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b24ee7d1bf53332f597a23bf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 30 22:35:53 2008 +0100 dmloader: Sign-compare warning fix. --- dlls/dmloader/debug.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index dbd8129..db85d76 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -433,7 +433,8 @@ const char *debugstr_dmreturn (DWORD code) { /* generic flag-dumping function */ static const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); + unsigned int i; + int size = sizeof(buffer); for (i=0; i < num_names; i++) { if ((flags & names[i].val)) {

1 0

Andrew Talbot : dmsynth: Sign-compare warning fix.
by Alexandre Julliard July 31, 2008

July 31, 2008

Module: wine Branch: master Commit: 634b688f5c11c643cba0abdf24ef6c020173de06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=634b688f5c11c643cba0abdf2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jul 30 22:35:59 2008 +0100 dmsynth: Sign-compare warning fix. --- dlls/dmsynth/dmsynth_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 372bee5..0a52544 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -525,7 +525,8 @@ const char *debugstr_dmreturn (DWORD code) { /* generic flag-dumping function */ const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); + unsigned int i; + int size = sizeof(buffer); for (i=0; i < num_names; i++) {

1 0