November 2007 - Wine-Commits

Stefan Dösinger : msvcrt: Implement _mbsnbcpy_s.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: a529ef4875d958cb598ba2ca7b935cfe2ffc0cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a529ef4875d958cb598ba2ca7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 15 16:32:33 2007 +0100 msvcrt: Implement _mbsnbcpy_s. --- dlls/msvcrt/mbcs.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/tests/string.c | 50 +++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index cc619e5..14a962a 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -27,6 +27,7 @@ #include "wine/unicode.h" #include "wine/debug.h" #include "msvcrt/mbctype.h" +#include "msvcrt/errno.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -443,6 +444,71 @@ unsigned char* CDECL _mbsncpy(unsigned char* dst, const unsigned char* src, MSVC } /********************************************************************* + * _mbsnbcpy_s(MSVCRT.@) + * REMARKS + * Unlike _mbsnbcpy this function does not pad the rest of the dest + * string with 0 + */ +int CDECL _mbsnbcpy_s(unsigned char* dst, MSVCRT_size_t size, const unsigned char* src, MSVCRT_size_t n) +{ + MSVCRT_size_t pos = 0; + + if(!dst || size == 0) + return EINVAL; + if(!src) + { + dst[0] = '\0'; + return EINVAL; + } + if(!n) + return 0; + + if(g_mbcp_is_multibyte) + { + int is_lead = 0; + while (*src && n) + { + if(pos == size) + { + dst[0] = '\0'; + return ERANGE; + } + is_lead = (!is_lead && _ismbblead(*src)); + n--; + dst[pos++] = *src++; + } + + if (is_lead) /* if string ends with a lead, remove it */ + dst[pos - 1] = 0; + } + else + { + while (n) + { + n--; + if(pos == size) + { + dst[0] = '\0'; + return ERANGE; + } + + if(!(*src)) break; + dst[pos++] = *src++; + } + } + + if(pos < size) + dst[pos] = '\0'; + else + { + dst[0] = '\0'; + return ERANGE; + } + + return 0; +} + +/********************************************************************* * _mbsnbcpy(MSVCRT.@) * REMARKS * Like strncpy this function doesn't enforce the string to be diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 567f193..568dcc2 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -375,6 +375,7 @@ @ cdecl _mbsnbcnt(ptr long) @ stub _mbsnbcoll #(str str long) @ cdecl _mbsnbcpy(ptr str long) +@ cdecl _mbsnbcpy_s(ptr long str long) @ cdecl _mbsnbicmp(str str long) @ stub _mbsnbicoll #(str str long) @ cdecl _mbsnbset(str long long) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9e96605..c6dcd34 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -49,6 +49,7 @@ static void* (*pmemcpy)(void *, const void *, size_t n); static int* (*pmemcmp)(void *, const void *, size_t n); static int (*pstrcpy_s)(char *dst, size_t len, const char *src); static int (*pstrcat_s)(char *dst, size_t len, const char *src); +static int (*p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -514,6 +515,53 @@ static void test_strcat_s(void) ok(ret == EINVAL, "strcat_s: Writing to a NULL string returned %d, expected EINVAL\n", ret); } +static void test__mbsnbcpy_s(void) +{ + unsigned char dest[8]; + const unsigned char big[] = "atoolongstringforthislittledestination"; + const unsigned char small[] = "small"; + int ret; + + if(!p_mbsnbcpy_s) + { + skip("_mbsnbcpy_s not found\n"); + return; + } + + memset(dest, 'X', sizeof(dest)); + ret = p_mbsnbcpy_s(dest, sizeof(dest), small, sizeof(small)); + ok(ret == 0, "_mbsnbcpy_s: Copying a string into a big enough destination returned %d, expected 0\n", ret); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == 'l' && + dest[4] == 'l' && dest[5] == '\0'&& dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from _mbsnbcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + /* WTF? */ + memset(dest, 'X', sizeof(dest)); + ret = p_mbsnbcpy_s(dest, sizeof(dest) - 2, big, sizeof(small)); + ok(ret == ERANGE, "_mbsnbcpy_s: Copying a too long string returned %d, expected ERANGE\n", ret); + ok(dest[0] == '\0'&& dest[1] == 't' && dest[2] == 'o' && dest[3] == 'o' && + dest[4] == 'l' && dest[5] == 'o' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from _mbsnbcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + memset(dest, 'X', sizeof(dest)); + ret = p_mbsnbcpy_s(dest, sizeof(dest) - 2, big, 4); + ok(ret == 0, "_mbsnbcpy_s: Copying a too long string with a count cap returned %d, expected 0\n", ret); + ok(dest[0] == 'a' && dest[1] == 't' && dest[2] == 'o' && dest[3] == 'o' && + dest[4] == '\0'&& dest[5] == 'X' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from _mbsnbcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + memset(dest, 'X', sizeof(dest)); + ret = p_mbsnbcpy_s(dest, sizeof(dest) - 2, small, sizeof(small) + 10); + ok(ret == 0, "_mbsnbcpy_s: Copying more data than the source string len returned %d, expected 0\n", ret); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == 'l' && + dest[4] == 'l' && dest[5] == '\0'&& dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from _mbsnbcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); +} + START_TEST(string) { char mem[100]; @@ -528,6 +576,7 @@ START_TEST(string) SET(pmemcmp,"memcmp"); SET(pstrcpy_s,"strcpy_s"); SET(pstrcat_s,"strcat_s"); + SET(p_mbsnbcpy_s,"_mbsnbcpy_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -549,4 +598,5 @@ START_TEST(string) test_strdup(); test_strcpy_s(); test_strcat_s(); + test__mbsnbcpy_s(); }

1 0

Stefan Dösinger : msvcrt: Implement strcat_s.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 9582f5c719ab426b13c1913cf9708d032e99525e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9582f5c719ab426b13c1913cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Nov 16 11:36:03 2007 +0100 msvcrt: Implement strcat_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/string.c | 29 +++++++++++++++++++ dlls/msvcrt/tests/string.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 63ed4aa..567f193 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -711,6 +711,7 @@ @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ cdecl strcat(str str) ntdll.strcat +@ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) ntdll.strchr @ cdecl strcmp(str str) ntdll.strcmp @ cdecl strcoll(str str) MSVCRT_strcoll diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e46ff49..660b94d 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -176,6 +176,35 @@ int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) } /********************************************************************* + * strcat_s (MSVCRT.@) + */ +int CDECL MSVCRT_strcat_s( char* dst, MSVCRT_size_t elem, const char* src ) +{ + MSVCRT_size_t i, j; + if(!dst) return EINVAL; + if(elem == 0) return EINVAL; + if(!src) + { + dst[0] = '\0'; + return EINVAL; + } + + for(i = 0; i < elem; i++) + { + if(dst[i] == '\0') + { + for(j = 0; (j + i) < elem; j++) + { + if((dst[j + i] = src[j]) == '\0') return 0; + } + } + } + /* Set the first element to 0, not the first element after the skipped part */ + dst[0] = '\0'; + return ERANGE; +} + +/********************************************************************* * strxfrm (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t len ) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 25d41c1..9e96605 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -48,6 +48,7 @@ static char *buf_to_string(const unsigned char *bin, int len, int nr) static void* (*pmemcpy)(void *, const void *, size_t n); static int* (*pmemcmp)(void *, const void *, size_t n); static int (*pstrcpy_s)(char *dst, size_t len, const char *src); +static int (*pstrcat_s)(char *dst, size_t len, const char *src); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -450,6 +451,69 @@ static void test_strcpy_s(void) ok(ret == EINVAL, "Copying a big string a NULL dest returned %d, expected EINVAL\n", ret); } +static void test_strcat_s(void) +{ + char dest[8]; + const char *small = "sma"; + int ret; + + if(!pstrcat_s) + { + skip("strcat_s not found\n"); + return; + } + + memset(dest, 'X', sizeof(dest)); + dest[0] = '\0'; + ret = pstrcat_s(dest, sizeof(dest), small); + ok(ret == 0, "strcat_s: Copying a string into a big enough destination returned %d, expected 0\n", ret); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == '\0'&& + dest[4] == 'X' && dest[5] == 'X' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + ret = pstrcat_s(dest, sizeof(dest), small); + ok(ret == 0, "strcat_s: Attaching a string to a big enough destination returned %d, expected 0\n", ret); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == 's' && + dest[4] == 'm' && dest[5] == 'a' && dest[6] == '\0'&& dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + ret = pstrcat_s(dest, sizeof(dest), small); + ok(ret == ERANGE, "strcat_s: Attaching a string to a filled up destination returned %d, expected ERANGE\n", ret); + ok(dest[0] == '\0'&& dest[1] == 'm' && dest[2] == 'a' && dest[3] == 's' && + dest[4] == 'm' && dest[5] == 'a' && dest[6] == 's' && dest[7] == 'm', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + memset(dest, 'X', sizeof(dest)); + dest[0] = 'a'; + dest[1] = '\0'; + + ret = pstrcat_s(dest, 0, small); + ok(ret == EINVAL, "strcat_s: Source len = 0 returned %d, expected EINVAL\n", ret); + ok(dest[0] == 'a' && dest[1] == '\0'&& dest[2] == 'X' && dest[3] == 'X' && + dest[4] == 'X' && dest[5] == 'X' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + ret = pstrcat_s(dest, 0, NULL); + ok(ret == EINVAL, "strcat_s: len = 0 and src = NULL returned %d, expected EINVAL\n", ret); + ok(dest[0] == 'a' && dest[1] == '\0'&& dest[2] == 'X' && dest[3] == 'X' && + dest[4] == 'X' && dest[5] == 'X' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + ret = pstrcat_s(dest, sizeof(dest), NULL); + ok(ret == EINVAL, "strcat_s: Sourcing from NULL returned %d, expected EINVAL\n", ret); + ok(dest[0] == '\0'&& dest[1] == '\0'&& dest[2] == 'X' && dest[3] == 'X' && + dest[4] == 'X' && dest[5] == 'X' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + ret = pstrcat_s(NULL, sizeof(dest), small); + ok(ret == EINVAL, "strcat_s: Writing to a NULL string returned %d, expected EINVAL\n", ret); +} + START_TEST(string) { char mem[100]; @@ -463,6 +527,7 @@ START_TEST(string) SET(pmemcpy,"memcpy"); SET(pmemcmp,"memcmp"); SET(pstrcpy_s,"strcpy_s"); + SET(pstrcat_s,"strcat_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -483,4 +548,5 @@ START_TEST(string) /* test _strdup */ test_strdup(); test_strcpy_s(); + test_strcat_s(); }

1 0

Vijay Kiran Kamuju : rsaenh: Add a few more tests which check the decryption strings.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: fc90d2bd451768e15948d49c0488f1f64ae640c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc90d2bd451768e15948d49c0… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Nov 15 13:29:18 2007 -0600 rsaenh: Add a few more tests which check the decryption strings. --- dlls/rsaenh/tests/rsaenh.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 076467e..d221647 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -31,6 +31,38 @@ static const char szContainer[] = "winetest"; static const unsigned char pbData[] = "Wine rocks totally!"; static const char szProvider[] = MS_ENHANCED_PROV_A; +typedef struct _ctdatatype { + unsigned char origstr[32]; + unsigned char decstr[32]; + int strlen; + int enclen; + int buflen; +} cryptdata; + +static const cryptdata cTestData[4] = { + {"abcdefghijkl", + {'a','b','c','d','e','f','g','h',0x2,0x2,'k','l',0}, + 12,8,16}, + {"abcdefghij", + {'a','b','c','d','e','f','g','h',0x2,0x2,0}, + 10,8,16}, + {"abcdefgh", + {'a','b','c','d','e','f','g','h',0}, + 8,8,16}, + {"abcdefghijkl", + {'a','b','c','d','e','f','g','h','i','j','k','l',0}, + 12,12,16} +}; + +static void printBytes(const char *heading, BYTE *pb, size_t cb) +{ + size_t i; + printf("%s: ",heading); + for(i=0;i<cb;i++) + printf("0x%02x,",pb[i]); + putchar('\n'); +} + static BOOL (WINAPI *pCryptDuplicateHash) (HCRYPTHASH, DWORD*, DWORD, HCRYPTHASH*); /* @@ -424,6 +456,26 @@ static void test_3des112(void) result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); + for (i=0; i<4; i++) + { + memcpy(pbData,cTestData[i].origstr,cTestData[i].strlen); + + dwLen = cTestData[i].enclen; + result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + + result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[1].enclen)==0,"decryption incorrect %d\n",i); + if((dwLen != cTestData[i].enclen) || + memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) + { + printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); + printBytes("got",pbData,dwLen); + } + } result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); } @@ -460,6 +512,27 @@ static void test_des(void) result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); + for (i=0; i<4; i++) + { + memcpy(pbData,cTestData[i].origstr,cTestData[i].strlen); + + dwLen = cTestData[i].enclen; + result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + + result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)==0,"decryption incorrect %d\n",i); + if((dwLen != cTestData[i].enclen) || + memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) + { + printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); + printBytes("got",pbData,dwLen); + } + } + result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); } @@ -489,6 +562,26 @@ static void test_3des(void) result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); + for (i=0; i<4; i++) + { + memcpy(pbData,cTestData[i].origstr,cTestData[i].strlen); + + dwLen = cTestData[i].enclen; + result = CryptEncrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen, cTestData[i].buflen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].buflen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].buflen); + + result = CryptDecrypt(hKey, (HCRYPTHASH)NULL, TRUE, 0, pbData, &dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen==cTestData[i].enclen,"length incorrect, got %d, expected %d\n",dwLen,cTestData[i].enclen); + ok(memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)==0,"decryption incorrect %d\n",i); + if((dwLen != cTestData[i].enclen) || + memcmp(pbData,cTestData[i].decstr,cTestData[i].enclen)) + { + printBytes("expected",cTestData[i].decstr,cTestData[i].strlen); + printBytes("got",pbData,dwLen); + } + } result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); }

1 0

Gerald Pfeifer : winedbg: Fix type of loop variable in types_udt_find_element().
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: a6dd4795fabf9466cef1344fed100d967d4814f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dd4795fabf9466cef1344fe… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 15 21:06:26 2007 +0100 winedbg: Fix type of loop variable in types_udt_find_element(). --- programs/winedbg/types.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 9a3d4f4..06b7355 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -259,7 +259,6 @@ BOOL types_udt_find_element(struct dbg_lvalue* lvalue, const char* name, long in TI_FINDCHILDREN_PARAMS* fcp = (TI_FINDCHILDREN_PARAMS*)buffer; WCHAR* ptr; char tmp[256]; - int i; struct dbg_type type; if (!types_get_info(&lvalue->type, TI_GET_SYMTAG, &tag) || @@ -274,6 +273,7 @@ BOOL types_udt_find_element(struct dbg_lvalue* lvalue, const char* name, long in fcp->Count = min(count, 256); if (types_get_info(&lvalue->type, TI_FINDCHILDREN, fcp)) { + unsigned i; type.module = lvalue->type.module; for (i = 0; i < min(fcp->Count, count); i++) {

1 0

Stefan Dösinger : msvcrt: Implement strcpy_s.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 18daed62ed7f6c15c57d9db1ad95f42dbcbf2c65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18daed62ed7f6c15c57d9db1a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 15 16:11:26 2007 +0100 msvcrt: Implement strcpy_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/string.c | 23 +++++++++++++++++ dlls/msvcrt/tests/string.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6e7504a..63ed4aa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -715,6 +715,7 @@ @ cdecl strcmp(str str) ntdll.strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) ntdll.strcpy +@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcspn(str str) ntdll.strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(str long str ptr) MSVCRT_strftime diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 5fc7146..e46ff49 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -26,6 +26,7 @@ #include <stdlib.h> #include "msvcrt.h" +#include "msvcrt/errno.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -153,6 +154,28 @@ int CDECL MSVCRT_strcoll( const char* str1, const char* str2 ) } /********************************************************************* + * strcpy_s (MSVCRT.@) + */ +int CDECL MSVCRT_strcpy_s( char* dst, MSVCRT_size_t elem, const char* src ) +{ + MSVCRT_size_t i; + if(!elem) return EINVAL; + if(!dst) return EINVAL; + if(!src) + { + dst[0] = '\0'; + return EINVAL; + } + + for(i = 0; i < elem; i++) + { + if((dst[i] = src[i]) == '\0') return 0; + } + dst[0] = '\0'; + return ERANGE; +} + +/********************************************************************* * strxfrm (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t len ) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 876415c..25d41c1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <mbctype.h> #include <locale.h> +#include <errno.h> static char *buf_to_string(const unsigned char *bin, int len, int nr) { @@ -46,6 +47,7 @@ static char *buf_to_string(const unsigned char *bin, int len, int nr) static void* (*pmemcpy)(void *, const void *, size_t n); static int* (*pmemcmp)(void *, const void *, size_t n); +static int (*pstrcpy_s)(char *dst, size_t len, const char *src); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -393,6 +395,61 @@ static void test_strdup(void) free( str ); } +static void test_strcpy_s(void) +{ + char dest[8]; + const char *small = "small"; + const char *big = "atoolongstringforthislittledestination"; + int ret; + + if(!pstrcpy_s) + { + skip("strcpy_s not found\n"); + return; + } + + memset(dest, 'X', sizeof(dest)); + ret = pstrcpy_s(dest, sizeof(dest), small); + ok(ret == 0, "Copying a string into a big enough destination returned %d, expected 0\n", ret); + ok(dest[0] == 's' && dest[1] == 'm' && dest[2] == 'a' && dest[3] == 'l' && + dest[4] == 'l' && dest[5] == '\0'&& dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + memset(dest, 'X', sizeof(dest)); + ret = pstrcpy_s(dest, 0, big); + ok(ret == EINVAL, "Copying into a destination of size 0 returned %d, expected EINVAL\n", ret); + ok(dest[0] == 'X' && dest[1] == 'X' && dest[2] == 'X' && dest[3] == 'X' && + dest[4] == 'X' && dest[5] == 'X' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + ret = pstrcpy_s(dest, 0, NULL); + ok(ret == EINVAL, "Copying into a destination of size 0 returned %d, expected EINVAL\n", ret); + ok(dest[0] == 'X' && dest[1] == 'X' && dest[2] == 'X' && dest[3] == 'X' && + dest[4] == 'X' && dest[5] == 'X' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + memset(dest, 'X', sizeof(dest)); + ret = pstrcpy_s(dest, sizeof(dest), big); + ok(ret == ERANGE, "Copying a big string in a small location returned %d, expected ERANGE\n", ret); + ok(dest[0] == '\0'&& dest[1] == 't' && dest[2] == 'o' && dest[3] == 'o' && + dest[4] == 'l' && dest[5] == 'o' && dest[6] == 'n' && dest[7] == 'g', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + memset(dest, 'X', sizeof(dest)); + ret = pstrcpy_s(dest, sizeof(dest), NULL); + ok(ret == EINVAL, "Copying from a NULL source string returned %d, expected EINVAL\n", ret); + ok(dest[0] == '\0'&& dest[1] == 'X' && dest[2] == 'X' && dest[3] == 'X' && + dest[4] == 'X' && dest[5] == 'X' && dest[6] == 'X' && dest[7] == 'X', + "Unexpected return data from strcpy_s: 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", + dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); + + ret = pstrcpy_s(NULL, sizeof(dest), small); + ok(ret == EINVAL, "Copying a big string a NULL dest returned %d, expected EINVAL\n", ret); +} + START_TEST(string) { char mem[100]; @@ -405,6 +462,7 @@ START_TEST(string) ok(hMsvcrt != 0, "GetModuleHandleA failed\n"); SET(pmemcpy,"memcpy"); SET(pmemcmp,"memcmp"); + SET(pstrcpy_s,"strcpy_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -424,4 +482,5 @@ START_TEST(string) test_mbsspnp(); /* test _strdup */ test_strdup(); + test_strcpy_s(); }

1 0

Stefan Dösinger : wined3d: Destroy GL contexts before changing the screen resolution.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: c698052b31231b757bad25665a03ddc3a115d76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c698052b31231b757bad25665… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 14 22:45:00 2007 +0100 wined3d: Destroy GL contexts before changing the screen resolution. --- dlls/wined3d/swapchain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 81f17c3..2eaa812 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -106,6 +106,9 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB HeapFree(GetProcessHeap(), 0, This->backBuffer); } + for(i = 0; i < This->num_contexts; i++) { + DestroyContext(This->wineD3DDevice, This->context[i]); + } /* Restore the screen resolution if we rendered in fullscreen * This will restore the screen resolution to what it was before creating the swapchain. In case of d3d8 and d3d9 * this will be the original desktop resolution. In case of d3d7 this will be a NOP because ddraw sets the resolution @@ -118,9 +121,6 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface, D3DCB mode.Format = This->orig_fmt; IWineD3DDevice_SetDisplayMode((IWineD3DDevice *) This->wineD3DDevice, 0, &mode); } - for(i = 0; i < This->num_contexts; i++) { - DestroyContext(This->wineD3DDevice, This->context[i]); - } HeapFree(GetProcessHeap(), 0, This->context); HeapFree(GetProcessHeap(), 0, This);

1 0

Stefan Dösinger : wined3d: Remove a hack that slipped in.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 683c258ff4cf09d367ee0cb28c8768615522ac1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=683c258ff4cf09d367ee0cb28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 14 21:49:14 2007 +0100 wined3d: Remove a hack that slipped in. --- dlls/wined3d/vertexshader.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e957eb4..5baf00d 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -349,9 +349,7 @@ static VOID IWineD3DVertexShaderImpl_GenerateShader( * before the homogenous divide, so we have to take the w into account: z = ((z / w) * 2 - 1) * w, * which is the same as z = z / 2 - w. */ - shader_addline(&buffer, "tmp0 = gl_Position;\n"); - shader_addline(&buffer, "gl_Position.z = tmp0.z * 2.0;\n"); - shader_addline(&buffer, "gl_Position.z = gl_Position.z - gl_Position.w;\n"); + shader_addline(&buffer, "gl_Position.z = gl_Position.z * 2.0 - gl_Position.w;\n"); shader_addline(&buffer, "}\n");

1 0

Stefan Dösinger : wined3d: Do not call PreLoad in surface_download_data.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: f13bb40671baba8a4938d926da821701a7b71841 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13bb40671baba8a4938d926d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 15 14:38:34 2007 +0100 wined3d: Do not call PreLoad in surface_download_data. --- dlls/wined3d/surface.c | 27 ++++++++++++++++++++++++++- dlls/wined3d/surface_base.c | 5 +++++ dlls/wined3d/surface_gdi.c | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d_interface.h | 2 ++ 5 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dadb7a0..df617dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -57,7 +57,7 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { checkGLcall("glActiveTextureARB"); } IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); - IWineD3DSurface_PreLoad((IWineD3DSurface *) This); + IWineD3DSurface_BindTexture((IWineD3DSurface *) This); if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || @@ -2186,6 +2186,30 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO return WINED3D_OK; } +static void WINAPI IWineD3DSurfaceImpl_BindTexture(IWineD3DSurface *iface) { + /* TODO: check for locks */ + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; + IWineD3DBaseTexture *baseTexture = NULL; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + TRACE("(%p)Checking to see if the container is a base texture\n", This); + if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { + TRACE("Passing to container\n"); + IWineD3DBaseTexture_BindTexture(baseTexture); + IWineD3DBaseTexture_Release(baseTexture); + } else { + TRACE("(%p) : Binding surface\n", This); + + if(!device->isInDraw) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } + ENTER_GL(); + glBindTexture(This->glDescription.target, This->glDescription.textureName); + LEAVE_GL(); + } + return; +} + #include <errno.h> #include <stdio.h> HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const char* filename) { @@ -3845,6 +3869,7 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = /* Internal use: */ IWineD3DSurfaceImpl_AddDirtyRect, IWineD3DSurfaceImpl_LoadTexture, + IWineD3DSurfaceImpl_BindTexture, IWineD3DSurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, IWineD3DSurfaceImpl_SetGlTextureDesc, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 11a3d0b..f57b9f4 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1628,3 +1628,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DL return WINED3D_OK; } + +void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface) { + ERR("Should not be called on base texture\n"); + return; +} diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 03852f8..5f569a1 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -805,6 +805,7 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = /* Internal use: */ IWineGDISurfaceImpl_AddDirtyRect, IWineGDISurfaceImpl_LoadTexture, + IWineD3DBaseSurfaceImpl_BindTexture, IWineGDISurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, IWineGDISurfaceImpl_SetGlTextureDesc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9a3a9ba..428b8df 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1159,6 +1159,7 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface); HRESULT WINAPI IWineD3DBaseSurfaceImpl_Blt(IWineD3DSurface *iface, RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, WINEDDBLTFX *DDBltFx, WINED3DTEXTUREFILTERTYPE Filter); HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans); HRESULT WINAPI IWineD3DBaseSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags); +void WINAPI IWineD3DBaseSurfaceImpl_BindTexture(IWineD3DSurface *iface); const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index d77a18f..6335eb9 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1134,6 +1134,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) /* Internally used methods */ STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; STDMETHOD(LoadTexture)(THIS, BOOL srgb_mode) PURE; + STDMETHOD_(void, BindTexture)(THIS) PURE; STDMETHOD(SaveSnapshot)(THIS_ const char *filename) PURE; STDMETHOD(SetContainer)(THIS_ IWineD3DBase *container) PURE; STDMETHOD_(void,SetGlTextureDesc)(THIS_ UINT textureName, int target) PURE; @@ -1191,6 +1192,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a) #define IWineD3DSurface_LoadTexture(p,a) (p)->lpVtbl->LoadTexture(p,a) +#define IWineD3DSurface_BindTexture(p) (p)->lpVtbl->BindTexture(p) #define IWineD3DSurface_SaveSnapshot(p,a) (p)->lpVtbl->SaveSnapshot(p,a) #define IWineD3DSurface_SetContainer(p,a) (p)->lpVtbl->SetContainer(p,a) #define IWineD3DSurface_SetGlTextureDesc(p,a,b) (p)->lpVtbl->SetGlTextureDesc(p,a,b)

1 0

Rob Shearman : mapi32: Add a stub for DllGetClassObject.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: c835703ff7c2bf205e3f603c35b2bae8ddedcc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c835703ff7c2bf205e3f603c3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 15 18:50:19 2007 +0000 mapi32: Add a stub for DllGetClassObject. --- dlls/mapi32/mapi32.spec | 2 +- dlls/mapi32/mapi32_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 7292e52..bf97415 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -16,7 +16,7 @@ 24 stub PRProviderInit 25 stub LAUNCHWIZARD 26 stub LaunchWizard(a)20 - 27 stub DllGetClassObject + 27 stdcall -private DllGetClassObject(ptr ptr ptr) 28 stdcall -private DllCanUnloadNow() 29 stub MAPIOpenFormMgr 30 stub MAPIOpenFormMgr(a)8 diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index a985ac6..edfa326 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -53,6 +53,16 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) } /*********************************************************************** + * DllGetClassObject (MAPI32.27) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +{ + *ppv = NULL; + FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** * DllCanUnloadNow (MAPI32.28) * * Determine if this dll can be unloaded from the callers address space.

1 0

Francois Gouget : d3d9/tests: Fix the trailing '\n' in an ok() call.
by Alexandre Julliard Nov. 16, 2007

Nov. 16, 2007

Module: wine Branch: master Commit: 5c3151b2e723e0b40debf039e5efcfa37e014de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c3151b2e723e0b40debf039e… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 15 19:22:34 2007 +0100 d3d9/tests: Fix the trailing '\n' in an ok() call. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a61a7d2..8b9a461 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -4425,7 +4425,7 @@ void test_compare_instructions(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); color = getPixelColor(device, 160, 360); - ok(color == 0x00FF00FF, "Compare test: Quad 1(sge vec) returned color 0x%08x, expected 0x00FF00FFn", color); + ok(color == 0x00FF00FF, "Compare test: Quad 1(sge vec) returned color 0x%08x, expected 0x00FF00FF\n", color); color = getPixelColor(device, 480, 360); ok(color == 0x0000FF00, "Compare test: Quad 2(slt vec) returned color 0x%08x, expected 0x0000FF00\n", color); color = getPixelColor(device, 160, 120);

1 0