wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

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

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

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

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

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

Tony Wasserka : d3dx9: Fix an off by one error in point_filter_simple_data.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: ecce9eebcf14ed31a4613e7fc7902a35bd2430d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecce9eebcf14ed31a4613e7fc… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Aug 21 13:07:09 2010 +0200 d3dx9: Fix an off by one error in point_filter_simple_data. --- dlls/d3dx9_36/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ca4fd25..199209f 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -586,16 +586,16 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT sr for(y = 0;y < destsize.y;y++) { BYTE *destptr = dest + y * destpitch; const BYTE *bufptr = src + srcpitch * (y * srcsize.y / destsize.y); - const BYTE *srcptr = bufptr; for(x = 0;x < destsize.x;x++) { + const BYTE *srcptr = bufptr + (x * srcsize.x / destsize.x) * srcformat->bytes_per_pixel; + /* extract source color components */ if(srcformat->type == FORMAT_ARGB) get_relevant_argb_components(&conv_info, *(const DWORD*)srcptr, channels); /* recombine the components */ if(destformat->type == FORMAT_ARGB) make_argb_color(&conv_info, channels, (DWORD*)destptr); - srcptr = bufptr + (x * srcsize.x / destsize.x) * srcformat->bytes_per_pixel; destptr += destformat->bytes_per_pixel; } }

1 0

Tony Wasserka : d3dx9: Black out pixels which are outside the source rect in D3DXLoadSurfaceFromMemory if no stretching is used .
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 18b891694266435edfeece184ab7cecf3d59f56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b891694266435edfeece184… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Aug 21 12:54:38 2010 +0200 d3dx9: Black out pixels which are outside the source rect in D3DXLoadSurfaceFromMemory if no stretching is used. --- dlls/d3dx9_36/surface.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 487f06f..ca4fd25 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -526,6 +526,7 @@ static void make_argb_color(CONST struct argb_conversion_info *info, CONST DWORD * * Copies the source buffer to the destination buffer, performing * any necessary format conversion and color keying. + * Pixels outsize the source rect are blacked out. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, CONST PixelFormatDesc *srcformat, @@ -555,8 +556,12 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, C srcptr += srcformat->bytes_per_pixel; destptr += destformat->bytes_per_pixel; } + + if(srcsize.x < destsize.x) /* black out remaining pixels */ + ZeroMemory(destptr, destformat->bytes_per_pixel * (destsize.x - srcsize.x)); } - /* TODO: Black out unused pixels */ + if(srcsize.y < destsize.y) /* black out remaining pixels */ + ZeroMemory(dest + srcsize.y * destpitch, destpitch * (destsize.y - srcsize.y)); } /************************************************************

1 0

Stefan Dösinger : wined3d: Fix the wined3d_event_query_supported prototype.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: fad5ff478d26ac7637eb95c52c35d9620c9b7f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad5ff478d26ac7637eb95c52… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 29 17:13:01 2010 +0200 wined3d: Fix the wined3d_event_query_supported prototype. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34a8eb2..cfb6e71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -995,7 +995,7 @@ void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HID enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; -HRESULT wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_context {

1 0

Stefan Dösinger : wined3d: Don' t return a value from a void function.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 79666d2b6dac3504714230d2981a313cc46ed14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79666d2b6dac3504714230d29… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 29 17:11:15 2010 +0200 wined3d: Don't return a value from a void function. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 86355fa..da90288 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3098,7 +3098,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4]) { FIXME("texldd used, but not supported by hardware. Falling back to regular tex\n"); - return shader_glsl_tex(ins); + shader_glsl_tex(ins); + return; } sampler_idx = ins->src[1].reg.idx;

1 0

Stefan Dösinger : wined3d: Use float functions in drawprim.c.
by Alexandre Julliard 23 Aug '10

23 Aug '10

Module: wine Branch: master Commit: 612801d3aa0ec8c6bb4e777e6c9f81969f4ba3fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=612801d3aa0ec8c6bb4e777e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 29 17:08:59 2010 +0200 wined3d: Use float functions in drawprim.c. --- dlls/wined3d/drawprim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f848f51..4f70811 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -743,7 +743,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT static void normalize_normal(float *n) { float length = n[0] * n[0] + n[1] * n[1] + n[2] * n[2]; if (length == 0.0f) return; - length = sqrt(length); + length = sqrtf(length); n[0] = n[0] / length; n[1] = n[1] / length; n[2] = n[2] / length; @@ -828,9 +828,9 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, for(j = 0; j < info->Height; j++) { for(i = 0; i < info->Width; i++) { const float *v = (const float *)(data + vtxStride * i + vtxStride * info->Stride * j); - if(fabs(v[0]) > max_x) max_x = fabs(v[0]); - if(fabs(v[1]) > max_y) max_y = fabs(v[1]); - if(fabs(v[2]) > max_z) max_z = fabs(v[2]); + if(fabs(v[0]) > max_x) max_x = fabsf(v[0]); + if(fabs(v[1]) > max_y) max_y = fabsf(v[1]); + if(fabs(v[2]) > max_z) max_z = fabsf(v[2]); if(v[2] < neg_z) neg_z = v[2]; } }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010