March 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : wine_common_ver: Set company name to Microsoft, some apps check for that.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: d7ea855a3ec5e81b9e502d68ed89a522abb0e77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ea855a3ec5e81b9e502d68e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 7 21:33:44 2007 +0100 wine_common_ver: Set company name to Microsoft, some apps check for that. --- include/wine/wine_common_ver.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 1d33705..e7be2fc 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -80,7 +80,7 @@ FILESUBTYPE WINE_FILESUBTYPE { BLOCK "040904E4" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */ { - VALUE "CompanyName", "Wine Team" + VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */ VALUE "FileDescription", WINE_FILEDESCRIPTION_STR VALUE "FileVersion", WINE_FILEVERSION_STR VALUE "InternalName", WINE_FILENAME

1 0

Alexandre Julliard : winedump: Fixed formatting of timestamps.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 0da06dba482a6f00e32ffd38440ee5e123cd6770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0da06dba482a6f00e32ffd384… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 7 21:33:51 2007 +0100 winedump: Fixed formatting of timestamps. --- tools/winedump/dump.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 25ae22f..9c8f2ff 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -105,7 +105,6 @@ const char *get_time_str(unsigned long _t) * I wonder if Wine isn't broken wrt to GMT settings... */ if (len && str[len-1] == '\n') len--; - if (len >= sizeof(buf)) len = sizeof(buf) - 1; buf = dump_want_n(len + 1); if (buf) {

1 0

Hwang YunSong(황윤성) : cmd: Updated Korean resource.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: aec743c16ea9e5f2eb00433e96ba7245dcc02ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec743c16ea9e5f2eb00433e9… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Mar 6 17:32:59 2007 +0900 cmd: Updated Korean resource. --- programs/cmd/Ko.rc | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/programs/cmd/Ko.rc b/programs/cmd/Ko.rc index a62e688..9240aa2 100644 --- a/programs/cmd/Ko.rc +++ b/programs/cmd/Ko.rc @@ -189,6 +189,11 @@ verify �÷��״� Wine��  �ϵ� ��մϴ�.\n" WCMD_VOL, "VOL ��\n" + WCMD_PUSHD, "PUSHD <��丮 �̸�> �� 丮�� ÿ� ��Ѵ�.\n\ + �׸�� 丮�� û�� 丮�� ٲ۴�.\n" + + WCMD_POPD, "POPD�� 丮�� PUSH�� ߴ� �� ٲ۴�.\n" + WCMD_EXIT, "EXIT�� ߴܽ�Ű�� ü�� ư��ų� cmd��\n\ ȣ�� ư��ϴ�.\n" @@ -208,7 +213,9 @@ HELP\t\t �� ©�� ׸� ��\n\ MD (MKDIR)\t�� 丮 ��\n\ MOVE\t\t�� ̳� �� ,�׸�� 丮 �� ̵�\n\ PATH\t\tŽ�� ְų� ��ϱ�\n\ +POPD\t\tPUSHD�� ߴ� ��丮�� ư��\n\ PROMPT\t\t�� Ʈ �ٲٱ�\n\ +PUSHD\t\t�� 丮�� ϰ�, �� 丮�� ٲٱ�\n\ REN (RENAME)\t�� ̸� �ٲٱ�\n\ RD (RMDIR)\t�� 丮 ��\n\ SET\t\tȯ�� ְų� �ٲٱ�\n\ @@ -220,8 +227,8 @@ VOL\t\t��ũ ��ġ�� ҷ� �� ֱ�\n\ EXIT\t\tCMD �ݱ�\n\n\ HELP <��>�� ġ�� \n" - WCMD_CONFIRM, "Are you sure" - WCMD_YES, "Y" - WCMD_NO, "N" - WCMD_NOASSOC, "File association missing for extension %s\n" + WCMD_CONFIRM, "�� Ȯ��մϱ�?" + WCMD_YES, "��" + WCMD_NO, "�ƴϿ�" + WCMD_NOASSOC, "�� Ȯ�� %s�� Ǯ�׸�� ϴ� \n" }

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 404d853d32001bbb40ea1f5f93df0f1e9ecae275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404d853d32001bbb40ea1f5f9… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Mar 7 17:30:06 2007 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 7125629..33c7678 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -1,6 +1,6 @@ /* * Copyright 2004 by Krzysztof Foltman - * Copyright 2006 by YunSong Hwang + * Copyright 2006,2007 by YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,10 +33,12 @@ BEGIN BEGIN MENUITEM "�ǵ��(&U)\tCtrl+Z", ID_EDIT_UNDO MENUITEM "�ٽ� ��(&R)\tCtrl+Y", ID_EDIT_REDO - MENUITEM "�� (&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "�߶󳻱�(&T)\tCtrl+X", ID_EDIT_CUT MENUITEM "��(&C)\tCtrl+C", ID_EDIT_COPY + MENUITEM "�ٿ��ֱ�(&P)\tCtrl+V", ID_EDIT_PASTE + MENUITEM "��(&C)\tDEL", ID_EDIT_CLEAR + MENUITEM "�� (&S)\tCtrl+A", ID_EDIT_SELECTALL MENUITEM SEPARATOR MENUITEM "�б� ��(&O)", ID_EDIT_READONLY MENUITEM "�� (&M)", ID_EDIT_MODIFIED @@ -65,3 +67,10 @@ BEGIN END END END + +STRINGTABLE DISCARDABLE +BEGIN + STRING_RICHTEXT_FILES_RTF, "��ġ �ؽ�Ʈ �� (*.rtf)" + STRING_TEXT_FILES_TXT, "�ؽ�Ʈ �� (*.txt)" + STRING_ALL_FILES, "�� (*.*)" +END

1 0

Konstantin Kondratyuk : kernel32: Allow to execute .cmd files.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: aefbef00f926ff04adca0940b7d3a3e085d82e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aefbef00f926ff04adca0940b… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Wed Mar 7 18:15:31 2007 +0300 kernel32: Allow to execute .cmd files. --- dlls/kernel32/process.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8cdcd72..983750e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -90,6 +90,7 @@ const WCHAR *DIR_System = NULL; static const WCHAR comW[] = {'.','c','o','m',0}; static const WCHAR batW[] = {'.','b','a','t',0}; +static const WCHAR cmdW[] = {'.','c','m','d',0}; static const WCHAR pifW[] = {'.','p','i','f',0}; static const WCHAR winevdmW[] = {'w','i','n','e','v','d','m','.','e','x','e',0}; @@ -1688,7 +1689,7 @@ BOOL WINAPI CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIB inherit, flags, startup_info, info, unixdir, FALSE ); break; } - if (!strcmpiW( p, batW )) + if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) ) { TRACE( "starting %s as batch binary\n", debugstr_w(name) ); retv = create_cmd_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr,

1 0

Alexandre Julliard : Added version information for a number of dlls.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 9dd1f1e34111b4b09adc39c37d2cf8904404a205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dd1f1e34111b4b09adc39c37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 7 21:25:16 2007 +0100 Added version information for a number of dlls. --- .gitignore | 9 +++++++++ dlls/advapi32/Makefile.in | 2 ++ dlls/advapi32/version.rc | 26 ++++++++++++++++++++++++++ dlls/imm32/Makefile.in | 2 ++ dlls/imm32/version.rc | 26 ++++++++++++++++++++++++++ dlls/iphlpapi/Makefile.in | 2 ++ dlls/iphlpapi/version.rc | 26 ++++++++++++++++++++++++++ dlls/lz32/Makefile.in | 3 +++ dlls/lz32/version.rc | 26 ++++++++++++++++++++++++++ dlls/ntdll/Makefile.in | 2 ++ dlls/ntdll/version.rc | 26 ++++++++++++++++++++++++++ dlls/rpcrt4/Makefile.in | 2 ++ dlls/rpcrt4/version.rc | 26 ++++++++++++++++++++++++++ dlls/rsaenh/Makefile.in | 2 ++ dlls/rsaenh/version.rc | 26 ++++++++++++++++++++++++++ dlls/version/Makefile.in | 2 ++ dlls/version/version.rc | 26 ++++++++++++++++++++++++++ dlls/winex11.drv/Makefile.in | 2 ++ dlls/winex11.drv/version.rc | 22 ++++++++++++++++++++++ 19 files changed, 258 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9dd1f1e34111b4b09adc3…

1 0

Rob Shearman : kernel32: Add tests for ImpersonateNamedPipeClient.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 1fa2a2b6491d1f827afb2b45aca5defe205b7177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa2a2b6491d1f827afb2b45a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Mar 6 18:00:15 2007 +0000 kernel32: Add tests for ImpersonateNamedPipeClient. --- dlls/kernel32/tests/Makefile.in | 2 +- dlls/kernel32/tests/pipe.c | 459 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 454 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fa2a2b6491d1f827afb2…

1 0

Rob Shearman : Maketest.rules.in: Make CROSSOBJS consistent with the equivalent OBJS rule in the toplevel Make .rules.in.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: dcc642356b382da34c0574beea5891e1b43980c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc642356b382da34c0574bee… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 7 13:30:53 2007 +0000 Maketest.rules.in: Make CROSSOBJS consistent with the equivalent OBJS rule in the toplevel Make.rules.in. --- dlls/Maketest.rules.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index a7095a5..73bf4d9 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -22,7 +22,7 @@ ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS) EXTRA_OBJS = testlist.o CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe -CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) testlist.cross.o +CROSSOBJS = $(C_SRCS:.c=.cross.o) $(RC_SRCS:.rc=.res.cross.o) $(BISON_SRCS:.y=.tab.cross.o) $(LEX_SRCS:.l=.yy.cross.o) $(IDL_GEN_C_SRCS:.c=.cross.o) testlist.cross.o CROSSCC = @CROSSCC@ CROSSWINDRES = @CROSSWINDRES@

1 0

Rob Shearman : widl: Implement writing of SAFEARRAY type descriptions in typelibs.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 1c2a717b59ed563511ca44fbbef8ea1e9f60c1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2a717b59ed563511ca44fbb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Mar 7 13:32:22 2007 +0000 widl: Implement writing of SAFEARRAY type descriptions in typelibs. --- tools/widl/parser.y | 18 ++++++++++++++---- tools/widl/typelib.c | 4 ++++ tools/widl/write_msft.c | 23 +++++++++++++++-------- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0d03b03..b757c5c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -90,7 +90,7 @@ static var_t *make_var(char *name); static func_list_t *append_func(func_list_t *list, func_t *func); static func_t *make_func(var_t *def, var_list_t *args); static type_t *make_class(char *name); -static type_t *make_safearray(void); +static type_t *make_safearray(typeref_t *tref); static type_t *make_builtin(char *name); static type_t *make_int(int sign); @@ -833,7 +833,7 @@ type: tVOID { $$ = make_tref(NULL, duptype(find_type("void", 0), 1)); } | tSTRUCT aIDENTIFIER { $$ = make_tref(NULL, get_type(RPC_FC_STRUCT, $2, tsSTRUCT)); } | uniondef { $$ = make_tref(NULL, $1); } | tUNION aIDENTIFIER { $$ = make_tref(NULL, find_type2($2, tsUNION)); } - | tSAFEARRAY '(' type ')' { $$ = make_tref(NULL, make_safearray()); } + | tSAFEARRAY '(' type ')' { $$ = make_tref(NULL, make_safearray($3)); } ; typedef: tTYPEDEF m_attributes type pident_list { reg_typedefs(type_ref($3), $4, $2); @@ -1321,9 +1321,19 @@ static type_t *make_class(char *name) return c; } -static type_t *make_safearray(void) +static type_t *make_safearray(typeref_t *tref) { - return make_type(RPC_FC_FP, find_type("SAFEARRAY", 0)); + const type_t *sa_orig = find_type("SAFEARRAY", 0); + type_t *sa = make_type(sa_orig->type, sa_orig->ref); + type_t *ptr; + + if (sa_orig->name) + sa->name = strdup(sa_orig->name); + sa->ref = type_ref(tref); + ptr = make_type(RPC_FC_FP, sa); + ptr->name = strdup("SAFEARRAY"); + + return ptr; } #define HASHMAX 64 diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 4e66c7b..2f8708b 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -181,7 +181,11 @@ unsigned short get_type_vt(type_t *t) case RPC_FC_OP: case RPC_FC_FP: if(t->ref) + { + if (match(t->ref->name, "SAFEARRAY")) + return VT_SAFEARRAY; return VT_PTR; + } error("get_type_vt: unknown-deref-type: %d\n", t->ref->type); break; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 0017bd9..d3a5bf4 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -903,14 +903,22 @@ static int encode_type( *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; } -#if 0 case VT_SAFEARRAY: - /* FIXME: Make with the error checking. */ - FIXME("SAFEARRAY vartype, may not work correctly.\n"); + { + int next_vt; + + /* skip over SAFEARRAY type straight to element type */ + type = type->ref; - ctl2_encode_typedesc(typelib, tdesc->u.lptdesc, &target_type, NULL, NULL, &child_size); + for(next_vt = 0; type->ref; type = type->ref) { + next_vt = get_type_vt(type->ref); + if (next_vt != 0) + break; + } + + encode_type(typelib, next_vt, type->ref, &target_type, NULL, NULL, &child_size); for (typeoffset = 0; typeoffset < typelib->typelib_segdir[MSFT_SEG_TYPEDESC].length; typeoffset += 8) { typedata = (void *)&typelib->typelib_segment_data[MSFT_SEG_TYPEDESC][typeoffset]; @@ -934,16 +942,15 @@ static int encode_type( typedata[1] = target_type; } - *encoded_tdesc = typeoffset; + *encoded_type = typeoffset; *width = 4; *alignment = 4; - *decoded_size = sizeof(TYPEDESC) + child_size; + *decoded_size = 8 /*sizeof(TYPEDESC)*/ + child_size; break; + } -#endif - case VT_USERDEFINED: { int typeinfo_offset;

1 0

Dmitry Timoshkov : comdlg32: Use unicode Win32 APIs when possible.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: afd6f64a02b1f2347a4174b5d4adc2f9e57cab78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afd6f64a02b1f2347a4174b5d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Mar 7 21:18:40 2007 +0800 comdlg32: Use unicode Win32 APIs when possible. --- dlls/comdlg32/filedlg.c | 175 +++++++++++++++++++++++------------------------ 1 files changed, 87 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afd6f64a02b1f2347a417…

1 0