March 2006 - Wine-Commits - list.winehq.org

Francois Gouget : taskmgr: Avoid forward declarations and make functions static.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: b72013d6d1d292f7d7d1dc04624f5b3984df6024 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b72013d6d1d292f7d7d1dc0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:32:40 2006 +0100 taskmgr: Avoid forward declarations and make functions static. --- programs/taskmgr/about.c | 15 +- programs/taskmgr/affinity.c | 68 ++++---- programs/taskmgr/column.c | 245 ++++++++++++++-------------- programs/taskmgr/graph.c | 208 ++++++++++++------------ programs/taskmgr/perfpage.c | 298 +++++++++++++++++----------------- programs/taskmgr/proclist.c | 2 programs/taskmgr/procpage.c | 374 +++++++++++++++++++++---------------------- 7 files changed, 595 insertions(+), 615 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b72013d6d1d292f7d7d…

1 0

Francois Gouget : Update win32.api to match the current sources.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 0c02e4671eedec3da3738e314c19fdb00c31c3e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c02e4671eedec3da3738e3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:21:51 2006 +0100 Update win32.api to match the current sources. --- tools/winapi/win32.api | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 9edb6af..d0e5db4 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -31,6 +31,7 @@ ACCESS_MODE ACL_INFORMATION_CLASS ALG_ID BOOL +BOOLEAN BYTE DWORD HANDLE @@ -43,6 +44,7 @@ LONG LSA_HANDLE NTSTATUS POLICY_INFORMATION_CLASS +POLICY_NOTIFICATION_INFORMATION_CLASS REGSAM SC_HANDLE SC_STATUS_TYPE @@ -53,6 +55,7 @@ SECURITY_INFORMATION SERVICE_STATUS_HANDLE TOKEN_INFORMATION_CLASS TOKEN_TYPE +TRUSTED_INFORMATION_CLASS TRUSTEE_FORM TRUSTEE_TYPE UINT @@ -122,6 +125,7 @@ PLSA_OBJECT_ATTRIBUTES PLSA_REFERENCED_DOMAIN_LIST * PLSA_TRANSLATED_NAME * PLSA_TRANSLATED_SID * +PLSA_TRANSLATED_SID2 * PLSA_UNICODE_STRING PLSA_UNICODE_STRING * PLUID @@ -141,6 +145,8 @@ PSID_NAME_USE PTOKEN_GROUPS PTRACE_GUID_REGISTRATION PTRACEHANDLE +PTRUSTED_DOMAIN_AUTH_INFORMATION +PTRUSTED_DOMAIN_INFORMATION_EX PTRUSTEEA PTRUSTEEW PUCHAR @@ -202,6 +208,11 @@ STRTABLEA * LPCSTR LPSTR +%wstr + +LPCWSTR +LPWSTR + %void void @@ -631,6 +642,7 @@ HCRYPTOIDFUNCSET HLRUCACHE HLRUCACHE * LPFILETIME +LPSTR * LPVOID LPWSTR * PCCERT_CONTEXT @@ -656,6 +668,7 @@ PFN_CRYPT_ENUM_OID_INFO PVOID SIP_ADD_NEWPROVIDER * SIP_DISPATCH_INFO * +int * void * void ** @@ -1771,6 +1784,7 @@ DWORD FLAGS HRESULT INT +LHANDLE LONG SCODE UINT @@ -1821,6 +1835,7 @@ PULONG PUSHORT PVOID ULONG * +lpMapiMessage void * %str @@ -1978,6 +1993,8 @@ BOOL * ENUMPASSWORDPROC LPAUTHDLGSTRUCTA LPBYTE +LPCHANGEPWDINFOA +LPCHANGEPWDINFOW LPCONNECTDLGSTRUCTA LPCONNECTDLGSTRUCTW LPCSTR * @@ -2755,6 +2772,7 @@ PRTL_HEAP_DEFINITION PRTL_QUERY_REGISTRY_TABLE PRTL_THREAD_START_ROUTINE PRTL_USER_PROCESS_PARAMETERS +PRTL_WORK_ITEM_ROUTINE PSECURITY_DESCRIPTOR PSECURITY_DESCRIPTOR_CONTROL PSECURITY_QUALITY_OF_SERVICE @@ -2796,7 +2814,6 @@ UNICODE_STRING * USHORT * VOID * WCHAR ** -enum loadorder_type[] int * obj_handle_t * union cptable * @@ -4432,11 +4449,16 @@ DWORD HDC HRESULT LCID +UINT int %ptr +ABC * BYTE * +GOFFSET * +RECT * +SCRIPT_ANALYSIS * SCRIPT_CACHE * SCRIPT_CONTROL * SCRIPT_DIGITSUBSTITUTE * @@ -4446,6 +4468,8 @@ SCRIPT_PROPERTIES *** SCRIPT_STATE * SCRIPT_STRING_ANALYSIS * SCRIPT_TABDEF * +SCRIPT_VISATTR * +WORD * int * void * @@ -5213,16 +5237,20 @@ BOOL DWORD HANDLE HCATADMIN +HRESULT HWND LONG %ptr BYTE * +CRYPT_PROVIDER_DATA * +CRYPT_PROVIDER_SGNR * CRYPT_REGISTER_ACTIONID * DWORD * GUID * HCATADMIN * +LPVOID WINTRUST_DATA * %void

1 0

Francois Gouget : include: Add missing error and facility codes.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 155ac7e598527f8e010e5b021262a1574b1780d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=155ac7e598527f8e010e5b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:20:32 2006 +0100 include: Add missing error and facility codes. --- include/winerror.h | 57 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index b824c79..ef5d591 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -19,17 +19,46 @@ #ifndef __WINE_WINERROR_H #define __WINE_WINERROR_H -#define FACILITY_NULL 0 -#define FACILITY_RPC 1 -#define FACILITY_DISPATCH 2 -#define FACILITY_STORAGE 3 -#define FACILITY_ITF 4 -#define FACILITY_WIN32 7 -#define FACILITY_WINDOWS 8 -#define FACILITY_SSPI 9 -#define FACILITY_CONTROL 10 -#define FACILITY_CERT 11 -#define FACILITY_INTERNET 12 +#define FACILITY_NULL 0 +#define FACILITY_RPC 1 +#define FACILITY_DISPATCH 2 +#define FACILITY_STORAGE 3 +#define FACILITY_ITF 4 +#define FACILITY_WIN32 7 +#define FACILITY_WINDOWS 8 +#define FACILITY_SSPI 9 +#define FACILITY_SECURITY FACILITY_SSPI +#define FACILITY_CONTROL 10 +#define FACILITY_CERT 11 +#define FACILITY_INTERNET 12 +#define FACILITY_MEDIASERVER 13 +#define FACILITY_MSMQ 14 +#define FACILITY_SETUPAPI 15 +#define FACILITY_SCARD 16 +#define FACILITY_COMPLUS 17 +#define FACILITY_AAF 18 +#define FACILITY_URT 19 +#define FACILITY_ACS 20 +#define FACILITY_DPLAY 21 +#define FACILITY_UMI 22 +#define FACILITY_SXS 23 +#define FACILITY_WINDOWS_CE 24 +#define FACILITY_HTTP 25 +#define FACILITY_COMMONLOG 26 +#define FACILITY_USERMODE_FILTER_MANAGER 31 +#define FACILITY_BACKGROUNDCOPY 32 +#define FACILITY_CONFIGURATION 33 +#define FACILITY_STATE_MANAGEMENT 34 +#define FACILITY_METADIRECTORY 35 +#define FACILITY_WINDOWSUPDATE 36 +#define FACILITY_DIRECTORYSERVICE 37 +#define FACILITY_GRAPHICS 38 +#define FACILITY_SHELL 39 +#define FACILITY_TPM_SERVICES 40 +#define FACILITY_TPM_SOFTWARE 41 +#define FACILITY_PLA 48 +#define FACILITY_FVE 49 +#define FACILITY_WINDOWS_DEFENDER 80 #define SEVERITY_SUCCESS 0 #define SEVERITY_ERROR 1 @@ -255,7 +284,13 @@ #define ERROR_INVALID_OPLOCK_PROTOCOL 301 #define ERROR_DISK_TOO_FRAGMENTED 302 #define ERROR_MR_MID_NOT_FOUND 317 +#define ERROR_SCOPE_NOT_FOUND 318 +#define ERROR_FAIL_NOACTION_REBOOT 350 +#define ERROR_FAIL_SHUTDOWN 351 +#define ERROR_FAIL_RESTART 352 +#define ERROR_MAX_SESSIONS_REACHED 353 #define ERROR_INVALID_ADDRESS 487 +#define ERROR_USER_PROFILE_LOAD 500 #define ERROR_ARITHMETIC_OVERFLOW 534 #define ERROR_PIPE_CONNECTED 535 #define ERROR_PIPE_LISTENING 536

1 0

Francois Gouget : advapi32: Fix the LsaEnumerateAccountRights() export.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: cf49dc36c764e96d5453a6effdfc2591e5eee4f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf49dc36c764e96d5453a6e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:18:32 2006 +0100 advapi32: Fix the LsaEnumerateAccountRights() export. --- dlls/advapi32/advapi32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 2fdd9ca..1f23818 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -351,7 +351,7 @@ @ stdcall LsaCreateTrustedDomainEx(ptr ptr ptr long ptr) @ stub LsaDelete @ stdcall LsaDeleteTrustedDomain(ptr ptr) -@ stdcall LsaEnumerateAccountRights(ptr ptr long ptr long) +@ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) @ stub LsaEnumerateAccounts @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) @ stub LsaEnumeratePrivileges

1 0

Francois Gouget : include: Standardize the LsaLookupNames() prototype.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 5b993191a9a20aa6b85ee6beabeda204d1135f02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5b993191a9a20aa6b85ee6b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:16:47 2006 +0100 include: Standardize the LsaLookupNames() prototype. --- include/ntsecapi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index a775be7..b5f969b 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -277,7 +277,7 @@ NTSTATUS WINAPI LsaEnumerateAccountsWith NTSTATUS WINAPI LsaEnumerateTrustedDomains(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaEnumerateTrustedDomainsEx(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*,ULONG,PULONG); NTSTATUS WINAPI LsaFreeMemory(PVOID); -NTSTATUS WINAPI LsaLookupNames(LSA_HANDLE,ULONG Count,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*, +NTSTATUS WINAPI LsaLookupNames(LSA_HANDLE,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*, PLSA_TRANSLATED_SID*); NTSTATUS WINAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*, PLSA_TRANSLATED_SID2*);

1 0

Robert Shearman : oleaut: ITypeInfo:: GetIDsOfNames should search inherited interfaces
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 4b19449b6b145880461fc133296fa26d9c1dc7c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b19449b6b145880461fc13… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Mar 21 13:45:51 2006 +0000 oleaut: ITypeInfo::GetIDsOfNames should search inherited interfaces regardless of what type they are. Add a test for this and dump type infos created with CreateDispTypeInfo. --- dlls/oleaut32/tests/typelib.c | 12 +++++++++++- dlls/oleaut32/typelib.c | 11 +++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 72021dd..1108496 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -227,13 +227,15 @@ static void test_CreateDispTypeInfo(void TYPEATTR *pTypeAttr; HREFTYPE href; FUNCDESC *pFuncDesc; + MEMBERID memid; static const WCHAR func1[] = {'f','u','n','c','1',0}; static const WCHAR func2[] = {'f','u','n','c','2',0}; static const WCHAR func3[] = {'f','u','n','c','3',0}; static const WCHAR parm1[] = {'p','a','r','m','1',0}; static const WCHAR parm2[] = {'p','a','r','m','2',0}; - + OLECHAR *name = (OLECHAR *)func1; + ifdata.pmethdata = methdata; ifdata.cMembers = sizeof(methdata) / sizeof(methdata[0]); @@ -293,6 +295,9 @@ static void test_CreateDispTypeInfo(void hr = ITypeInfo_GetRefTypeOfImplType(pTypeInfo, 0, &href); ok(hr == S_OK, "hr %08lx\n", hr); + todo_wine { + ok(href == 0, "href = 0x%lx\n", href); + } hr = ITypeInfo_GetRefTypeInfo(pTypeInfo, href, &pTI2); ok(hr == S_OK, "hr %08lx\n", hr); hr = ITypeInfo_GetTypeAttr(pTI2, &pTypeAttr); @@ -351,6 +356,11 @@ static void test_CreateDispTypeInfo(void ok(pFuncDesc->elemdescFunc.tdesc.vt == VT_I4, "ret vt %x\n", pFuncDesc->elemdescFunc.tdesc.vt); ITypeInfo_ReleaseFuncDesc(pTI2, pFuncDesc); + /* test GetIDsOfNames on a coclass to see if it searches its interfaces */ + hr = ITypeInfo_GetIDsOfNames(pTypeInfo, &name, 1, &memid); + ok(hr == S_OK, "hr 0x%08lx\n", hr); + ok(memid == 0x123, "memid 0x%08lx\n", memid); + ITypeInfo_Release(pTI2); ITypeInfo_Release(pTypeInfo); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ede6de5..cfb17ba 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4784,9 +4784,8 @@ static HRESULT WINAPI ITypeInfo_fnGetIDs return ret; } } - /* not found, see if this is and interface with an inheritance */ - if(This->TypeAttr.cImplTypes && - (This->TypeAttr.typekind==TKIND_INTERFACE || This->TypeAttr.typekind==TKIND_DISPATCH)) { + /* not found, see if it can be found in an inherited interface */ + if(This->TypeAttr.cImplTypes) { /* recursive search */ ITypeInfo *pTInfo; ret=ITypeInfo_GetRefTypeInfo(iface, @@ -6338,7 +6337,7 @@ HRESULT WINAPI CreateDispTypeInfo( int param, func; TLBFuncDesc **ppFuncDesc; - TRACE_(typelib)("\n"); + TRACE("\n"); pTypeLibImpl = TypeLibImpl_Constructor(); if (!pTypeLibImpl) return E_FAIL; @@ -6394,6 +6393,8 @@ HRESULT WINAPI CreateDispTypeInfo( ppFuncDesc = &(*ppFuncDesc)->next; } + dump_TypeInfo(pTIIface); + pTypeLibImpl->pTypeInfo = pTIIface; pTypeLibImpl->TypeInfoCount++; @@ -6423,6 +6424,8 @@ HRESULT WINAPI CreateDispTypeInfo( pTIClass->reflist->reference = 1; pTIClass->reflist->pImpTLInfo = TLB_REF_INTERNAL; + dump_TypeInfo(pTIClass); + pTIIface->next = pTIClass; pTypeLibImpl->TypeInfoCount++;

1 0

Huw Davies : fonts: Use the EBLC table to retrieve the ascent of the bitmap font.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 130a0e4f41e8f3c381942734be3c3f14030bce46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=130a0e4f41e8f3c38194273… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 21 17:08:56 2006 +0000 fonts: Use the EBLC table to retrieve the ascent of the bitmap font. --- dlls/gdi/tests/gdiobj.c | 2 - tools/sfnt2fnt.c | 87 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 7 deletions(-) diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c index 35b19a3..f9a621b 100644 --- a/dlls/gdi/tests/gdiobj.c +++ b/dlls/gdi/tests/gdiobj.c @@ -235,9 +235,7 @@ static void test_bitmap_font_metrics(voi { "MS Serif", FW_NORMAL, 21, 16, 5, 3, 0, 9, 23 }, { "MS Serif", FW_NORMAL, 27, 21, 6, 3, 0, 12, 27 }, { "MS Serif", FW_NORMAL, 35, 27, 8, 3, 0, 16, 34 }, -#if 0 /* FIXME: enable once the bug in sfnt2fnt is fixed */ { "Courier", FW_NORMAL, 13, 11, 2, 0, 0, 8, 8 }, -#endif { "Courier", FW_NORMAL, 16, 13, 3, 0, 0, 9, 9 }, { "Courier", FW_NORMAL, 20, 16, 4, 0, 0, 12, 12 }, { "System", FW_BOLD, 16, 13, 3, 3, 0, 7, 15 } diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 63e5b7a..921bb9a 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -34,6 +34,7 @@ #include FT_FREETYPE_H #include FT_SFNT_NAMES_H #include FT_TRUETYPE_TABLES_H +#include FT_TRUETYPE_TAGS_H #include "wine/unicode.h" #include "wine/wingdi16.h" @@ -53,6 +54,45 @@ typedef struct { DWORD offset; } CHAR_TABLE_ENTRY; +typedef struct { + DWORD version; + ULONG numSizes; +} eblcHeader_t; + +typedef struct { + CHAR ascender; + CHAR descender; + BYTE widthMax; + CHAR caretSlopeNumerator; + CHAR caretSlopeDenominator; + CHAR caretOffset; + CHAR minOriginSB; + CHAR minAdvanceSB; + CHAR maxBeforeBL; + CHAR maxAfterBL; + CHAR pad1; + CHAR pad2; +} sbitLineMetrics_t; + +typedef struct { + ULONG indexSubTableArrayOffset; + ULONG indexTableSize; + ULONG numberOfIndexSubTables; + ULONG colorRef; + sbitLineMetrics_t hori; + sbitLineMetrics_t vert; + USHORT startGlyphIndex; + USHORT endGlyphIndex; + BYTE ppemX; + BYTE ppemY; + BYTE bitDepth; + CHAR flags; +} bitmapSizeTable_t; + +#define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] ) +#define GET_BE_DWORD(ptr) ((DWORD)MAKELONG( GET_BE_WORD(&((WORD *)(ptr))[1]), \ + GET_BE_WORD(&((WORD *)(ptr))[0]) )) + #include "poppack.h" static const char *output_name; @@ -141,7 +181,7 @@ static int lookup_charset(int enc) static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned char def_char, int avg_width) { - int ascent, il, ppem, descent, width_bytes = 0, space_size, max_width = 0; + int ascent = 0, il, ppem, descent = 0, width_bytes = 0, space_size, max_width = 0; FNT_HEADER hdr; FONTINFO16 fi; BYTE left_byte, right_byte, byte; @@ -153,6 +193,11 @@ static void fill_fontinfo(FT_Face face, const union cptable *cptable; FT_SfntName sfntname; TT_OS2 *os2; + FT_ULong needed; + eblcHeader_t *eblc; + bitmapSizeTable_t *size_table; + int num_sizes; + cptable = wine_cp_get_table(enc); if(!cptable) error("Can't find codepage %d\n", enc); @@ -165,12 +210,44 @@ static void fill_fontinfo(FT_Face face, } ppem = face->size->metrics.y_ppem; + + needed = 0; + if(FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, NULL, &needed)) + error("Can't find EBLC table\n"); + + eblc = malloc(needed); + FT_Load_Sfnt_Table(face, TTAG_EBLC, 0, (FT_Byte *)eblc, &needed); + + num_sizes = GET_BE_DWORD(&eblc->numSizes); + + size_table = (bitmapSizeTable_t *)(eblc + 1); + for(i = 0; i < num_sizes; i++) + { + if(size_table->hori.ascender - size_table->hori.descender == ppem) + { + ascent = size_table->hori.ascender; + descent = -size_table->hori.descender; + break; + } + size_table++; + } + + /* Versions of fontforge prior to early 2006 have incorrect + ascender values in the eblc table, so we won't find the + correct bitmapSizeTable. In this case use the height of + the Aring glyph instead. */ + if(ascent == 0) + { + if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) + error("Can't find Aring\n"); + ascent = face->glyph->metrics.horiBearingY >> 6; + descent = ppem - ascent; + } + + free(eblc); + start = sizeof(FNT_HEADER) + sizeof(FONTINFO16); - if(FT_Load_Char(face, 0xc5, FT_LOAD_DEFAULT)) - error("Can't find Aring\n"); - ascent = face->glyph->metrics.height >> 6; - descent = ppem - ascent; if(FT_Load_Char(face, 'M', FT_LOAD_DEFAULT)) error("Can't find M\n"); il = ascent - (face->glyph->metrics.height >> 6);

1 0

Jeff Latimer : winedbg: Add display for floating point status.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: 0994126701b8f1612db054dc9c74559c049b14ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0994126701b8f1612db054d… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Mar 21 23:54:41 2006 +1100 winedbg: Add display for floating point status. Added code to examine and display floating point unit status into be_i386.c as info all-regs command. --- programs/winedbg/be_alpha.c | 2 + programs/winedbg/be_cpu.h | 2 + programs/winedbg/be_i386.c | 72 ++++++++++++++++++++++++++++++++++++++- programs/winedbg/be_ppc.c | 2 + programs/winedbg/dbg.y | 5 ++- programs/winedbg/debug.l | 2 + programs/winedbg/info.c | 3 +- programs/winedbg/tgt_active.c | 2 + programs/winedbg/tgt_minidump.c | 2 + programs/winedbg/winedbg.man.in | 2 + 10 files changed, 85 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0994126701b8f1612db…

1 0

Alexandre Julliard : sfnt2fnt: Remove output file on failure.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: ef4440ad1b68d0e8007f632b3c27b0b511213ff9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef4440ad1b68d0e8007f632… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 16:18:45 2006 +0100 sfnt2fnt: Remove output file on failure. --- tools/sfnt2fnt.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c index 6b9f341..63e5b7a 100644 --- a/tools/sfnt2fnt.c +++ b/tools/sfnt2fnt.c @@ -55,6 +55,8 @@ typedef struct { #include "poppack.h" +static const char *output_name; + static void usage(char **argv) { fprintf(stderr, "%s foo.ttf ppem enc dpi def_char avg_width\n", argv[0]); @@ -65,6 +67,12 @@ static void usage(char **argv) #define __attribute__(X) #endif +/* atexit handler to cleanup files */ +static void cleanup(void) +{ + if (output_name) unlink( output_name ); +} + static void error(const char *s, ...) __attribute__((format (printf, 1, 2))); static void error(const char *s, ...) @@ -377,10 +385,13 @@ int main(int argc, char **argv) sprintf(output, "%s-%d-%d-%d.fnt", name, enc, dpi, ppem); + atexit( cleanup ); fp = fopen(output, "w"); + output_name = output; fill_fontinfo(face, enc, fp, dpi, def_char, avg_width); fclose(fp); + output_name = NULL; exit(0); }

1 0

Alexandre Julliard : Added DLL_WINE_PREATTACH handling in a number of stub-only dlls.
by Alexandre Julliard March 21, 2006

March 21, 2006

Module: wine Branch: refs/heads/master Commit: c39a5f0dbae4964f6a796fab467bed20ba4bbc85 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c39a5f0dbae4964f6a796fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 21 16:18:24 2006 +0100 Added DLL_WINE_PREATTACH handling in a number of stub-only dlls. --- dlls/activeds/activeds_main.c | 10 +++++++++- dlls/cfgmgr32/main.c | 16 ++++++++++++++++ dlls/cryptdll/cryptdll.c | 2 ++ dlls/d3dim/d3dim_main.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/d3drm/d3drm_main.c | 22 +++++++++++++++++++--- dlls/msnet32/msnet_main.c | 21 +++++++++++++++++++++ dlls/snmpapi/main.c | 2 ++ dlls/url/url_main.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/vdmdbg/vdmdbg.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/winnls32/winnls.c | 16 ++++++++++++++++ dlls/wintrust/wintrust_main.c | 17 +++++++++++++++++ 11 files changed, 213 insertions(+), 7 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index d010a76..b296742 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -48,7 +48,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(activeds); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved); - /* For the moment, do nothing here. */ + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + break; + } return TRUE; } diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index 10757d6..0312900 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -29,6 +29,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(cfgmgr32); +/*********************************************************************** + * DllMain (CFGMGR32.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { diff --git a/dlls/cryptdll/cryptdll.c b/dlls/cryptdll/cryptdll.c index fcb8589..9c9b6d7 100644 --- a/dlls/cryptdll/cryptdll.c +++ b/dlls/cryptdll/cryptdll.c @@ -32,6 +32,8 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: { DisableThreadLibraryCalls(hinstDLL); diff --git a/dlls/d3dim/d3dim_main.c b/dlls/d3dim/d3dim_main.c index 67a01ed..0c0f022 100644 --- a/dlls/d3dim/d3dim_main.c +++ b/dlls/d3dim/d3dim_main.c @@ -1 +1,37 @@ -/* nothing here yet */ +/* + * Copyright 2006 Alexandre Julliard + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/*********************************************************************** + * DllMain (D3DIM.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c index ecb7191..caa0f90 100644 --- a/dlls/d3drm/d3drm_main.c +++ b/dlls/d3drm/d3drm_main.c @@ -16,6 +16,22 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/*********************************************************************** + * DllMain (D3DRM.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index 40e9dc4..bc92f45 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -16,10 +16,31 @@ #include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msnet); + +/*********************************************************************** + * DllMain (MSNET32.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + /*********************************************************************** * @ (MSNET32.57) */ diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 326e6bc..fda8f35 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -39,6 +39,8 @@ BOOL WINAPI DllMain( TRACE("(%p,%ld,%p)\n", hInstDLL, fdwReason, lpvReserved); switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); break; diff --git a/dlls/url/url_main.c b/dlls/url/url_main.c index 67a01ed..b85e204 100644 --- a/dlls/url/url_main.c +++ b/dlls/url/url_main.c @@ -1 +1,37 @@ -/* nothing here yet */ +/* + * Copyright 2006 Alexandre Julliard + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/*********************************************************************** + * DllMain (URL.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/vdmdbg/vdmdbg.c b/dlls/vdmdbg/vdmdbg.c index 67a01ed..3d272c0 100644 --- a/dlls/vdmdbg/vdmdbg.c +++ b/dlls/vdmdbg/vdmdbg.c @@ -1 +1,37 @@ -/* nothing here yet */ +/* + * Copyright 2006 Alexandre Julliard + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +/*********************************************************************** + * DllMain (VDMDBG.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} diff --git a/dlls/winnls32/winnls.c b/dlls/winnls32/winnls.c index 4172fc2..892ec1c 100644 --- a/dlls/winnls32/winnls.c +++ b/dlls/winnls32/winnls.c @@ -23,6 +23,22 @@ #include "wine/winuser16.h" /*********************************************************************** + * DllMain (WINNLS.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + +/*********************************************************************** * WINNLSEnableIME (WINNLS.16) */ BOOL WINAPI WINNLSEnableIME16(HWND16 hWnd, BOOL fEnable) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 3d7ac5c..09ddfed 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -32,6 +32,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintrust); + +/*********************************************************************** + * DllMain (WINTRUST.@) + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + } + return TRUE; +} + /*********************************************************************** * CryptCATAdminAcquireContext (WINTRUST.@) */

1 0