August 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Make pixel format objects const and get rid of the WineGLPixelFormat typedef .
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 451828e169ce41ec696f7fcd8a17a35ffa1eef4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=451828e169ce41ec696f7fcd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 15:38:05 2012 +0200 winex11: Make pixel format objects const and get rid of the WineGLPixelFormat typedef. --- dlls/winex11.drv/opengl.c | 56 +++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=451828e169ce41ec696f7…

1 0

Alexandre Julliard : winex11: Remove the redundant pixel format index from the pixel format object.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 5e932efbf6a9bec78c24fc7960c6d31c77b6419c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e932efbf6a9bec78c24fc796… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 15 15:44:00 2012 +0200 winex11: Remove the redundant pixel format index from the pixel format object. --- dlls/winex11.drv/opengl.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5f3c766..fc7448a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -133,7 +133,6 @@ struct WineGLInfo { struct wgl_pixel_format { - int iPixelFormat; GLXFBConfig fbconfig; int fmt_id; int render_type; @@ -964,7 +963,6 @@ static void init_pixel_formats( Display *display ) } TRACE("Found onscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); - list[size].iPixelFormat = size+1; /* The index starts at 1 */ list[size].fbconfig = cfgs[i]; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); @@ -976,7 +974,6 @@ static void init_pixel_formats( Display *display ) if(check_fbconfig_bitmap_capability(display, cfgs[i])) { TRACE("Found bitmap capable format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); - list[size].iPixelFormat = size+1; /* The index starts at 1 */ list[size].fbconfig = cfgs[i]; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); @@ -1001,7 +998,6 @@ static void init_pixel_formats( Display *display ) } TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", fmt_id, size+1, i); - list[size].iPixelFormat = size+1; /* The index starts at 1 */ list[size].fbconfig = cfgs[i]; list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); @@ -1469,10 +1465,9 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (ctx->fmt->iPixelFormat != escape.pixel_format) + if (ctx->fmt - pixel_formats != escape.pixel_format - 1) { - WARN( "mismatched pixel format hdc %p %u ctx %p %u\n", - hdc, escape.pixel_format, ctx, ctx->fmt->iPixelFormat ); + WARN( "mismatched pixel format hdc %p %u ctx %p\n", hdc, escape.pixel_format, ctx ); SetLastError( ERROR_INVALID_PIXEL_FORMAT ); return FALSE; }

1 0

Dmitry Timoshkov : winedbg: Make the crash dialog slightly larger and minimize/maximize-able.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 6407cd8e0ccb53c0c80c1f61d6d1568c671ba45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6407cd8e0ccb53c0c80c1f61d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 6 11:08:20 2012 +0900 winedbg: Make the crash dialog slightly larger and minimize/maximize-able. --- programs/winedbg/winedbg.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 4effa6e..8d9dc34 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -58,17 +58,17 @@ BEGIN PUSHBUTTON "Show &Details", ID_DETAILS, 140, 151, 60, 16, WS_TABSTOP END -IDD_DETAILS_DLG DIALOGEX 100, 100, 300, 240 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_VISIBLE +IDD_DETAILS_DLG DIALOGEX 100, 100, 400, 340 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE CAPTION "Program Error Details" FONT 8, "MS Shell Dlg" BEGIN - EDITTEXT IDC_CRASH_TXT, 4, 4, 292, 172, ES_MULTILINE | ES_READONLY | WS_HSCROLL | WS_VSCROLL, WS_TABSTOP + EDITTEXT IDC_CRASH_TXT, 4, 4, 392, 272, ES_MULTILINE | ES_READONLY | WS_HSCROLL | WS_VSCROLL, WS_TABSTOP CONTROL "If this problem is not present under Windows and has not been reported yet, \ you can save the detailed information to a file using the \"Save As\" button, \ then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> \ and attach that file to the report.", - IDC_STATIC_TXT2,"SysLink",0,6,185,288,32 - DEFPUSHBUTTON "Close", IDOK, 226, 220, 70, 16, WS_TABSTOP - PUSHBUTTON "&Save As...", ID_SAVEAS, 152, 220, 70, 16, WS_TABSTOP + IDC_STATIC_TXT2,"SysLink",0,6,285,388,32 + DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP + PUSHBUTTON "&Save As...", ID_SAVEAS, 252, 320, 70, 16, WS_TABSTOP END

1 0

Piotr Caban : msvcp90: Export wcin, wcout, wcerr and wclog objects.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: fe8811bfd88a51a56f1a18bdc8dbe276006a6567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8811bfd88a51a56f1a18bdc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:06 2012 +0200 msvcp90: Export wcin, wcout, wcerr and wclog objects. --- dlls/msvcp90/ios.c | 160 ++++++++++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.spec | 48 +++++++------- 2 files changed, 168 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe8811bfd88a51a56f1a1…

1 0

Piotr Caban : msvcp90: Added basic_ostringstream<short> implementation.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 8499ea376dbda112b3361aac6bf6a1a90fd604ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8499ea376dbda112b3361aac6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:17 2012 +0200 msvcp90: Added basic_ostringstream<short> implementation. --- dlls/msvcp90/ios.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++-------------- 2 files changed, 75 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8499ea376dbda112b3361…

1 0

Piotr Caban : msvcp90: Added basic_istringstream<short> implementation.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: b1ff81a7702d2cdc08d69648af81323d6b2380f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ff81a7702d2cdc08d69648a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:27 2012 +0200 msvcp90: Added basic_istringstream<short> implementation. --- dlls/msvcp90/ios.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++-------------- 2 files changed, 75 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ff81a7702d2cdc08d69…

1 0

Piotr Caban : msvcp90: Added basic_stringstream<short> implementation.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 625940a5607ba4c8fbe4706af010c246ee6a4062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625940a5607ba4c8fbe4706af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:37 2012 +0200 msvcp90: Added basic_stringstream<short> implementation. --- dlls/msvcp90/ios.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 38 +++++++++++++------------- 2 files changed, 81 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=625940a5607ba4c8fbe47…

1 0

Piotr Caban : msvcp90: Use streamoff in std::_BADOFF definition.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 1202e8bf87ea4d1058b425a26c630b085c9d160a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1202e8bf87ea4d1058b425a26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:48 2012 +0200 msvcp90: Use streamoff in std::_BADOFF definition. --- dlls/msvcp90/msvcp90_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 18a2514..9981e95 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -104,11 +104,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /* ?_BADOFF(a)std@@3JB -> long const std::_BADOFF */ /* ?_BADOFF(a)std@@3_JB -> __int64 const std::_BADOFF */ -const INT_PTR std_BADOFF = -1; +const streamoff std_BADOFF = -1; /* ?_BADOFF_func(a)std@@YAABJXZ -> long const & __cdecl std::_BADOFF_func(void) */ /* ?_BADOFF_func(a)std@@YAAEB_JXZ -> __int64 const & __ptr64 __cdecl std::_BADOFF_func(void) */ -const INT_PTR * __cdecl std_BADOFF_func(void) +const streamoff * __cdecl std_BADOFF_func(void) { return &std_BADOFF; }

1 0

Piotr Caban : msvcp90: Added partial strstreambuf implementation.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: f143f3e6bc74eb491a38530fd35ebc356fdf633b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f143f3e6bc74eb491a38530fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:58 2012 +0200 msvcp90: Added partial strstreambuf implementation. --- dlls/msvcp90/ios.c | 357 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 82 +++++----- 2 files changed, 398 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f143f3e6bc74eb491a385…

1 0

Piotr Caban : msvcp90: Fixed basic_streambuf:: sputn functions behaviour when there's no place in buffer.
by Alexandre Julliard 15 Aug '12

15 Aug '12

Module: wine Branch: master Commit: 76821340a4ece7a4f140b96f7d2e62655634eaab URL: http://source.winehq.org/git/wine.git/?a=commit;h=76821340a4ece7a4f140b96f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:09 2012 +0200 msvcp90: Fixed basic_streambuf::sputn functions behaviour when there's no place in buffer. --- dlls/msvcp90/ios.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a053103..43fb46f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1031,7 +1031,7 @@ streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy_s(ptr+copied, size, *this->prpos, chunk); *this->prpos += chunk; *this->prsize -= chunk; @@ -1450,7 +1450,7 @@ streamsize __thiscall basic_streambuf_char_xsputn(basic_streambuf_char *this, co if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy(*this->pwpos, ptr+copied, chunk); *this->pwpos += chunk; *this->pwsize -= chunk; @@ -1776,7 +1776,7 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy_s(ptr+copied, size, *this->prpos, chunk); *this->prpos += chunk; *this->prsize -= chunk; @@ -2269,7 +2269,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this, if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy(*this->pwpos, ptr+copied, chunk); *this->pwpos += chunk; *this->pwsize -= chunk;

1 0