wine-commits March 2007

wine-commits@winehq.org

3 participants
844 discussions

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

Alexandre Julliard : netapi32: Added support for more info levels in NetWkstaGetInfo.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 6782d2b49018aa6ac7eb28094c3f64ef5156a5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6782d2b49018aa6ac7eb28094… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 7 18:05:57 2007 +0100 netapi32: Added support for more info levels in NetWkstaGetInfo. --- dlls/netapi32/wksta.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index 5774344..ad4b704 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -489,7 +489,10 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LPWSTR servername, DWORD level, switch (level) { case 100: + case 101: + case 102: { + static const WCHAR lanroot[] = {'c',':','\\','l','a','n','m','a','n',0}; /* FIXME */ DWORD computerNameLen, domainNameLen, size; WCHAR computerName[MAX_COMPUTERNAME_LENGTH + 1]; LSA_OBJECT_ATTRIBUTES ObjectAttributes; @@ -512,28 +515,31 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LPWSTR servername, DWORD level, LsaQueryInformationPolicy(PolicyHandle, PolicyAccountDomainInformation, (PVOID*)&DomainInfo); domainNameLen = lstrlenW(DomainInfo->DomainName.Buffer) + 1; - size = sizeof(WKSTA_INFO_100) + computerNameLen * sizeof(WCHAR) - + domainNameLen * sizeof(WCHAR); + size = sizeof(WKSTA_INFO_102) + computerNameLen * sizeof(WCHAR) + + domainNameLen * sizeof(WCHAR) + sizeof(lanroot); ret = NetApiBufferAllocate(size, (LPVOID *)bufptr); if (ret == NERR_Success) { - PWKSTA_INFO_100 info = (PWKSTA_INFO_100)*bufptr; + /* INFO_100 and INFO_101 structures are subsets of INFO_102 */ + PWKSTA_INFO_102 info = (PWKSTA_INFO_102)*bufptr; OSVERSIONINFOW verInfo; - info->wki100_platform_id = PLATFORM_ID_NT; - info->wki100_computername = (LPWSTR)(*bufptr + - sizeof(WKSTA_INFO_100)); - memcpy(info->wki100_computername, computerName, + info->wki102_platform_id = PLATFORM_ID_NT; + info->wki102_computername = (LPWSTR)(*bufptr + + sizeof(WKSTA_INFO_102)); + memcpy(info->wki102_computername, computerName, computerNameLen * sizeof(WCHAR)); - info->wki100_langroup = (LPWSTR)(*bufptr + - sizeof(WKSTA_INFO_100) + computerNameLen * sizeof(WCHAR)); - memcpy(info->wki100_langroup, DomainInfo->DomainName.Buffer, + info->wki102_langroup = info->wki102_computername + computerNameLen; + memcpy(info->wki102_langroup, DomainInfo->DomainName.Buffer, domainNameLen * sizeof(WCHAR)); + info->wki102_lanroot = info->wki102_langroup + domainNameLen; + memcpy(info->wki102_lanroot, lanroot, sizeof(lanroot)); memset(&verInfo, 0, sizeof(verInfo)); verInfo.dwOSVersionInfoSize = sizeof(verInfo); GetVersionExW(&verInfo); - info->wki100_ver_major = verInfo.dwMajorVersion; - info->wki100_ver_minor = verInfo.dwMinorVersion; + info->wki102_ver_major = verInfo.dwMajorVersion; + info->wki102_ver_minor = verInfo.dwMinorVersion; + info->wki102_logged_on_users = 1; } LsaFreeMemory(DomainInfo); LsaClose(PolicyHandle);

1 0

Luis Carlos Busquets Pérez : dpnaddr: Added dll that just forwards to dpnet.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 8caf078754b0a0944fce632ee66ea69004454dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8caf078754b0a0944fce632ee… Author: Luis Carlos Busquets Pérez <luis.busquets(a)ilidium.com> Date: Wed Mar 7 09:41:41 2007 +0100 dpnaddr: Added dll that just forwards to dpnet. --- .gitignore | 1 + Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/dpnaddr/Makefile.in | 12 ++++++++++++ dlls/dpnaddr/dpnaddr.spec | 1 + dlls/dpnaddr/version.rc | 26 ++++++++++++++++++++++++++ 8 files changed, 47 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 772db5f..21f4f56 100644 --- a/.gitignore +++ b/.gitignore @@ -217,6 +217,7 @@ dlls/dplayx/tests/*.ok dlls/dplayx/tests/dplayx_crosstest.exe dlls/dplayx/tests/testlist.c dlls/dplayx/version.res +dlls/dpnaddr/version.res dlls/dpnet/libdpnet.def dlls/dpnet/version.res dlls/dpnhpast/version.res diff --git a/Makefile.in b/Makefile.in index d4e743a..f488e7d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -217,6 +217,7 @@ ALL_MAKEFILES = \ dlls/dplay/Makefile \ dlls/dplayx/Makefile \ dlls/dplayx/tests/Makefile \ + dlls/dpnaddr/Makefile \ dlls/dpnet/Makefile \ dlls/dpnhpast/Makefile \ dlls/dsound/Makefile \ @@ -552,6 +553,7 @@ dlls/dnsapi/tests/Makefile: dlls/dnsapi/tests/Makefile.in dlls/Maketest.rules dlls/dplay/Makefile: dlls/dplay/Makefile.in dlls/Makedll.rules dlls/dplayx/Makefile: dlls/dplayx/Makefile.in dlls/Makedll.rules dlls/dplayx/tests/Makefile: dlls/dplayx/tests/Makefile.in dlls/Maketest.rules +dlls/dpnaddr/Makefile: dlls/dpnaddr/Makefile.in dlls/Makedll.rules dlls/dpnet/Makefile: dlls/dpnet/Makefile.in dlls/Makedll.rules dlls/dpnhpast/Makefile: dlls/dpnhpast/Makefile.in dlls/Makedll.rules dlls/dsound/Makefile: dlls/dsound/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index 549688a..319be49 100755 --- a/configure +++ b/configure @@ -20565,6 +20565,8 @@ ac_config_files="$ac_config_files dlls/dplayx/Makefile" ac_config_files="$ac_config_files dlls/dplayx/tests/Makefile" +ac_config_files="$ac_config_files dlls/dpnaddr/Makefile" + ac_config_files="$ac_config_files dlls/dpnet/Makefile" ac_config_files="$ac_config_files dlls/dpnhpast/Makefile" @@ -21714,6 +21716,7 @@ do "dlls/dplay/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dplay/Makefile" ;; "dlls/dplayx/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dplayx/Makefile" ;; "dlls/dplayx/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dplayx/tests/Makefile" ;; + "dlls/dpnaddr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnaddr/Makefile" ;; "dlls/dpnet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnet/Makefile" ;; "dlls/dpnhpast/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dpnhpast/Makefile" ;; "dlls/dsound/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dsound/Makefile" ;; diff --git a/configure.ac b/configure.ac index 59257fd..7ad14c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1587,6 +1587,7 @@ AC_CONFIG_FILES([dlls/dnsapi/tests/Makefile]) AC_CONFIG_FILES([dlls/dplay/Makefile]) AC_CONFIG_FILES([dlls/dplayx/Makefile]) AC_CONFIG_FILES([dlls/dplayx/tests/Makefile]) +AC_CONFIG_FILES([dlls/dpnaddr/Makefile]) AC_CONFIG_FILES([dlls/dpnet/Makefile]) AC_CONFIG_FILES([dlls/dpnhpast/Makefile]) AC_CONFIG_FILES([dlls/dsound/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 4c47aae..b88cde3 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -64,6 +64,7 @@ BASEDIRS = \ dnsapi \ dplay \ dplayx \ + dpnaddr \ dpnet \ dpnhpast \ dsound \ diff --git a/dlls/dpnaddr/Makefile.in b/dlls/dpnaddr/Makefile.in new file mode 100644 index 0000000..7bd5901 --- /dev/null +++ b/dlls/dpnaddr/Makefile.in @@ -0,0 +1,12 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = dpnaddr.dll +IMPORTS = dpnet kernel32 + +RC_SRCS = version.rc + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/dpnaddr/dpnaddr.spec b/dlls/dpnaddr/dpnaddr.spec new file mode 100644 index 0000000..e271f57 --- /dev/null +++ b/dlls/dpnaddr/dpnaddr.spec @@ -0,0 +1 @@ +@ stdcall DirectPlay8AddressCreate(ptr ptr ptr) dpnet.DirectPlay8Create diff --git a/dlls/dpnaddr/version.rc b/dlls/dpnaddr/version.rc new file mode 100644 index 0000000..b66e785 --- /dev/null +++ b/dlls/dpnaddr/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2004 Christian Costa + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine DpnAddr dll" +#define WINE_FILENAME_STR "dpnadr.dll" +#define WINE_FILEVERSION 5,3,2600,2180 +#define WINE_FILEVERSION_STR "5.3.2600.2180" +#define WINE_PRODUCTVERSION 5,3,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.3.2600.2180" + +#include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : server: Use internal luid_t type where appropriate.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: bf17ce86d4a38b276a62637610c3fd2e196b8832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf17ce86d4a38b276a6263761… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 7 12:43:12 2007 +0100 server: Use internal luid_t type where appropriate. --- server/token.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/server/token.c b/server/token.c index 3fc6bc3..1325058 100644 --- a/server/token.c +++ b/server/token.c @@ -74,13 +74,13 @@ const PSID security_interactive_sid = (PSID)&interactive_sid; static const PSID security_authenticated_user_sid = (PSID)&authenticated_user_sid; static const PSID security_local_system_sid = (PSID)&local_system_sid; -static LUID prev_luid_value = { 1000, 0 }; +static luid_t prev_luid_value = { 1000, 0 }; struct token { struct object obj; /* object header */ - LUID token_id; /* system-unique id of token */ - LUID modified_id; /* new id allocated every time token is modified */ + luid_t token_id; /* system-unique id of token */ + luid_t modified_id; /* new id allocated every time token is modified */ struct list privileges; /* privileges available to the token */ struct list groups; /* groups that the user of this token belongs to (sid_and_attributes) */ SID *user; /* SID of user this token represents */ @@ -359,19 +359,15 @@ static inline int is_equal_luid( const LUID *luid1, const LUID *luid2 ) return (luid1->LowPart == luid2->LowPart && luid1->HighPart == luid2->HighPart); } -static inline void allocate_luid( LUID *luid ) +static inline void allocate_luid( luid_t *luid ) { - prev_luid_value.LowPart++; + prev_luid_value.low_part++; *luid = prev_luid_value; } DECL_HANDLER( allocate_locally_unique_id ) { - LUID luid; - - allocate_luid( &luid ); - reply->luid.low_part = luid.LowPart; - reply->luid.high_part = luid.HighPart; + allocate_luid( &reply->luid ); } static inline void luid_and_attr_from_privilege( LUID_AND_ATTRIBUTES *out, const struct privilege *in) @@ -438,7 +434,7 @@ static struct token *create_token( unsigned primary, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, - const LUID *modified_id, + const luid_t *modified_id, SECURITY_IMPERSONATION_LEVEL impersonation_level ) { struct token *token = alloc_object( &token_ops ); @@ -1177,7 +1173,7 @@ DECL_HANDLER(duplicate_token) TOKEN_DUPLICATE, &token_ops ))) { - const LUID *modified_id = + const luid_t *modified_id = req->primary || (req->impersonation_level == src_token->impersonation_level) ? &src_token->modified_id : NULL; struct token *token = NULL;

1 0

Juan Lang : ntdll: Implement NtAllocateLocallyUniqueId with server call.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: c2cb29627703d7cbcff9edef0fa22ec9a14eb790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2cb29627703d7cbcff9edef0… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Mar 6 16:33:26 2007 -0800 ntdll: Implement NtAllocateLocallyUniqueId with server call. --- dlls/ntdll/nt.c | 23 +++++++++++++---------- include/wine/server_protocol.h | 22 +++++++++++++++++++++- server/protocol.def | 12 ++++++++++++ server/request.h | 2 ++ server/token.c | 9 +++++++++ server/trace.c | 18 ++++++++++++++++++ tools/make_requests | 1 + 7 files changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ce3c31a..4158f4e 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1090,25 +1090,28 @@ NTSTATUS WINAPI NtShutdownSystem(SHUTDOWN_ACTION Action) /****************************************************************************** * NtAllocateLocallyUniqueId (NTDLL.@) - * - * FIXME: the server should do that */ NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID Luid) { - static LUID luid = { SE_MAX_WELL_KNOWN_PRIVILEGE, 0 }; + NTSTATUS status; - FIXME("%p\n", Luid); + TRACE("%p\n", Luid); if (!Luid) return STATUS_ACCESS_VIOLATION; - luid.LowPart++; - if (luid.LowPart==0) - luid.HighPart++; - Luid->HighPart = luid.HighPart; - Luid->LowPart = luid.LowPart; + SERVER_START_REQ( allocate_locally_unique_id ) + { + status = wine_server_call( req ); + if (!status) + { + Luid->LowPart = reply->luid.low_part; + Luid->HighPart = reply->luid.high_part; + } + } + SERVER_END_REQ; - return STATUS_SUCCESS; + return status; } /****************************************************************************** diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 02851dc..db9309a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -187,6 +187,12 @@ typedef struct unsigned short attr; } char_info_t; +typedef struct +{ + unsigned int low_part; + int high_part; +} luid_t; + #define MAX_ACL_LEN 65535 struct security_descriptor @@ -4005,6 +4011,17 @@ struct get_token_impersonation_level_reply }; +struct allocate_locally_unique_id_request +{ + struct request_header __header; +}; +struct allocate_locally_unique_id_reply +{ + struct reply_header __header; + luid_t luid; +}; + + enum request { REQ_new_process, @@ -4224,6 +4241,7 @@ enum request REQ_query_symlink, REQ_get_object_info, REQ_get_token_impersonation_level, + REQ_allocate_locally_unique_id, REQ_NB_REQUESTS }; @@ -4448,6 +4466,7 @@ union generic_request struct query_symlink_request query_symlink_request; struct get_object_info_request get_object_info_request; struct get_token_impersonation_level_request get_token_impersonation_level_request; + struct allocate_locally_unique_id_request allocate_locally_unique_id_request; }; union generic_reply { @@ -4670,8 +4689,9 @@ union generic_reply struct query_symlink_reply query_symlink_reply; struct get_object_info_reply get_object_info_reply; struct get_token_impersonation_level_reply get_token_impersonation_level_reply; + struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 279 +#define SERVER_PROTOCOL_VERSION 280 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index d88bbe8..f3175a3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -203,6 +203,12 @@ typedef struct unsigned short attr; } char_info_t; +typedef struct +{ + unsigned int low_part; + int high_part; +} luid_t; + #define MAX_ACL_LEN 65535 struct security_descriptor @@ -2870,3 +2876,9 @@ enum message_type @REPLY int impersonation_level; /* impersonation level of the impersonation token */ @END + +/* Allocate a locally-unique identifier */ +@REQ(allocate_locally_unique_id) +@REPLY + luid_t luid; +@END diff --git a/server/request.h b/server/request.h index b24d7c7..44bab11 100644 --- a/server/request.h +++ b/server/request.h @@ -327,6 +327,7 @@ DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); DECL_HANDLER(get_object_info); DECL_HANDLER(get_token_impersonation_level); +DECL_HANDLER(allocate_locally_unique_id); #ifdef WANT_REQUEST_HANDLERS @@ -550,6 +551,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_query_symlink, (req_handler)req_get_object_info, (req_handler)req_get_token_impersonation_level, + (req_handler)req_allocate_locally_unique_id, }; #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/token.c b/server/token.c index 278b6d1..3fc6bc3 100644 --- a/server/token.c +++ b/server/token.c @@ -365,6 +365,15 @@ static inline void allocate_luid( LUID *luid ) *luid = prev_luid_value; } +DECL_HANDLER( allocate_locally_unique_id ) +{ + LUID luid; + + allocate_luid( &luid ); + reply->luid.low_part = luid.LowPart; + reply->luid.high_part = luid.HighPart; +} + static inline void luid_and_attr_from_privilege( LUID_AND_ATTRIBUTES *out, const struct privilege *in) { out->Luid = in->luid; diff --git a/server/trace.c b/server/trace.c index 56cc7f6..01c873f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -239,6 +239,11 @@ static void dump_apc_result( const apc_result_t *result ) fputc( '}', stderr ); } +static void dump_luid( const luid_t *luid ) +{ + fprintf( stderr, "%d.%u", luid->high_part, luid->low_part ); +} + static void dump_context( const CONTEXT *context ) { #ifdef __i386__ @@ -3454,6 +3459,16 @@ static void dump_get_token_impersonation_level_reply( const struct get_token_imp fprintf( stderr, " impersonation_level=%d", req->impersonation_level ); } +static void dump_allocate_locally_unique_id_request( const struct allocate_locally_unique_id_request *req ) +{ +} + +static void dump_allocate_locally_unique_id_reply( const struct allocate_locally_unique_id_reply *req ) +{ + fprintf( stderr, " luid=" ); + dump_luid( &req->luid ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3672,6 +3687,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_query_symlink_request, (dump_func)dump_get_object_info_request, (dump_func)dump_get_token_impersonation_level_request, + (dump_func)dump_allocate_locally_unique_id_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -3892,6 +3908,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_query_symlink_reply, (dump_func)dump_get_object_info_reply, (dump_func)dump_get_token_impersonation_level_reply, + (dump_func)dump_allocate_locally_unique_id_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4112,6 +4129,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "query_symlink", "get_object_info", "get_token_impersonation_level", + "allocate_locally_unique_id", }; static const struct diff --git a/tools/make_requests b/tools/make_requests index 9f110f9..8cbe539 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -44,6 +44,7 @@ my %formats = "char_info_t" => "&dump_char_info", "apc_call_t" => "&dump_apc_call", "apc_result_t" => "&dump_apc_result", + "luid_t" => "&dump_luid", ); my @requests = ();

1 0

Stefan Dösinger : wined3d: Rework surface dirtification.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: c54a0fc2cf5c58bf2aa47a523aa7593dc71e333e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54a0fc2cf5c58bf2aa47a523… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Mar 6 21:47:45 2007 +0100 wined3d: Rework surface dirtification. Previously the surfaces stored a flag if the system memory copy was ahead of the gl copy(SFLAG_DIRTY) or the gl copy is ahead(SFLAG_GLDIRTY). The pbuffer copy was 'managed' differently using SFLAG_INPBUFFER and SFLAG_INTEXTURE. This patch replaces them with 3 flags, INSYSMEM, INPBUFFER and INTEXTURE which specify which copy contains the most up to date copy. It is perfectly valid to have more than one of those flags set. One must be set at least (except at init, when no content is in the surface yet). When one copy is modified, the flags for the others are removed. --- dlls/wined3d/context.c | 5 -- dlls/wined3d/device.c | 11 ++++- dlls/wined3d/drawprim.c | 40 ++++++++++++++- dlls/wined3d/surface.c | 99 +++++++++++++++++++++----------------- dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/swapchain.c | 18 ++++--- dlls/wined3d/utils.c | 6 +- dlls/wined3d/wined3d_private.h | 23 ++++----- include/wine/wined3d_interface.h | 2 - 9 files changed, 124 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c54a0fc2cf5c58bf2aa47…

1 0

Stefan Dösinger : wined3d: Remove IWineD3DSurface:: SetPBufferState.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: ebe274feed73a74c5d9c34db96ac0244c698f89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe274feed73a74c5d9c34db9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 3 15:19:41 2007 +0100 wined3d: Remove IWineD3DSurface::SetPBufferState. The method is removed because it does not really help with anything. It should not be exported from wined3d, there is no need for the other libs to call it. It does not help abstraction and code simplification in any way because it is very specific and the code calling it has to know what is happening in the surface to use this method. --- dlls/wined3d/context.c | 6 ++++-- dlls/wined3d/surface.c | 20 -------------------- dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d_interface.h | 2 -- 5 files changed, 4 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6b00120..b926af0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -709,10 +709,12 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* Do that before switching the context: * Read the back buffer of the old drawable into the destination texture */ - IWineD3DSurface_SetPBufferState(This->lastActiveRenderTarget, TRUE /* inPBuffer */, FALSE /* inTexture */); + ((IWineD3DSurfaceImpl *) This->lastActiveRenderTarget)->Flags |= SFLAG_INPBUFFER; + ((IWineD3DSurfaceImpl *) This->lastActiveRenderTarget)->Flags &= ~SFLAG_INTEXTURE; IWineD3DSurface_AddDirtyRect(This->lastActiveRenderTarget, NULL); IWineD3DSurface_PreLoad(This->lastActiveRenderTarget); - IWineD3DSurface_SetPBufferState(This->lastActiveRenderTarget, FALSE /* inPBuffer */, FALSE /* inTexture */); + ((IWineD3DSurfaceImpl *) This->lastActiveRenderTarget)->Flags &= ~SFLAG_INPBUFFER; + ((IWineD3DSurfaceImpl *) This->lastActiveRenderTarget)->Flags &= ~SFLAG_INTEXTURE; } This->lastActiveRenderTarget = target; if(oldRenderOffscreen != This->render_offscreen && This->depth_copy_state != WINED3D_DCS_NO_COPY) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c4eefc9..772bdbb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2130,25 +2130,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { return WINED3D_OK; } -/* TODO: replace this function with context management routines */ -HRESULT WINAPI IWineD3DSurfaceImpl_SetPBufferState(IWineD3DSurface *iface, BOOL inPBuffer, BOOL inTexture) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - if(inPBuffer) { - This->Flags |= SFLAG_INPBUFFER; - } else { - This->Flags &= ~SFLAG_INPBUFFER; - } - - if(inTexture) { - This->Flags |= SFLAG_INTEXTURE; - } else { - This->Flags &= ~SFLAG_INTEXTURE; - } - - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD Flags) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDevice *D3D = (IWineD3DDevice *) This->resource.wineD3DDevice; @@ -3261,7 +3242,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_LoadTexture, IWineD3DSurfaceImpl_SaveSnapshot, IWineD3DSurfaceImpl_SetContainer, - IWineD3DSurfaceImpl_SetPBufferState, IWineD3DSurfaceImpl_SetGlTextureDesc, IWineD3DSurfaceImpl_GetGlDesc, IWineD3DSurfaceImpl_GetData, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 87ee0d0..508aaae 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1605,7 +1605,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineGDISurfaceImpl_LoadTexture, IWineGDISurfaceImpl_SaveSnapshot, IWineD3DSurfaceImpl_SetContainer, - IWineD3DSurfaceImpl_SetPBufferState, IWineD3DSurfaceImpl_SetGlTextureDesc, IWineD3DSurfaceImpl_GetGlDesc, IWineD3DSurfaceImpl_GetData, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a8c4b8..ddb487e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1082,7 +1082,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Fla HRESULT WINAPI IWineD3DSurfaceImpl_CleanDirtyRect(IWineD3DSurface *iface); extern HRESULT WINAPI IWineD3DSurfaceImpl_AddDirtyRect(IWineD3DSurface *iface, CONST RECT* pDirtyRect); HRESULT WINAPI IWineD3DSurfaceImpl_SetContainer(IWineD3DSurface *iface, IWineD3DBase *container); -HRESULT WINAPI IWineD3DSurfaceImpl_SetPBufferState(IWineD3DSurface *iface, BOOL inPBuffer, BOOL inTexture); void WINAPI IWineD3DSurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT textureName, int target); void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription); const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface); diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 3783ebc..dfa5125 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1113,7 +1113,6 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) STDMETHOD(LoadTexture)(THIS) PURE; STDMETHOD(SaveSnapshot)(THIS_ const char *filename) PURE; STDMETHOD(SetContainer)(THIS_ IWineD3DBase *container) PURE; - STDMETHOD(SetPBufferState)(THIS_ BOOL inPBuffer, BOOL inTexture) PURE; STDMETHOD_(void,SetGlTextureDesc)(THIS_ UINT textureName, int target) PURE; STDMETHOD_(void,GetGlDesc)(THIS_ glDescriptor **glDescription) PURE; STDMETHOD_(CONST void *, GetData)(THIS) PURE; @@ -1168,7 +1167,6 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) #define IWineD3DSurface_LoadTexture(p) (p)->lpVtbl->LoadTexture(p) #define IWineD3DSurface_SaveSnapshot(p,a) (p)->lpVtbl->SaveSnapshot(p,a) #define IWineD3DSurface_SetContainer(p,a) (p)->lpVtbl->SetContainer(p,a) -#define IWineD3DSurface_SetPBufferState(p,a,b) (p)->lpVtbl->SetPBufferState(p,a,b) #define IWineD3DSurface_SetGlTextureDesc(p,a,b) (p)->lpVtbl->SetGlTextureDesc(p,a,b) #define IWineD3DSurface_GetGlDesc(p,a) (p)->lpVtbl->GetGlDesc(p,a) #define IWineD3DSurface_GetData(p) (p)->lpVtbl->GetData(p)

1 0

Aric Stewart : gdi32: Search SystemLinked fonts when looking for a valid replacement.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 33eefa24dc92bd984515164714cb63c789cdfad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33eefa24dc92bd98451516471… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 7 14:45:11 2007 +0900 gdi32: Search SystemLinked fonts when looking for a valid replacement. --- dlls/gdi32/freetype.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5f00116..db990fa 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -740,7 +740,25 @@ static Family *find_family_from_name(const WCHAR *name) return NULL; } - + +static Face *find_face_from_path_index(const CHAR *file_name, const INT index) +{ + Family *family; + Face *face; + + TRACE("looking for file %s index %i\n", debugstr_a(file_name), index); + + LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) + { + LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + { + if(!strcasecmp(face->file, file_name) && face->face_index == index) + return face; + } + } + return NULL; +} + static void DumpSubstList(void) { FontSubst *psub; @@ -2714,6 +2732,9 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) family = NULL; if(lf.lfFaceName[0] != '\0') { FontSubst *psub; + SYSTEM_LINKS *font_link; + CHILD_FONT *font_link_entry; + psub = get_font_subst(&font_subst_list, lf.lfFaceName, lf.lfCharSet); if(psub) { @@ -2739,6 +2760,33 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) } } } + + /* + * Try check the SystemLink list first for a replacement font. + * We may find good replacements there. + */ + LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { + if(!strcmpW(font_link->font_name, lf.lfFaceName)) + { + TRACE("found entry in system list\n"); + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) + { + face = find_face_from_path_index(font_link_entry->file_name, + font_link_entry->index); + if (face) + { + family = face->family; + if(csi.fs.fsCsb[0] & + (face->fs.fsCsb[0] | face->fs_links.fsCsb[0])) + { + if(face->scalable || can_use_bitmap) + goto found; + } + } + } + } + } } /* If requested charset was DEFAULT_CHARSET then try using charset

1 0

Aric Stewart : user32: Don't delete hrgnClip until we are done using it.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: e499a84416528e5c854be3f280a80688edf8fe83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e499a84416528e5c854be3f28… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 7 15:31:19 2007 +0900 user32: Don't delete hrgnClip until we are done using it. Thanks to Peter Oberndorfer for noticing this. --- dlls/user32/painting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 5c70b2a..c361610 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -869,7 +869,6 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, if( !bOwnRgn) CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); RedrawWindow( hwnd, NULL, hrgnTemp, rdw_flags); - DeleteObject( hrgnClip ); /* Catch the case where the scolling amount exceeds the size of the * original window. This generated a second update area that is the @@ -889,6 +888,7 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, if( !bOwnRgn) CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); } + DeleteObject( hrgnClip ); } DeleteObject( hrgnTemp ); } else {

1 0

Detlef Riekenberg : localspl/tests: Add tests for XcvDataPort_DeletePort.
by Alexandre Julliard 07 Mar '07

07 Mar '07

Module: wine Branch: master Commit: 8db7b9c7c7c6e2232e4ef36454dc881fcc4bbaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db7b9c7c7c6e2232e4ef3645… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 7 00:20:32 2007 +0100 localspl/tests: Add tests for XcvDataPort_DeletePort. --- dlls/localspl/tests/localmon.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 4361e71..bce9a48 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -69,6 +69,7 @@ static BOOL (WINAPI *pDeletePortUI)(PCWSTR, HWND, PCWSTR); static const WCHAR cmd_ConfigureLPTPortCommandOKW[] = {'C','o','n','f','i','g','u','r','e', 'L','P','T','P','o','r','t', 'C','o','m','m','a','n','d','O','K',0}; +static WCHAR cmd_DeletePortW[] = {'D','e','l','e','t','e','P','o','r','t',0}; static WCHAR cmd_GetTransmissionRetryTimeoutW[] = {'G','e','t', 'T','r','a','n','s','m','i','s','s','i','o','n', 'R','e','t','r','y','T','i','m','e','o','u','t',0}; @@ -483,6 +484,48 @@ static void test_XcvDataPort_ConfigureLPTPortCommandOK(void) /* ########################### */ +static void test_XcvDataPort_DeletePort(void) +{ + DWORD res; + HANDLE hXcv; + DWORD needed; + + + if ((pXcvOpenPort == NULL) || (pXcvDataPort == NULL) || (pXcvClosePort == NULL)) return; + + hXcv = (HANDLE) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvOpenPort(emptyW, SERVER_ALL_ACCESS, &hXcv); + ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); + if (!res) return; + + /* cleanup: just to make sure */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed); + ok( !res || (res == ERROR_FILE_NOT_FOUND), + "returned %d with %u (expected ERROR_SUCCESS or ERROR_FILE_NOT_FOUND)\n", + res, GetLastError()); + + + /* ToDo: cmd_AddPortW for tempfileW, then cmd_DeletePortW for the existing Port */ + + + /* try to delete a non-existing Port */ + needed = (DWORD) 0xdeadbeef; + SetLastError(0xdeadbeef); + res = pXcvDataPort(hXcv, cmd_DeletePortW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed); + ok( res == ERROR_FILE_NOT_FOUND, + "returned %d with %u (expected ERROR_FILE_NOT_FOUND)\n", res, GetLastError()); + + /* emptyW as Portname: ERROR_FILE_NOT_FOUND is returned */ + /* NULL as Portname: Native localspl.dll crashed */ + + pXcvClosePort(hXcv); +} + +/* ########################### */ + static void test_XcvDataPort_GetTransmissionRetryTimeout(void) { CHAR org_value[16]; @@ -1039,6 +1082,7 @@ START_TEST(localmon) test_EnumPorts(); test_XcvClosePort(); test_XcvDataPort_ConfigureLPTPortCommandOK(); + test_XcvDataPort_DeletePort(); test_XcvDataPort_GetTransmissionRetryTimeout(); test_XcvDataPort_MonitorUI(); test_XcvDataPort_PortIsValid();

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
85
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 March 2007