wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Erich E. Hoover : advapi32/tests: Add tests for inheriting ACL attributes.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 404d5bf09d2ba78e7507099a04b42cdae8ec8884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404d5bf09d2ba78e7507099a0… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Apr 18 14:08:36 2014 -0600 advapi32/tests: Add tests for inheriting ACL attributes. CreateFile should also inherit ACL from the parent directory. --- dlls/advapi32/tests/security.c | 50 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a3690e8..f195f94 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3118,10 +3118,11 @@ static void test_CreateDirectoryA(void) ACL_SIZE_INFORMATION acl_size; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; + char tmpfile[MAX_PATH]; char tmpdir[MAX_PATH]; + HANDLE token, hTemp; struct _SID *owner; BOOL bret = TRUE; - HANDLE token; DWORD error; PACL pDacl; @@ -3214,6 +3215,53 @@ static void test_CreateDirectoryA(void) } LocalFree(pSD); + /* Test inheritance of ACLs */ + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(hTemp != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError()); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", + acl_size.AceCount); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Inherited Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine + ok(bret, "Inherited Current User ACE != Current User SID.\n"); + todo_wine + ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, + "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, + "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Inherited Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine + ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); + todo_wine + ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, + "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, + "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + LocalFree(pSD); + CloseHandle(hTemp); + done: HeapFree(GetProcessHeap(), 0, user); bret = RemoveDirectoryA(tmpdir);

1 0

Nikolay Sivov : comctl32/listview: Always forward HDM_SETORDERARRAY to a header.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 30cdd592525340fc96b380f8900397873ed11aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cdd592525340fc96b380f89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 29 10:28:30 2015 +0300 comctl32/listview: Always forward HDM_SETORDERARRAY to a header. --- dlls/comctl32/listview.c | 6 +----- dlls/comctl32/tests/listview.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 081f2a0..d2cd940 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8307,12 +8307,8 @@ static BOOL LISTVIEW_SetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, */ static BOOL LISTVIEW_SetColumnOrderArray(LISTVIEW_INFO *infoPtr, INT iCount, const INT *lpiArray) { - TRACE("iCount %d lpiArray %p\n", iCount, lpiArray); - - if (!lpiArray || !IsWindow(infoPtr->hwndHeader)) return FALSE; - + if (!infoPtr->hwndHeader) return FALSE; infoPtr->colRectsDirty = TRUE; - return SendMessageW(infoPtr->hwndHeader, HDM_SETORDERARRAY, iCount, (LPARAM)lpiArray); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0947251..94c19f4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -181,6 +181,14 @@ static const struct message listview_getorderarray_seq[] = { { 0 } }; +static const struct message listview_setorderarray_seq[] = { + { LVM_SETCOLUMNORDERARRAY, sent|id|wparam, 2, 0, LISTVIEW_ID }, + { HDM_SETORDERARRAY, sent|id|wparam, 2, 0, HEADER_ID }, + { LVM_SETCOLUMNORDERARRAY, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_SETORDERARRAY, sent|id|wparam, 0, 0, HEADER_ID }, + { 0 } +}; + static const struct message empty_seq[] = { { 0 } }; @@ -1479,6 +1487,19 @@ static void test_columns(void) ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_getorderarray_seq, "get order array", FALSE); + /* LVM_SETCOLUMNORDERARRAY */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + order[0] = 0; + order[1] = 1; + rc = SendMessageA(hwnd, LVM_SETCOLUMNORDERARRAY, 2, (LPARAM)&order); + expect(1, rc); + + rc = SendMessageA(hwnd, LVM_SETCOLUMNORDERARRAY, 0, 0); + expect(0, rc); + + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_setorderarray_seq, "set order array", FALSE); + /* after column added subitem is considered as present */ insert_item(hwnd, 0);

1 0

Nikolay Sivov : comctl32/listview: Use defined name instead of magic value.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: d12c2f8b6ff2ea5c32655d9c23b0bfb10b3f4682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12c2f8b6ff2ea5c32655d9c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 29 10:21:16 2015 +0300 comctl32/listview: Use defined name instead of magic value. --- dlls/comctl32/listview.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b3c7976..081f2a0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8340,9 +8340,10 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) /* set column width only if in report or list mode */ if (infoPtr->uView != LV_VIEW_DETAILS && infoPtr->uView != LV_VIEW_LIST) return FALSE; - /* take care of invalid cx values */ - if(infoPtr->uView == LV_VIEW_DETAILS && cx < -2) cx = LVSCW_AUTOSIZE; - else if (infoPtr->uView == LV_VIEW_LIST && cx < 1) return FALSE; + /* take care of invalid cx values - LVSCW_AUTOSIZE_* values are negative, + with _USEHEADER being the lowest */ + if (infoPtr->uView == LV_VIEW_DETAILS && cx < LVSCW_AUTOSIZE_USEHEADER) cx = LVSCW_AUTOSIZE; + else if (infoPtr->uView == LV_VIEW_LIST && cx <= 0) return FALSE; /* resize all columns if in LV_VIEW_LIST mode */ if(infoPtr->uView == LV_VIEW_LIST)

1 0

Nikolay Sivov : comctl32/listview: Support header item image/ bitmap in LVSCW_AUTOSIZE_USEHEADER case.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 9fcfaaa64aeb76649c327bd473165c0cb7d2576d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fcfaaa64aeb76649c327bd47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 23:39:14 2015 +0300 comctl32/listview: Support header item image/bitmap in LVSCW_AUTOSIZE_USEHEADER case. --- dlls/comctl32/listview.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 861335b..b3c7976 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6,7 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun - * Copyright 2009-2014 Nikolay Sivov + * Copyright 2009-2015 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers * Copyright 2012-2013 Daniel Jelinski * @@ -54,7 +54,6 @@ * -- Support CustomDraw options for _WIN32_IE >= 0x560 (see NMLVCUSTOMDRAW docs). * -- LVA_SNAPTOGRID not implemented * -- LISTVIEW_ApproximateViewRect partially implemented - * -- LISTVIEW_SetColumnWidth ignores header images & bitmap * -- LISTVIEW_StyleChanged doesn't handle some changes too well * * Speedups @@ -8402,18 +8401,38 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) cx = 0; /* retrieve header text */ - hdi.mask = HDI_TEXT; + hdi.mask = HDI_TEXT|HDI_FORMAT|HDI_IMAGE|HDI_BITMAP; hdi.cchTextMax = DISP_TEXT_SIZE; hdi.pszText = szDispText; if (SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nColumn, (LPARAM)&hdi)) { HDC hdc = GetDC(infoPtr->hwndSelf); HFONT old_font = SelectObject(hdc, (HFONT)SendMessageW(infoPtr->hwndHeader, WM_GETFONT, 0, 0)); + HIMAGELIST himl = (HIMAGELIST)SendMessageW(infoPtr->hwndHeader, HDM_GETIMAGELIST, 0, 0); + INT bitmap_margin = 0; SIZE size; if (GetTextExtentPoint32W(hdc, hdi.pszText, lstrlenW(hdi.pszText), &size)) cx = size.cx + TRAILING_HEADER_PADDING; - /* FIXME: Take into account the header image, if one is present */ + + if (hdi.fmt & (HDF_IMAGE|HDF_BITMAP)) + bitmap_margin = SendMessageW(infoPtr->hwndHeader, HDM_GETBITMAPMARGIN, 0, 0); + + if ((hdi.fmt & HDF_IMAGE) && himl) + { + INT icon_cx, icon_cy; + + if (!ImageList_GetIconSize(himl, &icon_cx, &icon_cy)) + cx += icon_cx + 2*bitmap_margin; + } + else if (hdi.fmt & HDF_BITMAP) + { + BITMAP bmp; + + GetObjectW(hdi.hbm, sizeof(BITMAP), &bmp); + cx += bmp.bmWidth + 2*bitmap_margin; + } + SelectObject(hdc, old_font); ReleaseDC(infoPtr->hwndSelf, hdc); }

1 0

Mark Harmstone : comctl32: Redraw themed button on WM_ENABLE.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 961c7b887bb35598b601edc653463d5e39587936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961c7b887bb35598b601edc65… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon Mar 30 21:34:53 2015 +0100 comctl32: Redraw themed button on WM_ENABLE. --- dlls/comctl32/theme_button.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 5a3b4b4..bdeba93 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -380,9 +380,11 @@ LRESULT CALLBACK THEMING_ButtonSubclassProc(HWND hwnd, UINT msg, case WM_ENABLE: theme = GetWindowTheme(hwnd); - if (theme) RedrawWindow(hwnd, NULL, NULL, - RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + if (theme) { + RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + return 0; + } else + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); case WM_MOUSEMOVE: {

1 0

Ken Thomases : winemac: Cleanup system tray icons when their owner is destroyed instead of polling.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 5bba54505d7fe9977351f577c1b2e91cc9bee62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bba54505d7fe9977351f577c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 30 14:00:26 2015 -0500 winemac: Cleanup system tray icons when their owner is destroyed instead of polling. --- dlls/winemac.drv/systray.c | 50 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 6bae0ed..16d2e6c 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -35,10 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); -#define CHECK_SYSTRAY_TIMER 1 -#define CHECK_SYSTRAY_INTERVAL_MS 2000 - - /* an individual systray icon */ struct tray_icon { @@ -59,49 +55,16 @@ static BOOL delete_icon(struct tray_icon *icon); /*********************************************************************** - * check_icons + * cleanup_icons * - * Timer procedure for periodically checking that the systray icons are - * still valid (their owning windows still exist). + * Delete all systray icons owned by a given window. */ -static VOID CALLBACK check_icons(HWND hwnd, UINT msg, UINT_PTR timer, DWORD time) +static void cleanup_icons(HWND hwnd) { struct tray_icon *icon, *next; LIST_FOR_EACH_ENTRY_SAFE(icon, next, &icon_list, struct tray_icon, entry) - if (!IsWindow(icon->owner)) delete_icon(icon); -} - - -/*********************************************************************** - * setup_check_icons_timer - * - * Set up a window with a timer to check that tray icons are still valid - * (their owning windows still exist). - */ -static void setup_check_icons_timer(void) -{ - static BOOL done; - - if (!done) - { - static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; - HWND timer_window; - - /* Whether we succeed or not, don't try again. */ - done = TRUE; - - timer_window = CreateWindowW(messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, - NULL, NULL, NULL); - if (!timer_window) - { - WARN("Could not create systray checking message window\n"); - return; - } - - if (!SetTimer(timer_window, CHECK_SYSTRAY_TIMER, CHECK_SYSTRAY_INTERVAL_MS, check_icons)) - WARN("Could not create systray checking timer\n"); - } + if (icon->owner == hwnd) delete_icon(icon); } @@ -231,8 +194,6 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) return FALSE; } - setup_check_icons_timer(); - if (!(icon = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*icon)))) { ERR("out of memory\n"); @@ -299,6 +260,9 @@ int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) case NIM_MODIFY: if ((icon = get_icon(data->hWnd, data->uID))) ret = modify_icon(icon, data); break; + case 0xdead: /* Wine extension: owner window has died */ + cleanup_icons(data->hWnd); + break; default: FIXME("unhandled tray message: %u\n", msg); break;

1 0

Christoph von Wittich : riched20: EM_SETSEL should not return 0.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: c0c36fba709a53eecdebf8b7cd4b4e37027a3a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c36fba709a53eecdebf8b7c… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Mon Mar 30 19:39:13 2015 +0200 riched20: EM_SETSEL should not return 0. --- dlls/riched20/editor.c | 3 +-- dlls/riched20/tests/editor.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 146e4be..171ec69 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3308,8 +3308,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETSEL: { - handle_EM_EXSETSEL( editor, wParam, lParam ); - return 0; + return handle_EM_EXSETSEL( editor, wParam, lParam ); } case EM_SETSCROLLPOS: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 151fcba..65752af 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4454,6 +4454,43 @@ static void test_EM_EXSETSEL(void) DestroyWindow(hwndRichEdit); } +static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + LRESULT result; + int start, end; + + result = SendMessageA(hwnd, EM_SETSEL, setsel->min, setsel->max); + + ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + if (setsel->_getsel_todo_wine) { + todo_wine { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } + } else { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } +} + +static void test_EM_SETSEL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456*/ + /* 10 */ + + for (i = 0; i < num_tests; i++) { + check_EM_SETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + DestroyWindow(hwndRichEdit); +} + static void test_EM_REPLACESEL(int redraw) { HWND hwndRichEdit = new_richedit(NULL); @@ -7658,6 +7695,7 @@ START_TEST( editor ) test_EM_GETLIMITTEXT(); test_WM_SETFONT(); test_EM_GETMODIFY(); + test_EM_SETSEL(); test_EM_EXSETSEL(); test_WM_PASTE(); test_EM_STREAMIN();

1 0

Piotr Caban : msvcr120: Add some missing exports on i386 architecture.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: ccea6c60599e5c2e46d3b5596c4ba167792de649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccea6c60599e5c2e46d3b5596… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 30 16:31:38 2015 +0200 msvcr120: Add some missing exports on i386 architecture. --- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/math.c | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c7df42f..b79e32c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -893,8 +893,8 @@ @ stub -arch=i386,win64 __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) @ stub __crtCreateEventExW -@ stub -arch=i386 ___crtCreateSemaphoreExW -@ stub -arch=x86_64 __crtCreateSymbolicLinkW +@ stub -arch=i386 __crtCreateSemaphoreExW +@ stub __crtCreateSymbolicLinkW @ stub -arch=i386,win64 __crtEnumSystemLocalesEx @ stub -arch=i386,win64 __crtFlsAlloc @ stub -arch=i386,win64 __crtFlsFree @@ -1057,7 +1057,7 @@ @ cdecl _chdir(str) MSVCRT__chdir @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign -@ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf +@ cdecl _chgsignf(float) MSVCRT__chgsignf @ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize @@ -1071,7 +1071,7 @@ @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign(double double) MSVCRT__copysign -@ cdecl -arch=arm,x86_64 _copysignf(float float) MSVCRT__copysignf +@ cdecl _copysignf(float float) MSVCRT__copysignf @ varargs _cprintf(str) @ stub _cprintf_l @ stub _cprintf_p diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 71a6347..f67e414 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1021,7 +1021,7 @@ @ cdecl _calloc_crt(long long) msvcr120._calloc_crt @ cdecl _cexit() msvcr120._cexit @ cdecl _chgsign(double) msvcr120._chgsign -@ cdecl -arch=arm,x86_64 _chgsignf(float) msvcr120._chgsignf +@ cdecl _chgsignf(float) msvcr120._chgsignf @ cdecl -arch=i386 -norelay _chkesp() msvcr120._chkesp @ cdecl _chmod(str long) msvcr120._chmod @ cdecl _chsize(long long) msvcr120._chsize @@ -1035,7 +1035,7 @@ @ cdecl _controlfp(long long) msvcr120._controlfp @ cdecl _controlfp_s(ptr long long) msvcr120._controlfp_s @ cdecl _copysign(double double) msvcr120._copysign -@ cdecl -arch=arm,x86_64 _copysignf(float float) msvcr120._copysignf +@ cdecl _copysignf(float float) msvcr120._copysignf @ cdecl _creat(str long) msvcr120._creat @ cdecl _create_locale(long str) msvcr120._create_locale @ stub -arch=i386 _crt_debugger_hook diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0cd69da..7c971d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -73,7 +73,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#if defined(__x86_64__) || defined(__arm__) +#if defined(__x86_64__) || defined(__arm__) || _MSVCR_VER>=120 /********************************************************************* * _chgsignf (MSVCRT.@) @@ -94,6 +94,9 @@ float CDECL MSVCRT__copysignf( float num, float sign ) return signbit(num) ? -num : num; } +#endif +#if defined(__x86_64__) || defined(__arm__) + /********************************************************************* * _finitef (MSVCRT.@) */

1 0

Hugh McMaster : attrib: Fix incorrect comment.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: d4fb6257f5d88adb69f1bacd3f7d810a1d416eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fb6257f5d88adb69f1bacd3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Mar 30 22:58:17 2015 +1100 attrib: Fix incorrect comment. --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 7e3b01e..0938cb8 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -64,7 +64,7 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) /* * Allocate buffer to use when writing to console * Note: Not freed - memory will be allocated once and released when - * xcopy ends + * attrib ends */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0,

1 0

Mark Harmstone : ntdll: Treat strings as case-insensitive in find_window_class.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 104161cfd29b20d3720cb9e88d3398511e21b794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104161cfd29b20d3720cb9e88… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Mar 28 21:24:49 2015 +0000 ntdll: Treat strings as case-insensitive in find_window_class. --- dlls/ntdll/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4552e40..715a760 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3332,7 +3332,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI { const WCHAR *nameW = (WCHAR*)((BYTE*)actctx->wndclass_section + iter->name_offset); - if (!strcmpW(nameW, name->Buffer)) + if (!strcmpiW(nameW, name->Buffer)) { index = iter; break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015