February 2007 - Wine-commits

Alexandre Julliard : widl: Output correct alignments in type format strings .
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 732b3dc8c7088baf41838c15d96b53817188ffba URL: http://source.winehq.org/git/wine.git/?a=commit;h=732b3dc8c7088baf41838c15d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 15:54:58 2007 +0100 widl: Output correct alignments in type format strings. --- tools/widl/typegen.c | 104 +++++++++++++++++++++++++++++--------------------- tools/widl/typegen.h | 1 - 2 files changed, 60 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=732b3dc8c7088baf41838…

1 0

Alexandre Julliard : widl: Add support for arrays of simple types in format strings.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 3fa891bfee73dffc7c5975f75f6a19bd8d8e8ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa891bfee73dffc7c5975f75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 15:55:29 2007 +0100 widl: Add support for arrays of simple types in format strings. --- tools/widl/typegen.c | 111 +++++++++++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 47 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 019755b..c1e26ab 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -327,6 +327,37 @@ void write_procformatstring(FILE *file, print_file(file, indent, "\n"); } +static int write_base_type(FILE *file, const type_t *type, unsigned int *typestring_offset) +{ + switch (type->type) + { +#define CASE_BASETYPE(fctype) \ + case RPC_##fctype: \ + print_file(file, 2, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ + *typestring_offset += 1; \ + return 1; + + CASE_BASETYPE(FC_BYTE); + CASE_BASETYPE(FC_CHAR); + CASE_BASETYPE(FC_SMALL); + CASE_BASETYPE(FC_USMALL); + CASE_BASETYPE(FC_WCHAR); + CASE_BASETYPE(FC_SHORT); + CASE_BASETYPE(FC_USHORT); + CASE_BASETYPE(FC_LONG); + CASE_BASETYPE(FC_ULONG); + CASE_BASETYPE(FC_FLOAT); + CASE_BASETYPE(FC_HYPER); + CASE_BASETYPE(FC_DOUBLE); + CASE_BASETYPE(FC_ENUM16); + CASE_BASETYPE(FC_ENUM32); + CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_ERROR_STATUS_T); +#undef CASE_BASETYPE + } + return 0; +} + /* write conformance / variance descriptor */ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const type_t *structure, const expr_t *expr) { @@ -888,9 +919,13 @@ static size_t write_array_tfs(FILE *file *typestring_offset += 1; } - print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + if (!write_base_type( file, type, typestring_offset )) + { + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + *typestring_offset += 1; + } print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); - *typestring_offset += 2; + *typestring_offset += 1; return start_offset; } @@ -943,9 +978,13 @@ static size_t write_array_tfs(FILE *file *typestring_offset += 1; } - print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + if (!write_base_type( file, type, typestring_offset )) + { + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + *typestring_offset += 1; + } print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); - *typestring_offset += 2; + *typestring_offset += 1; return start_offset; } @@ -977,9 +1016,13 @@ static size_t write_array_tfs(FILE *file *typestring_offset += 1; } - print_file(file, 2, "0x%x, /* FIXME: write out conversion data */\n", type->type); + if (!write_base_type( file, type, typestring_offset )) + { + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + *typestring_offset += 1; + } print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); - *typestring_offset += 2; + *typestring_offset += 1; return start_offset; } @@ -1014,9 +1057,13 @@ static size_t write_array_tfs(FILE *file *typestring_offset += 1; } - print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + if (!write_base_type( file, type, typestring_offset )) + { + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + *typestring_offset += 1; + } print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); - *typestring_offset += 2; + *typestring_offset += 1; return start_offset; } @@ -1037,59 +1084,29 @@ static const var_t *find_array_or_string return find_array_or_string_in_struct(last_field->type); } -static size_t write_struct_members(FILE *file, const type_t *type) +static void write_struct_members(FILE *file, const type_t *type, unsigned int *typestring_offset) { - size_t typestring_size = 0; const var_t *field; if (type->fields) LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) { unsigned char rtype = field->type->type; - if (is_base_type(rtype)) - { - switch (rtype) - { -#define CASE_BASETYPE(fctype) \ - case RPC_##fctype: \ - print_file(file, 2, "0x%02x,\t\t/* " #fctype " */\n", RPC_##fctype); \ - typestring_size++; \ - break; - CASE_BASETYPE(FC_BYTE); - CASE_BASETYPE(FC_CHAR); - CASE_BASETYPE(FC_SMALL); - CASE_BASETYPE(FC_USMALL); - CASE_BASETYPE(FC_WCHAR); - CASE_BASETYPE(FC_SHORT); - CASE_BASETYPE(FC_USHORT); - CASE_BASETYPE(FC_LONG); - CASE_BASETYPE(FC_ULONG); - CASE_BASETYPE(FC_FLOAT); - CASE_BASETYPE(FC_HYPER); - CASE_BASETYPE(FC_DOUBLE); - CASE_BASETYPE(FC_ENUM16); - CASE_BASETYPE(FC_ENUM32); - CASE_BASETYPE(FC_IGNORE); - CASE_BASETYPE(FC_ERROR_STATUS_T); - default: - break; -#undef CASE_BASETYPE - } - } - else + if (field->array) + write_array_tfs( file, field->attrs, field->type, field->array, + field->name, typestring_offset ); + else if (!write_base_type( file, field->type, typestring_offset )) error("Unsupported member type 0x%x\n", rtype); } - if (!(typestring_size % 2)) + if (!(*typestring_offset % 2)) { print_file(file, 2, "0x%x,\t\t/* FC_PAD */\n", RPC_FC_PAD); - typestring_size++; + *typestring_offset += 1; } print_file(file, 2, "0x%x,\t\t/* FC_END */\n", RPC_FC_END); - typestring_size++; - - return typestring_size; + *typestring_offset += 1; } static size_t write_struct_tfs(FILE *file, const type_t *type, @@ -1142,7 +1159,7 @@ static size_t write_struct_tfs(FILE *fil } /* member layout */ - *typestring_offset += write_struct_members(file, type); + write_struct_members(file, type, typestring_offset); return start_offset; case RPC_FC_CSTRUCT: case RPC_FC_CPSTRUCT:

1 0

Marcus Meissner : oleview: Removed dead code (Coverity).
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 7fba3dd88d736892c7805c9f762e9e11c6a9d241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fba3dd88d736892c7805c9f7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 5 21:06:33 2007 +0100 oleview: Removed dead code (Coverity). --- programs/oleview/typelib.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 7205d1c..64e3084 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -829,12 +829,7 @@ void CreateTypedefHeader(ITypeInfo *pTyp AddToTLDataStrW(pTLData, wszTypedef); if(memcmp(&pTypeAttr->guid, &GUID_NULL, sizeof(GUID))) { - if(bFirst) AddToTLDataStrW(pTLData, wszOpenBrackets1); - else - { - AddToTLDataStrW(pTLData, wszComa); - AddToTLDataStrW(pTLData, wszSpace); - } + AddToTLDataStrW(pTLData, wszOpenBrackets1); bFirst = FALSE; AddToTLDataStrW(pTLData, wszUUID); AddToTLDataStrW(pTLData, wszOpenBrackets2);

1 0

Marcus Meissner : riched20: Fixed wrong condition (Coverity).
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 886b15e7238ee9e6c207654f6a4b820d11da8393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=886b15e7238ee9e6c207654f6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 5 21:24:27 2007 +0100 riched20: Fixed wrong condition (Coverity). --- dlls/riched20/row.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/row.c b/dlls/riched20/row.c index 549b3cb..a9acb79 100644 --- a/dlls/riched20/row.c +++ b/dlls/riched20/row.c @@ -28,7 +28,7 @@ ME_DisplayItem *ME_FindRowStart(ME_Conte int nRelPos) { ME_DisplayItem *para = ME_GetParagraph(item); ME_MustBeWrapped(c, para); - if(nRelPos>=0) { /* if this or preceding row */ + if(nRelPos<=0) { /* if this or preceding row */ while(nRelPos<=0) { ME_DisplayItem *item2 = ME_FindItemBack(item, diStartRowOrParagraph); if (item2->type == diParagraph)

1 0

Marcus Meissner : winex11.drv: Removed dead code (Coverity).
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 3afd7282bd35aa7d257fcf24c925b6f9785eace5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3afd7282bd35aa7d257fcf24c… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Feb 5 21:13:55 2007 +0100 winex11.drv: Removed dead code (Coverity). --- dlls/winex11.drv/xfont.c | 38 ++++++++++++++------------------------ 1 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index 656cd40..8eebd7c 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -857,6 +857,7 @@ static BOOL LFD_ComposeLFD( const fontOb const char *any = "*"; char h_string[64], resx_string[64], resy_string[64]; LFD aLFD; + const fontEncodingTemplate* boba = &fETTable[0]; /* Get the worst case over with first */ @@ -1001,33 +1002,22 @@ static BOOL LFD_ComposeLFD( const fontOb /* encoding */ - if (uRelax <= 5) - { - const fontEncodingTemplate* boba = &fETTable[0]; - - for(i = fo->fi->fi_encoding >> 8; i; i--) boba = boba->next; - aLFD.charset_registry = boba->prefix ? boba->prefix : any; - - i = fo->fi->fi_encoding & 255; - switch( i ) - { - default: - aLFD.charset_encoding = boba->sufch[i].psuffix; - break; + for(i = fo->fi->fi_encoding >> 8; i; i--) boba = boba->next; + aLFD.charset_registry = boba->prefix ? boba->prefix : any; - case 254: - aLFD.charset_encoding = any; - break; + i = fo->fi->fi_encoding & 255; + switch( i ) { + default: + aLFD.charset_encoding = boba->sufch[i].psuffix; + break; - case 255: /* no suffix - it ends eg "-ascii" */ - aLFD.charset_encoding = NULL; - break; - } - } - else - { - aLFD.charset_registry = any; + case 254: aLFD.charset_encoding = any; + break; + + case 255: /* no suffix - it ends eg "-ascii" */ + aLFD.charset_encoding = NULL; + break; } LFD_UnParse(lpLFD, MAX_LFD_LENGTH, &aLFD);

1 0

Francois Gouget : rpcrt4: Improve the prototypes Win64 compatibility by replacing long with LONG.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 62662d21dd34fa7c3cd33b3bbf346d71083ab61f URL: http://source.winehq.org/git/wine.git/?a=commit;h=62662d21dd34fa7c3cd33b3bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 6 10:18:02 2007 +0100 rpcrt4: Improve the prototypes Win64 compatibility by replacing long with LONG. --- dlls/rpcrt4/rpc_binding.c | 66 ++++++++++++++++++++++---------------------- dlls/rpcrt4/rpc_server.c | 18 ++++++------ include/rpcdce.h | 44 +++++++++++++++--------------- tools/winapi/win32.api | 5 +-- 4 files changed, 66 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62662d21dd34fa7c3cd33…

1 0

Francois Gouget : hid: Add the hidsdi.h header.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: c03ae8277377f3479834932ce621e88ab63a36c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c03ae8277377f3479834932ce… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 6 10:19:40 2007 +0100 hid: Add the hidsdi.h header. --- dlls/hid/main.c | 1 + include/Makefile.in | 1 + include/ddk/hidsdi.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/hid/main.c b/dlls/hid/main.c index 7222aad..17eee9a 100644 --- a/dlls/hid/main.c +++ b/dlls/hid/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "ddk/hidsdi.h" #include "wine/debug.h" diff --git a/include/Makefile.in b/include/Makefile.in index ba75d05..da9ae3c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -105,6 +105,7 @@ SRCDIR_INCLUDES = \ dde.h \ ddeml.h \ ddk/compstui.h \ + ddk/hidsdi.h \ ddk/ntddcdvd.h \ ddk/ntddser.h \ ddk/ntddtape.h \ diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h new file mode 100644 index 0000000..ebaef11 --- /dev/null +++ b/include/ddk/hidsdi.h @@ -0,0 +1,32 @@ +/* + * Copyright (C) the Wine project + * + * 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 + */ + +#ifndef __WINE_HIDSDI_H +#define __WINE_HIDSDI_H + +/* FIXME: #include "hidusage.h" */ +/* FIXME: #include "hidpi.h" */ + +#ifndef WINE_NTSTATUS_DECLARED +#define WINE_NTSTATUS_DECLARED +typedef LONG NTSTATUS; +#endif + +void WINAPI HidD_GetHidGuid(LPGUID guid); + +#endif /* __WINE_HIDSDI_H */

1 0

Francois Gouget : ntdll: Add a stub API documentation to make winapi_check happy.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 0f376b4874aeb9887394f65cf656b9d31d2965ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f376b4874aeb9887394f65cf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 6 10:18:30 2007 +0100 ntdll: Add a stub API documentation to make winapi_check happy. --- dlls/ntdll/rtl.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 605ec89..827cb74 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -912,6 +912,9 @@ static DWORD_PTR get_pointer_obfuscator( return pointer_obfuscator; } +/************************************************************************* + * RtlEncodePointer [NTDLL.@] + */ PVOID WINAPI RtlEncodePointer( PVOID ptr ) { DWORD_PTR ptrval = (DWORD_PTR) ptr; @@ -1029,6 +1032,9 @@ PSLIST_ENTRY WINAPI RtlInterlockedPopEnt #endif } +/************************************************************************* + * RtlInterlockedPushListSList [NTDLL.@] + */ PSLIST_ENTRY WINAPI RtlInterlockedPushListSList(volatile PSLIST_HEADER ListHeader, PSLIST_ENTRY FirstEntry, PSLIST_ENTRY LastEntry,

1 0

Damjan Jovanovic : msvcrt: Align struct _stati64' s st_size on an 8 byte boundary.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 65d9723dc4c45e691132ac0fef50087895935c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d9723dc4c45e691132ac0fe… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Feb 6 09:35:50 2007 +0200 msvcrt: Align struct _stati64's st_size on an 8 byte boundary. --- dlls/msvcrt/msvcrt.h | 2 +- include/msvcrt/sys/stat.h | 12 +++++++++++- include/msvcrt/wchar.h | 12 +++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 68fa119..e7b037f 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -366,7 +366,7 @@ struct MSVCRT__stati64 { short st_uid; short st_gid; MSVCRT__dev_t st_rdev; - __int64 st_size; + __int64 DECLSPEC_ALIGN(8) st_size; MSVCRT_time_t st_atime; MSVCRT_time_t st_mtime; MSVCRT_time_t st_ctime; diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index 83026f2..c8b1888 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -46,6 +46,16 @@ typedef int _off_t; #define _OFF_T_DEFINED #endif +#ifndef DECLSPEC_ALIGN +# if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) +# define DECLSPEC_ALIGN(x) __declspec(align(x)) +# elif defined(__GNUC__) +# define DECLSPEC_ALIGN(x) __attribute__((aligned(x))) +# else +# define DECLSPEC_ALIGN(x) +# endif +#endif + #define _S_IEXEC 0x0040 #define _S_IWRITE 0x0080 #define _S_IREAD 0x0100 @@ -99,7 +109,7 @@ struct _stati64 { short st_uid; short st_gid; _dev_t st_rdev; - __int64 st_size; + __int64 DECLSPEC_ALIGN(8) st_size; time_t st_atime; time_t st_mtime; time_t st_ctime; diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index f07db62..03bf7cc 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -43,6 +43,16 @@ typedef unsigned short wchar_t; #define _WIN64 #endif +#ifndef DECLSPEC_ALIGN +# if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) +# define DECLSPEC_ALIGN(x) __declspec(align(x)) +# elif defined(__GNUC__) +# define DECLSPEC_ALIGN(x) __attribute__((aligned(x))) +# else +# define DECLSPEC_ALIGN(x) +# endif +#endif + typedef int mbstate_t; #ifndef _SIZE_T_DEFINED @@ -181,7 +191,7 @@ struct _stati64 { short st_uid; short st_gid; _dev_t st_rdev; - __int64 st_size; + __int64 DECLSPEC_ALIGN(8) st_size; time_t st_atime; time_t st_mtime; time_t st_ctime;

1 0

Francois Gouget : pstorec: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 788b9d3ed5bac6eb154096d3ce208cfbb31774ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=788b9d3ed5bac6eb154096d3c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 6 10:21:01 2007 +0100 pstorec: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index a4ca27c..a30c676 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3476,6 +3476,19 @@ LPSTR LPWSTR +%%pstorec.dll + +%long + +DWORD +HRESULT + +%ptr + +IPStore ** +PST_PROVIDERID * +void * + %%qcap.dll %long

1 0