November 2010 - Wine-commits

André Hentschel : include: Add some relocation types.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: f6692721524d5d4b9f0401d4e2e11c5b26e2b3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6692721524d5d4b9f0401d4e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 16 20:58:52 2010 +0100 include: Add some relocation types. --- include/winnt.h | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e6f9b3c..b72a952 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3274,6 +3274,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_I386_SEG12 9 #define IMAGE_REL_I386_SECTION 10 #define IMAGE_REL_I386_SECREL 11 +#define IMAGE_REL_I386_TOKEN 12 +#define IMAGE_REL_I386_SECREL7 13 #define IMAGE_REL_I386_REL32 20 /* MIPS relocation types */ @@ -3289,7 +3291,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_MIPS_SECREL 0x000B #define IMAGE_REL_MIPS_SECRELLO 0x000C #define IMAGE_REL_MIPS_SECRELHI 0x000D -#define IMAGE_REL_MIPS_JMPADDR16 0x0010 +#define IMAGE_REL_MIPS_TOKEN 0x000E +#define IMAGE_REL_MIPS_JMPADDR16 0x0010 #define IMAGE_REL_MIPS_REFWORDNB 0x0022 #define IMAGE_REL_MIPS_PAIR 0x0025 @@ -3342,6 +3345,7 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_PPC_SECRELLO 0x0013 #define IMAGE_REL_PPC_SECRELHI 0x0014 #define IMAGE_REL_PPC_GPREL 0x0015 +#define IMAGE_REL_PPC_TOKEN 0x0016 #define IMAGE_REL_PPC_TYPEMASK 0x00FF /* modifier bits */ #define IMAGE_REL_PPC_NEG 0x0100 @@ -3367,6 +3371,8 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_SH3_SECTION 0x000E #define IMAGE_REL_SH3_SECREL 0x000F #define IMAGE_REL_SH3_DIRECT32_NB 0x0010 +#define IMAGE_REL_SH3_GPREL4_LONG 0x0011 +#define IMAGE_REL_SH3_TOKEN 0x0012 /* ARM (Archimedes?) relocation types */ #define IMAGE_REL_ARM_ABSOLUTE 0x0000 @@ -3374,6 +3380,11 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_ARM_ADDR32NB 0x0002 #define IMAGE_REL_ARM_BRANCH24 0x0003 #define IMAGE_REL_ARM_BRANCH11 0x0004 +#define IMAGE_REL_ARM_TOKEN 0x0005 +#define IMAGE_REL_ARM_GPREL12 0x0006 +#define IMAGE_REL_ARM_GPREL7 0x0007 +#define IMAGE_REL_ARM_BLX24 0x0008 +#define IMAGE_REL_ARM_BLX11 0x0009 #define IMAGE_REL_ARM_SECTION 0x000E #define IMAGE_REL_ARM_SECREL 0x000F @@ -3395,12 +3406,18 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_IA64_SECREL 0x000E #define IMAGE_REL_IA64_LTOFF64 0x000F #define IMAGE_REL_IA64_DIR32NB 0x0010 -#define IMAGE_REL_IA64_RESERVED_11 0x0011 -#define IMAGE_REL_IA64_RESERVED_12 0x0012 -#define IMAGE_REL_IA64_RESERVED_13 0x0013 -#define IMAGE_REL_IA64_RESERVED_14 0x0014 -#define IMAGE_REL_IA64_RESERVED_15 0x0015 -#define IMAGE_REL_IA64_RESERVED_16 0x0016 +#define IMAGE_REL_IA64_SREL14 0x0011 +#define IMAGE_REL_IA64_SREL22 0x0012 +#define IMAGE_REL_IA64_SREL32 0x0013 +#define IMAGE_REL_IA64_UREL32 0x0014 +#define IMAGE_REL_IA64_PCREL60X 0x0015 +#define IMAGE_REL_IA64_PCREL60B 0x0016 +#define IMAGE_REL_IA64_PCREL60F 0x0017 +#define IMAGE_REL_IA64_PCREL60I 0x0018 +#define IMAGE_REL_IA64_PCREL60M 0x0019 +#define IMAGE_REL_IA64_IMMGPREL64 0x001A +#define IMAGE_REL_IA64_TOKEN 0x001B +#define IMAGE_REL_IA64_GPREL32 0x001C #define IMAGE_REL_IA64_ADDEND 0x001F /* AMD64 relocation types */

1 0

Juan Lang : crypt32: Add CertFindChainInStore stub.
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 107a95d86bffdf8a9519bff5af9c3b82f32a7aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107a95d86bffdf8a9519bff5a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 15 11:26:01 2010 -0800 crypt32: Add CertFindChainInStore stub. --- dlls/crypt32/chain.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index fa739fe..1fb368b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2901,6 +2901,15 @@ VOID WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) } } +PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE store, + DWORD certEncodingType, DWORD findFlags, DWORD findType, + const void *findPara, PCCERT_CHAIN_CONTEXT prevChainContext) +{ + FIXME("(%p, %08x, %08x, %d, %p, %p): stub\n", store, certEncodingType, + findFlags, findType, findPara, prevChainContext); + return NULL; +} + static void find_element_with_error(PCCERT_CHAIN_CONTEXT chain, DWORD error, LONG *iChain, LONG *iElement) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index d9cd9a8..dedcb4f 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -40,6 +40,7 @@ @ stdcall CertEnumPhysicalStore(ptr long ptr ptr) @ stdcall CertEnumSystemStore(long ptr ptr ptr) @ stdcall CertFindAttribute(str long ptr) +@ stdcall CertFindChainInStore(ptr long long long ptr ptr) @ stdcall CertFindCRLInStore(ptr long long long ptr ptr) @ stdcall CertFindCTLInStore(ptr long long long ptr ptr) @ stdcall CertFindCertificateInStore(ptr long long long ptr ptr)

1 0

Nikolay Sivov : comctl32/listview: Use a code set by dispinfo holder to convert data encoding after LVN_GETDISPINFO .
by Alexandre Julliard 17 Nov '10

17 Nov '10

Module: wine Branch: master Commit: 119860b05f8c22d1525b573e461afe95e430a63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=119860b05f8c22d1525b573e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 16 23:55:23 2010 +0300 comctl32/listview: Use a code set by dispinfo holder to convert data encoding after LVN_GETDISPINFO. --- dlls/comctl32/listview.c | 130 ++++++++++++++++++++++++--------------- dlls/comctl32/tests/listview.c | 41 +++++++++++++ 2 files changed, 121 insertions(+), 50 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6c4165d..fd9a499 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -928,74 +928,104 @@ static BOOL notify_deleteitem(const LISTVIEW_INFO *infoPtr, INT nItem) Send notification. depends on dispinfoW having same structure as dispinfoA. infoPtr : listview struct - notificationCode : *Unicode* notification code + code : *Unicode* notification code pdi : dispinfo structure (can be unicode or ansi) isW : TRUE if dispinfo is Unicode */ -static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT notificationCode, LPNMLVDISPINFOW pdi, BOOL isW) +static BOOL notify_dispinfoT(const LISTVIEW_INFO *infoPtr, UINT code, LPNMLVDISPINFOW pdi, BOOL isW) { - BOOL bResult = FALSE; - BOOL convertToAnsi = FALSE, convertToUnicode = FALSE; - INT cchTempBufMax = 0, savCchTextMax = 0; - UINT realNotifCode; - LPWSTR pszTempBuf = NULL, savPszText = NULL; + INT length = 0, ret_length; + LPWSTR buffer = NULL, ret_text; + BOOL return_ansi = FALSE; + BOOL return_unicode = FALSE; + BOOL ret; if ((pdi->item.mask & LVIF_TEXT) && is_text(pdi->item.pszText)) { - convertToAnsi = (isW && infoPtr->notifyFormat == NFR_ANSI); - convertToUnicode = (!isW && infoPtr->notifyFormat == NFR_UNICODE); + return_unicode = ( isW && infoPtr->notifyFormat == NFR_ANSI); + return_ansi = (!isW && infoPtr->notifyFormat == NFR_UNICODE); } - if (convertToAnsi || convertToUnicode) + ret_length = pdi->item.cchTextMax; + ret_text = pdi->item.pszText; + + if (return_unicode || return_ansi) { - if (notificationCode != LVN_GETDISPINFOW) - { - cchTempBufMax = convertToUnicode ? + if (code != LVN_GETDISPINFOW) + { + length = return_ansi ? MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, NULL, 0): WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); - } - else - { - cchTempBufMax = pdi->item.cchTextMax; - *pdi->item.pszText = 0; /* make sure we don't process garbage */ - } - - pszTempBuf = Alloc( (convertToUnicode ? sizeof(WCHAR) : sizeof(CHAR)) * cchTempBufMax); - if (!pszTempBuf) return FALSE; - - if (convertToUnicode) - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, - pszTempBuf, cchTempBufMax); - else - WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) pszTempBuf, - cchTempBufMax, NULL, NULL); + } + else + { + length = pdi->item.cchTextMax; + *pdi->item.pszText = 0; /* make sure we don't process garbage */ + } - savCchTextMax = pdi->item.cchTextMax; - savPszText = pdi->item.pszText; - pdi->item.pszText = pszTempBuf; - pdi->item.cchTextMax = cchTempBufMax; + buffer = Alloc( (return_ansi ? sizeof(WCHAR) : sizeof(CHAR)) * length); + if (!buffer) return FALSE; + + if (return_ansi) + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pdi->item.pszText, -1, + buffer, length); + else + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) buffer, + length, NULL, NULL); + + pdi->item.pszText = buffer; + pdi->item.cchTextMax = length; } if (infoPtr->notifyFormat == NFR_ANSI) - realNotifCode = get_ansi_notification(notificationCode); - else - realNotifCode = notificationCode; + code = get_ansi_notification(code); + TRACE(" pdi->item=%s\n", debuglvitem_t(&pdi->item, infoPtr->notifyFormat != NFR_ANSI)); - bResult = notify_hdr(infoPtr, realNotifCode, &pdi->hdr); + ret = notify_hdr(infoPtr, code, &pdi->hdr); + TRACE(" resulting code=0x%08x\n", pdi->hdr.code); - if (convertToUnicode || convertToAnsi) + if (return_ansi || return_unicode) { - if (convertToUnicode) /* note : pointer can be changed by app ! */ - WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) savPszText, - savCchTextMax, NULL, NULL); - else - MultiByteToWideChar(CP_ACP, 0, (LPSTR) pdi->item.pszText, -1, - savPszText, savCchTextMax); - pdi->item.pszText = savPszText; /* restores our buffer */ - pdi->item.cchTextMax = savCchTextMax; - Free (pszTempBuf); + if (return_ansi && (pdi->hdr.code == LVN_GETDISPINFOA)) + { + strcpy((char*)ret_text, (char*)pdi->item.pszText); + } + else if (return_unicode && (pdi->hdr.code == LVN_GETDISPINFOW)) + { + strcpyW(ret_text, pdi->item.pszText); + } + else if (return_ansi) /* note : pointer can be changed by app ! */ + { + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) ret_text, + ret_length, NULL, NULL); + } + else + MultiByteToWideChar(CP_ACP, 0, (LPSTR) pdi->item.pszText, -1, + ret_text, ret_length); + + pdi->item.pszText = ret_text; /* restores our buffer */ + pdi->item.cchTextMax = ret_length; + + Free(buffer); + return ret; } - return bResult; + + /* if dipsinfo holder changed notification code then convert */ + if (!isW && (pdi->hdr.code == LVN_GETDISPINFOW)) + { + length = WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, NULL, 0, NULL, NULL); + + buffer = Alloc(length * sizeof(CHAR)); + if (!buffer) return FALSE; + + WideCharToMultiByte(CP_ACP, 0, pdi->item.pszText, -1, (LPSTR) buffer, + ret_length, NULL, NULL); + + strcpy((LPSTR)pdi->item.pszText, (LPSTR)buffer); + Free(buffer); + } + + return ret; } static void customdraw_fill(NMLVCUSTOMDRAW *lpnmlvcd, const LISTVIEW_INFO *infoPtr, HDC hdc, @@ -6490,7 +6520,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, if (lpLVItem->mask & LVIF_STATE) dispInfo.item.stateMask = lpLVItem->stateMask & infoPtr->uCallbackMask; /* could be zeroed on LVIF_NORECOMPUTE case */ - if (dispInfo.item.mask != 0) + if (dispInfo.item.mask) { notify_dispinfoT(infoPtr, LVN_GETDISPINFOW, &dispInfo, isW); dispInfo.item.stateMask = lpLVItem->stateMask; @@ -6596,7 +6626,7 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } /* If we don't have all the requested info, query the application */ - if (dispInfo.item.mask != 0) + if (dispInfo.item.mask) { dispInfo.item.iItem = lpLVItem->iItem; dispInfo.item.iSubItem = lpLVItem->iSubItem; /* yes: the original subitem */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0223167..89619f7 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -59,6 +59,8 @@ static INT notifyFormat; static BOOL g_is_below_5; /* item data passed to LVN_GETDISPINFOA */ static LVITEMA g_itema; +/* alter notification code A->W */ +static BOOL g_disp_A_to_W; static HWND subclass_editbox(HWND hwndListview); @@ -372,6 +374,13 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP { NMLVDISPINFOA *dispinfo = (NMLVDISPINFOA*)lParam; g_itema = dispinfo->item; + + if (g_disp_A_to_W && (dispinfo->item.mask & LVIF_TEXT)) + { + static const WCHAR testW[] = {'T','E','S','T',0}; + dispinfo->hdr.code = LVN_GETDISPINFOW; + memcpy(dispinfo->item.pszText, testW, sizeof(testW)); + } } break; case NM_HOVER: @@ -4538,6 +4547,37 @@ static void test_createdragimage(void) DestroyWindow(list); } +static void test_dispinfo(void) +{ + static const char testA[] = "TEST"; + WCHAR buff[10]; + LVITEMA item; + HWND hwnd; + INT ret; + + hwnd = create_listview_control(LVS_ICON); + ok(hwnd != 0, "failed to create listview window\n"); + + insert_item(hwnd, 0); + + memset(&item, 0, sizeof(item)); + item.pszText = LPSTR_TEXTCALLBACKA; + ret = SendMessageA(hwnd, LVM_SETITEMTEXTA, 0, (LPARAM)&item); + ok(ret, "got %d\n", ret); + + g_disp_A_to_W = TRUE; + item.pszText = (char*)buff; + item.cchTextMax = sizeof(buff)/sizeof(WCHAR); + ret = SendMessageA(hwnd, LVM_GETITEMTEXTA, 0, (LPARAM)&item); + ok(ret == sizeof(testA)-1, "got %d, expected 4\n", ret); + g_disp_A_to_W = FALSE; + + ok(memcmp(item.pszText, testA, sizeof(testA)) == 0, + "got %s, expected %s\n", item.pszText, testA); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4601,6 +4641,7 @@ START_TEST(listview) test_hover(); test_destroynotify(); test_createdragimage(); + test_dispinfo(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Hans Leidekker : winspool.drv: Return success from the AddPrintProcessorW stub.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: b8d0c0dcc70dc06674c9b0f42230357c736359f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8d0c0dcc70dc06674c9b0f42… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 16 09:07:50 2010 +0100 winspool.drv: Return success from the AddPrintProcessorW stub. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4ffe092..3076572 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -4666,7 +4666,7 @@ BOOL WINAPI AddPrintProcessorW(LPWSTR pName, LPWSTR pEnvironment, LPWSTR pPathNa { FIXME("(%s,%s,%s,%s): stub\n", debugstr_w(pName), debugstr_w(pEnvironment), debugstr_w(pPathName), debugstr_w(pPrintProcessorName)); - return FALSE; + return TRUE; } /*****************************************************************************

1 0

Eric Pouech : msvcrt: Use the macros for parameter checking for wcsncat_s ( and fix the test).
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: d38196a0ffe8fcaf74e73838ea3b3544735ec835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38196a0ffe8fcaf74e73838e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 15 22:00:10 2010 +0100 msvcrt: Use the macros for parameter checking for wcsncat_s (and fix the test). --- dlls/msvcr90/tests/msvcr90.c | 59 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/tests/string.c | 8 +++++ dlls/msvcrt/wcs.c | 13 ++++++--- 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 6b0363f..1a94182 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -64,6 +64,7 @@ static char** (__cdecl *p__sys_errlist)(void); static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); +static int (__cdecl *p_wcsncat_s)(wchar_t *dst, size_t elem, const wchar_t *src, size_t count); static void* (WINAPI *pEncodePointer)(void *); @@ -384,6 +385,62 @@ static void test__itoa_s(void) buffer); } +static void test_wcsncat_s(void) +{ + static wchar_t abcW[] = {'a','b','c',0}; + int ret; + wchar_t dst[4]; + wchar_t src[4]; + + if (!p_wcsncat_s) + { + win_skip("skipping wcsncat_s tests\n"); + return; + } + + if(!p_set_invalid_parameter_handler) { + win_skip("_set_invalid_parameter_handler not found\n"); + return; + } + + memcpy(src, abcW, sizeof(abcW)); + dst[0] = 0; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(NULL, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 0, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 0, src, _TRUNCATE); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + ret = p_wcsncat_s(dst, 4, NULL, 0); + ok(ret == 0, "err = %d\n", ret); + + dst[0] = 0; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 2, src, 4); + ok(ret == ERANGE, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + dst[0] = 0; + ret = p_wcsncat_s(dst, 2, src, _TRUNCATE); + ok(ret == STRUNCATE, "err = %d\n", ret); + ok(dst[0] == 'a' && dst[1] == 0, "dst is %s\n", wine_dbgstr_w(dst)); + + memcpy(dst, abcW, sizeof(abcW)); + dst[3] = 'd'; + SET_EXPECT(invalid_parameter_handler); + ret = p_wcsncat_s(dst, 4, src, 4); + ok(ret == EINVAL, "err = %d\n", ret); + CHECK_CALLED(invalid_parameter_handler); +} /* ########## */ @@ -415,6 +472,7 @@ START_TEST(msvcr90) p_strtoi64 = (void *) GetProcAddress(hcrt, "_strtoi64"); p_strtoui64 = (void *) GetProcAddress(hcrt, "_strtoui64"); p_itoa_s = (void *)GetProcAddress(hcrt, "_itoa_s"); + p_wcsncat_s = (void *)GetProcAddress( hcrt,"wcsncat_s" ); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -424,4 +482,5 @@ START_TEST(msvcr90) test_error_messages(); test__strtoi64(); test__itoa_s(); + test_wcsncat_s(); } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index aa57b31..2a5d4fc 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1459,6 +1459,10 @@ static void test_wcsncat_s(void) return; } + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + memcpy(src, abcW, sizeof(abcW)); dst[0] = 0; ret = p_wcsncat_s(NULL, 4, src, 4); @@ -1483,6 +1487,10 @@ static void test_wcsncat_s(void) dst[3] = 'd'; ret = p_wcsncat_s(dst, 4, src, 4); ok(ret == EINVAL, "err = %d\n", ret); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); } static void test__mbsnbcat_s(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 922e9d3..484679f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1634,11 +1634,12 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, MSVCRT_wchar_t dststart; INT ret = 0; - if (src == NULL && count > 0) - return MSVCRT_EINVAL; - if (dst == NULL) + if (!MSVCRT_CHECK_PMT(dst != NULL) || !MSVCRT_CHECK_PMT(elem > 0)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; return MSVCRT_EINVAL; - if (elem == 0) + } + if (!MSVCRT_CHECK_PMT(src != NULL || count == 0)) return MSVCRT_EINVAL; if (count == 0) return 0; @@ -1649,7 +1650,10 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, break; } if (dststart == elem) + { + MSVCRT_INVALID_PMT("dst[elem] is not NULL terminated\n"); return MSVCRT_EINVAL; + } if (count == MSVCRT__TRUNCATE) { @@ -1668,6 +1672,7 @@ INT CDECL MSVCRT_wcsncat_s(MSVCRT_wchar_t *dst, MSVCRT_size_t elem, dst[srclen] = '\0'; return ret; } + MSVCRT_INVALID_PMT("dst[elem] is too small"); dst[0] = '\0'; return MSVCRT_ERANGE; }

1 0

Borut Razem : msvcrt: popen: stderr from the child process should not be redirected to the parent' s stdin.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 828fd598b0a9eb94924a0902342fb26c6b2d51c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828fd598b0a9eb94924a09023… Author: Borut Razem <borut.razem(a)siol.net> Date: Mon Nov 15 22:50:23 2010 +0100 msvcrt: popen: stderr from the child process should not be redirected to the parent's stdin. --- dlls/msvcrt/process.c | 15 +-------------- 1 files changed, 1 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b4c39c1..3e2e15e 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1031,7 +1031,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc { MSVCRT_FILE *ret; BOOL readPipe = TRUE; - int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1, fdStdErr = -1; + int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1; const MSVCRT_wchar_t *p; MSVCRT_wchar_t *comspec, *fullcmd; unsigned int len; @@ -1073,13 +1073,6 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc goto error; if (MSVCRT__dup2(fds[fdToDup], fdToDup) != 0) goto error; - if (readPipe) - { - if ((fdStdErr = MSVCRT__dup(MSVCRT_STDERR_FILENO)) == -1) - goto error; - if (MSVCRT__dup2(fds[fdToDup], MSVCRT_STDERR_FILENO) != 0) - goto error; - } MSVCRT__close(fds[fdToDup]); @@ -1106,16 +1099,10 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const MSVCRT_wchar_t* command, const MSVCRT_wc HeapFree(GetProcessHeap(), 0, fullcmd); MSVCRT__dup2(fdStdHandle, fdToDup); MSVCRT__close(fdStdHandle); - if (readPipe) - { - MSVCRT__dup2(fdStdErr, MSVCRT_STDERR_FILENO); - MSVCRT__close(fdStdErr); - } return ret; error: if (fdStdHandle != -1) MSVCRT__close(fdStdHandle); - if (fdStdErr != -1) MSVCRT__close(fdStdErr); MSVCRT__close(fds[0]); MSVCRT__close(fds[1]); return NULL;

1 0

Henri Verbeet : wined3d: Remove a redundant flag in IWineD3DSurfaceImpl_SetMem().
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 4dc28005eb94da48a1bf01702b372e05aa802f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dc28005eb94da48a1bf01702… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:28 2010 +0100 wined3d: Remove a redundant flag in IWineD3DSurfaceImpl_SetMem(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 69a9efd..fa715b1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2612,7 +2612,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *M This->resource.heapMemory = NULL; } This->resource.allocatedMemory = Mem; - This->flags |= SFLAG_USERPTR | SFLAG_INSYSMEM; + This->flags |= SFLAG_USERPTR; /* Now the surface memory is most up do date. Invalidate drawable and texture */ surface_modify_location(This, SFLAG_INSYSMEM, TRUE);

1 0

Henri Verbeet : wined3d: buffer_get_sysmem() potentially invalidates the current element array buffer binding.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: fadd192cba73af4e1617d8f9c85091df3334bd0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fadd192cba73af4e1617d8f9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:29 2010 +0100 wined3d: buffer_get_sysmem() potentially invalidates the current element array buffer binding. This fixes a regression introduced by commit 2a7a2371709233bc87071bbab43e87955cb122ca. --- dlls/wined3d/buffer.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2306d1f..7400fd8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -678,6 +678,12 @@ BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_inf This->resource.heapMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + RESOURCE_ALIGNMENT); This->resource.allocatedMemory = (BYTE *)(((ULONG_PTR)This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); + + if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) + { + IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_INDEXBUFFER); + } + ENTER_GL(); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); GL_EXTCALL(glGetBufferSubDataARB(This->buffer_type_hint, 0, This->resource.size, This->resource.allocatedMemory));

1 0

Henri Verbeet : d3d9: Fix some return values.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: 06581b45136307b620e4100162104d82c55d6ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06581b45136307b620e410016… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:30 2010 +0100 d3d9: Fix some return values. --- dlls/d3d9/device.c | 39 ++++++++++++++++++++------------------- dlls/d3d9/surface.c | 5 +++-- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1c2aa99..d453350 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -420,9 +420,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", iface, XHotSpot, YHotSpot, pCursorBitmap); - if(!pCursorBitmap) { - WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; + if (!pCursorBitmap) + { + WARN("No cursor bitmap, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); @@ -616,7 +617,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(LPDIRECT3DDE This->notreset = TRUE; wined3d_mutex_unlock(); - return WINED3DERR_INVALIDCALL; + return D3DERR_INVALIDCALL; } localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth; @@ -2717,7 +2718,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_SetConvolutionMonoKernel(IDirect3DD FIXME("iface %p, width %u, height %u, rows %p, columns %p stub!\n", iface, width, height, rows, columns); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *iface, @@ -2729,7 +2730,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *if iface, src_surface, dst_surface, src_descs, rect_count, dst_descs, operation, offset_x, offset_y); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_PresentEx(IDirect3DDevice9Ex *iface, @@ -2739,28 +2740,28 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_PresentEx(IDirect3DDevice9Ex *iface FIXME("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p, flags %#x stub!\n", iface, src_rect, dst_rect, dst_window_override, dirty_region, flags); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT *priority) { FIXME("iface %p, priority %p stub!\n", iface, priority); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_SetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT priority) { FIXME("iface %p, priority %d stub!\n", iface, priority); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_WaitForVBlank(IDirect3DDevice9Ex *iface, UINT swapchain_idx) { FIXME("iface %p, swapchain_idx %u stub!\n", iface, swapchain_idx); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDevice9Ex *iface, @@ -2769,14 +2770,14 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDev FIXME("iface %p, resources %p, resource_count %u stub!\n", iface, resources, resource_count); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) { FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency) @@ -2785,7 +2786,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(IDirect3DDev *max_latency = 2; - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window) @@ -2797,7 +2798,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex if (!i++) FIXME("iface %p, dst_window %p stub!\n", iface, dst_window); - return WINED3D_OK; + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevice9Ex *iface, @@ -2809,7 +2810,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevic iface, width, height, format, multisample_type, multisample_quality, lockable, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(IDirect3DDevice9Ex *iface, @@ -2819,7 +2820,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(IDire FIXME("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p, usage %#x stub!\n", iface, width, height, format, pool, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect3DDevice9Ex *iface, @@ -2831,7 +2832,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect iface, width, height, format, multisample_type, multisample_quality, discard, surface, shared_handle, usage); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_ResetEx(IDirect3DDevice9Ex *iface, @@ -2839,7 +2840,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_ResetEx(IDirect3DDevice9Ex *iface, { FIXME("iface %p, present_parameters %p, mode %p stub!\n", iface, present_parameters, mode); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static HRESULT WINAPI IDirect3DDevice9ExImpl_GetDisplayModeEx(IDirect3DDevice9Ex *iface, @@ -2847,7 +2848,7 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_GetDisplayModeEx(IDirect3DDevice9 { FIXME("iface %p, swapchain_idx %u, mode %p, rotation %p stub!\n", iface, swapchain_idx, mode, rotation); - return WINED3DERR_INVALIDCALL; + return E_NOTIMPL; } static const IDirect3DDevice9ExVtbl Direct3DDevice9_Vtbl = diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 76c5e98..6601530 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -325,8 +325,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, hr = IWineD3DSurface_ReleaseDC(This->wineD3DSurface, hdc); wined3d_mutex_unlock(); - switch(hr) { - case WINEDDERR_NODC: return WINED3DERR_INVALIDCALL; + switch (hr) + { + case WINEDDERR_NODC: return D3DERR_INVALIDCALL; default: return hr; } }

1 0

Henri Verbeet : d3d8: Fix some return values.
by Alexandre Julliard 16 Nov '10

16 Nov '10

Module: wine Branch: master Commit: f024e2372f091f1d1a071d6dcac7f30042d864ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=f024e2372f091f1d1a071d6dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 16 12:09:31 2010 +0100 d3d8: Fix some return values. --- dlls/d3d8/device.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7700dfb..67edb06 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -464,9 +464,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", iface, XHotSpot, YHotSpot, pCursorBitmap); - if(!pCursorBitmap) { - WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); - return WINED3DERR_INVALIDCALL; + if (!pCursorBitmap) + { + WARN("No cursor bitmap, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); @@ -903,11 +904,15 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID destFormat = winedesc.format; /* Check that the source and destination formats match */ - if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) { - WARN("(%p) source %p format must match the dest %p format, returning WINED3DERR_INVALIDCALL\n", iface, pSourceSurface, pDestinationSurface); + if (srcFormat != destFormat && WINED3DFMT_UNKNOWN != destFormat) + { + WARN("Source %p format must match the dest %p format, returning D3DERR_INVALIDCALL.\n", + pSourceSurface, pDestinationSurface); wined3d_mutex_unlock(); - return WINED3DERR_INVALIDCALL; - } else if (WINED3DFMT_UNKNOWN == destFormat) { + return D3DERR_INVALIDCALL; + } + else if (WINED3DFMT_UNKNOWN == destFormat) + { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); IWineD3DSurface_SetFormat(Dest->wineD3DSurface, srcFormat); }

1 0