April 2011 - Wine-Commits - list.winehq.org

David Hedberg : comdlg32: Set explorerbrowser' s site before navigating anywhere.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 0a524a0c76bba5364f4c4bfd4ed02ecdf0ad8fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a524a0c76bba5364f4c4bfd4… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Fri Apr 1 05:52:23 2011 +0200 comdlg32: Set explorerbrowser's site before navigating anywhere. --- dlls/comdlg32/itemdlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 35812f2..ef4bb9d 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -281,14 +281,14 @@ static HRESULT init_explorerbrowser(FileDialogImpl *This) IExplorerBrowser_SetFolderSettings(This->peb, &fos); - /* Browse somewhere */ - psi_folder = This->psi_setfolder ? This->psi_setfolder : This->psi_defaultfolder; - IExplorerBrowser_BrowseToObject(This->peb, (IUnknown*)psi_folder, SBSP_DEFBROWSER); - hr = IUnknown_SetSite((IUnknown*)This->peb, (IUnknown*)This); if(FAILED(hr)) ERR("SetSite (ExplorerBrowser) failed.\n"); + /* Browse somewhere */ + psi_folder = This->psi_setfolder ? This->psi_setfolder : This->psi_defaultfolder; + IExplorerBrowser_BrowseToObject(This->peb, (IUnknown*)psi_folder, SBSP_DEFBROWSER); + return S_OK; }

1 0

Francois Gouget : regedit: Add support for creating expandable string values.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 1ea5c7b8d9d4db8a86057d922c1e6f10019bcf14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea5c7b8d9d4db8a86057d922… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 1 10:39:50 2011 +0200 regedit: Add support for creating expandable string values. --- po/ar.po | 160 ++++++++++++++++++++++--------------------- po/bg.po | 161 ++++++++++++++++++++++--------------------- po/ca.po | 160 ++++++++++++++++++++++--------------------- po/cs.po | 161 ++++++++++++++++++++++--------------------- po/da.po | 161 ++++++++++++++++++++++--------------------- po/de.po | 161 ++++++++++++++++++++++--------------------- po/el.po | 160 ++++++++++++++++++++++--------------------- po/en.po | 160 ++++++++++++++++++++++--------------------- po/en_US.po | 160 ++++++++++++++++++++++--------------------- po/eo.po | 160 ++++++++++++++++++++++--------------------- po/es.po | 161 ++++++++++++++++++++++--------------------- po/fa.po | 160 ++++++++++++++++++++++--------------------- po/fi.po | 160 ++++++++++++++++++++++--------------------- po/fr.po | 161 ++++++++++++++++++++++--------------------- po/he.po | 161 ++++++++++++++++++++++--------------------- po/hi.po | 160 ++++++++++++++++++++++--------------------- po/hu.po | 161 ++++++++++++++++++++++--------------------- po/it.po | 161 ++++++++++++++++++++++--------------------- po/ja.po | 161 ++++++++++++++++++++++--------------------- po/ko.po | 161 ++++++++++++++++++++++--------------------- po/lt.po | 161 ++++++++++++++++++++++--------------------- po/ml.po | 160 ++++++++++++++++++++++--------------------- po/nb_NO.po | 161 ++++++++++++++++++++++--------------------- po/nl.po | 161 ++++++++++++++++++++++--------------------- po/or.po | 160 ++++++++++++++++++++++--------------------- po/pa.po | 160 ++++++++++++++++++++++--------------------- po/pl.po | 161 ++++++++++++++++++++++--------------------- po/pt_BR.po | 161 ++++++++++++++++++++++--------------------- po/pt_PT.po | 161 ++++++++++++++++++++++--------------------- po/rm.po | 160 ++++++++++++++++++++++--------------------- po/ro.po | 161 ++++++++++++++++++++++--------------------- po/ru.po | 161 ++++++++++++++++++++++--------------------- po/sk.po | 160 ++++++++++++++++++++++--------------------- po/sl.po | 161 ++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 160 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 160 ++++++++++++++++++++++--------------------- po/sv.po | 161 ++++++++++++++++++++++--------------------- po/te.po | 160 ++++++++++++++++++++++--------------------- po/th.po | 160 ++++++++++++++++++++++--------------------- po/tr.po | 161 ++++++++++++++++++++++--------------------- po/uk.po | 161 ++++++++++++++++++++++--------------------- po/wa.po | 160 ++++++++++++++++++++++--------------------- po/wine.pot | 160 ++++++++++++++++++++++--------------------- po/zh_CN.po | 161 ++++++++++++++++++++++--------------------- po/zh_TW.po | 161 ++++++++++++++++++++++--------------------- programs/regedit/framewnd.c | 3 + programs/regedit/regedit.rc | 2 + programs/regedit/resource.h | 1 + 48 files changed, 3721 insertions(+), 3510 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ea5c7b8d9d4db8a86057…

1 0

Matteo Bruni : wined3d: Fix an error message.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 0322114cd6d3261d590d545ff8c16efe1e1c0a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0322114cd6d3261d590d545ff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 18 18:40:37 2011 +0100 wined3d: Fix an error message. --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3b0a9b6..8413c42 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2304,7 +2304,7 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf { DWORD err = GetLastError(); ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", - context->hdc, context->glCtx, err); + context->glCtx, context->hdc, err); } }

1 0

Austin Lund : user32/tests: Fixed SetParent test on 64bit Vista.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: be24fd4b64e2886485c8df13e9eb2ce6d4d7eea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be24fd4b64e2886485c8df13e… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Apr 1 09:42:48 2011 +1000 user32/tests: Fixed SetParent test on 64bit Vista. --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ab9a3fb..712f564 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12681,6 +12681,7 @@ static const struct message WmSetParentSeq_2[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { HCBT_SETFOCUS, hook|optional }, { WM_NCACTIVATE, sent|wparam, 0 }, { WM_ACTIVATE, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam, 0 },

1 0

Matteo Bruni : wined3d: Better handle some instances when we can' t make the required GL context current.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 06ef87ceb12e510b721bd5cc019c026682df4fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06ef87ceb12e510b721bd5cc0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 18 19:17:52 2011 +0100 wined3d: Better handle some instances when we can't make the required GL context current. --- dlls/wined3d/context.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8413c42..c3a6a5f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1017,12 +1017,20 @@ BOOL context_set_current(struct wined3d_context *ctx) if (ctx) { + if (!ctx->valid) + { + ERR("Trying to make invalid context %p current\n", ctx); + return FALSE; + } + TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) { DWORD err = GetLastError(); ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", ctx->glCtx, ctx->hdc, err); + ctx->valid = 0; + pwglMakeCurrent(NULL, NULL); TlsSetValue(wined3d_context_tls_idx, NULL); return FALSE; } @@ -1063,6 +1071,7 @@ void context_release(struct wined3d_context *context) DWORD err = GetLastError(); ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", context->restore_ctx, context->restore_dc, err); + context_set_current(NULL); } context->restore_ctx = NULL; context->restore_dc = NULL; @@ -2305,6 +2314,8 @@ struct wined3d_context *context_acquire(IWineD3DDeviceImpl *device, IWineD3DSurf DWORD err = GetLastError(); ERR("Failed to make GL context %p current on device context %p, last error %#x.\n", context->glCtx, context->hdc, err); + context->valid = 0; + pwglMakeCurrent(NULL, NULL); } }

1 0

Francois Gouget : notepad: Remove the 'Help on Help' menu.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 9b21a106cc0040edc8a6a84b84acd586934c1383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b21a106cc0040edc8a6a84b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 1 10:39:13 2011 +0200 notepad: Remove the 'Help on Help' menu. It is redundant with the help application's 'Help' menu and clutters notepad. --- po/ar.po | 48 +++++++++++++++++++------------------- po/bg.po | 48 +++++++++++++++++++------------------- po/ca.po | 48 +++++++++++++++++++------------------- po/cs.po | 48 +++++++++++++++++++------------------- po/da.po | 48 +++++++++++++++++++------------------- po/de.po | 48 +++++++++++++++++++------------------- po/el.po | 48 +++++++++++++++++++------------------- po/en.po | 48 +++++++++++++++++++------------------- po/en_US.po | 48 +++++++++++++++++++------------------- po/eo.po | 48 +++++++++++++++++++------------------- po/es.po | 48 +++++++++++++++++++------------------- po/fa.po | 48 +++++++++++++++++++------------------- po/fi.po | 48 +++++++++++++++++++------------------- po/fr.po | 48 +++++++++++++++++++------------------- po/he.po | 48 +++++++++++++++++++------------------- po/hi.po | 48 +++++++++++++++++++------------------- po/hu.po | 48 +++++++++++++++++++------------------- po/it.po | 48 +++++++++++++++++++------------------- po/ja.po | 48 +++++++++++++++++++------------------- po/ko.po | 48 +++++++++++++++++++------------------- po/lt.po | 48 +++++++++++++++++++------------------- po/ml.po | 48 +++++++++++++++++++------------------- po/nb_NO.po | 48 +++++++++++++++++++------------------- po/nl.po | 48 +++++++++++++++++++------------------- po/or.po | 48 +++++++++++++++++++------------------- po/pa.po | 48 +++++++++++++++++++------------------- po/pl.po | 48 +++++++++++++++++++------------------- po/pt_BR.po | 48 +++++++++++++++++++------------------- po/pt_PT.po | 48 +++++++++++++++++++------------------- po/rm.po | 50 ++++++++++++++++++++-------------------- po/ro.po | 48 +++++++++++++++++++------------------- po/ru.po | 48 +++++++++++++++++++------------------- po/sk.po | 48 +++++++++++++++++++------------------- po/sl.po | 48 +++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 48 +++++++++++++++++++------------------- po/sr_RS(a)latin.po | 48 +++++++++++++++++++------------------- po/sv.po | 48 +++++++++++++++++++------------------- po/te.po | 48 +++++++++++++++++++------------------- po/th.po | 48 +++++++++++++++++++------------------- po/tr.po | 48 +++++++++++++++++++------------------- po/uk.po | 48 +++++++++++++++++++------------------- po/wa.po | 48 +++++++++++++++++++------------------- po/wine.pot | 48 +++++++++++++++++++------------------- po/zh_CN.po | 48 +++++++++++++++++++------------------- po/zh_TW.po | 48 +++++++++++++++++++------------------- programs/notepad/dialog.c | 5 ---- programs/notepad/dialog.h | 1 - programs/notepad/main.c | 1 - programs/notepad/notepad.rc | 1 - programs/notepad/notepad_res.h | 1 - 50 files changed, 1081 insertions(+), 1090 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b21a106cc0040edc8a6a…

1 0

Francois Gouget : winefile: Remove the 'Help on Help' menu.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: fb3641c5d06551b2fe6509e0b84195adb4991e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3641c5d06551b2fe6509e0b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 1 10:39:19 2011 +0200 winefile: Remove the 'Help on Help' menu. It is redundant with the help application's 'Help' menu and clutters winefile. --- po/ar.po | 48 ++++++++++++++++++--------------------- po/bg.po | 49 ++++++++++++++++++---------------------- po/ca.po | 48 ++++++++++++++++++--------------------- po/cs.po | 48 ++++++++++++++++++--------------------- po/da.po | 48 ++++++++++++++++++--------------------- po/de.po | 48 ++++++++++++++++++--------------------- po/el.po | 48 ++++++++++++++++++--------------------- po/en.po | 48 ++++++++++++++++++--------------------- po/en_US.po | 48 ++++++++++++++++++--------------------- po/eo.po | 49 ++++++++++++++++++---------------------- po/es.po | 48 ++++++++++++++++++--------------------- po/fa.po | 48 ++++++++++++++++++--------------------- po/fi.po | 49 ++++++++++++++++++---------------------- po/fr.po | 48 ++++++++++++++++++--------------------- po/he.po | 48 ++++++++++++++++++--------------------- po/hi.po | 48 ++++++++++++++++++--------------------- po/hu.po | 48 ++++++++++++++++++--------------------- po/it.po | 48 ++++++++++++++++++--------------------- po/ja.po | 48 ++++++++++++++++++--------------------- po/ko.po | 48 ++++++++++++++++++--------------------- po/lt.po | 48 ++++++++++++++++++--------------------- po/ml.po | 48 ++++++++++++++++++--------------------- po/nb_NO.po | 48 ++++++++++++++++++--------------------- po/nl.po | 48 ++++++++++++++++++--------------------- po/or.po | 48 ++++++++++++++++++--------------------- po/pa.po | 48 ++++++++++++++++++--------------------- po/pl.po | 48 ++++++++++++++++++--------------------- po/pt_BR.po | 48 ++++++++++++++++++--------------------- po/pt_PT.po | 48 ++++++++++++++++++--------------------- po/rm.po | 49 ++++++++++++++++++---------------------- po/ro.po | 48 ++++++++++++++++++--------------------- po/ru.po | 48 ++++++++++++++++++--------------------- po/sk.po | 49 ++++++++++++++++++---------------------- po/sl.po | 48 ++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 48 ++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 49 ++++++++++++++++++---------------------- po/sv.po | 48 ++++++++++++++++++--------------------- po/te.po | 48 ++++++++++++++++++--------------------- po/th.po | 48 ++++++++++++++++++--------------------- po/tr.po | 48 ++++++++++++++++++--------------------- po/uk.po | 48 ++++++++++++++++++--------------------- po/wa.po | 49 ++++++++++++++++++---------------------- po/wine.pot | 48 ++++++++++++++++++--------------------- po/zh_CN.po | 48 ++++++++++++++++++--------------------- po/zh_TW.po | 48 ++++++++++++++++++--------------------- programs/winefile/resource.h | 1 - programs/winefile/winefile.rc | 1 - 47 files changed, 990 insertions(+), 1179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb3641c5d06551b2fe650…

1 0

Francois Gouget : progman: Remove the 'Help on Help' menu.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: d2e6e2a03dbff0ce2deb24691cd5169fa6051cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e6e2a03dbff0ce2deb24691… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 1 10:38:49 2011 +0200 progman: Remove the 'Help on Help' menu. It is redundant with the help application's 'Help' menu and clutters progman. --- po/ar.po | 48 +++++++++++++++++++++--------------------- po/bg.po | 48 +++++++++++++++++++++--------------------- po/ca.po | 48 +++++++++++++++++++++--------------------- po/cs.po | 48 +++++++++++++++++++++--------------------- po/da.po | 48 +++++++++++++++++++++--------------------- po/de.po | 48 +++++++++++++++++++++--------------------- po/el.po | 48 +++++++++++++++++++++--------------------- po/en.po | 48 +++++++++++++++++++++--------------------- po/en_US.po | 48 +++++++++++++++++++++--------------------- po/eo.po | 48 +++++++++++++++++++++--------------------- po/es.po | 48 +++++++++++++++++++++--------------------- po/fa.po | 48 +++++++++++++++++++++--------------------- po/fi.po | 48 +++++++++++++++++++++--------------------- po/fr.po | 48 +++++++++++++++++++++--------------------- po/he.po | 48 +++++++++++++++++++++--------------------- po/hi.po | 48 +++++++++++++++++++++--------------------- po/hu.po | 48 +++++++++++++++++++++--------------------- po/it.po | 48 +++++++++++++++++++++--------------------- po/ja.po | 48 +++++++++++++++++++++--------------------- po/ko.po | 48 +++++++++++++++++++++--------------------- po/lt.po | 48 +++++++++++++++++++++--------------------- po/ml.po | 48 +++++++++++++++++++++--------------------- po/nb_NO.po | 48 +++++++++++++++++++++--------------------- po/nl.po | 48 +++++++++++++++++++++--------------------- po/or.po | 48 +++++++++++++++++++++--------------------- po/pa.po | 48 +++++++++++++++++++++--------------------- po/pl.po | 48 +++++++++++++++++++++--------------------- po/pt_BR.po | 48 +++++++++++++++++++++--------------------- po/pt_PT.po | 48 +++++++++++++++++++++--------------------- po/rm.po | 48 +++++++++++++++++++++--------------------- po/ro.po | 48 +++++++++++++++++++++--------------------- po/ru.po | 48 +++++++++++++++++++++--------------------- po/sk.po | 48 +++++++++++++++++++++--------------------- po/sl.po | 48 +++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 48 +++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 48 +++++++++++++++++++++--------------------- po/sv.po | 48 +++++++++++++++++++++--------------------- po/te.po | 48 +++++++++++++++++++++--------------------- po/th.po | 48 +++++++++++++++++++++--------------------- po/tr.po | 48 +++++++++++++++++++++--------------------- po/uk.po | 48 +++++++++++++++++++++--------------------- po/wa.po | 48 +++++++++++++++++++++--------------------- po/wine.pot | 48 +++++++++++++++++++++--------------------- po/zh_CN.po | 48 +++++++++++++++++++++--------------------- po/zh_TW.po | 48 +++++++++++++++++++++--------------------- programs/progman/main.c | 5 ---- programs/progman/progman.h | 1 - programs/progman/progman.rc | 1 - 48 files changed, 1080 insertions(+), 1087 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2e6e2a03dbff0ce2deb2…

1 0

Francois Gouget : progman: We don' t have a wintutor application so remove the 'Tutorial' menu.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: a80f3795650853d3e7c8451fb09b2552642bc2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80f3795650853d3e7c8451fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 1 10:39:05 2011 +0200 progman: We don't have a wintutor application so remove the 'Tutorial' menu. --- po/ar.po | 50 +++++++++++++++++++----------------------- po/bg.po | 50 +++++++++++++++++++----------------------- po/ca.po | 50 +++++++++++++++++++----------------------- po/cs.po | 50 +++++++++++++++++++----------------------- po/da.po | 50 +++++++++++++++++++----------------------- po/de.po | 50 +++++++++++++++++++----------------------- po/el.po | 50 +++++++++++++++++++----------------------- po/en.po | 50 +++++++++++++++++++----------------------- po/en_US.po | 50 +++++++++++++++++++----------------------- po/eo.po | 50 +++++++++++++++++++----------------------- po/es.po | 50 +++++++++++++++++++----------------------- po/fa.po | 50 +++++++++++++++++++----------------------- po/fi.po | 50 +++++++++++++++++++----------------------- po/fr.po | 50 +++++++++++++++++++----------------------- po/he.po | 50 +++++++++++++++++++----------------------- po/hi.po | 50 +++++++++++++++++++----------------------- po/hu.po | 50 +++++++++++++++++++----------------------- po/it.po | 50 +++++++++++++++++++----------------------- po/ja.po | 50 +++++++++++++++++++----------------------- po/ko.po | 50 +++++++++++++++++++----------------------- po/lt.po | 50 +++++++++++++++++++----------------------- po/ml.po | 50 +++++++++++++++++++----------------------- po/nb_NO.po | 50 +++++++++++++++++++----------------------- po/nl.po | 50 +++++++++++++++++++----------------------- po/or.po | 50 +++++++++++++++++++----------------------- po/pa.po | 50 +++++++++++++++++++----------------------- po/pl.po | 50 +++++++++++++++++++----------------------- po/pt_BR.po | 50 +++++++++++++++++++----------------------- po/pt_PT.po | 50 +++++++++++++++++++----------------------- po/rm.po | 50 +++++++++++++++++++----------------------- po/ro.po | 50 +++++++++++++++++++----------------------- po/ru.po | 50 +++++++++++++++++++----------------------- po/sk.po | 50 +++++++++++++++++++----------------------- po/sl.po | 50 +++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 50 +++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 50 +++++++++++++++++++----------------------- po/sv.po | 50 +++++++++++++++++++----------------------- po/te.po | 50 +++++++++++++++++++----------------------- po/th.po | 50 +++++++++++++++++++----------------------- po/tr.po | 50 +++++++++++++++++++----------------------- po/uk.po | 50 +++++++++++++++++++----------------------- po/wa.po | 50 +++++++++++++++++++----------------------- po/wine.pot | 50 +++++++++++++++++++----------------------- po/zh_CN.po | 50 +++++++++++++++++++----------------------- po/zh_TW.po | 50 +++++++++++++++++++----------------------- programs/progman/main.c | 4 --- programs/progman/progman.h | 1 - programs/progman/progman.rc | 2 - 48 files changed, 1035 insertions(+), 1222 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a80f3795650853d3e7c84…

1 0

Piotr Caban : msvcp: Added basic_string<{char, wchar}> operator+= exports.
by Alexandre Julliard April 1, 2011

April 1, 2011

Module: wine Branch: master Commit: 3f833d93a701fc4d1f6c891e07a3f271fb3cd1c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f833d93a701fc4d1f6c891e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 1 02:00:10 2011 +0200 msvcp: Added basic_string<{char, wchar}> operator+= exports. --- dlls/msvcp80/msvcp80.spec | 16 ++++++++-------- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 4 ++++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 585b436..20e1470 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -1718,8 +1718,8 @@ @ stub -arch=win64 ??X?$complex(a)O@std@@QEAAAEAV01(a)AEBO@Z @ stub -arch=win32 ??X?$complex(a)O@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??X?$complex(a)O@std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcp90.??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z +@ cdecl -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcp90.??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z @ stub -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z @ stub -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z @@ -1730,8 +1730,8 @@ @ stub -arch=win64 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)G@Z @ stub -arch=win32 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)PBG@Z @ stub -arch=win64 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)PEBG@Z -@ stub -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcp90.??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z +@ cdecl -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcp90.??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z @ stub -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z @ stub -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z @@ -3011,12 +3011,12 @@ @ stub -arch=win64 ?c_str@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAPEBGXZ @ thiscall -arch=win32 ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ(ptr) msvcp90.?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEPB_WXZ @ cdecl -arch=win64 ?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ(ptr) msvcp90.?c_str@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBAPEB_WXZ -@ stub -arch=win32 ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ -@ stub -arch=win64 ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ(ptr) msvcp90.?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIXZ +@ cdecl -arch=win64 ?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ(ptr) msvcp90.?capacity@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KXZ @ stub -arch=win32 ?capacity@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIXZ @ stub -arch=win64 ?capacity@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KXZ -@ stub -arch=win32 ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ -@ stub -arch=win64 ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ +@ thiscall -arch=win32 ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ(ptr) msvcp90.?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIXZ +@ cdecl -arch=win64 ?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ(ptr) msvcp90.?capacity@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KXZ @ stub ?cerr(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A @ stub ?cin(a)std@@3V?$basic_istream(a)DU?$char_traits(a)D@std@@@1(a)A @ stub -arch=win32 ?classic(a)locale@std@@SAABV12(a)XZ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d0f6ec3..566601b 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1722,8 +1722,8 @@ @ stub -arch=win64 ??X?$complex(a)O@std@@QEAAAEAV01(a)AEBO@Z @ stub -arch=win32 ??X?$complex(a)O@std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??X?$complex(a)O@std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_char_append +@ cdecl -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_append @ stub -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z @ stub -arch=win64 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z @ stub -arch=win32 ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z @@ -1734,8 +1734,8 @@ @ stub -arch=win64 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)G@Z @ stub -arch=win32 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)PBG@Z @ stub -arch=win64 ??Y?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)PEBG@Z -@ stub -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_wchar_append +@ cdecl -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_append @ stub -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z @ stub -arch=win64 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z @ stub -arch=win32 ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index af95b83..f401111 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -803,6 +803,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_substr(basic_string /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@@Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@@Z */ +/* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append, 8) basic_string_char* __thiscall MSVCP_basic_string_char_append( basic_string_char *this, basic_string_char *append) @@ -1252,6 +1254,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_substr(basic_stri /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@@Z */ /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)AEBV12@@Z */ +/* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z */ +/* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append, 8) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append( basic_string_wchar *this, basic_string_wchar *append)

1 0