December 2011 - Wine-Commits

Piotr Caban : msvcp90: Added ctype<char> class stub.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: ee13a2f8af3a55fdeea085faa0d82bc100d15aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee13a2f8af3a55fdeea085faa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 11:32:03 2011 +0100 msvcp90: Added ctype<char> class stub. --- dlls/msvcp90/locale.c | 396 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 144 ++++++++-------- 2 files changed, 468 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee13a2f8af3a55fdeea08…

1 0

Piotr Caban : msvcp90: Added ctype<wchar_t> class stub.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 04266052fe18c60f6368d573d4592a95727969a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04266052fe18c60f6368d573d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 11:32:18 2011 +0100 msvcp90: Added ctype<wchar_t> class stub. --- dlls/msvcp90/locale.c | 435 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 152 ++++++++-------- 2 files changed, 511 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04266052fe18c60f6368d…

1 0

Piotr Caban : msvcp90: Added ctype<unsigned short> class stub.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: d481bf61dc791d7ee3de610fc23c45fdeb0a8cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d481bf61dc791d7ee3de610fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 16 11:32:33 2011 +0100 msvcp90: Added ctype<unsigned short> class stub. --- dlls/msvcp90/locale.c | 177 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 156 ++++++++++++++++++++-------------------- 2 files changed, 255 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d481bf61dc791d7ee3de6…

1 0

Alexandre Julliard : wineps: Inherit the device mode from the source DC when creating a compatible DC.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: d77f0ae743a2b007fcff2d415e4723168efd15a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77f0ae743a2b007fcff2d415… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 12:08:38 2011 +0100 wineps: Inherit the device mode from the source DC when creating a compatible DC. --- dlls/wineps.drv/init.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 9cba84a..6ebd7c5 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -385,6 +385,7 @@ static BOOL PSDRV_CreateCompatibleDC( PHYSDEV orig, PHYSDEV *pdev ) if (!pi) return FALSE; if (!(physDev = create_psdrv_physdev( pi ))) return FALSE; + PSDRV_MergeDevmodes( physDev->Devmode, orig_dev->Devmode, pi ); PSDRV_UpdateDevCaps(physDev); SelectObject( hdc, PSDRV_DefaultFont ); push_dc_driver( pdev, &physDev->dev, &psdrv_funcs );

1 0

Francois Gouget : view: Remove unneeded RC files.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 70af45c51cd9566ba8a5ccba4072c63a058078d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70af45c51cd9566ba8a5ccba4… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 22:37:10 2011 +0100 view: Remove unneeded RC files. --- programs/view/Cs.rc | 32 -------------------------------- programs/view/Cy.rc | 29 ----------------------------- programs/view/Da.rc | 29 ----------------------------- programs/view/De.rc | 31 ------------------------------- programs/view/En.rc | 30 ------------------------------ programs/view/Eo.rc | 29 ----------------------------- programs/view/Es.rc | 29 ----------------------------- programs/view/Fr.rc | 35 ----------------------------------- programs/view/He.rc | 33 --------------------------------- programs/view/It.rc | 34 ---------------------------------- programs/view/Ja.rc | 33 --------------------------------- programs/view/Ko.rc | 33 --------------------------------- programs/view/Lt.rc | 32 -------------------------------- programs/view/Makefile.in | 28 +--------------------------- programs/view/Nl.rc | 28 ---------------------------- programs/view/No.rc | 29 ----------------------------- programs/view/Pl.rc | 30 ------------------------------ programs/view/Pt.rc | 33 --------------------------------- programs/view/Ro.rc | 30 ------------------------------ programs/view/Ru.rc | 31 ------------------------------- programs/view/Si.rc | 31 ------------------------------- programs/view/Sv.rc | 29 ----------------------------- programs/view/Tr.rc | 29 ----------------------------- programs/view/Uk.rc | 34 ---------------------------------- programs/view/Zh.rc | 39 --------------------------------------- programs/view/view.rc | 5 +++++ 26 files changed, 6 insertions(+), 779 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70af45c51cd9566ba8a5c…

1 0

Francois Gouget : include: shldisp.idl should only import ocidl.idl.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: af52a7a6aca65d5314fb405da6162e7386f8f0d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af52a7a6aca65d5314fb405da… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 20:32:28 2011 +0100 include: shldisp.idl should only import ocidl.idl. --- include/shldisp.idl | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/include/shldisp.idl b/include/shldisp.idl index 5c04f71..3e7fc45 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -18,12 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "objidl.idl"; -import "oleidl.idl"; -import "oaidl.idl"; -import "shtypes.idl"; -import "servprov.idl"; -import "comcat.idl"; +import "ocidl.idl"; #include <shdispid.h>

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 7a2a3b746fdfd6c197baff3dc15150eea7b4481d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2a3b746fdfd6c197baff3dc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 16 00:47:51 2011 -0700 po: Update Catalan translation. --- po/ca.po | 308 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 141 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a2a3b746fdfd6c197baf…

1 0

Alex Henrie : comdlg32: Widen buffer to accomodate Catalan translation.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 6e5bba1b60f97fce34415ea30ebecd5bd20dae20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5bba1b60f97fce34415ea30… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 16 00:48:01 2011 -0700 comdlg32: Widen buffer to accomodate Catalan translation. --- dlls/comdlg32/filedlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 5f80519..9b725ba 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1504,7 +1504,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { - WCHAR buf[16]; + WCHAR buf[64]; LoadStringW(COMDLG32_hInstance, IDS_SAVE_AS, buf, sizeof(buf)/sizeof(WCHAR)); SetWindowTextW(hwnd, buf); }

1 0

Francois Gouget : include: Add missing include directives.
by Alexandre Julliard Dec. 16, 2011

Dec. 16, 2011

Module: wine Branch: master Commit: 4ed257665ccb1e78efcff70306499cd7d33f0f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed257665ccb1e78efcff7030… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Dec 15 20:19:31 2011 +0100 include: Add missing include directives. --- include/dmusbuff.h | 2 ++ include/dpnathlp.h | 2 ++ include/fdi.h | 2 ++ include/lmwksta.h | 1 + include/ntddndis.h | 4 ++-- include/propvarutil.h | 1 - include/setupapi.h | 1 + include/winineti.h | 1 + 8 files changed, 11 insertions(+), 3 deletions(-) diff --git a/include/dmusbuff.h b/include/dmusbuff.h index ba5b776..7632b1a 100644 --- a/include/dmusbuff.h +++ b/include/dmusbuff.h @@ -20,6 +20,8 @@ #ifndef __WINE_DMUSIC_BUFFER_H #define __WINE_DMUSIC_BUFFER_H +#include <dmdls.h> + /***************************************************************************** * Misc. definitions */ diff --git a/include/dpnathlp.h b/include/dpnathlp.h index c1fa3c9..81d32b3 100644 --- a/include/dpnathlp.h +++ b/include/dpnathlp.h @@ -19,6 +19,8 @@ #ifndef __DPNATHLP_H__ #define __DPNATHLP_H__ +#include <ole2.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/include/fdi.h b/include/fdi.h index b77cd48..f36baaf 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -19,6 +19,8 @@ #ifndef __WINE_FDI_H #define __WINE_FDI_H +#include <basetsd.h> + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ diff --git a/include/lmwksta.h b/include/lmwksta.h index 6bc2faf..b35f28a 100644 --- a/include/lmwksta.h +++ b/include/lmwksta.h @@ -20,6 +20,7 @@ #define __WINE_LMWKSTA_H #include <lmcons.h> +#include <lmuseflg.h> #ifdef __cplusplus extern "C" { diff --git a/include/ntddndis.h b/include/ntddndis.h index 44566e8..5085f25 100644 --- a/include/ntddndis.h +++ b/include/ntddndis.h @@ -23,8 +23,8 @@ extern "C" { #endif -/* #include <ifdef.h>*/ -/* #include <devpkey.h> */ +#include <ifdef.h> +#include <devpkey.h> /* #include <pciprop.h> */ #define _NDIS_CONTROL_CODE(request, method) \ diff --git a/include/propvarutil.h b/include/propvarutil.h index fe7ab94..96265a5 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -19,7 +19,6 @@ #ifndef __WINE_PROPVARUTIL_H #define __WINE_PROPVARUTIL_H -#include <propidl.h> #include <shtypes.h> #include <shlwapi.h> diff --git a/include/setupapi.h b/include/setupapi.h index baa5787..04ddc75 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -21,6 +21,7 @@ #define _INC_SETUPAPI #include <commctrl.h> +#include <devpropdef.h> #ifdef _WIN64 #include <pshpack8.h> diff --git a/include/winineti.h b/include/winineti.h index 6419204..8029155 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -21,6 +21,7 @@ /* FIXME: #include <iedial.h> */ #include <schannel.h> +#include <sspi.h> typedef struct _INTERNET_CACHE_CONFIG_PATH_ENTRYA {

1 0

Jacek Caban : jscript: Call expressions needling EXPR_NEWREF flag directly.
by Alexandre Julliard Dec. 15, 2011

Dec. 15, 2011

Module: wine Branch: master Commit: 595646066b16e0018527e351d535343701a6e77e URL: http://source.winehq.org/git/wine.git/?a=commit;h=595646066b16e0018527e351d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 15 15:43:20 2011 +0100 jscript: Call expressions needling EXPR_NEWREF flag directly. --- dlls/jscript/engine.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 46bdffb..c7ed6d7 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1071,10 +1071,23 @@ HRESULT forin_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ TRACE("iter %s\n", debugstr_w(str)); - if(stat->variable) + if(stat->variable) { hres = identifier_eval(ctx, identifier, 0, NULL, &exprval); - else - hres = expr_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + }else { + switch(stat->expr->type) { + case EXPR_ARRAY: + hres = array_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + break; + case EXPR_IDENT: + hres = identifier_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + break; + case EXPR_MEMBER: + hres = member_expression_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); + break; + default: + hres = expr_eval(ctx, stat->expr, 0, &rt->ei, &exprval); + } + } if(SUCCEEDED(hres)) { V_VT(&name) = VT_BSTR; V_BSTR(&name) = str;

1 0