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

Austin English : dbghelp: Add initial Sparc CPU support.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: e92a552dca077caaeae0899e8a6114ff3e8ded84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e92a552dca077caaeae0899e8… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 20 09:44:25 2010 -0500 dbghelp: Add initial Sparc CPU support. --- dlls/dbghelp/Makefile.in | 1 + dlls/dbghelp/cpu_sparc.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp.c | 6 ++- include/winnt.h | 3 ++ 4 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index a6ba4e0..d4e57c9 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ coff.c \ cpu_i386.c \ cpu_ppc.c \ + cpu_sparc.c \ cpu_x86_64.c \ crc32.c \ dbghelp.c \ diff --git a/dlls/dbghelp/cpu_sparc.c b/dlls/dbghelp/cpu_sparc.c new file mode 100644 index 0000000..c69e419 --- /dev/null +++ b/dlls/dbghelp/cpu_sparc.c @@ -0,0 +1,79 @@ +/* + * File cpu_sparc.c + * + * Copyright (C) 2009-2009, Eric Pouech + * Copyright (C) 2010, Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "dbghelp_private.h" +#include "winternl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); + +static unsigned sparc_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum cpu_addr ca, ADDRESS64* addr) +{ + switch (ca) + { + case cpu_addr_pc: + case cpu_addr_stack: + case cpu_addr_frame: + default: + FIXME("not done for Sparc\n"); + } + return FALSE; +} + +static BOOL sparc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) +{ + FIXME("not done for Sparc\n"); + return FALSE; +} + +static unsigned sparc_map_dwarf_register(unsigned regno) +{ + FIXME("not done for Sparc\n"); + return 0; +} + +static void* sparc_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) +{ + FIXME("not done for Sparc\n"); + return NULL; +} + +static const char* sparc_fetch_regname(unsigned regno) +{ + FIXME("Unknown register %x\n", regno); + return NULL; +} + +struct cpu cpu_sparc = { + IMAGE_FILE_MACHINE_SPARC, + 4, + sparc_get_addr, + sparc_stack_walk, + NULL, + sparc_map_dwarf_register, + sparc_fetch_context_reg, + sparc_fetch_regname, +}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 0966f27..fe7d892 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -151,9 +151,9 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc; +extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 @@ -161,6 +161,8 @@ struct cpu* dbghelp_current_cpu = &cpu_x86_64 #elif defined(__powerpc__) &cpu_ppc +#elif defined(__sparc__) + &cpu_sparc #else #error define support for your CPU #endif diff --git a/include/winnt.h b/include/winnt.h index 0bcb31b..cc8a2cb 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2692,6 +2692,9 @@ typedef struct _IMAGE_VXD_HEADER { #define IMAGE_FILE_MACHINE_M32R 0x9041 #define IMAGE_FILE_MACHINE_CEE 0xc0ee +/* Wine extension */ +#define IMAGE_FILE_MACHINE_SPARC 0x2000 + #define IMAGE_SIZEOF_FILE_HEADER 20 #define IMAGE_SIZEOF_ROM_OPTIONAL_HEADER 56 #define IMAGE_SIZEOF_STD_OPTIONAL_HEADER 28

1 0

Detlef Riekenberg : include: Add more TOKEN_INFORMATION_CLASS result struct .
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 2e5d7064a62b106701eba0ebd807399a9cba59e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5d7064a62b106701eba0ebd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Aug 22 11:31:47 2010 +0200 include: Add more TOKEN_INFORMATION_CLASS result struct. --- include/winnt.h | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index cc8a2cb..9b6477c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4370,7 +4370,7 @@ typedef struct _TOKEN_DEFAULT_DACL { } TOKEN_DEFAULT_DACL, *PTOKEN_DEFAULT_DACL; /* - * TOKEN_SOURCEL + * TOKEN_SOURCE */ #define TOKEN_SOURCE_LENGTH 8 @@ -4435,6 +4435,32 @@ typedef struct _TOKEN_STATISTICS { } TOKEN_STATISTICS; #include <poppack.h> +typedef struct _TOKEN_GROUPS_AND_PRIVILEGES { + DWORD SidCount; + DWORD SidLength; + PSID_AND_ATTRIBUTES Sids; + DWORD RestrictedSidCount; + DWORD RestrictedSidLength; + PSID_AND_ATTRIBUTES RestrictedSids; + DWORD PrivilegeCount; + DWORD PrivilegeLength; + PLUID_AND_ATTRIBUTES Privileges; + LUID AuthenticationId; +} TOKEN_GROUPS_AND_PRIVILEGES, * PTOKEN_GROUPS_AND_PRIVILEGES; + +typedef struct _TOKEN_ORIGIN { + LUID OriginatingLogonSession; +} TOKEN_ORIGIN, * PTOKEN_ORIGIN; + +typedef struct _TOKEN_LINKED_TOKEN { + HANDLE LinkedToken; +} TOKEN_LINKED_TOKEN, * PTOKEN_LINKED_TOKEN; + +typedef struct _TOKEN_ELEVATION { + DWORD TokenIsElevated; +} TOKEN_ELEVATION, * PTOKEN_ELEVATION; + + /* * ACLs of NT */

1 0

Detlef Riekenberg : ntdll: Add a stub for TokenElevation in NtQueryInformationToken.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 2b76f8661d0994c060a9749c6cec14b45f3e273b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b76f8661d0994c060a9749c6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Aug 22 11:32:46 2010 +0200 ntdll: Add a stub for TokenElevation in NtQueryInformationToken. --- dlls/ntdll/nt.c | 61 ++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 43 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a2b1023..4472734 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -249,29 +249,47 @@ NTSTATUS WINAPI NtQueryInformationToken( ULONG tokeninfolength, PULONG retlen ) { - ULONG len; + static const ULONG info_len [] = + { + 0, + 0, /* TokenUser */ + 0, /* TokenGroups */ + 0, /* TokenPrivileges */ + 0, /* TokenOwner */ + 0, /* TokenPrimaryGroup */ + 0, /* TokenDefaultDacl */ + sizeof(TOKEN_SOURCE), /* TokenSource */ + sizeof(TOKEN_TYPE), /* TokenType */ + sizeof(SECURITY_IMPERSONATION_LEVEL), /* TokenImpersonationLevel */ + sizeof(TOKEN_STATISTICS), /* TokenStatistics */ + 0, /* TokenRestrictedSids */ + 0, /* TokenSessionId */ + 0, /* TokenGroupsAndPrivileges */ + 0, /* TokenSessionReference */ + 0, /* TokenSandBoxInert */ + 0, /* TokenAuditPolicy */ + 0, /* TokenOrigin */ + 0, /* TokenElevationType */ + 0, /* TokenLinkedToken */ + sizeof(TOKEN_ELEVATION), /* TokenElevation */ + 0, /* TokenHasRestrictions */ + 0, /* TokenAccessInformation */ + 0, /* TokenVirtualizationAllowed */ + 0, /* TokenVirtualizationEnabled */ + 0, /* TokenIntegrityLevel */ + 0, /* TokenUIAccess */ + 0, /* TokenMandatoryPolicy */ + 0 /* TokenLogonSid */ + }; + + ULONG len = 0; NTSTATUS status = STATUS_SUCCESS; TRACE("(%p,%d,%p,%d,%p)\n", token,tokeninfoclass,tokeninfo,tokeninfolength,retlen); - switch (tokeninfoclass) - { - case TokenSource: - len = sizeof(TOKEN_SOURCE); - break; - case TokenType: - len = sizeof (TOKEN_TYPE); - break; - case TokenImpersonationLevel: - len = sizeof(SECURITY_IMPERSONATION_LEVEL); - break; - case TokenStatistics: - len = sizeof(TOKEN_STATISTICS); - break; - default: - len = 0; - } + if (tokeninfoclass < MaxTokenInfoClass) + len = info_len[tokeninfoclass]; if (retlen) *retlen = len; @@ -489,6 +507,13 @@ NTSTATUS WINAPI NtQueryInformationToken( } SERVER_END_REQ; break; + case TokenElevation: + { + TOKEN_ELEVATION *elevation = tokeninfo; + FIXME("QueryInformationToken( ..., TokenElevation, ...) semi-stub\n"); + elevation->TokenIsElevated = TRUE; + } + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass);

1 0

Damjan Jovanovic : configure: Check for libicns.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: ebee19701cd95103342724151347657d86192079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebee19701cd95103342724151… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Aug 22 19:12:45 2010 +0200 configure: Check for libicns. --- configure | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 14 +++++++++ include/config.h.in | 6 ++++ 3 files changed, 94 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 22fe16f..d61a5b9 100755 --- a/configure +++ b/configure @@ -780,6 +780,7 @@ with_glu with_gnutls with_gsm with_hal +with_icns with_jack with_jpeg with_ldap @@ -1467,6 +1468,7 @@ Optional Packages: --without-gnutls do not use GnuTLS (schannel support) --without-gsm do not use libgsm (GSM 06.10 codec support) --without-hal do not use HAL (dynamic device support) + --without-icns do not use ICNS icon support --without-jack do not use the Jack sound support --without-jpeg do not use JPEG --without-ldap do not use LDAP @@ -2584,6 +2586,12 @@ if test "${with_hal+set}" = set; then : fi +# Check whether --with-icns was given. +if test "${with_icns+set}" = set; then : + withval=$with_icns; if test "x$withval" = "xno"; then ac_cv_header_icns_h=no; fi +fi + + # Check whether --with-jack was given. if test "${with_jack+set}" = set; then : withval=$with_jack; if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi @@ -5806,6 +5814,7 @@ for ac_header in \ grp.h \ gsm.h \ gsm/gsm.h \ + icns.h \ ieeefp.h \ inet/mib2.h \ io.h \ @@ -11088,6 +11097,71 @@ This is an error since --with-gsm was requested." "$LINENO" 5 ;; esac fi +if test "$ac_cv_header_icns_h" = "yes" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -licns" >&5 +$as_echo_n "checking for -licns... " >&6; } +if test "${ac_cv_lib_soname_icns+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_soname_save_LIBS=$LIBS +LIBS="-licns $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char icns_write_family_to_file (); +int +main () +{ +return icns_write_family_to_file (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + case "$LIBEXT" in + dll) ac_cv_lib_soname_icns=`$ac_cv_path_LDD conftest.exe | grep "icns" | sed -e "s/dll.*/dll/"';2,$d'` ;; + dylib) ac_cv_lib_soname_icns=`otool -L conftest$ac_exeext | grep "libicns\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libicns\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_icns=`$ac_cv_path_LDD conftest$ac_exeext | grep "libicns\\.$LIBEXT" | sed -e "s/^.*$libicns\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_soname_save_LIBS +fi +if test "x$ac_cv_lib_soname_icns" = "x"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_icns" >&5 +$as_echo "$ac_cv_lib_soname_icns" >&6; } + +cat >>confdefs.h <<_ACEOF +#define SONAME_LIBICNS "$ac_cv_lib_soname_icns" +_ACEOF + + +fi +fi +case $host_os in + darwin*|macosx*) + if test "x$ac_cv_lib_soname_icns" = "x"; then : + case "x$with_icns" in + x) as_fn_append wine_notices "|libicns ${notice_platform}development files not found, ICNS icons won't be supported." ;; + xno) ;; + *) as_fn_error "libicns ${notice_platform}development files not found, ICNS icons won't be supported. +This is an error since --with-icns was requested." "$LINENO" 5 ;; +esac +fi ;; +esac + if test "$ac_cv_header_jpeglib_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -ljpeg" >&5 diff --git a/configure.ac b/configure.ac index 5b8a199..b02c7aa 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,8 @@ AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (sch AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]), [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) +AC_ARG_WITH(icns, AS_HELP_STRING([--without-icns],[do not use ICNS icon support]), + [if test "x$withval" = "xno"; then ac_cv_header_icns_h=no; fi]) AC_ARG_WITH(jack, AS_HELP_STRING([--without-jack],[do not use the Jack sound support]), [if test "x$withval" = "xno"; then ac_cv_header_jack_jack_h=no; fi]) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG]), @@ -396,6 +398,7 @@ AC_CHECK_HEADERS(\ grp.h \ gsm.h \ gsm/gsm.h \ + icns.h \ ieeefp.h \ inet/mib2.h \ io.h \ @@ -1487,6 +1490,17 @@ fi WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], [libgsm ${notice_platform}development files not found, gsm 06.10 codec won't be supported.]) +dnl **** Check for libicns **** +if test "$ac_cv_header_icns_h" = "yes" +then + WINE_CHECK_SONAME(icns,icns_write_family_to_file) +fi +case $host_os in + darwin*|macosx*) + WINE_NOTICE_WITH(icns,[test "x$ac_cv_lib_soname_icns" = "x"], + [libicns ${notice_platform}development files not found, ICNS icons won't be supported.]) ;; +esac + dnl **** Check for libjpeg **** if test "$ac_cv_header_jpeglib_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index f365fca..98a951f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -256,6 +256,9 @@ /* Define to 1 if you have the <hal/libhal.h> header file. */ #undef HAVE_HAL_LIBHAL_H +/* Define to 1 if you have the <icns.h> header file. */ +#undef HAVE_ICNS_H + /* Define to 1 if you have the <ieeefp.h> header file. */ #undef HAVE_IEEEFP_H @@ -1195,6 +1198,9 @@ /* Define to the soname of the libhal library. */ #undef SONAME_LIBHAL +/* Define to the soname of the libicns library. */ +#undef SONAME_LIBICNS + /* Define to the soname of the libjack library. */ #undef SONAME_LIBJACK

1 0

Hwang YunSong : ipconfig: New Korean resource.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 8a172ceb520681578a4562515b0ef47aa98cbb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a172ceb520681578a4562515… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Aug 23 10:13:43 2010 +0900 ipconfig: New Korean resource. --- programs/ipconfig/Ko.rc | 48 +++++++++++++++++++++++++++++++++++++++++ programs/ipconfig/Makefile.in | 1 + 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Ko.rc b/programs/ipconfig/Ko.rc new file mode 100644 index 0000000..9f9f7aa --- /dev/null +++ b/programs/ipconfig/Ko.rc @@ -0,0 +1,48 @@ +/* + * IP configuration utility + * Korean language support + * + * Copyright 2010 Andrew Nguyen + * Copyright 2010 YunSOng Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "ipconfig.h" + +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "사용법: ipconfig [ /? | /all ]\n" + STRING_INVALID_CMDLINE, "에러: 알수 없거나 올바르지 않은 명령어 라인 매개변수가 지정됨\n" + STRING_ADAPTER_FRIENDLY, "%s 어댑터 %s\n" + STRING_ETHERNET, "이더넷" + STRING_UNKNOWN, "알 수 없음" + STRING_CONN_DNS_SUFFIX, "Connection-specific DNS suffix" + STRING_IP_ADDRESS, "IP 주소" + STRING_HOSTNAME, "호스트이름" + STRING_NODE_TYPE, "노드 형식" + STRING_BROADCAST, "브로드캐스트" + STRING_PEER_TO_PEER, "피어 투 피어" + STRING_MIXED, "Mixed" + STRING_HYBRID, "Hybrid" + STRING_IP_ROUTING, "IP 라우팅 가능" + STRING_DESCRIPTION, "설명" + STRING_PHYS_ADDR, "물리 주소" + STRING_DHCP_ENABLED, "DHCP 가능" +} diff --git a/programs/ipconfig/Makefile.in b/programs/ipconfig/Makefile.in index 8b9fc29..a19bffa 100644 --- a/programs/ipconfig/Makefile.in +++ b/programs/ipconfig/Makefile.in @@ -14,6 +14,7 @@ RC_SRCS = \ En.rc \ Fr.rc \ It.rc \ + Ko.rc \ Lt.rc \ Sv.rc \ Uk.rc

1 0

Hwang YunSong : jscript: Update Korean resource.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: c8193717ef9a3545334b5729c95f8d8e5661371f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8193717ef9a3545334b5729c… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Aug 23 10:14:06 2010 +0900 jscript: Update Korean resource. --- dlls/jscript/jscript_Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Ko.rc b/dlls/jscript/jscript_Ko.rc index d45094e..1b0cf99 100644 --- a/dlls/jscript/jscript_Ko.rc +++ b/dlls/jscript/jscript_Ko.rc @@ -30,6 +30,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "올바르지 않은 프로시져 호출이나 인수" IDS_CREATE_OBJ_ERROR "자동화 서버가 객체를 만들 수 없습니다" IDS_NO_PROPERTY "객체는 이 속성이나 메소드를 지원하지 않습니다" + IDS_UNSUPPORTED_ACTION "객체는 이 행동을 지원하지 않습니다" IDS_ARG_NOT_OPT "인수는 옵션이 아닙니다" IDS_SYNTAX_ERROR "문법 에러" IDS_SEMICOLON "';' 가 필요합니다"

1 0

Mariusz Pluciński : gameux/tests: Add tests for AddGame and RemoveGame methods.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 683502f4650fa6aeafcd718c21aa296384a23d56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=683502f4650fa6aeafcd718c2… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Aug 23 12:47:02 2010 +0200 gameux/tests: Add tests for AddGame and RemoveGame methods. --- dlls/gameux/tests/Makefile.in | 3 +- dlls/gameux/tests/gameexplorer.c | 86 ++++++++++++++++++++++++++++++++++++-- dlls/gameux/tests/rsrc.rc | 26 +++++++++++ dlls/gameux/tests/test.gdf.xml | 30 +++++++++++++ 4 files changed, 140 insertions(+), 5 deletions(-) diff --git a/dlls/gameux/tests/Makefile.in b/dlls/gameux/tests/Makefile.in index 7188e74..542fc29 100644 --- a/dlls/gameux/tests/Makefile.in +++ b/dlls/gameux/tests/Makefile.in @@ -3,11 +3,12 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = gameux.dll -IMPORTS = ole32 +IMPORTS = uuid shlwapi oleaut32 ole32 C_SRCS = \ gameexplorer.c \ gamestatistics.c +RC_SRCS = rsrc.rc @MAKE_TEST_RULES@ diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 8498fe1..3decfa2 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -20,18 +20,20 @@ #define COBJMACROS -#include "initguid.h" - #include "windows.h" #include "ole2.h" #include "objsafe.h" #include "objbase.h" +#include "shlwapi.h" +#include "shobjidl.h" + +#include "initguid.h" #include "gameux.h" #include "wine/test.h" -static void test_create( void ) +static void test_create(BOOL* gameExplorerAvailable) { HRESULT hr; @@ -43,6 +45,7 @@ static void test_create( void ) if(ge) { ok(hr == S_OK, "IGameExplorer creating failed (result false)\n"); + *gameExplorerAvailable = TRUE; IGameExplorer_Release(ge); } else @@ -59,14 +62,89 @@ static void test_create( void ) win_skip("IGameExplorer2 cannot be created\n"); } +static void test_add_remove_game(void) +{ + static const GUID defaultGUID = {0x01234567, 0x89AB, 0xCDEF, + { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF}}; + + HRESULT hr; + + IGameExplorer* ge = NULL; + WCHAR sExeName[MAX_PATH]; + WCHAR sExePath[MAX_PATH]; + BSTR bstrExeName = NULL, bstrExePath = NULL; + DWORD dwExeNameLen; + GUID guid; + + hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, &IID_IGameExplorer, (LPVOID*) & ge); + ok(ge != NULL, "cannot create coclass IGameExplorer\n"); + ok(hr == S_OK, "cannot create coclass IGameExplorer\n"); + + if(ge) + { + /* prepare path to binary */ + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + ok(dwExeNameLen != 0, "GetModuleFileNameW returned invalid value\n"); + lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); + bstrExeName = SysAllocString(sExeName); + ok(bstrExeName != NULL, "cannot allocate string for exe name\n"); + bstrExePath = SysAllocString(sExePath); + ok(bstrExePath != NULL, "cannot allocate string for exe path\n"); + + if(bstrExeName && bstrExePath) + { + trace("prepared EXE name: %s\n", wine_dbgstr_w(bstrExeName)); + trace("prepared EXE path: %s\n", wine_dbgstr_w(bstrExePath)); + + + /* try to register game with provided guid */ + memcpy(&guid, &defaultGUID, sizeof (guid)); + + hr = IGameExplorer_AddGame(ge, bstrExeName, bstrExePath, GIS_CURRENT_USER, &guid); + todo_wine ok(SUCCEEDED(hr), "IGameExplorer::AddGame failed (error 0x%08x)\n", hr); + ok(memcmp(&guid, &defaultGUID, sizeof (guid)) == 0, "AddGame unexpectedly modified GUID\n"); + + if(SUCCEEDED(hr)) + { + hr = IGameExplorer_RemoveGame(ge, guid); + todo_wine ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); + } + + + /* try to register game with empty guid */ + memcpy(&guid, &GUID_NULL, sizeof (guid)); + + hr = IGameExplorer_AddGame(ge, bstrExeName, bstrExePath, GIS_CURRENT_USER, &guid); + todo_wine ok(SUCCEEDED(hr), "IGameExplorer::AddGame failed (error 0x%08x)\n", hr); + todo_wine ok(memcmp(&guid, &GUID_NULL, sizeof (guid)) != 0, "AddGame did not modify GUID\n"); + + if(SUCCEEDED(hr)) + { + hr = IGameExplorer_RemoveGame(ge, guid); + todo_wine ok(SUCCEEDED(hr), "IGameExplorer::RemoveGame failed (error 0x%08x)\n", hr); + } + } + + /* free allocated resources */ + SysFreeString(bstrExePath); + SysFreeString(bstrExeName); + + IGameExplorer_Release(ge); + } +} + START_TEST(gameexplorer) { HRESULT r; + BOOL gameExplorerAvailable = FALSE; r = CoInitialize( NULL ); ok( r == S_OK, "failed to init COM\n"); - test_create(); + test_create(&gameExplorerAvailable); + + if(gameExplorerAvailable) + test_add_remove_game(); CoUninitialize(); } diff --git a/dlls/gameux/tests/rsrc.rc b/dlls/gameux/tests/rsrc.rc new file mode 100644 index 0000000..b310db9 --- /dev/null +++ b/dlls/gameux/tests/rsrc.rc @@ -0,0 +1,26 @@ +/* + * Resources script for GameUX testing + * + * Copyright (C) 2010 Mariusz Pluciński + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winuser.h" +#include <gameux.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT +ID_GDF_XML DATA "test.gdf.xml" diff --git a/dlls/gameux/tests/test.gdf.xml b/dlls/gameux/tests/test.gdf.xml new file mode 100644 index 0000000..32d054a --- /dev/null +++ b/dlls/gameux/tests/test.gdf.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> + +<GameDefinitionFile +xmlns:baseTypes="urn:schemas-microsoft-com:GamesExplorerBaseTypes.v1" +xmlns="urn:schemas-microsoft-com:GameDescription.v1"> + <GameDefinition gameID="{17A6558E-60BE-4078-B66F-9C3ADA2A32E6}"> + <Name>Example Game</Name> + <Version> + <VersionNumber versionNumber="1.0.0.0"/> + </Version> + </GameDefinition> +</GameDefinitionFile>

1 0

Nikolay Sivov : oleaut32/olepicture: Fix assumptions about S_OK value.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 32c2ef6c9761bf953ec97dc64d7196d9bb274521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c2ef6c9761bf953ec97dc64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:17:35 2010 +0400 oleaut32/olepicture: Fix assumptions about S_OK value. --- dlls/oleaut32/olepicture.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index df7826b..d6d55d9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -494,7 +494,7 @@ static void OLEPicture_SendNotify(OLEPictureImpl* this, DISPID dispID) IEnumConnections *pEnum; CONNECTDATA CD; - if (IConnectionPoint_EnumConnections(this->pCP, &pEnum)) + if (IConnectionPoint_EnumConnections(this->pCP, &pEnum) != S_OK) return; while(IEnumConnections_Next(pEnum, 1, &CD, NULL) == S_OK) { IPropertyNotifySink *sink; @@ -1336,7 +1336,7 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, * Currently implemented: BITMAP, ICON, JPEG, GIF, WMF, EMF */ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { - HRESULT hr = E_FAIL; + HRESULT hr; BOOL headerisdata = FALSE; BOOL statfailed = FALSE; ULONG xread, toread; @@ -1365,8 +1365,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { * Also handle streams where we do not have a working "Stat" method by * reading all data until the end of the stream. */ - hr=IStream_Stat(pStm,&statstg,STATFLAG_NONAME); - if (hr) { + hr = IStream_Stat(pStm,&statstg,STATFLAG_NONAME); + if (hr != S_OK) { TRACE("stat failed with hres %x, proceeding to read all data.\n",hr); statfailed = TRUE; /* we will read at least 8 byte ... just right below */ @@ -1377,8 +1377,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { headerread = 0; headerisdata = FALSE; do { - hr=IStream_Read(pStm,header,8,&xread); - if (hr || xread!=8) { + hr = IStream_Read(pStm, header, 8, &xread); + if (hr != S_OK || xread!=8) { ERR("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); return (hr?hr:E_FAIL); } @@ -1423,11 +1423,11 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { while (1) { while (xread < origsize) { hr = IStream_Read(pStm,xbuf+xread,origsize-xread,&nread); - xread+=nread; - if (hr || !nread) + xread += nread; + if (hr != S_OK || !nread) break; } - if (!nread || hr) /* done, or error */ + if (!nread || hr != S_OK) /* done, or error */ break; if (xread == origsize) { origsize += sizeinc; @@ -1435,7 +1435,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { xbuf = HeapReAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, xbuf, origsize); } } - if (hr) + if (hr != S_OK) TRACE("hr in no-stat loader case is %08x\n", hr); TRACE("loaded %d bytes.\n", xread); This->datalen = xread; @@ -1452,8 +1452,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { while (xread < This->datalen) { ULONG nread; hr = IStream_Read(pStm,xbuf+xread,This->datalen-xread,&nread); - xread+=nread; - if (hr || !nread) + xread += nread; + if (hr != S_OK || !nread) break; } if (xread != This->datalen) @@ -2159,8 +2159,8 @@ static const IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContai HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, BOOL fOwn, LPVOID *ppvObj ) { - OLEPictureImpl* newPict = NULL; - HRESULT hr = S_OK; + OLEPictureImpl* newPict; + HRESULT hr; TRACE("(%p,%s,%d,%p)\n", lpPictDesc, debugstr_guid(riid), fOwn, ppvObj); @@ -2209,10 +2209,10 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, lpstream, lSize, fRunmode, debugstr_guid(riid), ppvObj); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); - if (hr) + if (hr != S_OK) return hr; hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps); - if (hr) { + if (hr != S_OK) { ERR("Could not get IPersistStream iface from Ole Picture?\n"); IPicture_Release(newpic); *ppvObj = NULL; @@ -2228,7 +2228,7 @@ HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, return hr; } hr = IPicture_QueryInterface(newpic,riid,ppvObj); - if (hr) + if (hr != S_OK) ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); IPicture_Release(newpic); return hr; @@ -2248,10 +2248,10 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, lpstream, lSize, fRunmode, debugstr_guid(riid), xsiz, ysiz, flags, ppvObj); hr = OleCreatePictureIndirect(NULL,riid,!fRunmode,(LPVOID*)&newpic); - if (hr) + if (hr != S_OK) return hr; hr = IPicture_QueryInterface(newpic,&IID_IPersistStream, (LPVOID*)&ps); - if (hr) { + if (hr != S_OK) { ERR("Could not get IPersistStream iface from Ole Picture?\n"); IPicture_Release(newpic); *ppvObj = NULL; @@ -2267,7 +2267,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, return hr; } hr = IPicture_QueryInterface(newpic,riid,ppvObj); - if (hr) + if (hr != S_OK) ERR("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); IPicture_Release(newpic); return hr;

1 0

Nikolay Sivov : oleaut32/olepicture: No need to check interface pointer in vtable methods.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: b5a8c331821544a136fd23fe57ebbf54c7eb6a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a8c331821544a136fd23fe5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 23 11:54:07 2010 +0400 oleaut32/olepicture: No need to check interface pointer in vtable methods. --- dlls/oleaut32/olepicture.c | 27 ++++++--------------------- 1 files changed, 6 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index d6d55d9..4dd25fb 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -438,22 +438,14 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface( void** ppvObject) { OLEPictureImpl *This = (OLEPictureImpl *)iface; + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); - /* - * Perform a sanity check on the parameters. - */ - if ( (This==0) || (ppvObject==0) ) + if (!ppvObject) return E_INVALIDARG; - /* - * Initialize the return parameter. - */ *ppvObject = 0; - /* - * Compare the riid with the interface IDs implemented by this object. - */ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid)) *ppvObject = This; else if (IsEqualIID(&IID_IDispatch, riid)) @@ -465,20 +457,13 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface( else if (IsEqualIID(&IID_IConnectionPointContainer, riid)) *ppvObject = &This->lpvtblIConnectionPointContainer; - /* - * Check that we obtained an interface. - */ - if ((*ppvObject)==0) + if (!*ppvObject) { FIXME("() : asking for un supported interface %s\n",debugstr_guid(riid)); return E_NOINTERFACE; } - /* - * Query Interface always increases the reference count by one when it is - * successful - */ - OLEPictureImpl_AddRef((IPicture*)This); + IPicture_AddRef(iface); return S_OK; } @@ -1335,9 +1320,9 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, * * Currently implemented: BITMAP, ICON, JPEG, GIF, WMF, EMF */ -static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { +static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) { HRESULT hr; - BOOL headerisdata = FALSE; + BOOL headerisdata; BOOL statfailed = FALSE; ULONG xread, toread; ULONG headerread;

1 0

Stefan Dösinger : wined3d: The clipplane mask and texcoords are unsigned.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 1d710bb4cab2ffcef26ffe2e52d028f7b5b37c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d710bb4cab2ffcef26ffe2e5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 28 15:47:22 2010 +0200 wined3d: The clipplane mask and texcoords are unsigned. --- dlls/wined3d/arb_program_shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 03443b4..db1f953 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -248,8 +248,8 @@ struct arb_vs_compile_args struct { WORD bools; - char clip_texcoord; - char clipplane_mask; + unsigned char clip_texcoord; + unsigned char clipplane_mask; } boolclip; DWORD boolclip_compare; } clip; @@ -4482,7 +4482,7 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW { if(stateblock->renderState[WINED3DRS_CLIPPING]) { - args->clip.boolclip.clipplane_mask = stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; + args->clip.boolclip.clipplane_mask = (unsigned char) stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; } /* clipplane_mask was set to 0 by setting boolclip_compare to 0 */ }

1 0