May 2006 - Wine-commits - list.winehq.org

Huw Davies : rpcrt4: Support for non-encapsulated unions.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: b1d5158980a89dd92d23b2ee4f6fd5d6f705296d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b1d5158980a89dd92d23b2e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 28 14:28:24 2006 +0100 rpcrt4: Support for non-encapsulated unions. --- dlls/rpcrt4/ndr_marshall.c | 264 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 259 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 6830530..66a4caa 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1422,6 +1422,20 @@ void WINAPI NdrSimpleStructFree(PMIDL_ST } +static long NonEncapsulatedUnionSize(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING pFormat) +{ + pFormat += 2; + if (pStubMsg->fHasNewCorrDesc) + pFormat += 6; + else + pFormat += 4; + + pFormat += *(const SHORT*)pFormat; + TRACE("size %d\n", *(const SHORT*)pFormat); + return *(const SHORT*)pFormat; +} + unsigned long WINAPI EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { @@ -1433,6 +1447,8 @@ unsigned long WINAPI EmbeddedComplexSize return *(const WORD*)&pFormat[2]; case RPC_FC_USER_MARSHAL: return *(const WORD*)&pFormat[4]; + case RPC_FC_NON_ENCAPSULATED_UNION: + return NonEncapsulatedUnionSize(pStubMsg, pFormat); default: FIXME("unhandled embedded type %02x\n", *pFormat); } @@ -2799,6 +2815,83 @@ void WINAPI NdrEncapsulatedUnionFree(PMI FIXME("stub\n"); } +static PFORMAT_STRING get_arm_offset_from_union_arm_selector(PMIDL_STUB_MESSAGE pStubMsg, + unsigned long discriminant, + PFORMAT_STRING pFormat) +{ + unsigned short num_arms, arm, type; + + num_arms = *(const SHORT*)pFormat & 0x0fff; + pFormat += 2; + for(arm = 0; arm < num_arms; arm++) + { + if(discriminant == *(const ULONG*)pFormat) + { + pFormat += 4; + break; + } + pFormat += 6; + } + + type = *(const unsigned short*)pFormat; + TRACE("type %04x\n", type); + if(arm == num_arms) /* default arm extras */ + { + if(type == 0xffff) + { + FIXME("should raise an exception here\n"); + return NULL; + } + if(type == 0) + { + /* Don't marshall any type. FIXME is this correct? */ + return NULL; + } + } + return pFormat; +} + +static PFORMAT_STRING get_non_encapsulated_union_arm(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + ULONG value; + + pFormat = ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, + 0, &value); + TRACE("got switch value %lx\n", value); + pFormat += *(const SHORT*)pFormat; + pFormat += 2; + + return get_arm_offset_from_union_arm_selector(pStubMsg, value, pFormat); +} + +static unsigned char *get_conformance_address(PMIDL_STUB_MESSAGE pStubMsg, + unsigned char *pMemory, + PFORMAT_STRING pFormat) +{ + short ofs = *(short *)&pFormat[2]; + LPVOID ptr = NULL; + + switch (pFormat[0] & 0xf0) + { + case RPC_FC_NORMAL_CONFORMANCE: + ptr = pMemory; + break; + default: + FIXME("Conformance type %x\n", pFormat[0]); + return NULL; + } + + if(pFormat[1]) + { + FIXME("Conformance op %x\n", pFormat[1]); + return NULL; + } + + return (unsigned char *)ptr + ofs; +} + /*********************************************************************** * NdrNonEncapsulatedUnionMarshall [RPCRT4.@] */ @@ -2806,19 +2899,143 @@ unsigned char * WINAPI NdrNonEncapsulat unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + unsigned char *discriminant; + unsigned short type; + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + pFormat++; + + /* Marshall discriminant */ + discriminant = get_conformance_address(pStubMsg, pMemory, pFormat + 1); + NdrBaseTypeMarshall(pStubMsg, discriminant, pFormat); + pFormat++; + + pFormat = get_non_encapsulated_union_arm(pStubMsg, pMemory, pFormat); + if(!pFormat) + return NULL; + + type = *(const unsigned short*)pFormat; + if(type & 0x8000) + { + pFormat++; + return NdrBaseTypeMarshall(pStubMsg, pMemory, pFormat); + } + else + { + PFORMAT_STRING desc = pFormat + *(const SHORT*)pFormat; + NDR_MARSHALL m = NdrMarshaller[*desc & NDR_TABLE_MASK]; + if (m) + { + switch(*desc) + { + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: + pMemory = *(void**)pMemory; + break; + } + m(pStubMsg, pMemory, desc); + } + else FIXME("no marshaller for embedded type %02x\n", *desc); + } return NULL; } -/*********************************************************************** - * NdrNonEncapsulatedUnionUnmarshall [RPCRT4.@] +static long unmarshall_discriminant(PMIDL_STUB_MESSAGE pStubMsg, + PFORMAT_STRING *ppFormat) +{ + long discriminant = 0; + + switch(**ppFormat) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + discriminant = *(UCHAR *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(UCHAR); + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT) - 1); + discriminant = *(USHORT *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(USHORT); + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG) - 1); + discriminant = *(ULONG *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(ULONG); + break; + default: + FIXME("Unhandled base type: 0x%02x\n", **ppFormat); + } + (*ppFormat)++; + + if (pStubMsg->fHasNewCorrDesc) + *ppFormat += 6; + else + *ppFormat += 4; + return discriminant; +} + +/********************************************************************** + * NdrNonEncapsulatedUnionUnmarshall[RPCRT4.@] */ unsigned char * WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) { - FIXME("stub\n"); + long discriminant; + unsigned short type, size; + + TRACE("(%p, %p, %p, %d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); + pFormat++; + + /* Unmarshall discriminant */ + discriminant = unmarshall_discriminant(pStubMsg, &pFormat); + TRACE("unmarshalled discriminant %lx\n", discriminant); + + pFormat += *(const SHORT*)pFormat; + + size = *(const unsigned short*)pFormat; + pFormat += 2; + + pFormat = get_arm_offset_from_union_arm_selector(pStubMsg, discriminant, pFormat); + if(!pFormat) + return NULL; + + if(!*ppMemory || fMustAlloc) + *ppMemory = NdrAllocate(pStubMsg, size); + + type = *(const unsigned short*)pFormat; + if(type & 0x8000) + { + pFormat++; + return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, pFormat, fMustAlloc); + } + else + { + PFORMAT_STRING desc = pFormat + *(const SHORT*)pFormat; + NDR_UNMARSHALL m = NdrUnmarshaller[*desc & NDR_TABLE_MASK]; + if (m) + { + switch(*desc) + { + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: + **(void***)ppMemory = NULL; + break; + } + return m(pStubMsg, (unsigned char **)*ppMemory, desc, fMustAlloc); + } + else FIXME("no marshaller for embedded type %02x\n", *desc); + } return NULL; } @@ -2829,7 +3046,44 @@ void WINAPI NdrNonEncapsulatedUnionBuffe unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + unsigned short type; + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + pFormat++; + /* Add discriminant size */ + NdrBaseTypeBufferSize(pStubMsg, pMemory, pFormat); + pFormat++; + + pFormat = get_non_encapsulated_union_arm(pStubMsg, pMemory, pFormat); + if(!pFormat) + return; + + type = *(const unsigned short*)pFormat; + if(type & 0x8000) + { + pFormat++; + NdrBaseTypeBufferSize(pStubMsg, pMemory, pFormat); + } + else + { + PFORMAT_STRING desc = pFormat + *(const SHORT*)pFormat; + NDR_BUFFERSIZE m = NdrBufferSizer[*desc & NDR_TABLE_MASK]; + if (m) + { + switch(*desc) + { + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: + pMemory = *(void**)pMemory; + break; + } + m(pStubMsg, pMemory, desc); + } + else FIXME("no buffersizer for embedded type %02x\n", *desc); + } + return; } /***********************************************************************

1 0

Huw Davies : gdi32: FcPatternGet( FC_FILE ) only returns the basename as of fontconfig 2.3.92 .
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 0a01f37eb874821a8a1bc281fd16d75609ebe133 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a01f37eb874821a8a1bc28… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 28 12:51:36 2006 +0100 gdi32: FcPatternGet( FC_FILE ) only returns the basename as of fontconfig 2.3.92 . FcPatternGetString( FC_FILE ) returns the whole path. Go figure. --- dlls/gdi/freetype.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 1c923ec..4edac76 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -150,7 +150,7 @@ MAKE_FUNCPTR(FcObjectSetCreate); MAKE_FUNCPTR(FcObjectSetDestroy); MAKE_FUNCPTR(FcPatternCreate); MAKE_FUNCPTR(FcPatternDestroy); -MAKE_FUNCPTR(FcPatternGet); +MAKE_FUNCPTR(FcPatternGetString); #ifndef SONAME_LIBFONTCONFIG #define SONAME_LIBFONTCONFIG "libfontconfig.so" #endif @@ -1173,7 +1173,6 @@ #ifdef HAVE_FONTCONFIG_FONTCONFIG_H FcPattern *pat; FcObjectSet *os; FcFontSet *fontset; - FcValue v; int i, len; const char *file, *ext; @@ -1193,7 +1192,7 @@ LOAD_FUNCPTR(FcObjectSetCreate); LOAD_FUNCPTR(FcObjectSetDestroy); LOAD_FUNCPTR(FcPatternCreate); LOAD_FUNCPTR(FcPatternDestroy); -LOAD_FUNCPTR(FcPatternGet); +LOAD_FUNCPTR(FcPatternGetString); #undef LOAD_FUNCPTR if(!pFcInit()) return; @@ -1205,10 +1204,8 @@ #undef LOAD_FUNCPTR fontset = pFcFontList(config, pat, os); if(!fontset) return; for(i = 0; i < fontset->nfont; i++) { - if(pFcPatternGet(fontset->fonts[i], FC_FILE, 0, &v) != FcResultMatch) + if(pFcPatternGetString(fontset->fonts[i], FC_FILE, 0, (FcChar8**)&file) != FcResultMatch) continue; - if(v.type != FcTypeString) continue; - file = (LPCSTR) v.u.s; TRACE("fontconfig: %s\n", file); /* We're just interested in OT/TT fonts for now, so this hack just

1 0

Eric Kohl : widl: Implement 'oldnames' option.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 2c7270e388e8e3ea6448fc98c5ee31e7dbc6ed7e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c7270e388e8e3ea6448fc9… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Apr 22 21:52:51 2006 +0200 widl: Implement 'oldnames' option. --- tools/widl/client.c | 8 ++++++-- tools/widl/header.c | 12 ++++++++++-- tools/widl/server.c | 8 ++++++-- tools/widl/widl.c | 19 +++++++++++++++++-- tools/widl/widl.h | 1 + tools/widl/widl.man.in | 2 ++ 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index ea40d5e..6c00693 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -402,8 +402,12 @@ static void write_clientinterfacedecl(ty print_client("0,\n"); indent--; print_client("};\n"); - print_client("RPC_IF_HANDLE %s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", - iface->name, LOWORD(ver), HIWORD(ver), iface->name); + if (old_names) + print_client("RPC_IF_HANDLE %s_ClientIfHandle = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + iface->name, iface->name); + else + print_client("RPC_IF_HANDLE %s_v%d_%d_c_ifspec = (RPC_IF_HANDLE)& %s___RpcClientInterface;\n", + iface->name, LOWORD(ver), HIWORD(ver), iface->name); fprintf(client, "\n"); } diff --git a/tools/widl/header.c b/tools/widl/header.c index c4f3a26..0f39104 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -934,8 +934,16 @@ static void write_rpc_interface(const ty { write_iface_guid(iface); if (var) fprintf(header, "extern handle_t %s;\n", var); - fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); - fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + if (old_names) + { + fprintf(header, "extern RPC_IF_HANDLE %s_ClientIfHandle;\n", iface->name); + fprintf(header, "extern RPC_IF_HANDLE %s_ServerIfHandle;\n", iface->name); + } + else + { + fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_c_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + fprintf(header, "extern RPC_IF_HANDLE %s_v%d_%d_s_ifspec;\n", iface->name, LOWORD(ver), HIWORD(ver)); + } write_function_proto(iface); } fprintf(header,"\n#endif /* __%s_INTERFACE_DEFINED__ */\n\n", iface->name); diff --git a/tools/widl/server.c b/tools/widl/server.c index fc9051d..f02c146 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -548,8 +548,12 @@ static void write_serverinterfacedecl(ty print_server("0,\n"); indent--; print_server("};\n"); - print_server("RPC_IF_HANDLE %s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", - iface->name, LOWORD(ver), HIWORD(ver), iface->name); + if (old_names) + print_server("RPC_IF_HANDLE %s_ServerIfHandle = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + iface->name, iface->name); + else + print_server("RPC_IF_HANDLE %s_v%d_%d_s_ifspec = (RPC_IF_HANDLE)& %s___RpcServerInterface;\n", + iface->name, LOWORD(ver), HIWORD(ver), iface->name); fprintf(server, "\n"); } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 765fe06..f26f40d 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -31,6 +31,9 @@ #include <string.h> #include <assert.h> #include <ctype.h> #include <signal.h> +#ifdef HAVE_GETOPT_H +# include <getopt.h> +#endif #include "widl.h" #include "utils.h" @@ -58,6 +61,7 @@ static char usage[] = " -H file Name of header file (default is infile.h)\n" " -I path Set include search dir to path (multiple -I allowed)\n" " -N Do not preprocess input\n" +" --oldnames Use old naming conventions\n" " -p Generate proxy\n" " -P file Name of proxy file (default is infile_p.c)\n" " -s Generate server stub\n" @@ -91,6 +95,7 @@ int do_proxies = 0; int do_client = 0; int do_server = 0; int no_preprocess = 0; +int old_names = 0; char *input_name; char *header_name; @@ -111,7 +116,13 @@ FILE *proxy; time_t now; -int getopt (int argc, char *const *argv, const char *optstring); +static const char *short_options = + "cC:d:D:EhH:I:NpP:sS:tT:VW"; +static struct option long_options[] = { + { "oldnames", 0, 0, 1 }, + { 0, 0, 0, 0 } +}; + static void rm_tempfile(void); static void segvhandler(int sig); @@ -147,13 +158,17 @@ int main(int argc,char *argv[]) extern int optind; int optc; int ret = 0; + int opti = 0; signal(SIGSEGV, segvhandler); now = time(NULL); - while((optc = getopt(argc, argv, "cC:d:D:EhH:I:NpP:sS:tT:VW")) != EOF) { + while((optc = getopt_long(argc, argv, short_options, long_options, &opti)) != EOF) { switch(optc) { + case 1: + old_names = 1; + break; case 'c': do_everything = 0; do_client = 1; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 5b303c3..db8b95c 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -43,6 +43,7 @@ extern int do_typelib; extern int do_proxies; extern int do_client; extern int do_server; +extern int old_names; extern char *input_name; extern char *header_name; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index 9868467..267f1fe 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -24,6 +24,8 @@ Generate header files. .IP "\fB-H \fIfile\fR" Name of header file to generate. The default header filename is infile.h. +.IP "\fB--oldnames\fR" +Use old naming conventions. .PP .B Type library options: .IP \fB-t\fR

1 0

Eric Kohl : widl: Fix a typo.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: b64154882c9b9461023939bb88d32e8315bbd155 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b64154882c9b9461023939b… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Sat Apr 22 21:51:06 2006 +0200 widl: Fix a typo. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 033caf8..1c5c505 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -723,7 +723,7 @@ static size_t write_string_tfs(FILE *fil if (!(flags & RPC_FC_P_SIMPLEPOINTER)) { - print_file(file, 2, "NdrFcShort(0x2);\n"); + print_file(file, 2, "NdrFcShort(0x2),\n"); *typestring_offset += 2; }

1 0

Robert Shearman : server: Threads should start off without having an impersonation token.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: b02e6b0926a6b396daf4ceed81d82655249d970c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b02e6b0926a6b396daf4cee… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:42:35 2006 +0100 server: Threads should start off without having an impersonation token. --- server/thread.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/server/thread.c b/server/thread.c index a3a3572..a3ba2ae 100644 --- a/server/thread.c +++ b/server/thread.c @@ -147,6 +147,7 @@ inline static void init_thread_structure thread->creation_time = time(NULL); thread->exit_time = 0; thread->desktop_users = 0; + thread->token = NULL; list_init( &thread->mutex_list ); list_init( &thread->system_apc ); @@ -188,8 +189,6 @@ struct thread *create_thread( int fd, st return NULL; } - thread->token = (struct token *) grab_object( process->token ); - set_fd_events( thread->request_fd, POLLIN ); /* start listening to events */ add_process_thread( thread->process, thread ); return thread;

1 0

Robert Shearman : advapi32: Implement the majority of ImpersonateLoggedOnUser.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 35596ee290504d8b48ffe9711ccd2a66da18095c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=35596ee290504d8b48ffe97… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:43:54 2006 +0100 advapi32: Implement the majority of ImpersonateLoggedOnUser. --- dlls/advapi32/security.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 0c7327d..f5472a8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1667,8 +1667,52 @@ ImpersonateSelf(SECURITY_IMPERSONATION_L */ BOOL WINAPI ImpersonateLoggedOnUser(HANDLE hToken) { - FIXME("(%p):stub returning FALSE\n", hToken); - return FALSE; + NTSTATUS Status; + HANDLE ImpersonationToken; + TOKEN_TYPE Type = TokenImpersonation; + + FIXME( "(%p)\n", hToken ); + + /* FIXME: get token type */ + + if (Type == TokenPrimary) + { + OBJECT_ATTRIBUTES ObjectAttributes; + + InitializeObjectAttributes( &ObjectAttributes, NULL, 0, NULL, NULL ); + + Status = NtDuplicateToken( hToken, + TOKEN_IMPERSONATE | TOKEN_QUERY, + &ObjectAttributes, + SecurityImpersonation, + TokenImpersonation, + &ImpersonationToken ); + if (Status != STATUS_SUCCESS) + { + ERR( "NtDuplicateToken failed with error 0x%08lx\n", Status ); + SetLastError( RtlNtStatusToDosError( Status ) ); + return FALSE; + } + } + else + ImpersonationToken = hToken; + + Status = NtSetInformationThread( GetCurrentThread(), + ThreadImpersonationToken, + &ImpersonationToken, + sizeof(ImpersonationToken) ); + + if (Type == TokenPrimary) + NtClose( ImpersonationToken ); + + if (Status != STATUS_SUCCESS) + { + ERR( "NtSetInformationThread failed with error 0x%08lx\n", Status ); + SetLastError( RtlNtStatusToDosError( Status ) ); + return FALSE; + } + + return TRUE; } /******************************************************************************

1 0

Robert Shearman : include: Copy some format character types from wine/rpcfc .h to
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 2bcfe8eba2c16ea079eec3fdfa0fee52f695e8d5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2bcfe8eba2c16ea079eec3f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:40:38 2006 +0100 include: Copy some format character types from wine/rpcfc.h to ndrtypes.h and change them into an enumeration. --- include/ndrtypes.h | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/include/ndrtypes.h b/include/ndrtypes.h index 1cc91ad..606703a 100644 --- a/include/ndrtypes.h +++ b/include/ndrtypes.h @@ -126,4 +126,29 @@ typedef struct unsigned short FloatArgMask; } NDR_PROC_HEADER_EXTS64; +typedef enum +{ + FC_BYTE = 0x01, /* 0x01 */ + FC_CHAR, /* 0x02 */ + FC_SMALL, /* 0x03 */ + FC_USMALL, /* 0x04 */ + FC_WCHAR, /* 0x05 */ + FC_SHORT, /* 0x06 */ + FC_USHORT, /* 0x07 */ + FC_LONG, /* 0x08 */ + FC_ULONG, /* 0x09 */ + FC_FLOAT, /* 0x0a */ + FC_HYPER, /* 0x0b */ + FC_DOUBLE, /* 0x0c */ + FC_ENUM16, /* 0x0d */ + FC_ENUM32, /* 0x0e */ + FC_IGNORE, /* 0x0f */ + FC_ERROR_STATUS_T, /* 0x10 */ + + FC_RP, /* 0x11 */ /* reference pointer */ + FC_UP, /* 0x12 */ /* unique pointer */ + FC_OP, /* 0x13 */ /* object pointer */ + FC_FP, /* 0x14 */ /* full pointer */ +} FORMAT_CHARACTER; + #endif

1 0

Robert Shearman : wininet: Initialise the LPWITHREADERROR structure after it has been allocated.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 64ff0e54a3385e3200bfc71aa29f41a3425faaa0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64ff0e54a3385e3200bfc71… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Apr 26 15:44:14 2006 +0100 wininet: Initialise the LPWITHREADERROR structure after it has been allocated. --- dlls/wininet/internet.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index d504981..8c2f08e 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -3045,6 +3045,26 @@ HINTERNET WINAPI InternetOpenUrlA(HINTER } +static LPWITHREADERROR INTERNET_AllocThreadError(void) +{ + LPWITHREADERROR lpwite = HeapAlloc(GetProcessHeap(), 0, sizeof(*lpwite)); + + if (lpwite) + { + lpwite->dwError = 0; + lpwite->response[0] = '\0'; + } + + if (!TlsSetValue(g_dwTlsErrIndex, lpwite)) + { + HeapFree(GetProcessHeap(), 0, lpwite); + return NULL; + } + + return lpwite; +} + + /*********************************************************************** * INTERNET_SetLastError (internal) * @@ -3058,10 +3078,7 @@ void INTERNET_SetLastError(DWORD dwError LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); if (!lpwite) - { - lpwite = HeapAlloc(GetProcessHeap(), 0, sizeof(*lpwite)); - TlsSetValue(g_dwTlsErrIndex, lpwite); - } + lpwite = INTERNET_AllocThreadError(); SetLastError(dwError); if(lpwite) @@ -3493,10 +3510,7 @@ LPSTR INTERNET_GetResponseBuffer(void) { LPWITHREADERROR lpwite = (LPWITHREADERROR)TlsGetValue(g_dwTlsErrIndex); if (!lpwite) - { - lpwite = HeapAlloc(GetProcessHeap(), 0, sizeof(*lpwite)); - TlsSetValue(g_dwTlsErrIndex, lpwite); - } + lpwite = INTERNET_AllocThreadError(); TRACE("\n"); return lpwite->response; }

1 0

Mike McCormack : rpcrt4: Add some defines.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: 9b98cb56b362bbd511b8239bb89764f219fb3487 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9b98cb56b362bbd511b8239… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 28 13:42:23 2006 +0900 rpcrt4: Add some defines. --- include/rpcdce.h | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index 394b2c0..2510a18 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -115,6 +115,27 @@ #define RPC_C_MQ_AUTHN_LEVEL_NONE #define RPC_C_MQ_AUTHN_LEVEL_PKT_INTEGRITY 0x0008 #define RPC_C_MQ_AUTHN_LEVEL_PKT_PRIVACY 0x0010 +#define RPC_C_AUTHN_LEVEL_DEFAULT 0 +#define RPC_C_AUTHN_LEVEL_NONE 1 +#define RPC_C_AUTHN_LEVEL_CONNECT 2 +#define RPC_C_AUTHN_LEVEL_CALL 3 +#define RPC_C_AUTHN_LEVEL_PKT 4 +#define RPC_C_AUTHN_LEVEL_PKT_INTEGRITY 5 +#define RPC_C_AUTHN_LEVEL_PKT_PRIVACY 6 + +#define RPC_C_AUTHN_NONE 0 +#define RPC_C_AUTHN_DCE_PRIVATE 1 +#define RPC_C_AUTHN_DCE_PUBLIC 2 +#define RPC_C_AUTHN_DEC_PUBLIC 4 +#define RPC_C_AUTHN_GSS_NEGOTIATE 9 +#define RPC_C_AUTHN_WINNT 10 +#define RPC_C_AUTHN_GSS_SCHANNEL 14 +#define RPC_C_AUTHN_GSS_KERBEROS 16 +#define RPC_C_AUTHN_DPA 17 +#define RPC_C_AUTHN_MSN 18 +#define RPC_C_AUTHN_DIGEST 21 +#define RPC_C_AUTHN_MQ 100 +#define RPC_C_AUTHN_DEFAULT 0xffffffff typedef RPC_STATUS RPC_ENTRY RPC_IF_CALLBACK_FN( RPC_IF_HANDLE InterfaceUuid, void *Context ); typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)();

1 0

Mike McCormack : wininet: Fix peeking of http data with a nul byte in it.
by Alexandre Julliard 05 May '06

05 May '06

Module: wine Branch: refs/heads/master Commit: c1dce86f1ffa7a8bc2dcc11da1bf5d922d89a130 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1dce86f1ffa7a8bc2dcc11… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Apr 26 18:20:00 2006 +0900 wininet: Fix peeking of http data with a nul byte in it. --- dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 8043e4c..8564b15 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -63,6 +63,7 @@ #ifdef HAVE_OPENSSL_SSL_H SSL *ssl_s; char *peek_msg; char *peek_msg_mem; + size_t peek_len; #endif } WININET_NETCONNECTION; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 0c9d06f..dd47fe5 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -305,6 +305,7 @@ #if defined HAVE_OPENSSL_SSL_H && define HeapFree(GetProcessHeap(),0,connection->peek_msg_mem); connection->peek_msg = NULL; connection->peek_msg_mem = NULL; + connection->peek_len = 0; pSSL_shutdown(connection->ssl_s); pSSL_free(connection->ssl_s); @@ -520,19 +521,19 @@ #if defined HAVE_OPENSSL_SSL_H && define } else if (flags & MSG_PEEK && connection->peek_msg) { - size_t peek_msg_len = strlen(connection->peek_msg); - if (len < peek_msg_len) + if (len < connection->peek_len) FIXME("buffer isn't big enough. Do the expect us to wrap?\n"); - memcpy(buf, connection->peek_msg, min(len,peek_msg_len+1)); - *recvd = min(len, peek_msg_len); + *recvd = min(len, connection->peek_len); + memcpy(buf, connection->peek_msg, *recvd); return TRUE; } else if (connection->peek_msg) { - size_t peek_msg_len = strlen(connection->peek_msg); - memcpy(buf, connection->peek_msg, min(len,peek_msg_len+1)); - connection->peek_msg += *recvd = min(len, peek_msg_len); - if (*connection->peek_msg == '\0' || *(connection->peek_msg - 1) == '\0') + *recvd = min(len, connection->peek_len); + memcpy(buf, connection->peek_msg, *recvd); + connection->peek_len -= *recvd; + connection->peek_msg += *recvd; + if (connection->peek_len == 0) { HeapFree(GetProcessHeap(), 0, connection->peek_msg_mem); connection->peek_msg_mem = NULL; @@ -543,6 +544,7 @@ #if defined HAVE_OPENSSL_SSL_H && define *recvd = pSSL_read(connection->ssl_s, buf, len); if (flags & MSG_PEEK) /* must copy stuff into buffer */ { + connection->peek_len = *recvd; if (!*recvd) { HeapFree(GetProcessHeap(), 0, connection->peek_msg_mem); @@ -550,10 +552,7 @@ #if defined HAVE_OPENSSL_SSL_H && define connection->peek_msg = NULL; } else - { memcpy(connection->peek_msg, buf, *recvd); - connection->peek_msg[*recvd] = '\0'; - } } if (*recvd < 1 && len) return FALSE;

1 0