October 2016 - Wine-Commits

Aric Stewart : hidclass.sys: Minidriver handling for IRP_MN_REMOVE_DEVICE finished the IRP.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 4163642b99166fad6fbfb97442577e9e7c605744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4163642b99166fad6fbfb9744… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 4 05:35:35 2016 -0500 hidclass.sys: Minidriver handling for IRP_MN_REMOVE_DEVICE finished the IRP. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 7df8374..81514c0 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -256,8 +256,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_REMOVE_DEVICE: { HID_DeleteDevice(&minidriver->minidriver, device); - minidriver->PNPDispatch(device, irp); - break; + return minidriver->PNPDispatch(device, irp); } default: {

1 0

Hadrien Boizard : winemac.drv: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 5d96ef42a58e09a2d6cf47a685abb3f42b513ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d96ef42a58e09a2d6cf47a68… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Wed Sep 28 23:53:32 2016 +0200 winemac.drv: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 4 ++-- dlls/winemac.drv/window.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e1953dd..6e1f151 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1652,7 +1652,7 @@ static BOOL sync_context_rect(struct wgl_context *context) { RECT rect = data->client_rect; OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); - if (memcmp(&context->draw_rect, &rect, sizeof(context->draw_rect))) + if (!EqualRect(&context->draw_rect, &rect)) { context->draw_rect = rect; ret = TRUE; @@ -4327,7 +4327,7 @@ void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, cons OffsetRect(&old, -old_whole_rect->left, -old_whole_rect->top); OffsetRect(&new, -data->whole_rect.left, -data->whole_rect.top); - if (memcmp(&old, &new, sizeof(old))) + if (!EqualRect(&old, &new)) { TRACE("GL view %p changed position; marking contexts\n", data->client_cocoa_view); mark_contexts_for_moved_view(data->client_cocoa_view); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index f4be7ce..0359ef7 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -746,7 +746,7 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) */ static void create_cocoa_view(struct macdrv_win_data *data) { - BOOL equal = !memcmp(&data->window_rect, &data->client_rect, sizeof(data->whole_rect)); + BOOL equal = EqualRect(&data->window_rect, &data->client_rect); CGRect frame = cgrect_from_rect(data->window_rect); data->shaped = FALSE; @@ -1055,7 +1055,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c else { BOOL were_equal = (data->cocoa_view == data->client_cocoa_view); - BOOL now_equal = !memcmp(&data->whole_rect, &data->client_rect, sizeof(data->whole_rect)); + BOOL now_equal = EqualRect(&data->whole_rect, &data->client_rect); if (were_equal && !now_equal) { @@ -1781,7 +1781,7 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * OffsetRect(&rect, -window_rect->left, -window_rect->top); surface = data->surface; - if (!surface || memcmp(&surface->rect, &rect, sizeof(RECT))) + if (!surface || !EqualRect(&surface->rect, &rect)) { data->surface = create_surface(data->cocoa_window, &rect, NULL, TRUE); set_window_surface(data->cocoa_window, data->surface); @@ -1967,7 +1967,7 @@ void CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags surface_rect = get_surface_rect(visible_rect); if (data->surface) { - if (!memcmp(&data->surface->rect, &surface_rect, sizeof(surface_rect))) + if (EqualRect(&data->surface->rect, &surface_rect)) { /* existing surface is good enough */ surface_clip_to_visible_rect(data->surface, visible_rect); @@ -2051,7 +2051,7 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, old_client_rect.right - data->client_rect.right == x_offset && old_client_rect.top - data->client_rect.top == y_offset && old_client_rect.bottom - data->client_rect.bottom == y_offset && - !memcmp(&valid_rects[0], &data->client_rect, sizeof(RECT))) + EqualRect(&valid_rects[0], &data->client_rect)) { /* A Cocoa window's bits are moved automatically */ if (!window && (x_offset != 0 || y_offset != 0))

1 0

Huw Davies : riched20: Clearing the insert style should not depend on the event mask.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: df1b51dfa48d14f4e3dfe776c73050e3ad42608e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df1b51dfa48d14f4e3dfe776c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:36 2016 +0100 riched20: Clearing the insert style should not depend on the event mask. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1dacdfa..a47930f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1515,9 +1515,6 @@ void ME_SendSelChange(ME_TextEditor *editor) { SELCHANGE sc; - if (!(editor->nEventMask & ENM_SELCHANGE)) - return; - sc.nmhdr.hwndFrom = NULL; sc.nmhdr.idFrom = 0; sc.nmhdr.code = EN_SELCHANGE; @@ -1527,16 +1524,21 @@ void ME_SendSelChange(ME_TextEditor *editor) sc.seltyp |= SEL_TEXT; if (sc.chrg.cpMin < sc.chrg.cpMax+1) /* what were RICHEDIT authors thinking ? */ sc.seltyp |= SEL_MULTICHAR; - TRACE("cpMin=%d cpMax=%d seltyp=%d (%s %s)\n", - sc.chrg.cpMin, sc.chrg.cpMax, sc.seltyp, - (sc.seltyp & SEL_TEXT) ? "SEL_TEXT" : "", - (sc.seltyp & SEL_MULTICHAR) ? "SEL_MULTICHAR" : ""); + if (sc.chrg.cpMin != editor->notified_cr.cpMin || sc.chrg.cpMax != editor->notified_cr.cpMax) { ME_ClearTempStyle(editor); editor->notified_cr = sc.chrg; - ITextHost_TxNotify(editor->texthost, sc.nmhdr.code, &sc); + + if (editor->nEventMask & ENM_SELCHANGE) + { + TRACE("cpMin=%d cpMax=%d seltyp=%d (%s %s)\n", + sc.chrg.cpMin, sc.chrg.cpMax, sc.seltyp, + (sc.seltyp & SEL_TEXT) ? "SEL_TEXT" : "", + (sc.seltyp & SEL_MULTICHAR) ? "SEL_MULTICHAR" : ""); + ITextHost_TxNotify(editor->texthost, sc.nmhdr.code, &sc); + } } }

1 0

Huw Davies : riched20: Allow selecting the final end-of-paragraph when using the mouse.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 304c8320c9b86b770f98396b86499b200d20b92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=304c8320c9b86b770f98396b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:35 2016 +0100 riched20: Allow selecting the final end-of-paragraph when using the mouse. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 74239af..1dacdfa 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -961,11 +961,13 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, * x & y are pixel positions in virtual coordinates into the rich edit control, * so client coordinates must first be adjusted by the scroll position. * + * If final_eop is TRUE consider the final end-of-paragraph. + * * returns TRUE if the result was exactly under the cursor, otherwise returns * FALSE, and result is set to the closest position to the coordinates. */ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, - ME_Cursor *result, BOOL *is_eol) + ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; BOOL isExact = TRUE; @@ -1001,7 +1003,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, if (!pp) break; p = pp; } - if (p == editor->pBuffer->pLast) + if (p == editor->pBuffer->pLast && !final_eop) { /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to @@ -1016,10 +1018,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, if( p->type == diStartRow ) return ME_FindRunInRow( editor, p, x, result, is_eol ) && isExact; - result->pRun = ME_FindItemBack(p, diRun); - result->pPara = ME_GetParagraph(result->pRun); - result->nOffset = 0; - assert(result->pRun->member.run.nFlags & MERF_ENDPARA); + ME_SetCursorToEnd(editor, result, TRUE); return FALSE; } @@ -1047,7 +1046,7 @@ BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, } x += editor->horz_si.nPos; y += editor->vert_si.nPos; - bResult = ME_FindPixelPos(editor, x, y, cursor, NULL); + bResult = ME_FindPixelPos(editor, x, y, cursor, NULL, FALSE); if (isExact) *isExact = bResult; return TRUE; } @@ -1130,7 +1129,7 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) is_selection = ME_IsSelection(editor); is_shift = GetKeyState(VK_SHIFT) < 0; - ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd); + ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd, FALSE); if (x >= editor->rcFormat.left || is_shift) { @@ -1190,7 +1189,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) tmp_cursor = editor->pCursors[0]; /* FIXME: do something with the return value of ME_FindPixelPos */ - ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd); + ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd, TRUE); ME_InvalidateSelection(editor); editor->pCursors[0] = tmp_cursor;

1 0

Huw Davies : riched20: Move the wrap context struct into wrap.c .
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: ef2e53f9813a959931aa9ac0cc42d5ba9686941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2e53f9813a959931aa9ac0c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:37 2016 +0100 riched20: Move the wrap context struct into wrap.c . Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 15 --------------- dlls/riched20/wrap.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 261a701..35555a9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -460,19 +460,4 @@ typedef struct tagME_Context ME_TextEditor *editor; } ME_Context; -typedef struct tagME_WrapContext -{ - ME_Style *style; - ME_Context *context; - int nLeftMargin, nRightMargin, nFirstMargin; - int nAvailWidth; - int nRow; - POINT pt; - BOOL bOverflown, bWordWrap; - ME_DisplayItem *pPara; - ME_DisplayItem *pRowStart; - - ME_DisplayItem *pLastSplittableRun; -} ME_WrapContext; - #endif diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 195eb8d..24a7b16 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -33,6 +33,20 @@ WINE_DECLARE_DEBUG_CHANNEL(richedit_check); * - no tabs */ +typedef struct tagME_WrapContext +{ + ME_Style *style; + ME_Context *context; + int nLeftMargin, nRightMargin, nFirstMargin; + int nAvailWidth; + int nRow; + POINT pt; + BOOL bOverflown, bWordWrap; + ME_DisplayItem *pPara; + ME_DisplayItem *pRowStart; + + ME_DisplayItem *pLastSplittableRun; +} ME_WrapContext; static BOOL get_run_glyph_buffers( ME_Run *run ) {

1 0

Huw Davies : riched20: Allow selecting to the start / end when using the up / down arrow keys.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 7eb683772931f749cf27fa54d54003214923970d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb683772931f749cf27fa54d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:34 2016 +0100 riched20: Allow selecting to the start / end when using the up / down arrow keys. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index b137c5f..74239af 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1237,7 +1237,7 @@ static int ME_GetXForArrow(ME_TextEditor *editor, ME_Cursor *pCursor) static void -ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) +ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs, BOOL extend) { ME_DisplayItem *pRun = pCursor->pRun; ME_DisplayItem *pOldPara = pCursor->pPara; @@ -1255,8 +1255,12 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) assert(pItem); /* start of the previous row */ pItem = ME_FindItemBack(pItem, diStartRow); - if (!pItem) - return; /* row not found - ignore */ + if (!pItem) /* row not found */ + { + if (extend) + ME_SetCursorToStart(editor, pCursor); + return; + } pNewPara = ME_GetParagraph(pItem); if (pOldPara->member.para.nFlags & MEPF_ROWEND || (pOldPara->member.para.pCell && @@ -1282,8 +1286,12 @@ ME_MoveCursorLines(ME_TextEditor *editor, ME_Cursor *pCursor, int nRelOfs) { /* start of the next row */ pItem = ME_FindItemFwd(pRun, diStartRow); - if (!pItem) - return; /* row not found - ignore */ + if (!pItem) /* row not found */ + { + if (extend) + ME_SetCursorToEnd(editor, pCursor, TRUE); + return; + } pNewPara = ME_GetParagraph(pItem); if (pOldPara->member.para.nFlags & MEPF_ROWSTART || (pOldPara->member.para.pCell && @@ -1558,10 +1566,10 @@ ME_ArrowKey(ME_TextEditor *editor, int nVKey, BOOL extend, BOOL ctrl) success = ME_MoveCursorChars(editor, &tmp_curs, +1, extend); break; case VK_UP: - ME_MoveCursorLines(editor, &tmp_curs, -1); + ME_MoveCursorLines(editor, &tmp_curs, -1, extend); break; case VK_DOWN: - ME_MoveCursorLines(editor, &tmp_curs, +1); + ME_MoveCursorLines(editor, &tmp_curs, +1, extend); break; case VK_PRIOR: ME_ArrowPageUp(editor, &tmp_curs);

1 0

Huw Davies : riched20: Set the end-of-paragraph run width to that of a space.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 4c322698dad93edccc55c1462e7d8428a3177ffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c322698dad93edccc55c1462… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:31 2016 +0100 riched20: Set the end-of-paragraph run width to that of a space. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 778a952..984f8f5 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -611,17 +611,16 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i int startx, int *pAscent, int *pDescent) { SIZE size; - int nMaxLen = run->len; + WCHAR spaceW[] = {' ',0}; - if (nLen>nMaxLen) - nLen = nMaxLen; + nLen = min( nLen, run->len ); - /* FIXME the following call also ensures that TEXTMETRIC structure is filled - * this is wasteful for MERF_NONTEXT runs, but that shouldn't matter - * in practice - */ - - if (para->nFlags & MEPF_COMPLEX) + if (run->nFlags & MERF_ENDPARA) + { + nLen = min( nLen, 1 ); + ME_GetTextExtent(c, spaceW, nLen, run->style, &size); + } + else if (para->nFlags & MEPF_COMPLEX) { size.cx = run->nWidth; }

1 0

Hans Leidekker : ntdll: SzCSDVersion is an empty string on Windows 8 and up.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: f94784ddbac9880789171d9f0126499485051249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94784ddbac9880789171d9f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 4 13:28:33 2016 +0200 ntdll: SzCSDVersion is an empty string on Windows 8 and up. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 3 +++ dlls/ntdll/version.c | 9 +++------ programs/winecfg/appdefaults.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index a47e52c..4182c06 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -156,6 +156,9 @@ static void test_GetVersionEx(void) ok(ret || broken(ret == 0), /* win95 */ "Expected GetVersionExA to succeed\n"); + + if (!infoExA.wServicePackMajor && !infoExA.wServicePackMinor) + ok(!infoExA.szCSDVersion[0], "got '%s'\n", infoExA.szCSDVersion); } static void test_VerifyVersionInfo(void) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index b6cafc6..06f9827 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -176,20 +176,17 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = /* WIN8 */ { sizeof(RTL_OSVERSIONINFOEXW), 6, 2, 0x23F0, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN81 */ { sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, /* WIN10 */ { sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, - {' ',0}, - 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 91478fc..f674824 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,9 +48,9 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, - { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, - { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"}, { "win2008", "Windows 2008", 6, 0, 0x1772,VER_PLATFORM_WIN32_NT, "Service Pack 2", 2, 0, "ServerNT"},

1 0

Piotr Caban : msvcp110: Fix cin/cout/cerr/clog structure sizes.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: 3ba26d38eb38ca32ea23c76c2c50f2a412730d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba26d38eb38ca32ea23c76c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 4 10:09:58 2016 +0200 msvcp110: Fix cin/cout/cerr/clog structure sizes. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index f673bc1..84a6bf2c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15138,8 +15138,12 @@ static basic_filebuf_char filebuf_char_stdin; /* ?cin(a)std@@3V?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { basic_istream_char obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_char vbase; } cin = { { 0 } }; +C_ASSERT(sizeof(cin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_cin(a)std@@3PAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_cin(a)std@@3PEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_istream_char *_Ptr_cin = &cin.obj; @@ -15148,8 +15152,12 @@ static basic_filebuf_wchar filebuf_short_stdin; /* ?wcin(a)std@@3V?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)A */ struct { basic_istream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } ucin = { { 0 } }; +C_ASSERT(sizeof(ucin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcin(a)std@@3PAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)A */ /* ?_Ptr_wcin(a)std@@3PEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)EA */ basic_istream_wchar *_Ptr_ucin = &ucin.obj; @@ -15158,8 +15166,12 @@ static basic_filebuf_wchar filebuf_wchar_stdin; /* ?wcin(a)std@@3V?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ struct { basic_istream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } wcin = { { 0 } }; +C_ASSERT(sizeof(wcin) == VBTABLE_BASIC_IOS_ENTRY(basic_istream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcin(a)std@@3PAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ /* ?_Ptr_wcin(a)std@@3PEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_istream_wchar *_Ptr_wcin = &wcin.obj; @@ -15168,8 +15180,12 @@ static basic_filebuf_char filebuf_char_stdout; /* ?cout(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { basic_ostream_char obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_char vbase; } cout = { { 0 } }; +C_ASSERT(sizeof(cout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_cout(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_cout(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_ostream_char *_Ptr_cout = &cout.obj; @@ -15178,8 +15194,12 @@ static basic_filebuf_wchar filebuf_short_stdout; /* ?wcout(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } ucout = { { 0 } }; +C_ASSERT(sizeof(ucout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcout(a)std@@3PAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ /* ?_Ptr_wcout(a)std@@3PEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_ucout = &ucout.obj; @@ -15188,8 +15208,12 @@ static basic_filebuf_wchar filebuf_wchar_stdout; /* ?wcout(a)std@@3V?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } wcout = { { 0 } }; +C_ASSERT(sizeof(wcout) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcout(a)std@@3PAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ /* ?_Ptr_wcout(a)std@@3PEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_wcout = &wcout.obj; @@ -15198,8 +15222,12 @@ static basic_filebuf_char filebuf_char_stderr; /* ?cerr(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { basic_ostream_char obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_char vbase; } cerr = { { 0 } }; +C_ASSERT(sizeof(cerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_cerr(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_cerr(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_ostream_char *_Ptr_cerr = &cerr.obj; @@ -15208,8 +15236,12 @@ static basic_filebuf_wchar filebuf_short_stderr; /* ?wcerr(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } ucerr = { { 0 } }; +C_ASSERT(sizeof(ucerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcerr(a)std@@3PAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ /* ?_Ptr_wcerr(a)std@@3PEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_ucerr = &ucerr.obj; @@ -15218,8 +15250,12 @@ static basic_filebuf_wchar filebuf_wchar_stderr; /* ?wcerr(a)std@@3V?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } wcerr = { { 0 } }; +C_ASSERT(sizeof(wcerr) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wcerr(a)std@@3PAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ /* ?_Ptr_wcerr(a)std@@3PEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_wcerr = &wcerr.obj; @@ -15228,8 +15264,12 @@ static basic_filebuf_char filebuf_char_log; /* ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ struct { basic_ostream_char obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_char vbase; } clog = { { 0 } }; +C_ASSERT(sizeof(clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ basic_ostream_char *_Ptr_clog = &clog.obj; @@ -15238,8 +15278,12 @@ static basic_filebuf_wchar filebuf_short_log; /* ?wclog(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } uclog = { { 0 } }; +C_ASSERT(sizeof(uclog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wclog(a)std@@3PAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ /* ?_Ptr_wclog(a)std@@3PEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_uclog = &uclog.obj; @@ -15248,8 +15292,12 @@ static basic_filebuf_wchar filebuf_wchar_log; /* ?wclog(a)std@@3V?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ struct { basic_ostream_wchar obj; +#if _MSVCP_VER >= 110 + int vtordisp; +#endif basic_ios_wchar vbase; } wclog = { { 0 } }; +C_ASSERT(sizeof(wclog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_wchar, 0)+sizeof(basic_ios_wchar)); /* ?_Ptr_wclog(a)std@@3PAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)A */ /* ?_Ptr_wclog(a)std@@3PEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)EA */ basic_ostream_wchar *_Ptr_wclog = &wclog.obj;

1 0

Matteo Bruni : wined3d: Add core version of the functions introduced by EXT_draw_buffers2.
by Alexandre Julliard Oct. 4, 2016

Oct. 4, 2016

Module: wine Branch: master Commit: d048003694eb6e1cd371afff88c8b59b24e1e851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d048003694eb6e1cd371afff8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:53 2016 +0200 wined3d: Add core version of the functions introduced by EXT_draw_buffers2. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 00e8d63..d658692 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3056,10 +3056,12 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glDeleteShader) /* OpenGL 2.0 */ USE_GL_FUNC(glDeleteVertexArrays) /* OpenGL 3.0 */ USE_GL_FUNC(glDetachShader) /* OpenGL 2.0 */ + USE_GL_FUNC(glDisablei) /* OpenGL 3.0 */ USE_GL_FUNC(glDisableVertexAttribArray) /* OpenGL 2.0 */ USE_GL_FUNC(glDrawArraysInstanced) /* OpenGL 3.1 */ USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */ USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */ + USE_GL_FUNC(glEnablei) /* OpenGL 3.0 */ USE_GL_FUNC(glEnableVertexAttribArray) /* OpenGL 2.0 */ USE_GL_FUNC(glEndQuery) /* OpenGL 1.5 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ @@ -3068,9 +3070,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetActiveUniform) /* OpenGL 2.0 */ USE_GL_FUNC(glGetAttachedShaders) /* OpenGL 2.0 */ USE_GL_FUNC(glGetAttribLocation) /* OpenGL 2.0 */ + USE_GL_FUNC(glGetBooleani_v) /* OpenGL 3.0 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ USE_GL_FUNC(glGetDebugMessageLog) /* OpenGL 4.3 */ + USE_GL_FUNC(glGetIntegeri_v) /* OpenGL 3.0 */ USE_GL_FUNC(glGetProgramInfoLog) /* OpenGL 2.0 */ USE_GL_FUNC(glGetProgramiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetQueryiv) /* OpenGL 1.5 */ @@ -3082,6 +3086,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetUniformfv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetUniformiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetUniformLocation) /* OpenGL 2.0 */ + USE_GL_FUNC(glIsEnabledi) /* OpenGL 3.0 */ USE_GL_FUNC(glLinkProgram) /* OpenGL 2.0 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ @@ -3178,10 +3183,12 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glDeleteQueries, glDeleteQueriesARB); MAP_GL_FUNCTION(glDeleteShader, glDeleteObjectARB); MAP_GL_FUNCTION(glDetachShader, glDetachObjectARB); + MAP_GL_FUNCTION(glDisablei, glDisableIndexedEXT); MAP_GL_FUNCTION(glDisableVertexAttribArray, glDisableVertexAttribArrayARB); MAP_GL_FUNCTION(glDrawArraysInstanced, glDrawArraysInstancedARB); MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB); + MAP_GL_FUNCTION(glEnablei, glEnableIndexedEXT); MAP_GL_FUNCTION(glEnableVertexAttribArray, glEnableVertexAttribArrayARB); MAP_GL_FUNCTION(glEndQuery, glEndQueryARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); @@ -3189,9 +3196,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glGetActiveUniform, glGetActiveUniformARB); MAP_GL_FUNCTION(glGetAttachedShaders, glGetAttachedObjectsARB); MAP_GL_FUNCTION(glGetAttribLocation, glGetAttribLocationARB); + MAP_GL_FUNCTION(glGetBooleani_v, glGetBooleanIndexedvEXT); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB); MAP_GL_FUNCTION(glGetDebugMessageLog, glGetDebugMessageLogARB); + MAP_GL_FUNCTION(glGetIntegeri_v, glGetIntegerIndexedvEXT); MAP_GL_FUNCTION(glGetProgramInfoLog, glGetInfoLogARB); MAP_GL_FUNCTION(glGetProgramiv, glGetObjectParameterivARB); MAP_GL_FUNCTION(glGetQueryiv, glGetQueryivARB); @@ -3202,6 +3211,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glGetUniformfv, glGetUniformfvARB); MAP_GL_FUNCTION(glGetUniformiv, glGetUniformivARB); MAP_GL_FUNCTION(glGetUniformLocation, glGetUniformLocationARB); + MAP_GL_FUNCTION(glIsEnabledi, glIsEnabledIndexedEXT); MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB);

1 0