January 2009 - Wine-commits

Andrew Nguyen : msi/tests: Fix a few handle leaks.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 6d75522fb4d8379ba8de2be3a9c0cf1c70e1fff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d75522fb4d8379ba8de2be3a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Jan 18 04:48:05 2009 -0600 msi/tests: Fix a few handle leaks. This was pointed out by Christoph von Wittich. --- dlls/msi/tests/install.c | 1 + dlls/msi/tests/msi.c | 1 + dlls/msi/tests/package.c | 1 + dlls/msi/tests/source.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5360284..96b85b9 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1365,6 +1365,7 @@ static void get_user_sid(LPSTR *usersid) GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + CloseHandle(token); } static BOOL check_record(MSIHANDLE rec, UINT field, LPCSTR val) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index fba584d..da89faa 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -525,6 +525,7 @@ static void get_user_sid(LPSTR *usersid) GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + CloseHandle(token); } static void test_MsiQueryProductState(void) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 66ff3f0..04ad64c 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -51,6 +51,7 @@ static void get_user_sid(LPSTR *usersid) GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + CloseHandle(token); } /* RegDeleteTreeW from dlls/advapi32/registry.c */ diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 2eb5f18..5e21d67 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -139,6 +139,7 @@ static int get_user_sid(LPSTR *usersid) GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + CloseHandle(token); return 1; }

1 0

Dan Kegel : msvcrt: Remove CRs earlier in ascii mode.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: ebe4a9e321800fbe6d2004a640cd276a28d15c38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe4a9e321800fbe6d2004a64… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jan 18 19:19:46 2009 -0800 msvcrt: Remove CRs earlier in ascii mode. --- dlls/msvcrt/file.c | 90 +++++++++++++++++++-------------------------- dlls/msvcrt/tests/file.c | 34 +++++++++++++++++- 2 files changed, 71 insertions(+), 53 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8945044..e3bc6c4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1639,27 +1639,6 @@ int CDECL _rmtmp(void) } /********************************************************************* - * (internal) remove_cr - * - * Translate all \r\n to \n inplace. - * return the number of \r removed - * Corner cases required by some apps: - * \r\r\n -> \r\n - * BUG: should save state across calls somehow, so CR LF that - * straddles buffer boundary gets recognized properly? - */ -static unsigned int remove_cr(char *buf, unsigned int count) -{ - unsigned int i, j; - - for (i=0, j=0; j < count; j++) - if ((buf[j] != '\r') || ((j+1) < count && buf[j+1] != '\n')) - buf[i++] = buf[j]; - - return count - i; -} - -/********************************************************************* * (internal) read_i */ static int read_i(int fd, void *buf, unsigned int count) @@ -1686,18 +1665,25 @@ static int read_i(int fd, void *buf, unsigned int count) { if (MSVCRT_fdesc[fd].wxflag & WX_TEXT) { - DWORD i; - /* in text mode, a ctrl-z signals EOF */ - for (i=0; i<num_read; i++) + DWORD i, j; + for (i=0, j=0; i<num_read; i++) { + /* in text mode, a ctrl-z signals EOF */ if (bufstart[i] == 0x1a) { - num_read = i; MSVCRT_fdesc[fd].wxflag |= (WX_ATEOF|WX_READEOF); TRACE(":^Z EOF %s\n",debugstr_an(buf,num_read)); break; } + /* in text mode, strip \r if followed by \n. + * BUG: should save state across calls somehow, so CR LF that + * straddles buffer boundary gets recognized properly? + */ + if ((bufstart[i] != '\r') + || ((i+1) < num_read && bufstart[i+1] != '\n')) + bufstart[j++] = bufstart[i]; } + num_read = j; } if (count != 0 && num_read == 0) { @@ -1732,10 +1718,6 @@ int CDECL MSVCRT__read(int fd, void *buf, unsigned int count) { int num_read; num_read = read_i(fd, buf, count); - if (num_read>0 && MSVCRT_fdesc[fd].wxflag & WX_TEXT) - { - num_read -= remove_cr(buf,num_read); - } return num_read; } @@ -2219,17 +2201,13 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) { unsigned char *i; unsigned int j; - do { - if (file->_cnt>0) { - file->_cnt--; - i = (unsigned char *)file->_ptr++; - j = *i; - } else - j = MSVCRT__filbuf(file); - if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) - || ((j != '\r') || (file->_cnt && file->_ptr[0] != '\n'))) - return j; - } while(1); + if (file->_cnt>0) { + file->_cnt--; + i = (unsigned char *)file->_ptr++; + j = *i; + } else + j = MSVCRT__filbuf(file); + return j; } /********************************************************************* @@ -2597,17 +2575,13 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm /* first buffered data */ if(file->_cnt>0) { - while (file->_cnt>0 && rcnt > 0) { int pcnt= (rcnt>file->_cnt)? file->_cnt:rcnt; memcpy(ptr, file->_ptr, pcnt); file->_cnt -= pcnt; file->_ptr += pcnt; - if (MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) - pcnt -= remove_cr(ptr,pcnt); read += pcnt ; rcnt -= pcnt ; ptr = (char*)ptr + pcnt; - } } else if(!(file->_flag & MSVCRT__IOREAD )) { if(file->_flag & MSVCRT__IORW) { file->_flag |= MSVCRT__IOREAD; @@ -2723,17 +2697,26 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) */ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) { + /* TODO: just call fgetpos and return lower half of result */ int off=0; long pos; + pos = _tell(file->_file); + if(pos == -1) return -1; if(file->_bufsiz) { if( file->_flag & MSVCRT__IOWRT ) { off = file->_ptr - file->_base; } else { off = -file->_cnt; + if (MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + off--; + } + } } } - pos = _tell(file->_file); - if(pos == -1) return pos; return off + pos; } @@ -2742,22 +2725,25 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) */ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) { - /* This code has been lifted form the MSVCRT_ftell function */ int off=0; - *pos = MSVCRT__lseeki64(file->_file,0,SEEK_CUR); - - if (*pos == -1) return -1; - + if(*pos == -1) return -1; if(file->_bufsiz) { if( file->_flag & MSVCRT__IOWRT ) { off = file->_ptr - file->_base; } else { off = -file->_cnt; + if (MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + off--; + } + } } } *pos += off; - return 0; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 91effe9..44ca961 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -36,6 +36,37 @@ static HANDLE proc_handles[2]; +static void test_filbuf( void ) +{ + FILE *fp; + int c; + fpos_t pos; + + fp = fopen("filbuf.tst", "wb"); + fwrite("\n\n\n\n", 1, 4, fp); + fclose(fp); + + fp = fopen("filbuf.tst", "rt"); + c = _filbuf(fp); + ok(c == '\n', "read wrong byte\n"); + /* See bug 16970 for why we care about _filbuf. + * ftell returns screwy values on files with lots + * of bare LFs in ascii mode because it assumes + * that ascii files contain only CRLFs, removes + * the CR's early in _filbuf, and adjusts the return + * value of ftell to compensate. + * native _filbuf will read the whole file, then consume and return + * the first one. That leaves fp->_fd at offset 4, and fp->_ptr + * pointing to a buffer of three bare LFs, so + * ftell will return 4 - 3 - 3 = -2. + */ + ok(ftell(fp) == -2, "ascii crlf removal does not match native\n"); + ok(fgetpos(fp, &pos) == 0, "fgetpos fail\n"); + ok(pos == -2, "ftell does not match fgetpos\n"); + fclose(fp); + unlink("filbuf.tst"); +} + static void test_fdopen( void ) { static const char buffer[] = {0,1,2,3,4,5,6,7,8,9}; @@ -463,7 +494,7 @@ static void test_fgetwc( void ) ok(l==BUFSIZ-2, "ftell expected %d got %ld\n", BUFSIZ-2, l); fgetws(wtextW,LLEN,tempfh); l=ftell(tempfh); - ok(l==BUFSIZ-2+strlen(mytext), "ftell got %ld\n", l); + ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", BUFSIZ-2+strlen(mytext), l); mytextW = AtoW (mytext); aptr = mytextW; wptr = wtextW; @@ -1146,6 +1177,7 @@ START_TEST(file) test_unlink(); /* testing stream I/O */ + test_filbuf(); test_fdopen(); test_fopen_fclose_fcloseall(); test_fileops();

1 0

Andrew Talbot : riched20: Declare some functions static.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: b53d7d3295225e6c902b5a4414b406c0c40132fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53d7d3295225e6c902b5a441… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 17 16:27:08 2009 +0000 riched20: Declare some functions static. --- dlls/riched20/editor.h | 2 - dlls/riched20/reader.c | 94 ++++++++++++++++++++++++------------------------ dlls/riched20/rtf.h | 7 ---- dlls/riched20/string.c | 2 +- dlls/riched20/style.c | 2 +- 5 files changed, 49 insertions(+), 58 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d052d5d..dfe67fe 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -71,7 +71,6 @@ void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]); void ME_DumpStyle(ME_Style *s); CHARFORMAT2W *ME_ToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from); void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from); -CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); void ME_CopyCharFormat(CHARFORMAT2W *pDest, const CHARFORMAT2W *pSrc); /* only works with 2W structs */ void ME_CharFormatFromLogFont(HDC hDC, const LOGFONTW *lf, CHARFORMAT2W *fmt); /* ditto */ @@ -89,7 +88,6 @@ void ME_DumpDocument(ME_TextBuffer *buffer); const char *ME_GetDITypeName(ME_DIType type); /* string.c */ -int ME_GetOptimalBuffer(int nLen); ME_String *ME_MakeString(LPCWSTR szText); ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars); ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars); diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 0e0d9a0..7fc952b 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -178,6 +178,33 @@ RTFDestroy(RTF_Info *info) } + +/* ---------------------------------------------------------------------- */ + +/* + * Callback table manipulation routines + */ + + +/* + * Install or return a writer callback for a token class + */ + +static void RTFSetClassCallback(RTF_Info *info, int class, RTFFuncPtr callback) +{ + if (class >= 0 && class < rtfMaxClass) + info->ccb[class] = callback; +} + + +static RTFFuncPtr RTFGetClassCallback(const RTF_Info *info, int class) +{ + if (class >= 0 && class < rtfMaxClass) + return info->ccb[class]; + return NULL; +} + + /* * Initialize the reader. This may be called multiple times, * to read multiple files. The only thing not reset is the input @@ -281,33 +308,6 @@ char *RTFGetOutputName(const RTF_Info *info) } - -/* ---------------------------------------------------------------------- */ - -/* - * Callback table manipulation routines - */ - - -/* - * Install or return a writer callback for a token class - */ - -void RTFSetClassCallback(RTF_Info *info, int class, RTFFuncPtr callback) -{ - if (class >= 0 && class < rtfMaxClass) - info->ccb[class] = callback; -} - - -RTFFuncPtr RTFGetClassCallback(const RTF_Info *info, int class) -{ - if (class >= 0 && class < rtfMaxClass) - return info->ccb[class]; - return NULL; -} - - /* * Install or return a writer callback for a destination type */ @@ -319,7 +319,7 @@ void RTFSetDestinationCallback(RTF_Info *info, int dest, RTFFuncPtr callback) } -RTFFuncPtr RTFGetDestinationCallback(const RTF_Info *info, int dest) +static RTFFuncPtr RTFGetDestinationCallback(const RTF_Info *info, int dest) { if (dest >= 0 && dest < rtfMaxDestination) return info->dcb[dest]; @@ -416,6 +416,22 @@ void RTFReadGroup (RTF_Info *info) /* + * Install or return a token reader hook. + */ + +void RTFSetReadHook(RTF_Info *info, RTFFuncPtr f) +{ + info->readHook = f; +} + + +static RTFFuncPtr RTFGetReadHook(const RTF_Info *info) +{ + return (info->readHook); +} + + +/* * Read one token. Call the read hook if there is one. The * token class is the return value. Returns rtfEOF when there * are no more tokens. @@ -446,23 +462,7 @@ int RTFGetToken(RTF_Info *info) } -/* - * Install or return a token reader hook. - */ - -void RTFSetReadHook(RTF_Info *info, RTFFuncPtr f) -{ - info->readHook = f; -} - - -RTFFuncPtr RTFGetReadHook(const RTF_Info *info) -{ - return (info->readHook); -} - - -void RTFUngetToken(RTF_Info *info) +static void RTFUngetToken(RTF_Info *info) { if (info->pushedClass >= 0) /* there's already an ungotten token */ ERR ("cannot unget two tokens\n"); @@ -797,7 +797,7 @@ static int GetChar(RTF_Info *info) * part of the token text. */ -void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, const char *text) +static void RTFSetToken(RTF_Info *info, int class, int major, int minor, int param, const char *text) { info->rtfClass = class; info->rtfMajor = major; @@ -1269,7 +1269,7 @@ static void ReadObjGroup(RTF_Info *info) */ -RTFStyle *RTFGetStyle(const RTF_Info *info, int num) +static RTFStyle *RTFGetStyle(const RTF_Info *info, int num) { RTFStyle *s; diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index a276b7c..6de440f 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1195,17 +1195,11 @@ void RTFSetInputName (RTF_Info *, const char *); char *RTFGetInputName (const RTF_Info *); void RTFSetOutputName (RTF_Info *, const char *); char *RTFGetOutputName (const RTF_Info *); -void RTFSetClassCallback (RTF_Info *, int, RTFFuncPtr); -RTFFuncPtr RTFGetClassCallback (const RTF_Info *, int); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); -RTFFuncPtr RTFGetDestinationCallback (const RTF_Info *, int); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */ -void RTFUngetToken (RTF_Info *); int RTFPeekToken (RTF_Info *); -void RTFSetToken (RTF_Info *, int, int, int, int, const char *); void RTFSetReadHook (RTF_Info *, RTFFuncPtr); -RTFFuncPtr RTFGetReadHook (const RTF_Info *); void RTFRouteToken (RTF_Info *); void RTFSkipGroup (RTF_Info *); void RTFReadGroup (RTF_Info *); @@ -1215,7 +1209,6 @@ int RTFCheckCMM (const RTF_Info *, int, int, int); int RTFCheckMM (const RTF_Info *, int, int); RTFFont *RTFGetFont (const RTF_Info *, int); RTFColor *RTFGetColor (const RTF_Info *, int); -RTFStyle *RTFGetStyle (const RTF_Info *, int); int RTFCharToHex ( char); int RTFHexToChar ( int ); diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 4a5d590..c4abc6f 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -22,7 +22,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); -int ME_GetOptimalBuffer(int nLen) +static int ME_GetOptimalBuffer(int nLen) { return ((2*nLen+1)+128)&~63; } diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index b7dae3e..b7b909b 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -77,7 +77,7 @@ void ME_CopyToCF2W(CHARFORMAT2W *to, CHARFORMAT2W *from) *to = *from; } -CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) +static CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from) { assert(from->cbSize == sizeof(CHARFORMAT2W)); if (to->cbSize == sizeof(CHARFORMATA))

1 0

Rob Shearman : widl: Add a new function, type_alias_get_aliasee to wrap the retrieval of the type that the alias aliases .
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: bdb13215447c5e2481a7a8f10a54e3ff188a3e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdb13215447c5e2481a7a8f10… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 19 00:02:28 2009 +0000 widl: Add a new function, type_alias_get_aliasee to wrap the retrieval of the type that the alias aliases. --- tools/widl/header.c | 8 ++++---- tools/widl/parser.y | 10 +++++----- tools/widl/typegen.c | 4 ++-- tools/widl/typetree.h | 6 ++++++ tools/widl/write_msft.c | 11 +++++++---- 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index a3d2250..2afd3b5 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -63,7 +63,7 @@ int is_ptrchain_attr(const var_t *var, enum attr_type t) if (is_attr(type->attrs, t)) return 1; else if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) type = type_pointer_get_ref(type); else return 0; @@ -79,7 +79,7 @@ int is_aliaschain_attr(const type_t *type, enum attr_type attr) if (is_attr(t->attrs, attr)) return 1; else if (type_is_alias(t)) - t = t->orig; + t = type_alias_get_aliasee(t); else return 0; } } @@ -424,7 +424,7 @@ void check_for_additional_prototype_types(const var_list_t *list) } if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) type = type_pointer_get_ref(type); else if (is_array(type)) @@ -472,7 +472,7 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type) { fprintf(header, "typedef "); - write_type_def_or_decl(header, type->orig, FALSE, "%s", type->name); + write_type_def_or_decl(header, type_alias_get_aliasee(type), FALSE, "%s", type->name); fprintf(header, ";\n"); } diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 084b5b3..91036ab 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1443,7 +1443,7 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, { ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); if (!ptr_attr && type_is_alias(ptr)) - ptr = ptr->orig; + ptr = type_alias_get_aliasee(ptr); else break; } @@ -1777,7 +1777,7 @@ static void add_incomplete(type_t *t) static void fix_type(type_t *t) { if (type_is_alias(t) && is_incomplete(t)) { - type_t *ot = t->orig; + type_t *ot = type_alias_get_aliasee(t); fix_type(ot); if (is_struct(ot->type) || is_union(ot->type)) t->details.structure = ot->details.structure; @@ -2380,9 +2380,9 @@ static void check_field_common(const type_t *container_type, break; } if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) - type = type->ref; + type = type_pointer_get_ref(type); else if (is_array(type)) type = type_array_get_element(type); else @@ -2442,7 +2442,7 @@ static void check_remoting_args(const var_t *func) if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; if (type_is_alias(type)) - type = type->orig; + type = type_alias_get_aliasee(type); else if (is_ptr(type)) { ptr_level++; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index da5c29b..4e0bea0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -515,7 +515,7 @@ static type_t *get_user_type(const type_t *t, const char **pname) } if (type_is_alias(t)) - t = t->orig; + t = type_alias_get_aliasee(t); else return 0; } @@ -1053,7 +1053,7 @@ size_t type_memsize(const type_t *t, unsigned int *align) size_t size = 0; if (type_is_alias(t)) - size = type_memsize(t->orig, align); + size = type_memsize(type_alias_get_aliasee(t), align); else if (t->declarray && is_conformant_array(t)) { type_memsize(type_array_get_element(t), align); diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 8efc62b..245a9c5 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -180,6 +180,12 @@ static inline int type_is_alias(const type_t *type) return type->is_alias; } +static inline type_t *type_alias_get_aliasee(const type_t *type) +{ + assert(type_is_alias(type)); + return type->orig; +} + static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) { assert(type->type == RPC_FC_COCLASS); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 04195ff..9816048 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -981,7 +981,7 @@ static int encode_type( /* typedef'd types without public attribute aren't included in the typelib */ while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) - type = type->orig; + type = type_alias_get_aliasee(type); chat("encode_type: VT_USERDEFINED - type %p name = %s type->type %d idx %d\n", type, type->name, type->type, type->typelib_idx); @@ -2095,8 +2095,11 @@ static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); - encode_type(typelib, get_type_vt(tdef->orig), tdef->orig, &msft_typeinfo->typeinfo->datatype1, &msft_typeinfo->typeinfo->size, - &alignment, &msft_typeinfo->typeinfo->datatype2); + encode_type(typelib, get_type_vt(type_alias_get_aliasee(tdef)), + type_alias_get_aliasee(tdef), + &msft_typeinfo->typeinfo->datatype1, + &msft_typeinfo->typeinfo->size, + &alignment, &msft_typeinfo->typeinfo->datatype2); msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); } @@ -2269,7 +2272,7 @@ static void add_entry(msft_typelib_t *typelib, const statement_t *stmt) if (is_attr(type_entry->type->attrs, ATTR_PUBLIC)) add_typedef_typeinfo(typelib, type_entry->type); else - add_type_typeinfo(typelib, type_entry->type->orig); + add_type_typeinfo(typelib, type_alias_get_aliasee(type_entry->type)); } break; }

1 0

Rob Shearman : widl: Add new type_get_type and type_get_real_type_type functions.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 28ee1ee90f13523ea9ad4a4c33bcb205428f5b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ee1ee90f13523ea9ad4a4c3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 19 00:02:35 2009 +0000 widl: Add new type_get_type and type_get_real_type_type functions. Use these to implement a few helper functions. Change the type verification in type accessor functions to use these new functions. --- tools/widl/header.c | 3 +- tools/widl/typelib.c | 20 +-------- tools/widl/typetree.h | 115 +++++++++++++++++++++++++++++++++-------------- tools/widl/widltypes.h | 83 ++++++++++++++++++++++++++++++++++- 4 files changed, 166 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28ee1ee90f13523ea9ad4…

1 0

Ge van Geldorp : winetest: Make the wrapper immune to Ctrl-C.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 4de19cff1f7a0fc5f46186e89d84955f35138db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de19cff1f7a0fc5f46186e89… Author: Ge van Geldorp <ge(a)gse.nl> Date: Sat Jan 17 00:21:20 2009 +0100 winetest: Make the wrapper immune to Ctrl-C. --- programs/winetest/main.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a9ead7d..fc7a378 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -650,6 +650,16 @@ run_tests (char *logname) return logname; } +static BOOL WINAPI ctrl_handler(DWORD ctrl_type) +{ + if (ctrl_type == CTRL_C_EVENT) { + printf("Ignoring Ctrl-C, use Ctrl-Break if you really want to terminate\n"); + return TRUE; + } + + return FALSE; +} + static void usage (void) { @@ -750,6 +760,8 @@ int main( int argc, char *argv[] ) if (!running_on_visible_desktop ()) report (R_FATAL, "Tests must be run on a visible desktop"); + SetConsoleCtrlHandler(ctrl_handler, TRUE); + if (reset_env) { SetEnvironmentVariableA( "WINETEST_PLATFORM", running_under_wine () ? "wine" : "windows" );

1 0

Austin English : kernel32: Fix a compiler warning on NetBSD.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 7f3439d556b65f86901afbe11122e74afa0e3d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3439d556b65f86901afbe11… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 16 16:08:36 2009 -0600 kernel32: Fix a compiler warning on NetBSD. --- dlls/kernel32/cpu.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 95ac469..0898117 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -559,8 +559,7 @@ VOID WINAPI GetSystemInfo( mib[1] = CPU_FPU_PRESENT; val_len = sizeof(value); if (sysctl(mib, 2, &value, &val_len, NULL, 0) >= 0) - if (value) PF[PF_FLOATING_POINT_EMULATED] = FALSE; - else PF[PF_FLOATING_POINT_EMULATED] = TRUE; + PF[PF_FLOATING_POINT_EMULATED] = !value; #endif #ifdef CPU_SSE mib[1] = CPU_SSE; /* this should imply MMX */

1 0

Austin English : ntdll: Add support for NetBSD.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 198b8f736afb18c8ab647bfcc2aec8b2539a6a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=198b8f736afb18c8ab647bfcc… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Jan 16 15:39:21 2009 -0600 ntdll: Add support for NetBSD. --- dlls/ntdll/signal_i386.c | 38 +++++++++++++++++++++++++++++++++++++- 1 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 1543664..ffa60ad 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT; #endif /* bsdi */ -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) typedef struct sigcontext SIGCONTEXT; @@ -332,6 +332,42 @@ typedef ucontext_t SIGCONTEXT; #endif /* __APPLE__ */ +#if defined(__NetBSD__) +# include <sys/ucontext.h> +# include <sys/types.h> +# include <signal.h> + +typedef ucontext_t SIGCONTEXT; + +#define EAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EAX]) +#define EBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBX]) +#define ECX_sig(context) ((context)->uc_mcontext.__gregs[_REG_ECX]) +#define EDX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EDX]) +#define ESI_sig(context) ((context)->uc_mcontext.__gregs[_REG_ESI]) +#define EDI_sig(context) ((context)->uc_mcontext.__gregs[_REG_EDI]) +#define EBP_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBP]) +#define ESP_sig(context) _UC_MACHINE_SP(context) + +#define CS_sig(context) ((context)->uc_mcontext.__gregs[_REG_CS]) +#define DS_sig(context) ((context)->uc_mcontext.__gregs[_REG_DS]) +#define ES_sig(context) ((context)->uc_mcontext.__gregs[_REG_ES]) +#define SS_sig(context) ((context)->uc_mcontext.__gregs[_REG_SS]) +#define FS_sig(context) ((context)->uc_mcontext.__gregs[_REG_FS]) +#define GS_sig(context) ((context)->uc_mcontext.__gregs[_REG_GS]) + +#define EFL_sig(context) ((context)->uc_mcontext.__gregs[_REG_EFL]) +#define EIP_sig(context) _UC_MACHINE_PC(context) +#define TRAP_sig(context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO]) +#define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) + +#define FPU_sig(context) NULL +#define FPUX_sig(context) ((XMM_SAVE_AREA32 *)&((context)->uc_mcontext.__fpregs)) + +#define T_MCHK T_MCA +#define T_XMMFLT T_XMM + +#endif /* __NetBSD__ */ + WINE_DEFAULT_DEBUG_CHANNEL(seh); typedef int (*wine_signal_handler)(unsigned int sig);

1 0

Juan Lang : crypt32: Include root store in CertEnumSystemStore enumeration for the local machine location .
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 0509d021c0e950e585c8f7dd9f0cb9b644330085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0509d021c0e950e585c8f7dd9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 16 07:49:30 2009 -0800 crypt32: Include root store in CertEnumSystemStore enumeration for the local machine location. --- dlls/crypt32/store.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 602bd40..09c4acc 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -329,10 +329,11 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, return (PWINECRYPT_CERTSTORE)store; } +static const WCHAR rootW[] = { 'R','o','o','t',0 }; + static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { - static const WCHAR rootW[] = { 'R','o','o','t',0 }; static const WCHAR fmt[] = { '%','s','\\','%','s',0 }; LPCWSTR storeName = (LPCWSTR)pvPara; LPWSTR storePath; @@ -1350,6 +1351,7 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, BOOL ret = FALSE; LONG rc; HKEY key; + CERT_SYSTEM_STORE_INFO info = { sizeof(info) }; TRACE("(%08x, %p, %p, %p)\n", dwFlags, pvSystemStoreLocationPara, pvArg, pfnEnum); @@ -1358,7 +1360,6 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, if (!rc) { DWORD index = 0; - CERT_SYSTEM_STORE_INFO info = { sizeof(info) }; ret = TRUE; do { @@ -1375,6 +1376,12 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, } else SetLastError(rc); + /* Include root store for the local machine location (it isn't in the + * registry) + */ + if (ret && (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) == + CERT_SYSTEM_STORE_LOCAL_MACHINE) + ret = pfnEnum(rootW, dwFlags, &info, NULL, pvArg); return ret; }

1 0

Alexandre Julliard : user32/tests: Fix some more msg test failures and improve message sequence tracing.
by Alexandre Julliard 19 Jan '09

19 Jan '09

Module: wine Branch: master Commit: 7d585678be14df62a777fb15a4077878702f0cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d585678be14df62a777fb15a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 19 12:36:11 2009 +0100 user32/tests: Fix some more msg test failures and improve message sequence tracing. --- dlls/user32/tests/msg.c | 59 +++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 91a470b..38cfeef 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -750,6 +750,7 @@ static const struct message WmCreatePopupSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, { WM_ACTIVATE, sent|wparam, 1 }, @@ -834,6 +835,7 @@ static const struct message WmShowVisiblePopupSeq_3[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; /* CreateWindow (for child window, not initially visible) */ @@ -1884,8 +1886,15 @@ static void dump_sequence(const struct message *expected, const char *context, c while (expected->message && ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook))) { + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); expected++; + count++; } + + if (expected->message) + trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); + else if (actual->message && actual->output[0]) + trace_(file, line)( " %u: expected: nothing - actual: %s\n", count, actual->output ); } #define ok_sequence( exp, contx, todo) \ @@ -1950,6 +1959,14 @@ static void ok_sequence_(const struct message *expected_list, const char *contex if ((expected->lParam ^ actual->lParam) & ~expected->lp_mask) dump++; } } + if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && + (expected->flags & optional)) + { + /* don't match messages if their defwinproc status differs */ + expected++; + count++; + continue; + } if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && todo) { todo_wine { @@ -2387,12 +2404,12 @@ static const struct message WmCreateMDIchildVisibleMaxSeq1[] = { /* Win9x: message sequence terminates here. */ { WM_NCACTIVATE, sent|wparam|defwinproc|optional, 1 }, - { HCBT_SETFOCUS, hook }, /* in MDI client */ + { HCBT_SETFOCUS, hook|optional }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, /* in MDI client */ { WM_IME_NOTIFY, sent|wparam|optional, 2 }, /* in MDI client */ { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|optional }, /* in MDI client */ - { HCBT_SETFOCUS, hook }, + { HCBT_SETFOCUS, hook|optional }, { WM_KILLFOCUS, sent|optional }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, /* in MDI client */ { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, @@ -3116,6 +3133,7 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_GETTEXT && message != WM_MDIGETACTIVE && message != WM_GETICON && + message != WM_GETOBJECT && message != WM_DEVICECHANGE) { msg.hwnd = hwnd; @@ -3144,6 +3162,7 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && + message != WM_GETOBJECT && message != WM_DEVICECHANGE) { switch (message) @@ -3193,6 +3212,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && + message != WM_GETOBJECT && message != WM_DEVICECHANGE) { msg.hwnd = hwnd; @@ -3812,6 +3832,7 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam { /* ignore */ case WM_GETICON: + case WM_GETOBJECT: case WM_MOUSEMOVE: case WM_SETCURSOR: case WM_DEVICECHANGE: @@ -5061,9 +5082,9 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, switch (message) { - /* explicitly ignore WM_GETICON message */ case WM_GETICON: - return 0; + case WM_GETOBJECT: + return 0; /* ignore them */ case WM_SYNCPAINT: break; case BM_SETSTATE: @@ -5169,6 +5190,7 @@ static void test_button_messages(void) 0, 0, 50, 14, 0, 0, 0, NULL); ok(hwnd != 0, "Failed to create button window\n"); + SetForegroundWindow(hwnd); SetFocus(0); flush_events(); flush_sequence(); @@ -5206,8 +5228,7 @@ static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; + if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ msg.hwnd = hwnd; msg.message = message; @@ -5310,6 +5331,7 @@ static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && + message != WM_GETOBJECT && message != WM_DEVICECHANGE) { msg.hwnd = hwnd; @@ -6542,6 +6564,7 @@ static void pump_msg_loop(HWND hwnd, HACCEL hAccel) /* ignore some unwanted messages */ if (msg.message == WM_MOUSEMOVE || msg.message == WM_GETICON || + msg.message == WM_GETOBJECT || msg.message == WM_TIMER || msg.message == WM_DEVICECHANGE) continue; @@ -6766,9 +6789,6 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; - /* ignore registered messages */ if (message >= 0xc000) return 0; @@ -6833,6 +6853,8 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_MOUSEACTIVATE: case WM_NCMOUSEMOVE: case WM_SETCURSOR: + case WM_GETICON: + case WM_GETOBJECT: case WM_DEVICECHANGE: return 0; } @@ -6905,8 +6927,8 @@ static LRESULT WINAPI PopupMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, switch (message) { case WM_GETICON: - /* explicitly ignore WM_GETICON message */ - return 0; + case WM_GETOBJECT: + return 0; /* ignore them */ case WM_QUERYENDSESSION: case WM_ENDSESSION: lParam &= ~0x01; /* Vista adds a 0x01 flag */ @@ -6942,8 +6964,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; + if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ /* ignore registered messages */ if (message >= 0xc000) return 0; @@ -7009,8 +7030,7 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; + if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ if (test_def_id) { @@ -8633,8 +8653,7 @@ static LRESULT CALLBACK edit_hook_proc(HWND hwnd, UINT message, WPARAM wParam, L LRESULT ret; struct recvd_message msg; - /* explicitly ignore WM_GETICON message */ - if (message == WM_GETICON) return 0; + if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ msg.hwnd = hwnd; msg.message = message; @@ -9782,6 +9801,7 @@ static const struct message WmShowNA_1[] = { static const struct message WmShowNA_2[] = { { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; static const struct message WmRestore_1[] = { @@ -10091,9 +10111,9 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR switch (message) { - /* explicitly ignore WM_GETICON message */ case WM_GETICON: - return 0; + case WM_GETOBJECT: + return 0; /* ignore them */ } msg.hwnd = hwnd; @@ -10851,6 +10871,7 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && + message != WM_GETOBJECT && message != WM_GETICON && message != WM_DEVICECHANGE) {

1 0